junekeunsong 4 jaren geleden
bovenliggende
commit
b90ca59a1d

+ 1 - 0
src/main/java/com/lemon/lifecenter/controller/MobileLoginController.java

@@ -79,6 +79,7 @@ public class MobileLoginController extends LifeCenterController {
             LifeCenterSessionController.setSessionMobile(request, "sesMRoomNum", dto.getRoomNumber());
             LifeCenterSessionController.setSessionMobile(request, "sesMCenterCode", String.valueOf(dto.getCenterCode()));
             LifeCenterSessionController.setSessionMobile(request, "sesMCenterName", dto.getCenterName());
+            LifeCenterSessionController.setSessionMobile(request, "sesMJumin", dto.getJumin());
 
             logger.error("dto.getPw()dto.getPw() -- > " + dto.getPw());
             object.put("id", dto.getId());

+ 8 - 5
src/main/java/com/lemon/lifecenter/controller/MobileNonFaceController.java

@@ -35,9 +35,10 @@ public class MobileNonFaceController extends LifeCenterController {
         String timeStamp = LifeCenterFunction.getTimestamp();
         String signature = LifeCenterFunction.getSignature(config.nonFaceApiSecret, salt, timeStamp);
         
-        String patientId = LifeCenterSessionController.getSession( request, "sesMId" );
-        String roomId = LifeCenterSessionController.getSession(request, "sesMRoomNum");
-        String patientName = LifeCenterSessionController.getSession(request, "sesMName");
+        String patientId = LifeCenterSessionController.getSession( request, "sesMId" ).trim();
+        String roomId = LifeCenterSessionController.getSession(request, "sesMRoomNum").trim();
+        String patientName = LifeCenterSessionController.getSession(request, "sesMName").trim();
+        String jumin = LifeCenterSessionController.getSession(request, "sesMJumin");
         
         HashMap<String, String> data = new HashMap<String, String>();
         data.put("api_key", config.nonFaceApiKey);
@@ -47,12 +48,13 @@ public class MobileNonFaceController extends LifeCenterController {
         data.put("client_id", config.nonFaceClientId);
         data.put("member_id", patientId);
         
+        logger.error("data -- > " + data);
+        
         String result = LifeCenterFunction.httpUrlConnection(config.nonFaceApiTokenUrl, data);
         JSONObject object = new JSONObject(result);
         String message = "";
         String token = "";
         for(String key : object.keySet()) {
-            logger.error("key -- > " + key);
             if (key.equals("errorCode")) {
                 message = object.getString("message");
             } else if (key.equals("token")){
@@ -60,11 +62,12 @@ public class MobileNonFaceController extends LifeCenterController {
             }
         }
         
+        logger.error("message -- > " + message);
         if (!message.equals("")) {
             //error
         }
         
-        String hashData = LifeCenterFunction.getSignature(config.nonFaceApiSecret, config.nonFaceApiKey, roomId + patientId); //"1011503101"
+        String hashData = LifeCenterFunction.getSignature(config.nonFaceApiSecret, config.nonFaceApiKey, roomId + jumin + patientId); //"101 1503101"
         
         ModelAndView mv = setMobileMV("nonface/nonface");
         mv.addObject("api_key", config.nonFaceApiKey);

+ 0 - 1
src/main/java/com/lemon/lifecenter/controller/PatientController.java

@@ -365,7 +365,6 @@ public class PatientController extends LifeCenterController {
         object.put("member_name", userNm);
         object.put("classify", "d"); // p이면 환자 d이면 의사
         object.put("hashData", hashData);
-        logger.error("pid -- > " + hashData);
         
         return object.toString();
     }

+ 7 - 1
src/main/webapp/WEB-INF/jsp/mobile/nonface/nonface.jsp

@@ -5,7 +5,13 @@
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script type="text/javascript">
 $( function() {
-    systemBrowsing( "https://life-center.lemonhc.com/mobile/nonface/wait?" + $( "#nonface" ).serialize() );
+//     systemBrowsing( "https://life-center.lemonhc.com/mobile/nonface/wait?" + $( "#nonface" ).serialize() );
+    var win = window.open("","nonface");
+    var frm = document.nonface;
+    frm.action = 'https://lemon.medihere.com/app/vc';
+    frm.target ="nonface";
+    frm.method ="post";
+    frm.submit();
     
     setTimeout( function(){
         history.back();

+ 6 - 1
src/main/webapp/WEB-INF/jsp/patient/list.jsp

@@ -174,7 +174,12 @@ var endDate   = "<c:out value='${endDate}'/>";
                                                                 </td>
                                                                 <td><c:out value="${l.gender}" /></td>
                                                                 <td><c:out value="${l.age}" /></td>
-                                                                <td><c:out value="${l.wardNumber}동 ${l.roomNumber}호" /></td>
+                                                                <td>
+                                                                    <c:if test="${l.wardNumber ne null and l.wardNumber ne ''}">
+                                                                        <c:out value="${l.wardNumber}"/>동
+                                                                    </c:if>
+                                                                    <c:out value="${l.roomNumber}" />호 
+                                                                </td>
                                                                 <td><c:out value="${l.hospitalizationDate}" /></td>
                                                                 <td>
                                                                     <c:if test="${l.disisolationDate eq null or l.disisolationDate eq ''}">