Merge remote-tracking branch 'origin/databank'

src/main/java/com/lemon/lifecenter/controller/PatientController.java

@@ -56,10 +56,12 @@ import com.lemon.lifecenter.common.LifeCenterSessionController;
 import com.lemon.lifecenter.dto.CenterInfoDTO;
 import com.lemon.lifecenter.dto.FileDownloadDTO;
 import com.lemon.lifecenter.dto.PatientDTO;
+import com.lemon.lifecenter.dto.PushDTO;
 import com.lemon.lifecenter.dto.StaffDTO;
 import com.lemon.lifecenter.service.CenterService;
 import com.lemon.lifecenter.service.FileDownloadService;
 import com.lemon.lifecenter.service.PatientService;
+import com.lemon.lifecenter.service.PushService;
 import com.lemon.lifecenter.service.StaffService;
 
 
@@ -79,6 +81,9 @@ public class PatientController extends LifeCenterController {
     @Autowired
     private FileDownloadService fileDownloadService;
     
+    @Autowired
+    private PushService pushService;
+    
     @Autowired
     private LifeCenterConfigVO config;
     
@@ -515,6 +520,7 @@ public class PatientController extends LifeCenterController {
     @ResponseBody
     public String nonFaceStart(
             @RequestParam( value="pId", required = true ) String pId,
+            @RequestParam( value="patientIdx", required = true ) String patientIdx,
             @RequestParam( value="roomId", required = true ) String roomId,
             @RequestParam( value="pName", required = true ) String pName,
             HttpServletRequest request, HttpServletResponse response) throws Exception {
@@ -549,6 +555,29 @@ public class PatientController extends LifeCenterController {
         
         if (!message.equals("")) {
             //error
+        } else {
+            int sesCenterCode = Integer.valueOf( LifeCenterSessionController.getSession( request, "sesCenterCode" ) ) ;
+            String sesId      = LifeCenterSessionController.getSession( request, "sesId" );
+            String remoteIp   = LifeCenterFunction.getRemoteAddr( request );
+            
+            PushDTO dto = new PushDTO();
+            
+            dto.setPatientIdx(Integer.valueOf(patientIdx));
+            
+            pushService.insertPushTargetTemp(dto);
+            
+            dto.setSendType("D");
+            dto.setTargetType("P");
+            dto.setPushTitle("비대면 진료");
+            dto.setPushContent("비대면 진료를 요청하였습니다.");
+            dto.setPushPayLoad1("nonface");
+            
+            dto.setCenterCode( sesCenterCode );
+            dto.setSender( sesId );
+            dto.setSenderIp( remoteIp );
+            dto.setSendState( "W" );
+            
+            pushService.insertPushData(dto);
         }
         String hashData = LifeCenterFunction.getSignature(config.nonFaceApiSecret, config.nonFaceApiKey, roomId + userId); //"1011503101"
         

src/main/java/com/lemon/lifecenter/dto/PushDTO.java

@@ -15,6 +15,7 @@ public class PushDTO {
     private String sender="";
     private String pushTitle="";
     private String pushContent="";
+    private String pushPayLoad1 = "";
     private String sendDate=null;
     private String sendTime=null;
     private String createDate="";
@@ -291,6 +292,12 @@ public class PushDTO {
     public void setPushContent(String pushContent) {
         this.pushContent = pushContent;
     }
+    public String getPushPayLoad1() {
+        return pushPayLoad1;
+    }
+    public void setPushPayLoad1(String pushPayLoad1) {
+        this.pushPayLoad1 = pushPayLoad1;
+    }
     public String getSendDate() {
         return sendDate;
     }

src/main/resources/mybatis/mapper/push/push.xml

@@ -263,9 +263,9 @@
             INSERT
               INTO push_schedule 
                    ( send_type,    send_state,     target_type,   center_code,   sender_ip,   sender,
-                     push_title,   push_content,   send_date,     send_time,     create_date )
+                     push_title,   push_content,   push_payload1, send_date,     send_time,     create_date )
             VALUES ( #{sendType},  #{sendState},   #{targetType}, #{centerCode}, #{senderIp}, #{sender},
-                     #{pushTitle}, #{pushContent}, #{sendDate},   #{sendTime},   NOW() );
+                     #{pushTitle}, #{pushContent}, #{pushPayLoad1}, #{sendDate},   #{sendTime},   NOW() );
         ]]>
     </insert>
     

src/main/webapp/WEB-INF/jsp/clinic/info.jsp

@@ -1111,6 +1111,7 @@ $(document).ready(function() {
     <input type="hidden" id="pId" name="pId" value='<c:out value="${info.id}" />'>
     <input type="hidden" id="pName" name="pName" value='<c:out value="${info.patientName}" />'>
     <input type="hidden" id="roomId" name="roomId" value='<c:out value="${info.roomNumber}" />'>
+    <input type="hidden" id="patientIdx" name="patientIdx" value='<c:out value="${info.patientIdx}" />'>
   </form>
   <div class="preloader">
 		<div class="loadingIcon"></div>

src/main/webapp/WEB-INF/jsp/notice/edit.jsp

@@ -34,10 +34,10 @@ $( function(){
             form.submit();
         }
     });
-    var groupIdx = "<c:out value='${groupIdx}'/>";
-    if (groupIdx != "1") {
-        alertBox({ txt : '공지사항 수정 권한이 없습니다.', callBack : function(){ location.href='./list' } });
-    }
+//     var groupIdx = "<c:out value='${groupIdx}'/>";
+//     if (groupIdx != "1") {
+//         alertBox({ txt : '공지사항 수정 권한이 없습니다.', callBack : function(){ location.href='./list' } });
+//     }
 
     var button = '';
     var fileOrgName = '<c:out value="${item.fileOriginalName}" />';