From 3998703641edf236113f77f15c79561fd7f75c59 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 22 五月 2026 11:16:43 +0800
Subject: [PATCH] 【市一】短信发送

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 1159 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 813 insertions(+), 346 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 25c8f6b..0a1c316 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.service.IConfigService;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.DtoConversionUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -56,9 +57,13 @@
     private PatMedOperationMapper patMedOperationMapper;
     @Autowired
     private PatMedOperationItemMapper patMedOperationItemMapper;
+    @Autowired
+    private ServiceTaskRuleMapper serviceTaskRuleMapper;
 
     @Value("${spring.profiles.active}")
     private String active;
+    @Autowired
+    private IConfigService iSysConfigService;
 
 
     /**
@@ -85,6 +90,16 @@
      */
     @Override
     public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp) {
+        if (patMedInhosp.getCry() == 0) {
+            patMedInhosp.setDeptcodeList(patMedInhosp.getLeaveldeptcodes());
+            patMedInhosp.setHospitaldistrictcodeList(patMedInhosp.getLeavehospitaldistrictcodes());
+            patMedInhosp.setLeaveldeptcodes(null);
+            patMedInhosp.setLeavehospitaldistrictcodes(null);
+            patMedInhosp.setInhospstate("0");
+        } else if (patMedInhosp.getCry() == 1) {
+            patMedInhosp.setInhospstate("1");
+        }
+
         List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
         for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
             String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
@@ -146,16 +161,6 @@
     public PatMedRes selectPatMedInhospListCount(PatMedReq patMedReq) {
         PatMedRes patMedRes = null;
         // 鑾峰彇褰撳墠鐧婚檰浜虹殑閮ㄩ棬鏉冮檺
-        if (org.springframework.util.CollectionUtils.isEmpty(patMedReq.getDeptcodeList())) {
-//            Long userId = SecurityUtils.getUserId();
-//            List<SysDept> sysDepts = sysUserDeptMapper.selectDeptListByUserId(userId);
-//            List<String> deptCode = new ArrayList<>();
-//            for (SysDept sysDept : sysDepts) {
-//                deptCode.add(sysDept.getDeptId().toString());
-//            }
-//            patMedReq.setDeptcodeList(deptCode);
-//            patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
-        }
         patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
         return patMedRes;
     }
@@ -220,212 +225,97 @@
 
     @Override
     public int dealOutHospInfo(String config) {
+        //1.鍏ラ櫌瀹f暀
+        String helibrarySwitch = iSysConfigService.selectConfigByKey("in.helibrary.switch");
+        if (StringUtils.isNotEmpty(helibrarySwitch) && "2".equals(helibrarySwitch)) {
+            PatMedInhosp inhosp = new PatMedInhosp();
+            inhosp.setInDeptcheckFlag("0");
+            inhosp.setInhospstate("0");
+            inhosp.setFuflag("1");
+            List<PatMedInhosp> inPatMedInhosps = patMedInhospMapper.selectPatMedInhospList(inhosp);
 
-        PatMedInhosp pmks = new PatMedInhosp();
-        //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
-        pmks.setDeptcheckFlag("0");
-        pmks.setInhospstate("1");
-        pmks.setFuflag("1");
-        List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(pmks);
-        log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌閮ㄩ棬鎮h�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhosps) ? patMedInhosps.size() : null);
-        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
-            String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
-            patMedInhosp1.setTagname(tagname);
-        }
-
-        //绉戝
-        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
-            //鑾峰彇鎮h�呬俊鎭�
-            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
-            if (Objects.isNull(patArchive)) {
-                patMedInhosp1.setDeptcheckFlag("2");
-                patMedInhosp1.setLongTaskReason("鎮h�呭熀鏈俊鎭负绌�");
-                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
-                continue;
-            }
-            try {
-                //鏍规嵁鎮h�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟
-                ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
-                serviceTaskdept.setLongtask(1L);
-                serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
-                serviceTaskdept.setDeptType("1");
-                serviceTaskdept.setOrgid(patMedInhosp1.getOrgid());
-                List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
-                //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
-                if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
-                    PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
-                    patMedInhosp1.setDeptcheckFlag("2");
-                    patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆闀挎湡浠诲姟;");
-                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
-                } else {
-                    for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
-                        writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config);
-                    }
-//                    patMedInhosp1.setDeptcheckFlag("1");
-//                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
-                }
-
-            } catch (Exception e) {
-                e.printStackTrace();
-                log.error("浜哄憳绉戝澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
-                patMedInhosp1.setDeptcheckFlag("2");
-                patMedInhosp1.setLongTaskReason("浜哄憳绉戝澶勭悊寮傚父锛�" + e.getMessage());
-                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
-            }
-        }
-
-        //鏍规嵁鎮h�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
-        if (!active.equals("xh")) {
-            PatMedInhosp pmbq = new PatMedInhosp();
-            //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
-            pmbq.setWardcheckFlag("0");
-            pmbq.setInhospstate("1");
-            pmbq.setFuflag("1");
-            List<PatMedInhosp> patMedInhospBQs = patMedInhospMapper.selectPatMedInhospList(pmbq);
-            log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鐥呭尯鎮h�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhospBQs) ? patMedInhospBQs.size() : null);
-            for (PatMedInhosp patMedInhosp1 : patMedInhospBQs) {
-                String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
-                patMedInhosp1.setTagname(tagname);
-            }
-
-            //鐥呭尯鏁版嵁澶勭悊
-            for (PatMedInhosp pmiBQ1 : patMedInhospBQs) {
+            //1.1 绉戝
+            for (PatMedInhosp patMedInhosp1 : inPatMedInhosps) {
                 //鑾峰彇鎮h�呬俊鎭�
-                PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(pmiBQ1.getPatid());
+                PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
                 if (Objects.isNull(patArchive)) {
-                    pmiBQ1.setWardcheckFlag("2");
-                    pmiBQ1.setLongTaskReason("鎮h�呭熀鏈俊鎭负绌�");
-                    patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+                    patMedInhosp1.setInDeptcheckFlag("2");
+                    patMedInhosp1.setLongTaskReason("鎮h�呭熀鏈俊鎭负绌�");
+                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                     continue;
                 }
                 try {
+                    //鏍规嵁鎮h�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑鍏ラ櫌闀挎湡瀹f暀浠诲姟
                     ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
                     serviceTaskdept.setLongtask(1L);
-                    serviceTaskdept.setDeptCode(pmiBQ1.getLeavehospitaldistrictcode());
-                    serviceTaskdept.setDeptType("2");
-                    serviceTaskdept.setOrgid(pmiBQ1.getOrgid());
-                    List<ServiceTaskdept> serviceTaskdeptList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+                    serviceTaskdept.setDeptCode(patMedInhosp1.getDeptcode());
+                    serviceTaskdept.setDeptType("1");
+                    serviceTaskdept.setServiceType("17");
+                    serviceTaskdept.setOrgid(patMedInhosp1.getOrgid());
+                    List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
                     //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
-                    if (CollectionUtils.isEmpty(serviceTaskdeptList) || serviceTaskdeptList.size() == 0) {
-                        PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiBQ1.getInhospid());
-                        pmiBQ1.setWardcheckFlag("2");
-                        pmiBQ1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ梾鍖烘湭閰嶇疆闀挎湡浠诲姟;");
-                        patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+                    if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
+                        PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+                        patMedInhosp1.setInDeptcheckFlag("2");
+                        patMedInhosp1.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆鍏ラ櫌闀挎湡瀹f暀浠诲姟;" : "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆鍏ラ櫌闀挎湡瀹f暀浠诲姟;");
+                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                     } else {
-                        for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
-                            writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiBQ1, patArchive, 2, config);
+                        for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
+                            writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 4, config);
                         }
-//                        pmiBQ1.setWardcheckFlag("1");
-//                        patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
                     }
 
-
                 } catch (Exception e) {
-                    e.printStackTrace();
-                    log.error("浜哄憳鐥呭尯澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
-                    pmiBQ1.setWardcheckFlag("2");
-                    pmiBQ1.setLongTaskReason("浜哄憳鐥呭尯澶勭悊寮傚父锛�" + e.getMessage());
-                    patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+                    log.error("浜哄憳鍏ラ櫌绉戝澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+                    patMedInhosp1.setInDeptcheckFlag("2");
+                    patMedInhosp1.setLongTaskReason("浜哄憳鍏ラ櫌绉戝澶勭悊鍑哄紓甯镐簡锛�" + e.getMessage());
+                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                 }
             }
 
-            PatMedInhosp pmjb = new PatMedInhosp();
-            //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
-            pmjb.setDiagcheckFlag("0");
-            pmjb.setInhospstate("1");
-            pmjb.setFuflag("1");
-            List<PatMedInhosp> patMedInhospJBs = patMedInhospMapper.selectPatMedInhospList(pmjb);
-            log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鐤剧梾鎮h�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhospJBs) ? patMedInhospJBs.size() : null);
-            for (PatMedInhosp patMedInhosp1 : patMedInhospJBs) {
-                String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
-                patMedInhosp1.setTagname(tagname);
-            }
 
