From ad53e4af4e4e238453d7613530b501540df915e1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 10 十一月 2025 19:12:24 +0800
Subject: [PATCH] 长期任务,BUG处理

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |   21 ++++++++++++++-------
 1 files changed, 14 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 964e0b8..2bb0a19 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -66,6 +66,11 @@
         return patMedInhospMapper.selectPatMedInhospByInhospid(inhospid);
     }
 
+    @Override
+    public List<PatMedInhosp> selectPatMedInhosp(PatMedInhosp patMedInhosp) {
+        return patMedInhospMapper.selectPatMedInhosp(patMedInhosp);
+    }
+
     /**
      * 鏌ヨ鎮h�呬綇闄㈣褰曞垪琛�
      *
@@ -261,7 +266,7 @@
         }
 
         //鏍规嵁鎮h�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
-        if (active.equals("xh")) {
+        if (!active.equals("xh")) {
             PatMedInhosp pmbq = new PatMedInhosp();
             //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
             pmbq.setWardcheckFlag("0");
@@ -640,6 +645,7 @@
                 serviceSubtask.setCreateBy(serviceTask.getCreateBy());
                 serviceSubtask.setCreateTime(new Date());
                 i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+                addServiceSubtaskPreachform(serviceSubtask, null);
             }
         } else {
             if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
@@ -675,13 +681,15 @@
     }
 
     private Integer addServiceSubtaskPreachform(ServiceSubtask serviceSubtask, String sendstate) {
-        //灏唒reachform鐨刯son瀵硅薄锛屾斁鍒發ist闆嗗悎涓�
-        String preachform = serviceSubtask.getPreachform();
+        //灏唒reachformDesc鐨刯son瀵硅薄锛屾斁鍒發ist闆嗗悎涓�
+        ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+        String preachformDesc = serviceTask.getPreachformDesc();
+
         ObjectMapper objectMapper = new ObjectMapper();
-        if (org.apache.commons.lang3.StringUtils.isNotEmpty(preachform)) {
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(preachformDesc)) {
             List<ServiceSubtaskPreachform> serviceSubtaskPreachformList = null;
             try {
-                serviceSubtaskPreachformList = objectMapper.readValue(preachform, new TypeReference<List<ServiceSubtaskPreachform>>() {
+                serviceSubtaskPreachformList = objectMapper.readValue(preachformDesc, new TypeReference<List<ServiceSubtaskPreachform>>() {
                 });
             } catch (JsonProcessingException e) {
                 log.error("preachform杞琇ist<ServiceSubtaskPreachform>鎶ラ敊浜嗭細{}", e.getMessage());
@@ -694,8 +702,7 @@
                 if (StringUtils.isNotEmpty(sendstate)) serviceSubtaskPreachform.setSendstate(sendstate);
 
                 serviceSubtaskPreachform.setOrgid(serviceSubtask.getOrgid());
-                return serviceSubtaskPreachformMapper.insertServiceSubtaskPreachform(serviceSubtaskPreachform);
-
+                serviceSubtaskPreachformMapper.insertServiceSubtaskPreachform(serviceSubtaskPreachform);
             }
 
         }

--
Gitblit v1.9.3