Sfoglia il codice sorgente

전화번호, 비밀번호 힌트 수정
환자 정보 시간 24시간제 표기
수용인원, 의료진수 음수 안되게 수정
관리자, 의료진 비밀번호 초기화 변경

junekeunsong 4 anni fa
parent
commit
5f6a0a45e7

+ 2 - 2
src/main/resources/config.properties

@@ -5,8 +5,8 @@ config.aesKey             =   1q2w3e4r5t6y7u8i9o0p!@#$%^&*()hj
 config.pageGroupSize      = 5
 config.pageDataSize       = 10
 config.pagePrefix         = page
-config.staff.resetPw      = qwer!#24%
-config.center.resetPw     = !#24%qwer
+config.staff.resetPw      = doc1234!
+config.center.resetPw     = admin1234!
 config.nonface.api.token  = https://lemon.medihere.com/auth/token
 config.nonface.api.appVC  = https://lemon.medihere.com/app/vc
 config.nonface.api.key    = 94e1ab361de9b8ca057c84c19cf1d907

+ 4 - 4
src/main/resources/mybatis/mapper/patient/patient.xml

@@ -134,15 +134,15 @@
                    PC.WARD_NUMBER AS wardNumber,
                    PC.ROOM_NUMBER AS roomNumber,
                    PC.FINAL_CLINIC_DATE AS finalClinicDate,
-                   DATE_FORMAT(PC.HOSPITALIZATION_DATE, '%Y-%m-%d %h:%i') AS hospitalizationDate,
+                   DATE_FORMAT(PC.HOSPITALIZATION_DATE, '%Y-%m-%d %H:%i') AS hospitalizationDate,
                    PC.STATE AS state,
                    PC.CENTER_CODE AS centerCode,
                    PC.JUMIN AS jumin,
                    PC.PATIENT_PHONE AS patientPhone,
                    PC.GUARDIAN_PHONE AS guardianPhone,
-                   DATE_FORMAT(PC.SYMPTOM_START_DATE, '%Y-%m-%d %h:%i') AS symptomStartDate,
-                   DATE_FORMAT(PC.CONFIRMATION_DATE, '%Y-%m-%d %h:%i') AS confirmationDate,
-                   DATE_FORMAT(PC.DISISOLATION_DATE, '%Y-%m-%d %h:%i') AS disisolationDate,
+                   DATE_FORMAT(PC.SYMPTOM_START_DATE, '%Y-%m-%d %H:%i') AS symptomStartDate,
+                   DATE_FORMAT(PC.CONFIRMATION_DATE, '%Y-%m-%d %H:%i') AS confirmationDate,
+                   DATE_FORMAT(PC.DISISOLATION_DATE, '%Y-%m-%d %H:%i') AS disisolationDate,
                    PC.BASAL_DISEASE_YN AS basalDiseaseYn,
                    PC.DRUG_YN AS drugYn,
                    PC.DRUG_CONTENT AS drugContent,

+ 1 - 1
src/main/webapp/WEB-INF/jsp/center/edit.jsp

@@ -155,7 +155,7 @@ $( function(){
                                                 
                                                 <th><span class="fix">*</span>담당자 전화번호</th>
                                                 <td colspan="3">
-                                                    <input type="text" class="form-control" name="staffPhoneNumber" value="${centerInfo.staffPhoneNumber}" placeholder="010-1234-1234" required onkeypress="onlyNumber();">
+                                                    <input type="text" class="form-control" name="staffPhoneNumber" value="${centerInfo.staffPhoneNumber}" required onkeypress="onlyNumber();">
                                                 </td>
                                             </tr>
                                         </table>

+ 5 - 3
src/main/webapp/WEB-INF/jsp/center/new.jsp

@@ -42,10 +42,12 @@ $( function(){
                 equalTo: "#staffPw",
             },
             totalCapacity :{
-                number:true
+                number:true,
+                digits:true
             },
             totalStaff :{
-                number:true
+                number:true,
+                digits:true
             }
         },
         messages : {
@@ -165,7 +167,7 @@ $( function(){
                                             <tr>
                                                 <th><span class="fix">*</span>전화번호</th>
                                                 <td colspan="3">
-                                                    <input type="text" class="form-control" name="centerNumber" placeholder="'-'를 제외한 숫자만 입력하세요" required onkeypress="onlyNumber()">
+                                                    <input type="text" class="form-control" name="centerNumber" required onkeypress="onlyNumber()">
                                                 </td>
                                             </tr>
                                             <tr>

+ 3 - 0
src/main/webapp/WEB-INF/jsp/patient/info.jsp

@@ -80,6 +80,9 @@ function nonFaceStart() {
                                             <td><c:out value="${info.centerName}" /></td>
                                             <th>입소일시</th>
                                             <td colspan="2">
+<%--                                                 <fmt:parseDate var="hDate" value="${info.hospitalizationDate}" pattern="yyyy-MM-dd HH:mm" /> --%>
+<%--                                                 <c:set var="hospitalizationDate"><fmt:formatDate value="${hDate}" pattern="yyyy년 MM월 dd일 HH시 mm분" /></c:set> --%>
+<%--                                                 <c:out value="${hospitalizationDate}" /> --%>
                                                 <c:out value="${info.hospitalizationDate}" />
                                             </td>
                                         </tr>