1. 환자정보 리스트 항목 수정

2. 신규 환자 등록, 환자 정보 수정 기타환자 메모
3. 엑셀 다운로드 셀 수정
4. 환자정보 화면에 건강정보 버튼 추가

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

@@ -24,6 +24,7 @@ import com.lemon.lifecenter.common.LifeCenterSessionController;
 import com.lemon.lifecenter.dto.CenterInfoDTO;
 import com.lemon.lifecenter.dto.PatientDTO;
 import com.lemon.lifecenter.service.MobilePatientService;
+import com.lemon.lifecenter.service.RestApiService;
 import com.lemon.lifecenter.service.StaffService;
 
 @Controller
@@ -38,6 +39,9 @@ public class MobileLoginController extends LifeCenterController {
     @Autowired
     private MobilePatientService patientService;
     
+    @Autowired
+    private RestApiService restApiService;
+    
     @Autowired
     private LifeCenterConfigVO config;
     
@@ -106,10 +110,8 @@ public class MobileLoginController extends LifeCenterController {
         JSONObject json = new JSONObject();
         json.put("patientIdx", 1);
         
-//        String result = LifeCenterFunction.httpUrlCon("http://192.168.40.215:8080/deleteDeviceInfo", json.toString());
-//        logger.error("result -- > " + result);
-        
         logger.error( "[PATIENT LOGOUT] RemoteIP : " + remoteIp + " UserId : " + sesMId );
+//        restApiService.deleteDeviceInfo(Integer.parseInt(sesMId));
         
         LifeCenterFunction.scriptMessage(response, "localStorage.clear();location.href='/mobile/login';");
         return "/common/blank";

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

@@ -39,6 +39,7 @@ public class MobileMenuController extends LifeCenterController {
         int cnt = patientService.selectMunJinCount(dto);
         
         ModelAndView mv = setMobileMV("menu/menu");
+        mv.addObject("patientIdx", sesMpIdx);
         mv.addObject("patientId", patientId);
         mv.addObject("roomId", roomId);
         mv.addObject("name", patientName);

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

@@ -99,7 +99,7 @@ public class PatientController extends LifeCenterController {
         List<PatientDTO> result = new ArrayList<PatientDTO>();
 
         if (total > 0) {
-            result = patientService.selectPatietList(dto);
+            result = patientService.selectPatientList(dto);
             
             for( PatientDTO temp : result ) {
                 result.get( result.indexOf( temp ) ).setSymptomContent( LifeCenterFunction.getSymptom( temp ) );
@@ -523,7 +523,7 @@ public class PatientController extends LifeCenterController {
             dto.setLimit( 0 );
             dto.setLimitMax( total );
             
-            result = patientService.selectPatietList(dto);
+            result = patientService.selectPatientList(dto);
 
             for (PatientDTO temp : result) {
                 result.get(result.indexOf(temp)).setSymptomContent(LifeCenterFunction.getSymptom(temp));
@@ -611,11 +611,11 @@ public class PatientController extends LifeCenterController {
         cell1.setCellValue("생활치료센터명");
         cell2.setCellValue("환자명");
         cell3.setCellValue("동,호실");
-        cell4.setCellValue("성별");
-        cell5.setCellValue("나이");
+        cell4.setCellValue("성별/나이");
+        cell5.setCellValue("확진일자");
         cell6.setCellValue("입소일자");
-        cell7.setCellValue("상태 변경일");
-        cell8.setCellValue("상태");
+        cell7.setCellValue("퇴소예정일");
+        cell8.setCellValue("상태(상태 변경일)");
         cell9.setCellValue("체온");
         cell10.setCellValue("혈압");
         cell11.setCellValue("맥박");
@@ -647,9 +647,11 @@ public class PatientController extends LifeCenterController {
             String gender      = dto.getGender();
             String age         = dto.getAge();
             
-            String hospitalizationDate = dto.getHospitalizationDate();
-            String disisolationDate    = dto.getDisisolationDate();
-            String state               = dto.getState();
+            String confirmationDate     = dto.getConfirmationDate();
+            String hospitalizationDate  = dto.getHospitalizationDate();
+            String expecteDischargeDate = dto.getExpectedDischargeDate();
+            String disisolationDate     = dto.getDisisolationDate();
+            String state                = dto.getState();
             
             String temperature                      = dto.getTemperature();
             String temperatureCreateDate            = dto.getTemperatureCreateDate();
@@ -678,11 +680,16 @@ public class PatientController extends LifeCenterController {
             cell1.setCellValue( centerName );
             cell2.setCellValue( patientName );
             cell3.setCellValue( roomWard );
-            cell4.setCellValue( gender );
-            cell5.setCellValue( age );
+            cell4.setCellValue( gender + "/" + age );
+            cell5.setCellValue( confirmationDate );
             cell6.setCellValue( hospitalizationDate );
-            cell7.setCellValue( disisolationDate );
-            cell8.setCellValue( state );
+            cell7.setCellValue( expecteDischargeDate );
+            if (state.equals("입소")) {
+                cell8.setCellValue( state );
+            } else {
+                cell8.setCellValue( state + "(" + disisolationDate + ")" );
+            }
+            
             cell9.setCellValue( ( temperature == null || temperature.equals("") ) ? notMeasured : temperature + " ˚C (" + temperatureCreateDate + ")" );
             cell10.setCellValue( ( systolicBloodPressure == null || systolicBloodPressure.equals("") ) ? notMeasured : systolicBloodPressure + " mmHg / " + diastolicBloodPressure + " mmHg (" + systolicBloodPressureCreateDate + ")" );
             cell11.setCellValue( ( pulseRate == null || pulseRate.equals("") ) ? notMeasured : pulseRate + " bpm (" + pulseRateCreateDate + ")" );

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.lemon.lifecenter.dto.AppVersionDTO;
@@ -60,7 +61,7 @@ public class RestApiController {
      * 01 : 파라메터를 모두 받지 못함
      * 02 : 디바이스 토큰 저장 실패
      */
-    @RequestMapping(value="/insertDeviceInfo", method=RequestMethod.POST)
+    @RequestMapping(value="/mobile/insertDeviceInfo", method=RequestMethod.POST)
     public Map<String, String> setDeviceInfo(@RequestBody DeviceInfoDTO dto) {
         HashMap<String, String> result = new HashMap<>();
         String code = "99";

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

@@ -280,7 +280,7 @@ public class StaffController extends LifeCenterController {
         if (total > 0) {
             list = memberService.selectMemberList(dto);
         }
-        String param = "";
+        String param = "selectState=" + selectState + "&sData=" + sData + "&useYn=" + useYn;
         paging = LifeCenterPaging.getInstance();
         paging.paging(config, total, page, param);
         

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

@@ -38,6 +38,8 @@ public class PatientDTO {
     private String startDate;
     private String endDate;
     private String pw;
+    private String patientEtc = "";
+    private String expectedDischargeDate = null;
     
     // patient_disease
     private String highBloodPressureCheck="N";
@@ -693,5 +695,16 @@ public class PatientDTO {
     public void setServeyYn(String serveyYn) {
         this.serveyYn = serveyYn;
     }
-
+    public String getPatientEtc() {
+        return patientEtc;
+    }
+    public void setPatientEtc(String patientEtc) {
+        this.patientEtc = patientEtc;
+    }
+    public String getExpectedDischargeDate() {
+        return expectedDischargeDate;
+    }
+    public void setExpectedDischargeDate(String expectedDischargeDate) {
+        this.expectedDischargeDate = expectedDischargeDate;
+    }
 }

src/main/java/com/lemon/lifecenter/service/PatientService.java

@@ -19,7 +19,7 @@ public class PatientService {
         return mapper.selectPatientCount(dto);
     }
     
-    public List<PatientDTO> selectPatietList(PatientDTO dto) {
+    public List<PatientDTO> selectPatientList(PatientDTO dto) {
         return mapper.selectPatientList(dto);
     }
     

src/main/resources/logback-spring.xml

@@ -105,9 +105,6 @@
 
    <!-- 특정패키지 로깅레벨 설정 -->
    <logger name="org.apache.ibatis" level="DEBUG" additivity="true">
-      <!-- <appender-ref ref="CONSOLE" /> -->
-<!--       <appender-ref ref="FILE_SAVE" /> -->
-<!--       <appender-ref ref="Error" /> -->
    </logger>
    <!-- log4jdbc 옵션 설정 -->
    <logger name="jdbc" level="OFF"/>
@@ -127,7 +124,7 @@
    <logger name="jdbc.resultset" level="ERROR" additivity="true" />
       
    <!-- SQL 결과 조회된 데이터의 table을 로그로 남긴다. -->
-   <logger name="jdbc.resultsettable" level="INFO" additivity="true" />
+   <logger name="jdbc.resultsettable" level="OFF" additivity="false" />
    <logger name="com.zaxxer.hikari.HikariConfig" level="OFF" additivity="false" />
    <logger name="com.zaxxer.hikari" level="OFF" />
    

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

@@ -127,6 +127,8 @@
                    room_number                                                         AS roomNumber,
                    DATE_FORMAT(FINAL_CLINIC_DATE, '%Y-%m-%d')                          AS finamClinicDate,
                    DATE_FORMAT(HOSPITALIZATION_DATE, '%Y-%m-%d')                       AS hospitalizationDate,
+                   DATE_FORMAT(CONFIRMATION_DATE, '%Y-%m-%d')                          AS confirmationDate,
+                   DATE_FORMAT(EXPECTED_DISCHARGE_DATE, '%Y-%m-%d')                    AS expectedDischargeDate,
                    DATE_FORMAT(DISISOLATION_DATE, '%Y-%m-%d')                          AS disisolationDate,
                    CASE WHEN STATE = 'H' THEN '입소'
                         WHEN STATE = 'D' THEN '퇴소'
@@ -318,12 +320,14 @@
                    ( patient_name,      gender,      ward_number,     room_number,        hospitalization_date, state, 
                      center_code,       jumin,       patient_phone,   guardian_phone,     symptom_start_date,   confirmation_date,    disisolation_date, 
                      basal_disease_yn,  drug_yn,     drug_content,    pregnancy_status,   pregnancy_week,       id,                   pw, 
-                     create_date,       create_by,   update_by,       servey_yn,          foreigner_yn,         manager_id )
+                     create_date,       create_by,   update_by,       servey_yn,          foreigner_yn,         manager_id,           patient_etc,
+                     expected_discharge_date )
                       
             VALUES ( #{patientName},    #{gender},   #{wardNumber},   #{roomNumber},      #{hospitalizationDate}, #{state}, 
                      #{centerCode},     #{jumin},    #{patientPhone}, #{guardianPhone},   #{symptomStartDate},    #{confirmationDate},    #{disisolationDate}, 
                      #{basalDiseaseYn}, #{drugYn},   #{drugContent},  #{pregnancyStatus}, #{pregnancyWeek},       #{id},                  #{pw}, 
-                     NOW(),             #{createBy}, '',              #{serveyYn},        #{foreignerYn},         #{managerId} )
+                     NOW(),             #{createBy}, '',              #{serveyYn},        #{foreignerYn},         #{managerId},           #{patientEtc},
+                     #{expectedDischargeDate} )
         ]]>
     </insert>
     
@@ -390,6 +394,8 @@
                    PC.SERVEY_YN AS serveyYn,
                    PC.FOREIGNER_YN AS foreignerYn,
                    PC.MANAGER_ID AS managerId,
+                   PC.PATIENT_ETC AS patientEtc,
+                   DATE_FORMAT(PC.EXPECTED_DISCHARGE_DATE, '%Y-%m-%d') AS expectedDischargeDate,
             
                    PS.FEVER_CHECK AS feverCheck,
                    PS.COUGH_CHECK AS coughCheck,

src/main/webapp/WEB-INF/jsp/include/patientInfo.jsp

@@ -92,6 +92,12 @@
         </td>
     </tr>
     <tr>
+        <th>퇴소예정일</th>
+            <fmt:parseDate var="expectedDischargeDate" value="${info.expectedDischargeDate}" pattern="yyyy-MM-dd" />
+            <c:set var="expectedDischargeDate"><fmt:formatDate value="${expectedDischargeDate}" pattern="yyyy년 MM월 dd일" /></c:set>
+            <c:out value="${expectedDischargeDate}" />
+        <td>
+        </td>
         <th>담당 의료진</th>
         <td>
             <c:forEach var="sl" items="${staffList}">
@@ -181,4 +187,10 @@
             <c:out value="${info.oxygenSaturation} %" />
         </td>
     </tr>
+    <tr>
+        <th>기타 환자 메모</th>
+        <td colspan="3">
+            <c:out value="${info.patientEtc}" />
+        </td>
+    </tr>
 </table>

src/main/webapp/WEB-INF/jsp/mobile/menu/menu.jsp

@@ -3,6 +3,55 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
+<script type="text/javascript">
+
+// $( function(){
+//     token( "getToken" );
+// });
+
+// function getToken(token, deviceType, macAddress) {
+//     var jsonMsg = {
+//         patientIdx : "<c:out value='${patientIdx}' />",
+//         deviceType : deviceType,
+//         deviceToken : token,
+//         macAddress : macAddress
+//     };
+    
+//     $.ajax({
+//         url      : "/mobile/insertDeviceInfo",
+//         data     : JSON.stringify(jsonMsg),
+//         method   : "POST",
+//         contentType: 'application/json',
+//         success  : function( data ){
+//             console.log(JSON.stringify(data));
+//           if( typeof success == "function" ){
+//             //success( data );
+//           };
+//         },
+//         error : function(jqXHR, exception){
+//           if( typeof error == "function" ) {
+//             //error(jqXHR, exception);
+//           };
+//         }
+//     }).done( function(){
+//         if( typeof done == "function" ){
+//           //done();
+//         };
+//     });
+// }
+
+// function token(callback) {
+//     console.log(callback);
+//     var jsonMsg = {
+//         "type":"command",
+//         "functionType":"token",
+//         "value" : {
+//             "callbackFn" : callback
+//         }
+//     }
+//     toNative(jsonMsg);
+// }
+</script>
 </head>
 <body>
     <div id="main">

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

@@ -100,6 +100,18 @@ function setEventHandler(){
     $( "#state" ).on( "change", function(){
         stateCheck();
     });
+
+    $( "input.date-no-req2" ).daterangepicker({
+        singleDatePicker : true,
+        showDropdowns : true,
+        locale : {
+            format : "YYYY-MM-DD"
+        },
+        autoUpdateInput: false,
+        minDate : new Date()
+    }).on( "apply.daterangepicker", function( ev, picker ) {
+        $(this).val(picker.startDate.format('YYYY-MM-DD'));
+    });
 }
 
 function stateCheck(){
@@ -152,6 +164,9 @@ $( function(){
                     date : true,
                     maxDate : true
                 },
+                expectedDischargeDate : {
+                    date : trues
+                },
                 bloodPressureLevelCon : {
                     number : true
                 },
@@ -359,6 +374,13 @@ $( function(){
                                                     </td>
                                                 </tr>
                                                 <tr>
+                                                    <th>퇴소예정일</th>
+                                                    <td>
+                                                        <div class="form-group calendar-bar mb-xl-0">
+                                                            <input class="form-control date-no-req2" type="text" value="${patientData.expectedDischargeDate}" name="expectedDischargeDate" onKeyup="inputYMDNumber(this);" autocomplete="off">
+                                                            <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
+                                                        </div>
+                                                    </td>
                                                     <th>담당 의료진</th>
                                                     <td>
                                                         <select class="custom-select valid" name="managerId" aria-invalid="false">
@@ -605,6 +627,12 @@ $( function(){
                                                         (<input type="text" class="form-control form-control-sm w50" name="oxygenSaturation" value="${patientData.oxygenSaturation}">) %
                                                     </td>
                                                 </tr>
+                                                <tr>
+                                                    <th>기타 환자 메모</th>
+                                                    <td colspan="3">
+                                                        <textarea class="form-control" name="patientEtc" rows="10" cols="" maxlength="2000" placeholder="2000자 까지 입력 가능합니다."><c:out value="${patientData.patientEtc}" /></textarea>
+                                                    </td>
+                                                </tr>
                                             </table>
                                             <div class="row mt-3">
                                                 <div class="col-12">

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

@@ -55,6 +55,7 @@ function deleteConfirm(){
                                         <div class="row mt-3">
                                             <div class="col-12">
                                                 <div class="text-right">
+                                                    <button type="button" class="btn btn-warning w100" onclick="location.href='/clinic/info?patientIdx=${patientIdx}';">건강정보</button>
                                                     <c:if test="${data._SES_GROUP_IDX eq '2'}">
                                                         <button type="button" class="btn btn-danger w100" onclick="deleteConfirm();">삭제</button>
                                                     </c:if>

src/main/webapp/WEB-INF/jsp/patient/list.jsp

@@ -161,7 +161,7 @@ tr.phr-info td span.no-data{color:#999999;}
                                                 <col style="width: 40%">
                                             </colgroup>
                                             <tr>
-                                                <th>환자상태</th>
+                                                <th>검색 조건</th>
                                                 <td>
                                                     <select class="custom-select form-control" id="inputState" name="inputState">
                                                         <option value="ALL">전체</option>
@@ -243,11 +243,11 @@ tr.phr-info td span.no-data{color:#999999;}
                                                     <c:if test="${sesGroupIdx eq '1'}">
                                                         <th>생활치료센터명</th>
                                                     </c:if>
-                                                    <th>성별</th>
-                                                    <th>나이</th>
+                                                    <th>성별 / 나이</th>
+                                                    <th>확진일자</th>
                                                     <th>입소일자</th>
-                                                    <th>상태 변경일</th>
-                                                    <th>상태</th>
+                                                    <th>퇴소에정일</th>
+                                                    <th>상태(상태 변경일)</th>
                                                 </tr>
                                             </thead>
                                             <tbody>
@@ -271,20 +271,36 @@ tr.phr-info td span.no-data{color:#999999;}
                                                                 <c:if test="${sesGroupIdx eq '1'}">
                                                                     <td><c:out value="${l.centerName}" /></td>
                                                                 </c:if>
-                                                                <td><c:out value="${l.gender}" /></td>
-                                                                <td><c:out value="${l.age}" /></td>
+                                                                <td><c:out value="${l.gender} / ${l.age}" /></td>
+                                                                <td><c:out value="${l.confirmationDate}" /></td>
                                                                 <td><c:out value="${l.hospitalizationDate}" /></td>
                                                                 <td>
-                                                                    <c:if test="${l.disisolationDate eq null or l.disisolationDate eq ''}">
+                                                                    <c:if test="${l.expectedDischargeDate eq null or l.expectedDischargeDate eq ''}">
                                                                         -
                                                                     </c:if>
+                                                                    <c:if test="${l.expectedDischargeDate ne ''}">
+                                                                        <fmt:parseDate var="dDate" value="${l.expectedDischargeDate}" pattern="yyyy-MM-dd" />
+                                                                        <c:set var="expectedDischargeDate"><fmt:formatDate value="${dDate}" pattern="yyyy-MM-dd" /></c:set>
+                                                                        <c:out value="${expectedDischargeDate}" />
+                                                                    </c:if>
+                                                                </td>
+                                                                <td>
+<%--                                                                     <c:if test="${l.disisolationDate eq null or l.disisolationDate eq ''}"> --%>
+<%--                                                                         <c:out value="${l.state}" /> --%>
+<%--                                                                     </c:if> --%>
                                                                     <c:if test="${l.disisolationDate ne ''}">
                                                                         <fmt:parseDate var="dDate" value="${l.disisolationDate}" pattern="yyyy-MM-dd" />
                                                                         <c:set var="disisolationDate"><fmt:formatDate value="${dDate}" pattern="yyyy-MM-dd" /></c:set>
-                                                                        <c:out value="${disisolationDate}" />
+                                                                        <c:if test="${l.state ne '입소'}">
+                                                                            <c:out value="${l.state}(${disisolationDate})" />
+                                                                        </c:if>
+                                                                        <c:if test="${l.state eq '입소'}">
+                                                                            <c:out value="${l.state}" />
+                                                                        </c:if>
+                                                                        
                                                                     </c:if>
+<%--                                                                     <c:out value="${l.state}(${disisolationDate})" /> --%>
                                                                 </td>
-                                                                <td><c:out value="${l.state}" /></td>
                                                             </tr>
                                                             <tr class="phr-info">
                                                                <td>

src/main/webapp/WEB-INF/jsp/patient/new.jsp

@@ -124,6 +124,18 @@ function setEventHandler(){
     }).on( "apply.daterangepicker", function( ev, picker ) {
         $(this).val(picker.startDate.format('YYYY-MM-DD'));
     });
+
+    $( "input.date-no-req2" ).daterangepicker({
+        singleDatePicker : true,
+        showDropdowns : true,
+        locale : {
+            format : "YYYY-MM-DD"
+        },
+        autoUpdateInput: false,
+        minDate : new Date()
+    }).on( "apply.daterangepicker", function( ev, picker ) {
+        $(this).val(picker.startDate.format('YYYY-MM-DD'));
+    });
 }
 $( function(){
     patientNewInit();
@@ -157,6 +169,9 @@ $( function(){
                 date : true,
                 maxDate : true
             },
+            expectedDischargeDate : {
+                date : true
+            },
             bloodPressureLevelCon : {
                 number : true
             },
@@ -352,6 +367,13 @@ $( function(){
                                                     </td>
                                                 </tr>
                                                 <tr>
+                                                    <th>퇴소예정일</th>
+                                                    <td>
+                                                        <div class="form-group calendar-bar mb-xl-0">
+                                                            <input class="form-control date-no-req2" type="text" name="expectedDischargeDate" onKeyup="inputYMDNumber(this);" autocomplete="off">
+                                                            <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
+                                                        </div>
+                                                    </td>
                                                     <th>담당 의료진</th>
                                                     <td>
                                                         <select class="custom-select valid" name="managerId" aria-invalid="false">
@@ -598,6 +620,12 @@ $( function(){
                                                         (<input type="text" class="form-control form-control-sm w50" name="oxygenSaturation">) %
                                                     </td>
                                                 </tr>
+                                                <tr>
+                                                    <th>기타 환자 메모</th>
+                                                    <td colspan="3">
+                                                        <textarea class="form-control" name="patientEtc" rows="10" cols="" maxlength="2000" placeholder="2000자 까지 입력 가능합니다."></textarea>
+                                                    </td>
+                                                </tr>
                                             </table>
                                             <div class="row mt-3">
                                                 <div class="col-12">

src/main/webapp/resources/js/mobile/common.js

@@ -40,27 +40,6 @@ function toNative( reqParam ){
     }
 };
 
-var getVersion = function(data) {
-    localStorage.appVersion = data.version;
-    console.log(localStorage.getItem("appVersion"));
-}
-
-/**
- * 버전정보확인 callback(string)
- * @param callback fn
- */
-function version(callback) {
-    var jsonMsg = {
-        "type" : "command",
-        "functionType" : "version",
-        "value" : {
-            "callbackFn" : callback
-        }
-    };
-    
-    toNative(jsonMsg);
-}
-    
 function systemBrowsing(url) {
     var jsonMsg = {
         "type" : "command",