From 52fd89a3c439fdbf240a72487f97aad92725e9c5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 07 六月 2025 11:32:59 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 c44c160..4d8b5b6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -547,6 +547,16 @@
ServiceTask serviceTask = serviceTasks.get(0);
//灏佽serviceSubtask
ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive);
+ if (type != 2) {
+ //绉戝鍜岀柧鐥� 閮界敤 绉戝濉厖
+ serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeaveldeptcode());
+ serviceSubtask.setVisitDeptName(patMedInhosp1.getLeaveldeptname());
+ } else if (type == 2) {
+ serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
+ serviceSubtask.setVisitDeptName(patMedInhosp1.getLeavehospitaldistrictname());
+ }
+
+
Integer i = 0;
//鍏堝垽鏂竴涓嬶紝鏄惁闇�瑕佹牎楠�
if (check) {
@@ -570,7 +580,7 @@
serviceSubtask1.setSendstate(4L);
serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
serviceSubtask1.setResult("error");
- serviceSubtask1.setFinishtime(new Date());
+// serviceSubtask1.setFinishtime(new Date());
serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
serviceSubtask1.setUpdateTime(new Date());
Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
@@ -578,7 +588,7 @@
} else {
//鐩稿弽,鍒欏皢褰撴湁鐨勬暟鎹仠鎺�
serviceSubtask.setResult("error");
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
serviceSubtask.setSendstate(4L);
serviceSubtask.setRemark("褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
serviceSubtask.setCreateBy(serviceTask.getCreateBy());
@@ -591,7 +601,7 @@
serviceSubtask1.setSendstate(4L);
serviceSubtask1.setRemark("鐤剧梾鎮ｈ�呭啀鍏ラ櫌");
serviceSubtask1.setResult("error");
- serviceSubtask1.setFinishtime(new Date());
+// serviceSubtask1.setFinishtime(new Date());
serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
//閲嶆柊鏂板瀛愪换鍔�
@@ -604,7 +614,7 @@
serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
serviceSubtask.setSendstate(4L);
serviceSubtask.setResult("error");
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
}
serviceSubtask.setCreateBy(serviceTask.getCreateBy());
serviceSubtask.setCreateTime(new Date());
@@ -615,7 +625,7 @@
serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
serviceSubtask.setSendstate(4L);
serviceSubtask.setResult("error");
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
}
serviceSubtask.setCreateBy(serviceTask.getCreateBy());
@@ -691,7 +701,7 @@
String remark = patArchive.getNotrequiredreason();
serviceSubtask.setRemark(remark);
serviceSubtask.setResult("error");
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
//涓嶆墽琛�
serviceSubtask.setSendstate(4L);
}
@@ -720,7 +730,7 @@
serviceSubtask1.setSendstate(4L);
serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
serviceSubtask1.setResult("error");
- serviceSubtask1.setFinishtime(new Date());
+// serviceSubtask1.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
}
}
--
Gitblit v1.9.3