-            for (PatMedInhosp pmiJB : patMedInhospJBs) {
+            //1.2 鐥呭尯
+            inhosp.setInDeptcheckFlag(null);
+            inhosp.setInWardcheckFlag("0");
+            List<PatMedInhosp> inPatMedInhospsWard = patMedInhospMapper.selectPatMedInhospList(inhosp);
+            for (PatMedInhosp patMedInhosp1 : inPatMedInhospsWard) {
                 //鑾峰彇鎮h�呬俊鎭�
-                PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(pmiJB.getPatid());
+                PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
                 if (Objects.isNull(patArchive)) {
-                    pmiJB.setDiagcheckFlag("2");
-                    pmiJB.setLongTaskReason("鎮h�呭熀鏈俊鎭负绌�");
-                    patMedInhospMapper.updatePatMedInhosp(pmiJB);
+                    patMedInhosp1.setInDeptcheckFlag("2");
+                    patMedInhosp1.setLongTaskReason("鎮h�呭熀鏈俊鎭负绌�");
+                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                     continue;
                 }
-                try {
-                    if (StringUtils.isEmpty(pmiJB.getLeaveicd10code())) {
-                        continue;
+                //鏍规嵁鎮h�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑鍏ラ櫌闀挎湡瀹f暀浠诲姟锛堜細鍑虹幇涓�涓棶棰橈紝绉戝鍜岀梾鍖哄彂鐨勫悓涓�涓ā鏉匡級
+                ServiceTaskdept serviceTaskWard = new ServiceTaskdept();
+                serviceTaskWard.setLongtask(1L);
+                serviceTaskWard.setDeptCode(patMedInhosp1.getHospitaldistrictcode());
+                serviceTaskWard.setDeptType("2");
+                serviceTaskWard.setServiceType("17");
+                serviceTaskWard.setOrgid(patMedInhosp1.getOrgid());
+                List<ServiceTaskdept> serviceTaskWardList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskWard);
+                //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+                if (CollectionUtils.isEmpty(serviceTaskWardList) || serviceTaskWardList.size() == 0) {
+                    PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+                    patMedInhosp1.setInDeptcheckFlag("2");
+                    patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ梾鍖烘湭閰嶇疆鍏ラ櫌闀挎湡瀹f暀浠诲姟;");
+                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                } else {
+                    for (ServiceTaskdept serviceTaskdept1 : serviceTaskWardList) {
+                        writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 5, config);
                     }
-                    // 鏍规嵁鎮h�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
-                    ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
-                    serviceTaskdiag.setLongtask(1L);
-                    serviceTaskdiag.setIcd10code(pmiJB.getLeaveicd10code());
-                    serviceTaskdiag.setOrgid(pmiJB.getOrgid());
-
-                    List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagList(serviceTaskdiag);
-                    //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
-                    if (CollectionUtils.isEmpty(serviceTaskdiags) || serviceTaskdiags.size() == 0) {
-                        PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiJB.getInhospid());
-                        pmiJB.setDiagcheckFlag("2");
-                        pmiJB.setLongTaskReason(patMedInhosp.getLongTaskReason() + "鎵�鎮g殑鐤剧梾鏈厤缃暱鏈熶换鍔�;");
-                        patMedInhospMapper.updatePatMedInhosp(pmiJB);
-                    } else {
-                        for (ServiceTaskdiag serviceTaskdept1 : serviceTaskdiags) {
-                            writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiJB, patArchive, 3, config);
-                        }
-//                        pmiJB.setDiagcheckFlag("1");
-//                        patMedInhospMapper.updatePatMedInhosp(pmiJB);
-                    }
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    log.error("浜哄憳鐤剧梾澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
-                    pmiJB.setDiagcheckFlag("2");
-                    pmiJB.setLongTaskReason("浜哄憳鐤剧梾澶勭悊寮傚父锛�" + e.getMessage());
-                    patMedInhospMapper.updatePatMedInhosp(pmiJB);
-                }
-            }
-//            鎵嬫湳闅忚
-            PatMedOperationItem pmoi = new PatMedOperationItem();
-            //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
-            pmoi.setOpercheckFlag("0");
-            pmoi.setMainFlag("1");
-
-            List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectPatMedOperationItemList(pmoi);
-            log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎵嬫湳鎮h�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedOperationItems) ? patMedOperationItems.size() : null);
-
-            for (PatMedOperationItem opItem : patMedOperationItems) {
-
-                try {
-                    if (StringUtils.isEmpty(opItem.getOplevelcode())) {
-                        continue;
-                    }
-                    // 鏍规嵁鎮h�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
-                    ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
-                    serviceTaskoper.setLongtask(1L);
-                    serviceTaskoper.setOrgid(opItem.getOrgid());
-                    serviceTaskoper.setOplevelcode(opItem.getOplevelcode());
-
-                    List<ServiceTaskoper> serviceTaskopers = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);
-                    //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
-                    if (CollectionUtils.isEmpty(serviceTaskopers) || serviceTaskopers.size() == 0) {
-                        PatMedOperationItem patMedOperationItem = patMedOperationItemMapper.selectPatMedOperationItemById(opItem.getId());
-                        patMedOperationItem.setOpercheckFlag("2");
-                        patMedOperationItem.setLongTaskReason(patMedOperationItem.getLongTaskReason() + "鎵�鎮g殑鎵嬫湳鏈厤缃暱鏈熶换鍔�;");
-                        patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem);
-                    } else {
-                        for (ServiceTaskoper serviceTaskoper1 : serviceTaskopers) {
-                            writeInSubTaskForOp(serviceTaskoper1.getTaskId(), true, opItem, config);
-                        }
-                    }
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    log.error("浜哄憳鎵嬫湳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
-                    opItem.setOpercheckFlag("2");
-                    opItem.setLongTaskReason("浜哄憳鎵嬫湳澶勭悊寮傚父锛�" + e.getMessage());
-                    patMedOperationItemMapper.updatePatMedOperationItem(opItem);
                 }
             }
         }
+
+        //2.鍑洪櫌闅忚 - 鍩轰簬瑙勫垯鐨勪换鍔$敓鎴�
+        addSubTaskByRule(config);
+        //鏍规嵁鎮h�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
+        if (!active.equals("xh")) {
+            addOperationSubTask(config);
+        }
+
 
         //鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭d箣鍓嶇殑鍑洪櫌鎮h�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
         PatMedInhosp patMedInhosp = new PatMedInhosp();
@@ -441,6 +331,7 @@
 
     /**
      * 澶氱淮搴﹂殢璁�
+     *
      * @param config
      * @return
      */
@@ -479,14 +370,12 @@
      * 鎸夌淮搴︽壘鍒版墍鏈夊尮閰嶉暱鏈熶换鍔★紝鎵归噺鐢熸垚 subtask
      * type: 1=绉戝, 2=鐥呭尯, 3=鐤剧梾
      */
-    private void processTasksByDimension(PatMedInhosp patMedInhosp1,
-            PatArchive patArchive,
-            String config, int type) {
+    private void processTasksByDimension(PatMedInhosp patMedInhosp1, PatArchive patArchive, String config, int type) {
         List<Long> matchedTaskIds = findMatchingTaskIds(patMedInhosp1, type);
 
         if (CollectionUtils.isEmpty(matchedTaskIds)) {
-                String reason = getDimensionReason(type);
-                markFlagAsNoConfig(patMedInhosp1, type, reason);
+            String reason = getDimensionReason(type);
+            markFlagAsNoConfig(patMedInhosp1, type, reason);
             return;
         }
 
@@ -496,11 +385,11 @@
         }
     }
 
