Prechádzať zdrojové kódy

진료관리 정신건강 갱신 오류 수정

huiwonseo 4 rokov pred
rodič
commit
a0747a5c15

+ 4 - 1
src/main/java/com/lemon/lifecenter/dto/PatientPHRLatestDTO.java

@@ -499,9 +499,12 @@ public class PatientPHRLatestDTO {
     targetCalendar.setTime(targetDate);
 
     long diffSec = (todayCalendar.getTimeInMillis() - targetCalendar.getTimeInMillis()) / 1000;
+
     long diffDays = diffSec / (24 * 60 * 60);
+    System.out.println( "diffSec : " + diffSec );
+    System.out.println( "diffDays : " + diffDays );
     
-    if( diffSec <= 5 ) {
+    if( diffDays <= 5 ) {
       needCheck = false;
     }
 

+ 1 - 1
src/main/webapp/WEB-INF/jsp/clinic/mental.jsp

@@ -14,7 +14,7 @@ $( function(){
 
             alertBox({ 
                 type:"alert", 
-                txt : "모든항목에 체크해주세요", 
+                txt : "모든 항목에 체크해주세요", 
                 callBack: function() {
                   $( ".modal-content > .modal-header > .modal-title h3" ).remove();
                 }

+ 0 - 11
src/main/webapp/WEB-INF/jsp/clinic/mentalDetail.jsp

@@ -4,17 +4,6 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <script>
-// $( function(){
-//     $( "#healthForm" ).validate({
-//         errorPlacement: function(error, element) {
-//             // $( element ).closest('.checkgroup').find('.title').text()
-//             alertBox({ type:"alert", 
-//                 txt : "모든 항목에 체크해 주세요", 
-//             });
-//             $( element ).focus();
-//         }
-//     });
-// })
 </script>
 <style>
   .diagnosis-wrap-detail table td{font-size:14px !important; padding:5px !important;}

+ 2 - 3
src/main/webapp/WEB-INF/jsp/clinic/state.jsp

@@ -145,7 +145,6 @@ function searchPatients() {
 }
 
 function retrieveStateData(page, needInitPagination) {
-console.log( 12312312313)
   mCurrentPage = page;
   var searchText = '<c:out value="${searchText}" />';
   var filter = '<c:out value="${filter}" />';
@@ -175,8 +174,8 @@ console.log( 12312312313)
                 var mentalStep = d.isMentalWarning ?  "step_two" : "step_one";
                 
                 var agreeYn = d.agreeYn == 'Y' ? "(동의)" : "(비동의)";
-                var mentalWarning = d.needMentalCheck ?  d.isMentalWarning ?  "상담 연계 대상자" + agreeYn : "정상" : "-- ";
-                var mentalWarning1 = d.needMentalCheck ?  d.isMentalWarning ?  "" : "" : "timeover";
+                var mentalWarning = d.needMentalCheck ?  "-- " : d.isMentalWarning ?  "상담 연계 대상자" + agreeYn : "정상";
+                var mentalWarning1 = d.needMentalCheck ?  "timeover" : d.isMentalWarning ?  "" : "";
 
                 var temperatureCheck = d.needTemperatureCheck ? "timeover" : "";
                 var bloodPressureCheck = d.needBloodPressCheck ? "timeover" : "";