From 6994c4ae328dc6e41ab98f183774c7ffdc9b5dbf Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期三, 16 四月 2025 17:48:41 +0800
Subject: [PATCH] 04-16改数据采集-入科

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 2ef79d9..0fa3131 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -209,6 +209,7 @@
         //鑾峰彇闇�瑕佸嚭闄㈤殢璁匡紝鏈鐞嗙殑鏁版嵁
         patMedInhosp.setCheckFlag("0");
         patMedInhosp.setInhospstate("1");
+        patMedInhosp.setFuflag("1");
         List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
         log.error("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎮h�呬俊鎭細{}", patMedInhosps);
         for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
@@ -255,7 +256,8 @@
                     }
 
                     writeInSubTask(serviceTaskdepts.get(0).getTaskId(), true, patMedInhosp1, patArchive);
-                } else if (serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 2 || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 3) {
+                }
+                if (serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 2 || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 3) {
                     //涓芥按闇�瑕佹牴鎹闄㈢柧鐥呭璇ョ梾浜虹敓鎴愪竴娆¢殢璁�
                     String[] split = patMedInhosp1.getIcd10code().split(",");
                     ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
@@ -281,7 +283,6 @@
                     }
                     writeInSubTask(serviceTaskdiags.get(0).getTaskId(), false, patMedInhosp1, patArchive);
                 }
-
 
             } catch (Exception e) {
                 e.printStackTrace();
@@ -407,6 +408,8 @@
                         serviceSubtask1.setRemark("鎮h�呭啀鍏ラ櫌");
                         serviceSubtask1.setResult("error");
                         serviceSubtask1.setFinishtime(new Date());
+                        serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
+                        serviceSubtask1.setUpdateTime(new Date());
                         Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
                         if (aBoolean) i = 1;
                     } else {
@@ -415,6 +418,8 @@
                         serviceSubtask.setFinishtime(new Date());
                         serviceSubtask.setSendstate(4L);
                         serviceSubtask.setRemark("褰撳墠鎮h�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
+                        serviceSubtask.setCreateBy(serviceTask.getCreateBy());
+                        serviceSubtask.setCreateTime(new Date());
                         i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
                     }
                 }
@@ -425,6 +430,8 @@
                     serviceSubtask.setResult("error");
                     serviceSubtask.setFinishtime(new Date());
                 }
+                serviceSubtask.setCreateBy(serviceTask.getCreateBy());
+                serviceSubtask.setCreateTime(new Date());
                 i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
             }
         } else {
@@ -433,7 +440,10 @@
                 serviceSubtask.setSendstate(4L);
                 serviceSubtask.setResult("error");
                 serviceSubtask.setFinishtime(new Date());
+
             }
+            serviceSubtask.setCreateBy(serviceTask.getCreateBy());
+            serviceSubtask.setCreateTime(new Date());
             i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
         }
         if (i == 1) {
@@ -486,6 +496,8 @@
         serviceSubtask.setCreateBy(patMedInhosp1.getNurseName());
         serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
         serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
+        serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
+        serviceSubtask.setUpdateTime(new Date());
         //璁剧疆鍙戦�佹椂闂�
         if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
         Date newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());

--
Gitblit v1.9.3