-    private String getDimensionReason(int type){
+    private String getDimensionReason(int type) {
         switch (type) {
             case 1: { // 绉戝
                 return "鏈壘鍒扮瀹ゅ尮閰嶇殑闀挎湡浠诲姟";
-                 }
+            }
             case 2: { // 鐥呭尯
                 return "鏈壘鍒扮梾鍖哄尮閰嶇殑闀挎湡浠诲姟";
             }
@@ -511,9 +400,7 @@
         return "澶氱淮闀挎湡浠诲姟-鍖归厤绫诲瀷涓虹┖";
     }
 
-    private void markFlagAsNoConfig(PatMedInhosp patMedInhosp,
-                                    int type,
-                                    String reason){
+    private void markFlagAsNoConfig(PatMedInhosp patMedInhosp, int type, String reason) {
         switch (type) {
             case 1: { // 绉戝
                 patMedInhosp.setDeptcheckFlag("2");
@@ -537,14 +424,14 @@
 
     }
 
-    private void markAllFlagsAsError(PatMedInhosp patMedInhosp,
-                                    String reason){
+    private void markAllFlagsAsError(PatMedInhosp patMedInhosp, String reason) {
         patMedInhosp.setDeptcheckFlag("2");
         patMedInhosp.setWardcheckFlag("2");
         patMedInhosp.setDiagcheckFlag("2");
         patMedInhosp.setRemark(reason);
         patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
     }
+
     /**
      * 鏍规嵁缁村害绫诲瀷鏌ヨ鍖归厤鐨勯暱鏈熶换鍔� ID 鍒楄〃
      */
@@ -556,8 +443,7 @@
                 query.setDeptCode(patMedInhosp1.getLeaveldeptcode());
                 query.setDeptType("1");
                 query.setOrgid(patMedInhosp1.getOrgid());
-                return serviceTaskdeptMapper.selectServiceTaskdeptList(query)
-                        .stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
+                return serviceTaskdeptMapper.selectServiceTaskdeptList(query).stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
             }
             case 2: { // 鐥呭尯
                 ServiceTaskdept query = new ServiceTaskdept();
@@ -565,8 +451,7 @@
                 query.setDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
                 query.setDeptType("2");
                 query.setOrgid(patMedInhosp1.getOrgid());
-                return serviceTaskdeptMapper.selectServiceTaskdeptList(query)
-                        .stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
+                return serviceTaskdeptMapper.selectServiceTaskdeptList(query).stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
             }
             case 3: { // 鐤剧梾
                 if (StringUtils.isEmpty(patMedInhosp1.getLeaveicd10code())) return Collections.emptyList();
@@ -574,115 +459,12 @@
                 query.setLongtask(1L);
                 query.setIcd10code(patMedInhosp1.getLeaveicd10code());
                 query.setOrgid(patMedInhosp1.getOrgid());
-                return serviceTaskdiagMapper.selectServiceTaskdiagList(query)
-                        .stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
+                return serviceTaskdiagMapper.selectServiceTaskdiagList(query).stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
             }
         }
         return Collections.emptyList();
     }
 
-
-//
-//    @Override
-//    public int dealOutHospInfo() {
-//        PatMedInhosp patMedInhosp = new PatMedInhosp();
-//        //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
-//        patMedInhosp.setDeptcheckFlag("0");
-//        patMedInhosp.setInhospstate("1");
-//        patMedInhosp.setFuflag("1");
-//        List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
-//        log.error("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎮h�呬俊鎭細{}", patMedInhosps);
-//        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
-//            String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
-//            patMedInhosp1.setTagname(tagname);
-//        }
-//
-//        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
-//            //鍏堟牴鎹瀹ゅ幓service_check鏌ヨcheck_visit_flag鏄牴鎹�滅瀹も�濋殢璁匡紝杩樻槸鏍规嵁鈥滅涓�璇婃柇鈥濋殢璁�
-//            ServiceCheck serviceCheck = new ServiceCheck();
-//            serviceCheck.setDeptCode(patMedInhosp1.getDeptcode());
-//            serviceCheck.setOrgid(patMedInhosp1.getOrgid());
-//            List<ServiceCheck> serviceChecks = serviceCheckMapper.selectServiceCheckList(serviceCheck);
-//            //鑾峰彇鎮h�呬俊鎭�
-//            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
-//            if (Objects.isNull(patArchive)) {
-//                patMedInhosp1.setDeptcheckFlag("2");
-//                patMedInhosp1.setLongTaskReason("鎮h�呭熀鏈俊鎭负绌�");
-//                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
-//                continue;
-//            }
-//            try {
-//                if (CollectionUtils.isEmpty(serviceChecks) || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 1 || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 3) {
-//                    //鏍规嵁鎮h�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟
-//                    ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
-//                    serviceTaskdept.setLongtask(1L);
-//                    serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
-//                    serviceTaskdept.setServiceType("2");
-//                    List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
-//                    //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堟殏瀹氾紝灏嗗嚭鍏ラ櫌琛ㄧ殑check_flag璁剧疆涓�2  锛宭ong_task_reason 璁板綍鍘熷洜锛�
-//                    if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
-//                        patMedInhosp1.setDeptcheckFlag("2");
-//                        patMedInhosp1.setLongTaskReason("璇ユ偅鑰呮墍鍦ㄧ瀹わ紝鏈厤缃暱鏈熶换鍔�;");
-//                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
-//                        continue;
-//                    } else if (serviceTaskdepts.size() > 1) {
-//                        //濡傛灉鏌ヨ鍑哄涓换鍔★紝閭e氨鍙栫涓�涓紝骞跺湪鎮h�呭娉ㄤ竴涓�
-//                        List<Long> tempList = serviceTaskdepts.stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
-//                        patMedInhosp1.setLongTaskReason("璇ユ偅鑰呮墍鍦ㄧ瀹わ紝鏈夊涓嚭闄㈤殢璁块暱鏈熶换鍔�:" + tempList);
-//                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
-//                        ServiceTaskdept serviceTaskdept1 = serviceTaskdepts.get(0);
-//                        serviceTaskdepts = new ArrayList<>();
-//                        serviceTaskdepts.add(serviceTaskdept1);
-//                    }
-//
-//                    writeInSubTask(serviceTaskdepts.get(0).getTaskId(), true, patMedInhosp1, patArchive);
-//                }
-//                if (serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 2 || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 3) {
-//                    //涓芥按闇�瑕佹牴鎹闄㈢柧鐥呭璇ョ梾浜虹敓鎴愪竴娆¢殢璁�
-//                    String[] split = patMedInhosp1.getIcd10code().split(",");
-//                    ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
-//                    serviceTaskdiag.setLongtask(1L);
-//                    serviceTaskdiag.setIcd10code(split[0]);
-//                    serviceTaskdiag.setServiceType("2");
-//                    List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagList(serviceTaskdiag);
-//                    PatMedInhosp patMedInhosp2 = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
-//                    //濡傛灉鐤剧梾缂栫爜涓虹┖锛堟殏瀹氾紝灏嗗嚭鍏ラ櫌琛ㄧ殑check_flag璁剧疆涓�3  锛宭ong_task_reason 璁板綍鍘熷洜锛�
-//                    if (CollectionUtils.isEmpty(serviceTaskdiags) || serviceTaskdiags.size() == 0) {
-//                        patMedInhosp1.setDeptcheckFlag("3");
-//                        patMedInhosp1.setLongTaskReason(patMedInhosp2.getLongTaskReason() + "璇ユ偅鑰呯殑绗竴鐤剧梾缂栫爜锛屾湭閰嶇疆闀挎湡浠诲姟;");
-//                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
-//                        continue;
-//                    } else if (serviceTaskdiags.size() > 1) {
-//                        //濡傛灉鏌ヨ鍑哄涓换鍔★紝閭e氨鍙栫涓�涓紝骞跺湪鎮h�呭娉ㄤ竴涓�
-//                        List<Long> tempList = serviceTaskdiags.stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
-//                        patMedInhosp1.setLongTaskReason(patMedInhosp2.getLongTaskReason() + "璇ユ偅鑰呯殑绗竴鐤剧梾缂栫爜锛屾湁澶氫釜鍑洪櫌闅忚闀挎湡浠诲姟:" + tempList);
-//                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
-//                        ServiceTaskdiag serviceTaskdiag1 = serviceTaskdiags.get(0);
-//                        serviceTaskdiags = new ArrayList<>();
-//                        serviceTaskdiags.add(serviceTaskdiag1);
-//                    }
-//                    writeInSubTask(serviceTaskdiags.get(0).getTaskId(), false, patMedInhosp1, patArchive);
-//                }
-//
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//                log.error("浜哄憳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
-//            }
-//        }
-//
-//        //鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭d箣鍓嶇殑鍑洪櫌鎮h�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
-//        patMedInhosp.setDeptcheckFlag("0");
-//        patMedInhosp.setInhospstate("0");
-//        List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
-//        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
-//            String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
-//            patMedInhosp1.setTagname(tagname);
-//        }
-//        if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) {
-//            dealInHospInfo(patMedInhospList);
-//        }
-//        return 1;
-//    }
 
     /**
      * 鑾峰彇鍑洪櫌锛屼綇闄紝闂ㄨ瘖鏈嶅姟浜烘
@@ -741,13 +523,12 @@
     }
 
     /**
-     *
-     * @param taskid 浠诲姟id
-     * @param check 鏄惁闇�瑕佹牎楠�
+     * @param taskid        浠诲姟id
+     * @param check         鏄惁闇�瑕佹牎楠�
      * @param patMedInhosp1 鐥呬汉鍑哄叆闄俊鎭�
-     * @param patArchive 鐥呬汉淇℃伅
-     * @param type 闅忚绫诲瀷(1-绉戝锛�2-鐥呭尯锛�3-鐤剧梾锛�
-     * @param config 閰嶇疆淇℃伅 visit.early.day
+     * @param patArchive    鐥呬汉淇℃伅
+     * @param type          闅忚绫诲瀷(1-绉戝锛�2-鐥呭尯锛�3-鐤剧梾 4-鍏ラ櫌绉戝 5-鍏ラ櫌鐥呭尯)
+     * @param config        閰嶇疆淇℃伅 visit.early.day
      */
     //灏嗘偅鑰呮斁鍒皊ubtask涓�
     private void writeInSubTask(Long taskid, Boolean check, PatMedInhosp patMedInhosp1, PatArchive patArchive, Integer type, String config) {
@@ -776,22 +557,41 @@
                 patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呯柧鐥呴暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
                 patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                 return;
+            } else if (type == 4) {
+                patMedInhosp1.setInDeptcheckFlag("2");
+                patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呭叆闄㈢瀹ら暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                return;
+            } else if (type == 5) {
+                patMedInhosp1.setInWardcheckFlag("2");
+                patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呭叆闄㈢梾鍖洪暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                return;
             }
         } else {
             serviceTask = serviceTasks.get(0);
         }
-        if (Objects.isNull(patMedInhosp1.getEndtime())) {
+        if (patMedInhosp1.getInhospstate().equals("1") && Objects.isNull(patMedInhosp1.getEndtime())) {
             return;
         }
         //灏佽serviceSubtask
-        ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive, config);
+        ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive, config, type);
         if (ObjectUtils.isEmpty(serviceSubtask)) {
             return;
         }
         if (type != 2) {
             //绉戝鍜岀柧鐥� 閮界敤 绉戝濉厖
-            serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeaveldeptcode());
-            serviceSubtask.setVisitDeptName(patMedInhosp1.getLeaveldeptname());
+            if (patMedInhosp1.getInhospstate().equals("1")) {
+                serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeaveldeptcode());
+                serviceSubtask.setVisitDeptName(patMedInhosp1.getLeaveldeptname());
+            } else if (patMedInhosp1.getInhospstate().equals("0")) {
+                serviceSubtask.setVisitDeptCode(patMedInhosp1.getDeptcode());
+                serviceSubtask.setVisitDeptName(patMedInhosp1.getDeptname());
+                if (type == 5) {
+                    serviceSubtask.setVisitDeptCode(patMedInhosp1.getHospitaldistrictcode());
+                    serviceSubtask.setVisitDeptName(patMedInhosp1.getHospitaldistrictname());
+                }
+            }
         } else if (type == 2) {
             serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
             serviceSubtask.setVisitDeptName(patMedInhosp1.getLeavehospitaldistrictname());
@@ -899,7 +699,7 @@
                     i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
                     addServiceSubtaskPreachform(serviceSubtask, null);
                 }
