From 2e952232f71eae1bf92590471fc7f5d20a1af873 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 31 七月 2025 11:30:48 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
index 7b26833..dd95a3d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
@@ -149,12 +149,31 @@
         patMedOuthosp.setDiagcheckFlag("0");
         List<PatMedOuthosp> patMedOuthosps = selectPatMedOuthospList(patMedOuthosp);
         for (PatMedOuthosp patMedOuthosp1 : patMedOuthosps) {
+            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOuthosp1.getPatid());
+
+            //璇ユ偅鑰呮湁鍙兘鎻愬墠鏉ュ璇婁簡锛岄偅浠栧悗闈㈢殑鏈瀹ょ殑閫氱煡灏卞彲浠ヤ笉鐢ㄥ啀鍙戠煭淇′簡
+            ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+            if (StringUtils.isNotEmpty(patMedOuthosp1.getDeptcode())) {
+                serviceSubtaskVO.setDeptcode(patMedOuthosp1.getDeptcode());
+                serviceSubtaskVO.setSfzh(patArchive.getIdcardno());
+                serviceSubtaskVO.setType("3");
+                serviceSubtaskVO.setSendstate(2L);
+                serviceSubtaskVO.setPreachform("4");
+                List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+                if (!CollectionUtils.isEmpty(serviceSubtaskList)) {
+                    for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+                        serviceSubtask.setSendstate(6L);
+                        serviceSubtask.setRemark("宸插洖鏉ュ璇婏紝鏃犻渶鍐嶈繘琛岀煭淇¢�氱煡");
+                        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+                    }
+                }
+            }
+
             // 鏍规嵁鎮h�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
             ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
             serviceTaskdiag.setLongtask(1L);
             serviceTaskdiag.setIcd10code(patMedOuthosp1.getIcd10code());
             List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagList(serviceTaskdiag);
-            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOuthosp1.getPatid());
             //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(serviceTaskdiags) || serviceTaskdiags.size() == 0) {
                 patMedOuthosp1.setDiagcheckFlag("2");
@@ -290,6 +309,10 @@
         //璁剧疆鍙戦�佹椂闂�
         if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
         Date newDate = addDays(patMedOuthosp.getAdmitdate(), serviceTask.getSendDay().intValue());
+        if (patMedOuthosp.getFudate() != null) {
+            //濡傛灉闂ㄨ瘖琛ㄦ湁鎸囧畾闅忚鏃堕棿锛岄偅灏辩敤鎸囧畾鐨�
+            newDate = patMedOuthosp.getFudate();
+        }
         serviceSubtask.setLongSendTime(newDate);
         serviceSubtask.setVisitTime(newDate);
         //鎮h�呭彂閫佹椂闂�

--
Gitblit v1.9.3