lighter пре 2 година
родитељ
комит
167ae873ba

+ 1 - 1
src/main/java/thyyxxk/webserver/entity/inpatient/patient/Patient.java

@@ -177,7 +177,7 @@ public class Patient {
     public Integer getTempAge() {
         if (birthDate != null && admissDate != null) {
             try {
-                return DateUtil.calculateAge(DateUtil.parse(birthDate), admissDate);
+                return DateUtil.calculateAge(DateUtil.parse(birthDate, "yyyy-MM-dd"), admissDate);
             } catch (Exception ignored) {
             }
         }

+ 2 - 0
src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetMainService.java

@@ -230,6 +230,8 @@ public class CaseFrontSheetMainService {
                     dismissDate = dao.getDismissDateFromYzActOrder("yz_inact_order", bah, times);
                 }
                 sheet.setDismissDate(dismissDate);
+                Integer days = DateUtil.daysBetween(dismissDate, sheet.getAdmissDate());
+                sheet.setAdmissDays(0 == days ? "1" : String.valueOf(days));
             }
             return ResultVoUtil.success(sheet);
         }

+ 4 - 0
src/main/java/thyyxxk/webserver/service/triage/TriageService.java

@@ -20,6 +20,7 @@ import thyyxxk.webserver.utils.TokenUtil;
 import thyyxxk.webserver.utils.VoiceUtil;
 import thyyxxk.webserver.websocket.WebSocketServer;
 
+import java.nio.channels.NotYetBoundException;
 import java.util.*;
 
 /**
@@ -219,6 +220,9 @@ public class TriageService {
         VoiceUtil.textToSpeech(text, String.valueOf(param.getSerialNo()));
         final String msg = JSON.toJSONString(messageForPush);
         TriageNotifyRelation notifyRelation = dao.selectTriageNotifyRelation(messageForPush.getSerialNo());
+        if (null == notifyRelation) {
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有找到对应的分诊关系。");
+        }
         WebSocketServer.sendFloorTriageMessage(notifyRelation.getSocketSid(), msg);
         WebSocketServer.sendRoomTriageMessage(notifyRelation.getRoomCode(), msg);
         dao.updateNotifyDatetime(param.getSerialNo());