-            } else if (serviceSubtask.getTaskSituation() == 6) {
+            } else if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
                 //璇存槑璇ユ偅鑰呮槸琚繃婊ょ殑锛屼笉鐢ㄥ啀鎵ц浜�
                 serviceSubtask.setCreateBy(serviceTask.getCreateBy());
                 serviceSubtask.setCreateTime(new Date());
@@ -925,6 +725,8 @@
                 if (type == 1) patMedInhosp2.setDeptcheckFlag("1");
                 if (type == 2) patMedInhosp2.setWardcheckFlag("1");
                 if (type == 3) patMedInhosp2.setDiagcheckFlag("1");
+                if (type == 4) patMedInhosp2.setInDeptcheckFlag("1");
+                if (type == 5) patMedInhosp2.setInWardcheckFlag("1");
                 patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
             } else {
                 //鐢熸垚瀛愪换鍔″け璐ワ紝
@@ -934,6 +736,8 @@
                 if (type == 1) patMedInhosp2.setDeptcheckFlag("2");
                 if (type == 2) patMedInhosp2.setWardcheckFlag("2");
                 if (type == 3) patMedInhosp2.setDiagcheckFlag("2");
+                if (type == 4) patMedInhosp2.setInDeptcheckFlag("2");
+                if (type == 5) patMedInhosp2.setInWardcheckFlag("2");
                 patMedInhosp2.setRemark("鐢熸垚瀛愪换鍔″け璐� " + type);
                 patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
             }
@@ -954,10 +758,10 @@
 
     /**
      *
-     * @param taskid 浠诲姟id
-     * @param check 鏄惁闇�瑕佹牎楠�
+     * @param taskid              浠诲姟id
+     * @param check               鏄惁闇�瑕佹牎楠�
      * @param patMedOperationItem 鎵嬫湳璁板綍
-     * @param config 閰嶇疆淇℃伅 visit.early.day
+     * @param config              閰嶇疆淇℃伅 visit.early.day
      */
     //灏嗘偅鑰呮斁鍒皊ubtask涓� 鎵嬫湳涓撶敤
     private void writeInSubTaskForOp(Long taskid, Boolean check, PatMedOperationItem patMedOperationItem, String config) {
@@ -992,8 +796,18 @@
         if (Objects.isNull(patArchive)) {
             return;
         }
+        PatMedInhosp patMedInhosp = new PatMedInhosp();
+        patMedInhosp.setPatid(patMedOperation.getPatid());
+        patMedInhosp.setInhospstate("1");
+        patMedInhosp.setFuflag("1");
+        List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+
+        if (CollectionUtils.isEmpty(patMedInhospList)) {
+            return;
+        }
+
         //灏佽serviceSubtask
-        ServiceSubtask serviceSubtask = boxedServiceSubtaskForOp(serviceTask, patMedOperation, patArchive, config);
+        ServiceSubtask serviceSubtask = boxedServiceSubtaskForOp(serviceTask, patMedInhospList.get(0), patMedOperation, patMedOperationItem, patArchive, config);
         if (ObjectUtils.isEmpty(serviceSubtask)) {
             return;
         }
@@ -1115,7 +929,7 @@
 
 
     //灏佽serviceSubtask
-    private ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatArchive patArchive, String config) {
+    private ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatArchive patArchive, String config, Integer type) {
         //澧炲姞serviceTask鍒ょ┖
 //        if(Objects.isNull(serviceTask)){
 //            return null;
@@ -1131,6 +945,15 @@
         serviceSubtask.setDrname(patMedInhosp1.getDrname());
         serviceSubtask.setDeptcode(patMedInhosp1.getLeaveldeptcode());
         serviceSubtask.setDeptname(patMedInhosp1.getLeaveldeptname());
+        serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
+        serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
+        if (type == 4 || type == 5) {
+            //璁剧疆鍏ラ櫌鐨�
+            serviceSubtask.setDeptcode(patMedInhosp1.getDeptcode());
+            serviceSubtask.setDeptname(patMedInhosp1.getDeptname());
+            serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getHospitaldistrictcode());
+            serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getHospitaldistrictname());
+        }
         serviceSubtask.setLeaveicd10code(patMedInhosp1.getLeaveicd10code());
         serviceSubtask.setLeavediagname(patMedInhosp1.getDiagname());
         serviceSubtask.setTemplateid(serviceTask.getTemplateid());
@@ -1150,6 +973,7 @@
         serviceSubtask.setServiceType(serviceTask.getServiceType());
         serviceSubtask.setPreachform(serviceTask.getPreachform());
         serviceSubtask.setHospType("2");
+        if (type == 4 || type == 5) serviceSubtask.setHospType("6");
         serviceSubtask.setCreateTime(new Date());
         serviceSubtask.setUpdateTime(new Date());
         serviceSubtask.setCreateBy(patMedInhosp1.getNurseName());
@@ -1157,17 +981,24 @@
         serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
         serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
         serviceSubtask.setUpdateTime(new Date());
+        //濡傛灉鏄鏁欏氨璁剧疆涓�7
+        if (serviceTask.getServiceType().equals("17")) serviceSubtask.setTaskSituation(7);
         //璁剧疆鍙戦�佹椂闂�
         if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
         Date newDate = null;
         if (!Objects.isNull(patMedInhosp1.getEndtime())) {
             newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());
         } else {
-            patMedInhosp1.setDeptcheckFlag("2");
-            patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 璇ユ偅鑰呯柧鐥呭嚭闄㈡椂闂翠负绌�,鍑洪櫌璁板綍ID涓�:" + patMedInhosp1.getInhospid());
-            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
-            //濡傛灉鍑洪櫌鏃堕棿涓虹┖锛屽垯杩斿洖涓�涓柊瀵硅薄
-            return new ServiceSubtask();
+            //濡傛灉绛変簬4,璇存槑鏄叆闄㈠鏁欙紝鍏ラ櫌涓嶅彲鑳芥湁endTime
+            if (type != 4 && type != 5) {
+                patMedInhosp1.setDeptcheckFlag("2");
+                patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 璇ユ偅鑰呯柧鐥呭嚭闄㈡椂闂翠负绌�,鍑洪櫌璁板綍ID涓�:" + patMedInhosp1.getInhospid());
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                //濡傛灉鍑洪櫌鏃堕棿涓虹┖锛屽垯杩斿洖涓�涓柊瀵硅薄
+                return new ServiceSubtask();
+            }
+            //鍏ラ櫌瀹f暀锛屽熀鏈綋澶╂垨闅斿ぉ灏辫鍙戝嚭
+            newDate = addDays(new Date(), serviceTask.getSendDay().intValue());
         }
         serviceSubtask.setLongSendTime(newDate);
         serviceSubtask.setVisitTime(newDate);
@@ -1204,7 +1035,7 @@
     }
 
     //灏佽serviceSubtask
