From 376ea5b60128cf28b2e529ca908623da0ef006b3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 15 十二月 2025 15:09:28 +0800
Subject: [PATCH] 【丽水】增加出院时间判空
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 9f44995..cff1ca9 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -249,7 +249,6 @@
patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
} else {
for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
- //todo 1
writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config);
}
patMedInhosp1.setDeptcheckFlag("1");
@@ -301,7 +300,6 @@
patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
} else {
for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
- //todo 2
writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiBQ1, patArchive, 2, config);
}
pmiBQ1.setWardcheckFlag("1");
@@ -355,7 +353,6 @@
patMedInhospMapper.updatePatMedInhosp(pmiJB);
} else {
for (ServiceTaskdiag serviceTaskdept1 : serviceTaskdiags) {
- //todo 3
writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiJB, patArchive, 3, config);
}
pmiJB.setDiagcheckFlag("1");
@@ -605,8 +602,26 @@
if (type == 1 || type == 2) {
Date endTime = serviceSubtask.getEndtime();
Date endTime1 = serviceSubtask1.getEndtime();
- String serviceType1 = serviceSubtask1.getServiceType();
- if (endTime1.before(endTime) && "2".equals(serviceType1)) {
+ //鍑洪櫌鏃堕棿鍒ょ┖锛屽鏋滀负绌鸿烦杩�
+ if(Objects.isNull(endTime)){
+ serviceSubtask.setResult("error");
+ serviceSubtask.setRemark("鍑洪櫌鏃堕棿涓虹┖锛宻erviceSubtask鐨処d涓�" + serviceSubtask.getId());
+ serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
+ serviceSubtask.setUpdateTime(new Date());
+ Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ if (aBoolean) i = 1;
+ continue;
+ }
+ if(Objects.isNull(endTime1)){
+ serviceSubtask1.setResult("error");
+ serviceSubtask1.setRemark("鍑洪櫌鏃堕棿涓虹┖锛宻erviceSubtask鐨処d涓�" + serviceSubtask1.getId());
+ serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
+ serviceSubtask1.setUpdateTime(new Date());
+ Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ if (aBoolean) i = 1;
+ continue;
+ }
+ if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")) {
//濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
serviceSubtask1.setSendstate(4L);
if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
--
Gitblit v1.9.3