-    private ServiceSubtask boxedServiceSubtaskForOp(ServiceTask serviceTask, PatMedOperation patMedOperation, PatArchive patArchive, String config) {
+    private ServiceSubtask boxedServiceSubtaskForOp(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatMedOperation patMedOperation, PatMedOperationItem patMedOperationItem, PatArchive patArchive, String config) {
         ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
         serviceSubtask.setTaskid(serviceTask.getTaskid());
         if (StringUtils.isNotEmpty(serviceTask.getLibtemplateid()))
@@ -1240,13 +1071,23 @@
         serviceSubtask.setCreateBy(patMedOperation.getNurseName());
 //        serviceSubtask.setLeavehospitaldistrictcode(patArchive.getLeavehospitaldistrictcode());
 //        serviceSubtask.setLeavehospitaldistrictname(patArchive.getLeavehospitaldistrictname());
+        serviceSubtask.setOperationItemId(patMedOperationItem.getId());
         serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
         serviceSubtask.setUpdateTime(new Date());
+
+        //todo
         //璁剧疆鍙戦�佹椂闂�
         if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
         Date newDate = null;
-        //todo
-        newDate = addDays(patMedOperation.getCreateTime(), serviceTask.getSendDay().intValue());
+        if (!Objects.isNull(patMedInhosp1.getEndtime())) {
+            newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());
+        } else {
+            patMedInhosp1.setDeptcheckFlag("2");
+            patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 璇ユ偅鑰呮墜鏈嚭闄㈡椂闂翠负绌�,鍑洪櫌璁板綍ID涓�:" + patMedInhosp1.getInhospid());
+            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+            //濡傛灉鍑洪櫌鏃堕棿涓虹┖锛屽垯杩斿洖涓�涓柊瀵硅薄
+            return new ServiceSubtask();
+        }
         serviceSubtask.setLongSendTime(newDate);
         serviceSubtask.setVisitTime(newDate);
 
@@ -1254,7 +1095,6 @@
         if ("3".equals(serviceTask.getType())) {
             serviceSubtask.setVisitTime(minusDay(newDate, StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
         }
-
         //鎮h�呭彂閫佹椂闂�
         if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
             String remark = patArchive.getNotrequiredreason();
@@ -1301,24 +1141,651 @@
                             //涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
                             continue;
                         }
-                        if (serviceSubtask1.getEndtime().before(patMedInhosp1.getStarttime())) {
-                            //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
-//                            log.error("鎮h�呭啀鍏ラ櫌鐨剆erviceSubtask1涓�:{}", serviceSubtask1);
-                            serviceSubtask1.setSendstate(4L);
-                            serviceSubtask1.setRemark("鎮h�呭啀鍏ラ櫌");
-                            serviceSubtask1.setResult("error");
-//                            serviceSubtask1.setFinishtime(new Date());
-                            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+                        //鏅畞 鍑洪櫌棣栨锛�7澶╋級闅忚涓�瀹氳鍋�
+                        boolean firstVisit = false;
+                        if (serviceSubtask1.getOrgid().equals("47255004333112711A1001") && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
+                            firstVisit = true;
                         }
+                        if (!firstVisit) {
+                            if (serviceSubtask1.getEndtime().before(patMedInhosp1.getStarttime())) {
+                                //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
+//                            log.error("鎮h�呭啀鍏ラ櫌鐨剆erviceSubtask1涓�:{}", serviceSubtask1);
+                                serviceSubtask1.setSendstate(4L);
+                                serviceSubtask1.setIsVisitAgain(2);
+                                serviceSubtask1.setRemark("鎮h�呭啀鍏ラ櫌");
+                                serviceSubtask1.setResult("error");
+                                serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+                            }
+                        }
+
                     }
                 }
-                //灏嗘偅鍏ョ殑鍏ラ櫌鏁版嵁璁剧疆涓哄凡澶勭悊
-                //鏇存柊鐘舵�佸�� patMedInhosp1.setDeptcheckFlag("0");
-                //patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
             } catch (Exception e) {
                 log.error("鍏ラ櫌鏁版嵁淇℃伅鍑哄紓甯镐簡锛歿},{}", patMedInhosp1, e.getMessage());
             }
         }
     }
 
+    private void addOperationSubTask(String config) {
+        //            鎵嬫湳闅忚
+        PatMedOperationItem pmoi = new PatMedOperationItem();
+        //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
+        pmoi.setOpercheckFlag("0");
+        pmoi.setMainFlag("1");
+
+        List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectPatMedOperationItemList(pmoi);
+        log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎵嬫湳鎮h�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedOperationItems) ? patMedOperationItems.size() : null);
+
+        for (PatMedOperationItem opItem : patMedOperationItems) {
+
+            try {
+                if (StringUtils.isEmpty(opItem.getOplevelcode())) {
+                    continue;
+                }
+                // 鏍规嵁鎮h�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
+                ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
+                serviceTaskoper.setLongtask(1L);
+                serviceTaskoper.setOrgid(opItem.getOrgid());
+                serviceTaskoper.setOplevelcode(opItem.getOplevelcode());
+
+                List<ServiceTaskoper> serviceTaskopers = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);
+                //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+                if (CollectionUtils.isEmpty(serviceTaskopers) || serviceTaskopers.size() == 0) {
+                    PatMedOperationItem patMedOperationItem = patMedOperationItemMapper.selectPatMedOperationItemById(opItem.getId());
+                    patMedOperationItem.setOpercheckFlag("2");
+                    patMedOperationItem.setLongTaskReason(patMedOperationItem.getLongTaskReason() + "鎵�鎮g殑鎵嬫湳鏈厤缃暱鏈熶换鍔�;");
+                    patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem);
+                } else {
+                    for (ServiceTaskoper serviceTaskoper1 : serviceTaskopers) {
+                        writeInSubTaskForOp(serviceTaskoper1.getTaskId(), true, opItem, config);
+                    }
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("浜哄憳鎵嬫湳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+                opItem.setOpercheckFlag("2");
+                opItem.setLongTaskReason("浜哄憳鎵嬫湳澶勭悊寮傚父锛�" + e.getMessage());
+                patMedOperationItemMapper.updatePatMedOperationItem(opItem);
+            }
+        }
+    }
+
+    private void addIcd10SubTask(String config) {
+        PatMedInhosp pmjb = new PatMedInhosp();
+        //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
+        pmjb.setDiagcheckFlag("0");
+        pmjb.setInhospstate("1");
+        pmjb.setFuflag("1");
+        List<PatMedInhosp> patMedInhospJBs = patMedInhospMapper.selectPatMedInhospList(pmjb);
+        log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鐤剧梾鎮h�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhospJBs) ? patMedInhospJBs.size() : null);
+        for (PatMedInhosp patMedInhosp1 : patMedInhospJBs) {
+            String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+            patMedInhosp1.setTagname(tagname);
+        }
+
+        for (PatMedInhosp pmiJB : patMedInhospJBs) {
+            //鑾峰彇鎮h�呬俊鎭�
+            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(pmiJB.getPatid());
+            if (Objects.isNull(patArchive)) {
+                pmiJB.setDiagcheckFlag("2");
+                pmiJB.setLongTaskReason("鎮h�呭熀鏈俊鎭负绌�");
+                patMedInhospMapper.updatePatMedInhosp(pmiJB);
+                continue;
+            }
+            try {
+                String errorIcd = null;
+                if (StringUtils.isEmpty(pmiJB.getLeaveicd10code())) {
+                    continue;
+                }
+                // 鏍规嵁鎮h�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
+                ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
+                serviceTaskdiag.setLongtask(1L);
+                serviceTaskdiag.setServiceType("2");
+                if (active.equals("nhfy")) {
+                    //鍗楀崕闄勪竴鐨刬cd10code鏈夐噸澶嶏紝鎵�浠ョ敤涓昏瘖鏂悕绉板幓鏌ヨ
+                    serviceTaskdiag.setIcd10name(pmiJB.getLeavediagname());
+                    if (StringUtils.isEmpty(pmiJB.getLeavediagname())) {
+                        errorIcd = "璇ユ偅鑰呬富璇婃柇鍚嶇О涓虹┖;";
+                    }
+                } else {
+                    serviceTaskdiag.setIcd10code(pmiJB.getLeaveicd10code());
+                    if (StringUtils.isEmpty(pmiJB.getLeaveicd10code())) {
+                        errorIcd = "璇ユ偅鑰呬富璇婃柇ICD10鐮佷负绌�;";
+                    }
+                }
+                serviceTaskdiag.setOrgid(pmiJB.getOrgid());
+                List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagListByIcdName(serviceTaskdiag);
+
+                //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+                if (StringUtils.isNotEmpty(errorIcd)) {
+                    PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiJB.getInhospid());
+                    pmiJB.setDiagcheckFlag("2");
+                    pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd);
+                    patMedInhospMapper.updatePatMedInhosp(pmiJB);
+                } else if (CollectionUtils.isEmpty(serviceTaskdiags)) {
+                    errorIcd = "璇ユ偅鑰呮墍鎮g柧鐥呮湭閰嶇疆闀挎湡浠诲姟;";
+                    PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiJB.getInhospid());
+                    pmiJB.setDiagcheckFlag("2");
+                    pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd);
+                    patMedInhospMapper.updatePatMedInhosp(pmiJB);
+                } else {
+                    int flag = 0;
+                    for (ServiceTaskdiag serviceTaskdept1 : serviceTaskdiags) {
+                        //蹇呴』绉戝鎴栫梾鍖鸿兘鍖归厤涓�,鎵嶅彲浠ョ敤杩欎釜鐤剧梾鍒涘缓瀛愪换鍔★紙涓昏澶勭悊涓�涓柧鐥呭湪澶氫釜鐥呭尯鎴栫瀹ゅ嚭鐜帮級
+                        if (StringUtils.isNotEmpty(serviceTaskdept1.getDeptCode()) && serviceTaskdept1.getDeptCode().equals(pmiJB.getLeaveldeptcode())) {
+                            writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiJB, patArchive, 3, config);
+                            flag = 1;
+                        } else if (StringUtils.isNotEmpty(serviceTaskdept1.getWardCode()) && serviceTaskdept1.getWardCode().equals(pmiJB.getLeavehospitaldistrictcode())) {
+                            writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiJB, patArchive, 3, config);
+                            flag = 1;
+                        }
+                    }
+                    if (flag == 0) {
+                        log.error("璇ョ瀹ゆ垨鐥呭尯瀵逛簬鎮h�呮墍鎮g柧鐥呮湭閰嶇疆闀挎湡浠诲姟,鎮h�咃細{}", pmiJB.getInhospid());
+                        errorIcd = "璇ョ瀹ゆ垨鐥呭尯瀵逛簬鎮h�呮墍鎮g柧鐥呮湭閰嶇疆闀挎湡浠诲姟;";
+                        PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiJB.getInhospid());
+                        pmiJB.setDiagcheckFlag("2");
+                        pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd);
+                        patMedInhospMapper.updatePatMedInhosp(pmiJB);
+                    }
+
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("浜哄憳鐤剧梾澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+                pmiJB.setDiagcheckFlag("2");
+                pmiJB.setLongTaskReason("浜哄憳鐤剧梾澶勭悊寮傚父锛�" + e.getMessage());
+                patMedInhospMapper.updatePatMedInhosp(pmiJB);
+            }
+        }
+    }
+
+    private void addWardSubTask(String config) {
+        PatMedInhosp pmbq = new PatMedInhosp();
+        //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
+        pmbq.setWardcheckFlag("0");
+        pmbq.setInhospstate("1");
+        pmbq.setFuflag("1");
+        List<PatMedInhosp> patMedInhospBQs = patMedInhospMapper.selectPatMedInhospList(pmbq);
+        log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鐥呭尯鎮h�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhospBQs) ? patMedInhospBQs.size() : null);
+        for (PatMedInhosp patMedInhosp1 : patMedInhospBQs) {
+            String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+            patMedInhosp1.setTagname(tagname);
+        }
+
+        //鐥呭尯鏁版嵁澶勭悊
+        for (PatMedInhosp pmiBQ1 : patMedInhospBQs) {
+            if ("1".equals(pmiBQ1.getLeavehospitaldistrictcode()) && pmiBQ1.getDiagcheckFlag().equals("1")) {
+                pmiBQ1.setWardcheckFlag("2");
+                pmiBQ1.setLongTaskReason("鏍规嵁浜ゅ弶鐢熸垚闅忚浠诲姟瑙勫垯锛岀梾鍖轰换鍔″彲浠ヤ笉鐢ㄧ敓鎴�");
+                patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+                continue;
+            }
+
+            //鑾峰彇鎮h�呬俊鎭�
+            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(pmiBQ1.getPatid());
+            if (Objects.isNull(patArchive)) {
+                pmiBQ1.setWardcheckFlag("2");
+                pmiBQ1.setLongTaskReason("鎮h�呭熀鏈俊鎭负绌�");
+                patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+                continue;
+            }
+            try {
+                String errorreason = null;
+                List<ServiceTaskdept> serviceTaskdeptList = null;
+                if (!StringUtils.isEmpty(pmiBQ1.getLeavehospitaldistrictcode())) {
+                    ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+                    serviceTaskdept.setLongtask(1L);
+                    serviceTaskdept.setDeptCode(pmiBQ1.getLeavehospitaldistrictcode());
+                    serviceTaskdept.setDeptType("2");
+                    serviceTaskdept.setServiceType("2");
+                    serviceTaskdept.setOrgid(pmiBQ1.getOrgid());
+                    serviceTaskdeptList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+                    if (CollectionUtils.isEmpty(serviceTaskdeptList)) {
+                        errorreason = "璇ユ偅鑰呮墍鍦ㄧ梾鍖烘湭閰嶇疆闀挎湡浠诲姟;";
+                    }
+                } else {
+                    errorreason = "绂婚櫌鐥呭尯涓虹┖;";
+                }
+                //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+                if (StringUtils.isNotEmpty(errorreason)) {
+                    PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiBQ1.getInhospid());
+                    pmiBQ1.setWardcheckFlag("2");
+                    pmiBQ1.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorreason : errorreason);
+                    patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+                } else {
+                    for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
+                        writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiBQ1, patArchive, 2, config);
+                    }
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("浜哄憳鐥呭尯澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+                pmiBQ1.setWardcheckFlag("2");
+                pmiBQ1.setLongTaskReason("浜哄憳鐥呭尯澶勭悊寮傚父锛�" + e.getMessage());
+                patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+            }
+        }
+    }
+
+    private void addDeptSubTask(String config) {
+        //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
+        PatMedInhosp pmks = new PatMedInhosp();
+        pmks.setDeptcheckFlag("0");
+        pmks.setInhospstate("1");
+        pmks.setFuflag("1");
+        List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(pmks);
+        log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌閮ㄩ棬鎮h�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhosps) ? patMedInhosps.size() : null);
+        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
+            String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+            patMedInhosp1.setTagname(tagname);
+        }
+
+        //绉戝
+        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
+            if ("1".equals(patMedInhosp1.getLeavehospitaldistrictcode()) && patMedInhosp1.getDiagcheckFlag().equals("1")) {
+                patMedInhosp1.setDeptcheckFlag("2");
+                patMedInhosp1.setLongTaskReason("鏍规嵁浜ゅ弶鐢熸垚闅忚浠诲姟瑙勫垯锛岄儴闂ㄤ换鍔″彲浠ヤ笉鐢ㄧ敓鎴�");
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                continue;
+            }
+            //鑾峰彇鎮h�呬俊鎭�
+            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
+            if (Objects.isNull(patArchive)) {
+                patMedInhosp1.setDeptcheckFlag("2");
+                patMedInhosp1.setLongTaskReason("鎮h�呭熀鏈俊鎭负绌�");
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                continue;
+            }
+            try {
+                //鏍规嵁鎮h�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟
+                ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+                serviceTaskdept.setLongtask(1L);
+                serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
+                serviceTaskdept.setDeptType("1");
+                serviceTaskdept.setServiceType("2");
+                serviceTaskdept.setOrgid(patMedInhosp1.getOrgid());
+                List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+                //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+                if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
+                    PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+                    patMedInhosp1.setDeptcheckFlag("2");
+                    patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆绂婚櫌闀挎湡浠诲姟;");
+                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                } else {
+                    for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
+                        writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config);
+                    }
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("浜哄憳绉戝澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+                patMedInhosp1.setDeptcheckFlag("2");
+                patMedInhosp1.setLongTaskReason("浜哄憳绉戝澶勭悊寮傚父锛�" + e.getMessage());
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+            }
+        }
+    }
+
+    /**
+     * 缁熶竴鏇存柊pat_med_inhosp鐨刢heck_flag
+     *
+     * @param patMedInhosp 鎮h�呬綇闄㈣褰�
+     * @param type         1=deptcheck_flag, 2=wardcheck_flag, 3=diagcheck_flag, 4=inDeptcheck_flag, 5=inWardcheck_flag
+     * @param flagValue    瑕佽缃殑鍊�
+     * @param remark       澶囨敞淇℃伅
+     */
+    private void updateCheckFlag(PatMedInhosp patMedInhosp, Integer type, String flagValue, String remark) {
+        PatMedInhosp updateObj = new PatMedInhosp();
+        updateObj.setInhospid(patMedInhosp.getInhospid());
+        switch (type) {
+            case 1:
+                updateObj.setDeptcheckFlag(flagValue);
+                break;
+            case 2:
+                updateObj.setWardcheckFlag(flagValue);
+                break;
+            case 3:
+                updateObj.setDiagcheckFlag(flagValue);
+                break;
+            case 4:
+                updateObj.setInDeptcheckFlag(flagValue);
+                break;
+            case 5:
+                updateObj.setInWardcheckFlag(flagValue);
+                break;
+        }
+        if (StringUtils.isNotEmpty(remark)) {
+            updateObj.setRemark(remark + " (type=" + type + ")");
+        }
+        patMedInhospMapper.updatePatMedInhosp(updateObj);
+    }
+
+    /**
+     * 鍩轰簬瑙勫垯鐨勪换鍔$敓鎴愭柟娉�
+     * 鏍规嵁鎮h�呯闄㈢瀹ゆ垨鐥呭尯鏌ヨservice_task_rule锛岃幏鍙杁eptRule銆亀radRule銆乨iagRule
+     * 鏍规嵁瑙勫垯鍊煎喅瀹氳皟鐢ㄥ摢涓柟娉曠敓鎴愰殢璁夸换鍔�
+     */
+    private void addSubTaskByRule(String config) {
+        // 鑾峰彇鎵�鏈夐渶瑕佸鐞嗙殑鍑洪櫌鎮h�咃紙绉戝缁村害鏈鐞嗭級
+        PatMedInhosp pmks = new PatMedInhosp();
+        pmks.setDeptcheckFlag("0");
+        pmks.setInhospstate("1");
+        pmks.setFuflag("1");
+        List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(pmks);
+        log.info("銆愬熀浜庤鍒欍�戦渶瑕佸鐞嗙殑鍑洪櫌鎮h�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhosps) ? patMedInhosps.size() : null);
+
+        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
+            // 鑾峰彇鎮h�呭熀鏈俊鎭�
+            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
+            if (Objects.isNull(patArchive)) {
+                patMedInhosp1.setDeptcheckFlag("2");
+                patMedInhosp1.setLongTaskReason("鎮h�呭熀鏈俊鎭负绌�");
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                continue;
+            }
+
+            try {
+                // 鏌ヨ瑙勫垯锛氭牴鎹闄㈢瀹ゆ垨鐥呭尯
+                ServiceTaskRule ruleQuery = new ServiceTaskRule();
+                ruleQuery.setDeptcode(patMedInhosp1.getLeaveldeptcode());
+                ruleQuery.setWardcode(patMedInhosp1.getLeavehospitaldistrictcode());
+                ServiceTaskRule rule = serviceTaskRuleMapper.selectServiceTaskRuleByDeptOrWard(ruleQuery);
+
+                if (rule == null) {
+                    // 瑙勫垯涓虹┖锛屽叏閮ㄧ敓鎴�
+                    log.info("銆愬熀浜庤鍒欍�戞偅鑰厈}鏈厤缃鍒欙紝鎵ц鍏ㄩ儴鐢熸垚閫昏緫", patMedInhosp1.getInhospid());
+                    addDeptSubTaskForPatient(patMedInhosp1, patArchive, config);
+                    if (!active.equals("xh")) {
+                        addWardSubTaskForPatient(patMedInhosp1, patArchive, config);
+                        addIcd10SubTaskForPatient(patMedInhosp1, patArchive, config);
+                    }
+                } else {
+                    // 鏈夎鍒欙紝鎸夎鍒欐墽琛�
+                    log.info("銆愬熀浜庤鍒欍�戞偅鑰厈}鏌ヨ鍒拌鍒欙細deptRule={}, wradRule={}, diagRule={}", patMedInhosp1.getInhospid(), rule.getDeptRule(), rule.getWradRule(), rule.getDiagRule());
+
+                    boolean deptIsPrimary = "1".equals(rule.getDeptRule());
+                    boolean wardIsPrimary = "1".equals(rule.getWradRule());
+                    boolean diagIsPrimary = "1".equals(rule.getDiagRule());
+                    boolean deptIsSecondary = "2".equals(rule.getDeptRule());
+                    boolean wardIsSecondary = "2".equals(rule.getWradRule());
+                    boolean diagIsSecondary = "2".equals(rule.getDiagRule());
+
+                    boolean hasPrimaryRule = deptIsPrimary || wardIsPrimary || diagIsPrimary;
+
+                    if (hasPrimaryRule) {
+                        // 绗竴姝ワ細鎵ц鎵�鏈夎鍒�=1鐨勬柟娉曪紝姣忎釜鐙珛璁板綍鎴愬姛/澶辫触
+                        int deptGenCount = 0;
+                        int wardGenCount = 0;
+                        int diagGenCount = 0;
+
+                        if (deptIsPrimary) {
+                            log.info("銆愬熀浜庤鍒欍�戞墽琛岀瀹ら瑕佽鍒�");
+                            deptGenCount = addDeptSubTaskForPatient(patMedInhosp1, patArchive, config);
+                        }
+
+                        if (!active.equals("xh")) {
+                            if (wardIsPrimary) {
+                                log.info("銆愬熀浜庤鍒欍�戞墽琛岀梾鍖洪瑕佽鍒�");
+                                wardGenCount = addWardSubTaskForPatient(patMedInhosp1, patArchive, config);
+                            }
+
+                            if (diagIsPrimary) {
+                                log.info("銆愬熀浜庤鍒欍�戞墽琛岀柧鐥呴瑕佽鍒�");
+                                diagGenCount = addIcd10SubTaskForPatient(patMedInhosp1, patArchive, config);
+                            }
+                        }
+
+                        int primaryGeneratedCount = deptGenCount + wardGenCount + diagGenCount;
+                        log.info("銆愬熀浜庤鍒欍�戦瑕佽鍒欐墽琛岀粨鏋�: deptGen={}, wardGen={}, diagGen={}, total={}", deptGenCount, wardGenCount, diagGenCount, primaryGeneratedCount);
+
+                        // 绗簩姝ワ細鍒ゆ柇棣栬瑙勫垯鏄惁鏈変换鎰忎竴涓敓鎴愭垚鍔�
+                        if (primaryGeneratedCount > 0) {
+                            // 鑷冲皯鏈変竴涓瑕佽鍒欑敓鎴愭垚鍔�
+                            // 鈥斺�� 灏�=2鐨勬瑕佽鍒欏搴攆lag璁句负"2"锛堣烦杩囷級
+                            log.info("銆愬熀浜庤鍒欍�戦瑕佽鍒欐湁鎴愬姛(count={})锛屽皢娆¤瑙勫垯瀵瑰簲flag璁句负2", primaryGeneratedCount);
+                            if (deptIsSecondary) {
+                                updateCheckFlag(patMedInhosp1, 1, "2", "棣栬瑙勫垯宸茬敓鎴愶紝娆¤瑙勫垯璺宠繃");
+                            }
+                            if (!active.equals("xh")) {
+                                if (wardIsSecondary) {
+                                    updateCheckFlag(patMedInhosp1, 2, "2", "棣栬瑙勫垯宸茬敓鎴愶紝娆¤瑙勫垯璺宠繃");
+                                }
+                                if (diagIsSecondary) {
+                                    updateCheckFlag(patMedInhosp1, 3, "2", "棣栬瑙勫垯宸茬敓鎴愶紝娆¤瑙勫垯璺宠繃");
+                                }
+                            }
+                            // 鈥斺�� 瀵逛簬=1涓旂敓鎴愭垚鍔熺殑锛屽皢鍏跺搴攆lag璁句负"1"
+                            if (deptIsPrimary && deptGenCount > 0) {
+                                updateCheckFlag(patMedInhosp1, 1, "1", "绉戝棣栬瑙勫垯鐢熸垚鎴愬姛");
+                            }
+                            if (!active.equals("xh")) {
+                                if (wardIsPrimary && wardGenCount > 0) {
+                                    updateCheckFlag(patMedInhosp1, 2, "1", "鐥呭尯棣栬瑙勫垯鐢熸垚鎴愬姛");
+                                }
+                                if (diagIsPrimary && diagGenCount > 0) {
+                                    updateCheckFlag(patMedInhosp1, 3, "1", "鐤剧梾棣栬瑙勫垯鐢熸垚鎴愬姛");
+                                }
+                            }
+                            // 鈥斺�� 瀵逛簬=1浣嗙敓鎴愬け璐ョ殑锛屽皢鍏跺搴攆lag璁句负"2"
+                            if (deptIsPrimary && deptGenCount == 0) {
+                                updateCheckFlag(patMedInhosp1, 1, "2", "绉戝棣栬瑙勫垯鐢熸垚澶辫触");
+                            }
+                            if (!active.equals("xh")) {
+                                if (wardIsPrimary && wardGenCount == 0) {
+                                    updateCheckFlag(patMedInhosp1, 2, "2", "鐥呭尯棣栬瑙勫垯鐢熸垚澶辫触");
+                                }
+                                if (diagIsPrimary && diagGenCount == 0) {
+                                    updateCheckFlag(patMedInhosp1, 3, "2", "鐤剧梾棣栬瑙勫垯鐢熸垚澶辫触");
+                                }
+                            }
+                        } else {
+                            // 鎵�鏈夐瑕佽鍒欏叏閮ㄥけ璐ワ紝灏�=1鐨刦lag璁句负"2"锛岀劧鍚庢墽琛�=2鐨勬柟娉�
+                            log.info("銆愬熀浜庤鍒欍�戦瑕佽鍒欏叏閮ㄥけ璐ワ紝灏�=1鐨刦lag璁句负2锛屽紑濮嬫墽琛屾瑕佽鍒�");
+                            if (deptIsPrimary) {
+                                updateCheckFlag(patMedInhosp1, 1, "2", "绉戝棣栬瑙勫垯鍏ㄩ儴澶辫触");
+                            }
+                            if (!active.equals("xh")) {
+                                if (wardIsPrimary) {
+                                    updateCheckFlag(patMedInhosp1, 2, "2", "鐥呭尯棣栬瑙勫垯鍏ㄩ儴澶辫触");
+                                }
+                                if (diagIsPrimary) {
+                                    updateCheckFlag(patMedInhosp1, 3, "2", "鐤剧梾棣栬瑙勫垯鍏ㄩ儴澶辫触");
+                                }
+                            }
+                            // 鎵ц娆¤瑙勫垯(=2)鐨勬柟娉�
+                            if (deptIsSecondary) {
+                                log.info("銆愬熀浜庤鍒欍�戞墽琛岀瀹ゆ瑕佽鍒�");
+                                addDeptSubTaskForPatient(patMedInhosp1, patArchive, config);
+                            }
+
+                            if (!active.equals("xh")) {
+                                if (wardIsSecondary) {
+                                    log.info("銆愬熀浜庤鍒欍�戞墽琛岀梾鍖烘瑕佽鍒�");
+                                    addWardSubTaskForPatient(patMedInhosp1, patArchive, config);
+                                }
+
+                                if (diagIsSecondary) {
+                                    log.info("銆愬熀浜庤鍒欍�戞墽琛岀柧鐥呮瑕佽鍒�");
+                                    addIcd10SubTaskForPatient(patMedInhosp1, patArchive, config);
+                                }
+                            }
+                        }
+                    } else {
+                        // 娌℃湁棣栬瑙勫垯锛堥兘鏄�"2"鎴栧叾浠栵級锛屽叏閮ㄧ敓鎴�
+                        log.info("銆愬熀浜庤鍒欍�戞棤棣栬瑙勫垯锛屾墽琛屽叏閮ㄧ敓鎴愰�昏緫");
+                        addDeptSubTaskForPatient(patMedInhosp1, patArchive, config);
+                        if (!active.equals("xh")) {
+                            addWardSubTaskForPatient(patMedInhosp1, patArchive, config);
+                            addIcd10SubTaskForPatient(patMedInhosp1, patArchive, config);
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("銆愬熀浜庤鍒欍�戞偅鑰厈}澶勭悊寮傚父锛歿}", patMedInhosp1.getInhospid(), e.getMessage());
+                patMedInhosp1.setDeptcheckFlag("2");
+                patMedInhosp1.setLongTaskReason("鍩轰簬瑙勫垯澶勭悊寮傚父锛�" + e.getMessage());
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+            }
+        }
+    }
+
+    /**
+     * 涓哄崟涓偅鑰呯敓鎴愮瀹ょ淮搴︾殑瀛愪换鍔�
+     *
+     * @return 鐢熸垚鐨勫瓙浠诲姟鏁伴噺
+     */
+    private int addDeptSubTaskForPatient(PatMedInhosp patMedInhosp1, PatArchive patArchive, String config) {
+        int generatedCount = 0;
+        try {
+            //鏍规嵁鎮h�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟
+            ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+            serviceTaskdept.setLongtask(1L);
+            serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
+            serviceTaskdept.setDeptType("1");
+            serviceTaskdept.setServiceType("2");
+            serviceTaskdept.setOrgid(patMedInhosp1.getOrgid());
+            List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+
+            if (CollectionUtils.isEmpty(serviceTaskdepts)) {
+                PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+                patMedInhosp1.setDeptcheckFlag("2");
+                patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆绂婚櫌闀挎湡浠诲姟;");
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+            } else {
+                for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
+                    writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config);
+                    generatedCount++;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("銆愮瀹や换鍔°�戞偅鑰厈}澶勭悊寮傚父锛歿}", patMedInhosp1.getInhospid(), e.getMessage());
+            patMedInhosp1.setDeptcheckFlag("2");
+            patMedInhosp1.setLongTaskReason("绉戝浠诲姟澶勭悊寮傚父锛�" + e.getMessage());
+            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+        }
+        return generatedCount;
+    }
+
+    /**
+     * 涓哄崟涓偅鑰呯敓鎴愮梾鍖虹淮搴︾殑瀛愪换鍔�
+     *
+     * @return 鐢熸垚鐨勫瓙浠诲姟鏁伴噺
+     */
+    private int addWardSubTaskForPatient(PatMedInhosp patMedInhosp1, PatArchive patArchive, String config) {
+        int generatedCount = 0;
+        try {
+            String errorreason = null;
+            List<ServiceTaskdept> serviceTaskdeptList = null;
+            if (!StringUtils.isEmpty(patMedInhosp1.getLeavehospitaldistrictcode())) {
+                ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+                serviceTaskdept.setLongtask(1L);
+                serviceTaskdept.setDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
+                serviceTaskdept.setDeptType("2");
+                serviceTaskdept.setServiceType("2");
+                serviceTaskdept.setOrgid(patMedInhosp1.getOrgid());
+                serviceTaskdeptList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+                if (CollectionUtils.isEmpty(serviceTaskdeptList)) {
+                    errorreason = "璇ユ偅鑰呮墍鍦ㄧ梾鍖烘湭閰嶇疆闀挎湡浠诲姟;";
+                }
+            } else {
+                errorreason = "绂婚櫌鐥呭尯涓虹┖;";
+            }
+
+            if (StringUtils.isNotEmpty(errorreason)) {
+                PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+                patMedInhosp1.setWardcheckFlag("2");
+                patMedInhosp1.setDeptcheckFlag(patMedInhosp.getDeptcheckFlag());
+                patMedInhosp1.setDiagcheckFlag(patMedInhosp.getDiagcheckFlag());
+                patMedInhosp1.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorreason : errorreason);
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+            } else {
+                for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
+                    writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 2, config);
+                    generatedCount++;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("銆愮梾鍖轰换鍔°�戞偅鑰厈}澶勭悊寮傚父锛歿}", patMedInhosp1.getInhospid(), e.getMessage());
+            patMedInhosp1.setWardcheckFlag("2");
+            patMedInhosp1.setLongTaskReason("鐥呭尯浠诲姟澶勭悊寮傚父锛�" + e.getMessage());
+            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+        }
+        return generatedCount;
+    }
+
+    /**
+     * 涓哄崟涓偅鑰呯敓鎴愮柧鐥呯淮搴︾殑瀛愪换鍔�
+     *
+     * @return 鐢熸垚鐨勫瓙浠诲姟鏁伴噺
+     */
+    private int addIcd10SubTaskForPatient(PatMedInhosp patMedInhosp1, PatArchive patArchive, String config) {
+        int generatedCount = 0;
+        try {
+            if (StringUtils.isEmpty(patMedInhosp1.getLeaveicd10code())) {
+                return 0;
+            }
+
+            ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
+            serviceTaskdiag.setLongtask(1L);
+            serviceTaskdiag.setServiceType("2");
+            if (active.equals("nhfy")) {
+                serviceTaskdiag.setIcd10name(patMedInhosp1.getLeavediagname());
+                if (StringUtils.isEmpty(patMedInhosp1.getLeavediagname())) {
+                    PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+                    patMedInhosp1.setDiagcheckFlag("2");
+                    patMedInhosp1.setLongTaskReason("璇ユ偅鑰呬富璇婃柇鍚嶇О涓虹┖;");
+                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                    return 0;
+                }
+            } else {
+                serviceTaskdiag.setIcd10code(patMedInhosp1.getLeaveicd10code());
+            }
+            serviceTaskdiag.setOrgid(patMedInhosp1.getOrgid());
+            List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagListByIcdName(serviceTaskdiag);
+
+            if (CollectionUtils.isEmpty(serviceTaskdiags)) {
+                PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+                patMedInhosp.setDiagcheckFlag("2");
+                patMedInhosp.setLongTaskReason("璇ユ偅鑰呮墍鎮g柧鐥呮湭閰嶇疆闀挎湡浠诲姟;");
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+            } else {
+                int flag = 0;
+                for (ServiceTaskdiag serviceTaskdiag1 : serviceTaskdiags) {
+                    if (StringUtils.isNotEmpty(serviceTaskdiag1.getDeptCode()) && serviceTaskdiag1.getDeptCode().equals(patMedInhosp1.getLeaveldeptcode())) {
+                        writeInSubTask(serviceTaskdiag1.getTaskId(), true, patMedInhosp1, patArchive, 3, config);
+                        generatedCount++;
+                        flag = 1;
+                    } else if (StringUtils.isNotEmpty(serviceTaskdiag1.getWardCode()) && serviceTaskdiag1.getWardCode().equals(patMedInhosp1.getLeavehospitaldistrictcode())) {
+                        writeInSubTask(serviceTaskdiag1.getTaskId(), true, patMedInhosp1, patArchive, 3, config);
+                        generatedCount++;
+                        flag = 1;
+                    }
+                }
+                if (flag == 0) {
+                    log.error("璇ョ瀹ゆ垨鐥呭尯瀵逛簬鎮h�呮墍鎮g柧鐥呮湭閰嶇疆闀挎湡浠诲姟,鎮h�咃細{}", patMedInhosp1.getInhospid());
+                    PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+                    patMedInhosp.setDiagcheckFlag("2");
+                    patMedInhosp.setLongTaskReason("璇ョ瀹ゆ垨鐥呭尯瀵逛簬鎮h�呮墍鎮g柧鐥呮湭閰嶇疆闀挎湡浠诲姟;");
+                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("銆愮柧鐥呬换鍔°�戞偅鑰厈}澶勭悊寮傚父锛歿}", patMedInhosp1.getInhospid(), e.getMessage());
+            patMedInhosp1.setDiagcheckFlag("2");
+            patMedInhosp1.setLongTaskReason("鐤剧梾浠诲姟澶勭悊寮傚父锛�" + e.getMessage());
+            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+        }
+        return generatedCount;
+    }
+
+
 }

--
Gitblit v1.9.3