From 6e3d0a2097a4d841e941a84ec54780a67eb60ba1 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 10 七月 2026 09:22:56 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |  738 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 562 insertions(+), 176 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 3a0dbc4..e307373 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -9,6 +9,7 @@
 import com.ruoyi.common.utils.DtoConversionUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.smartor.common.ScheduleSubtaskBuilder;
 import com.smartor.domain.*;
 import com.smartor.domain.entity.ServiceSubtaskEntity;
 import com.smartor.mapper.*;
@@ -57,11 +58,20 @@
     private PatMedOperationMapper patMedOperationMapper;
     @Autowired
     private PatMedOperationItemMapper patMedOperationItemMapper;
+    @Autowired
+    private ServiceTaskRuleMapper serviceTaskRuleMapper;
 
     @Value("${spring.profiles.active}")
     private String active;
     @Autowired
     private IConfigService iSysConfigService;
+    @Autowired
+    private ServiceTaskScheduleMapper serviceTaskScheduleMapper;
+
+    @Autowired
+    private ScheduleSubtaskBuilder scheduleSubtaskBuilder;
+    @Autowired
+    private ServiceTaskScheduleDetailMapper serviceTaskScheduleDetailMapper;
 
 
     /**
@@ -88,14 +98,18 @@
      */
     @Override
     public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp) {
-        if (patMedInhosp.getCry() == 0) {
+        if (patMedInhosp.getCry() != null && 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) {
+        } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 1) {
             patMedInhosp.setInhospstate("1");
+        } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 2) {
+            patMedInhosp.setInhospstate("2");
+        } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 3) {
+            patMedInhosp.setInhospstate("3");
         }
 
         List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
@@ -307,31 +321,16 @@
             }
         }
 
-        //2.鍑洪櫌闅忚
-        String generationRule = iSysConfigService.selectConfigByKey("multitask.generation.rule");
-        //generationRule    0:鎵�鏈夋湇鍔¢兘鐢熸垚;    1:涓撶梾浠诲姟浼樺厛
-        if ("0".equals(generationRule)) {
-            //绉戝浠诲姟鏂板
-            addDeptSubTask(config, generationRule);
-            //鏍规嵁鎮h�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
-            if (!active.equals("xh")) {
-                addWardSubTask(config, generationRule);
-                addIcd10SubTask(config, generationRule);
-                addOperationSubTask(config, generationRule);
-            }
+        //2.鍑洪櫌闅忚 - 鍩轰簬瑙勫垯鐨勪换鍔$敓鎴�
+        addSubTaskByRule(config);
+        //鏍规嵁鎮h�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
+        if (!active.equals("xh")) {
+            addOperationSubTask(config);
         }
 
-        //涓芥按鐨勭壒娈婅姹傦紙闇�瑕佸厛鎵ц鐤剧梾锛屽鏋滅柧鐥呬负绌猴紝鍒欐墽琛岀瀹ゅ拰鐥呭尯锛�
-        if ("1".equals(generationRule)) {
-            addIcd10SubTask(config, generationRule);
-            //绉戝浠诲姟鏂板
-            addDeptSubTask(config, generationRule);
-            addWardSubTask(config, generationRule);
-        }
 
         //鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭d箣鍓嶇殑鍑洪櫌鎮h�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
         PatMedInhosp patMedInhosp = new PatMedInhosp();
-        //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
         patMedInhosp.setDeptcheckFlag("0");
         patMedInhosp.setInhospstate("0");
         List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
@@ -342,139 +341,152 @@
     }
 
     /**
-     * 澶氱淮搴﹂殢璁�
+     * 浠诲姟缁勯殢璁�
      *
      * @param config
      * @return
      */
-    public int dealOutHospInfoByDimension(String config) {
-        // 涓�娆℃�ф煡鍑烘墍鏈夐渶瑕佸鐞嗙殑鍑洪櫌鎮h�咃紙涓変釜缁村害浠绘剰涓�涓湭瀹屾垚锛�
-        List<PatMedInhosp> patList = patMedInhospMapper.selectNeedProcessList();
-        log.info("銆愮粺涓�鎵弿銆戝緟澶勭悊鎮h�呮暟锛歿}", patList.size());
+    public int dealOutHospInfoBySchedule(String config) {
 
-        for (PatMedInhosp patMedInhosp1 : patList) {
-            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
-            if (Objects.isNull(patArchive)) {
-                // 涓変釜缁村害閮芥爣璁颁负澶辫触
-                markAllFlagsAsError(patMedInhosp1, "鎮h�呭熀鏈俊鎭负绌�");
-                continue;
-            }
+        ServiceTask serviceTaskVo = new ServiceTask();
+        serviceTaskVo.setLongTask(1);
+        serviceTaskVo.setAppltype("5");
+        List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(serviceTaskVo);
 
-            // 鈹�鈹� 缁村害1锛氱瀹� 鈹�鈹�
-            if ("0".equals(patMedInhosp1.getDeptcheckFlag())) {
-                processTasksByDimension(patMedInhosp1, patArchive, config, 1);
-            }
+        if (CollectionUtils.isNotEmpty(serviceTasks)) {
+            for (ServiceTask serviceTask : serviceTasks) {
+                if(!ObjectUtils.isEmpty(serviceTask.getTaskid())){
+                    ServiceTaskSchedule serviceTaskSchedule = new ServiceTaskSchedule();
+                    ServiceTaskSchedule taskSchedule = new ServiceTaskSchedule();
+                    taskSchedule.setTaskid(serviceTask.getTaskid());
+                    List<ServiceTaskSchedule> serviceTaskSchedules = serviceTaskScheduleMapper.selectServiceTaskScheduleList(taskSchedule);
+                    if(CollectionUtils.isNotEmpty(serviceTaskSchedules)){
+                        serviceTaskSchedule = serviceTaskSchedules.get(0);
+                        String deptCodes = serviceTaskSchedule.getDeptCodes();
+                        String wardCodes = serviceTaskSchedule.getWardCodes();
+                        String icd10Codes = serviceTaskSchedule.getIcd10Codes();
+                        String opLevelCodes = serviceTaskSchedule.getOplevelCodes();
 
-            // 鈹�鈹� 缁村害2锛氱梾鍖� 鈹�鈹�锛堟柊鍗庡尰闄㈣烦杩囷級
-            if (!active.equals("xh") && "0".equals(patMedInhosp1.getWardcheckFlag())) {
-                processTasksByDimension(patMedInhosp1, patArchive, config, 2);
-            }
+                        List<String> icd10CodeList = new ArrayList<>();
+                        List<String> opLevelCodeList = new ArrayList<>();
+                        List<String> deptCodeList = new ArrayList<>();
+                        List<String> wardCodeList = new ArrayList<>();
 
-            // 鈹�鈹� 缁村害3锛氱柧鐥� 鈹�鈹�锛堟柊鍗庡尰闄㈣烦杩囷級
-            if (!active.equals("xh") && "0".equals(patMedInhosp1.getDiagcheckFlag())) {
-                processTasksByDimension(patMedInhosp1, patArchive, config, 3);
+                        /**
+                         * 闅忚绫诲瀷(1-绉戝锛�2-鐥呭尯锛�3-鐤剧梾 4-鍏ラ櫌绉戝 5-鍏ラ櫌鐥呭尯 6-鎵嬫湳)
+                         */
+                        Integer type = 1;
+                        if (StringUtils.isNotEmpty(deptCodes)) {
+                            type = 1;
+                            deptCodeList = Arrays.asList(deptCodes.split(","));
+                        }
+                        if(StringUtils.isNotEmpty(wardCodes)) {
+                            type = 2;
+                            wardCodeList = Arrays.asList(wardCodes.split(","));
+                        }
+                        if(StringUtils.isNotEmpty(icd10Codes)) {
+                            type = 3;
+                            icd10CodeList = Arrays.asList(icd10Codes.split(","));
+                        }
+                        if (StringUtils.isNotEmpty(opLevelCodes)) {
+                            type = 6;
+                            opLevelCodeList = Arrays.asList(opLevelCodes.split(","));
+                        }
+                        //闈炴墜鏈鐞嗘柟寮�
+                        if(type != 6){
+                            PatMedInhosp patMedInhospVo = new PatMedInhosp();
+                            patMedInhospVo.setScheduleCheckFlag("0");
+                            patMedInhospVo.setInhospstate("1");
+                            patMedInhospVo.setFuflag("1");
+//                            patMedInhospVo.setDeptcodeList(deptCodeList);
+                            patMedInhospVo.setLeaveldeptcodes(deptCodeList);
+                            patMedInhospVo.setLeavehospitaldistrictcodes(wardCodeList);
+                            patMedInhospVo.setIcd10codeList(icd10CodeList);
+                            List<PatMedInhosp> patList = patMedInhospMapper.selectPatMedInhospList(patMedInhospVo);
+                            log.info("dealOutHospInfoBySchedule 浠诲姟缁勯殢璁�, taskid = {}, 鎵弿鎮h�呬汉鏁� {}", serviceTask.getTaskid(), patList.size());
+
+                            for(PatMedInhosp patMedInhosp : patList){
+                                ServiceTaskScheduleDetail scheduleDetailVo = new ServiceTaskScheduleDetail();
+                                scheduleDetailVo.setTaskid(serviceTask.getTaskid());
+                                scheduleDetailVo.setScheduleid(serviceTaskSchedule.getId());
+                                List<ServiceTaskScheduleDetail> serviceTaskScheduleDetails = serviceTaskScheduleDetailMapper.selectServiceTaskScheduleDetailList(scheduleDetailVo);
+
+                                PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp.getPatid());
+                                if (Objects.isNull(patArchive)) {
+                                    continue;
+                                }
+                                //灏佽serviceSubtask
+
+                                ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp, patArchive, config, type);
+                                List<Map<String, Object>> preachformList = new ArrayList<>();
+                                if(StringUtils.isNotEmpty(serviceTask.getPreachformDesc())){
+                                    try {
+                                        ObjectMapper objectMapper = new ObjectMapper();
+                                        preachformList = objectMapper.readValue(serviceTask.getPreachformDesc(), List.class);
+                                    }catch (Exception e){
+                                        log.error("浠诲姟缁刾reachformDesc瑙f瀽澶辫触,taskid={},inhospid={}", serviceTask.getTaskid(), patMedInhosp.getInhospid());
+                                    }
+                                }
+                                scheduleSubtaskBuilder.buildSubtasksForPatient(serviceTask, serviceTaskSchedule, serviceTaskScheduleDetails, serviceSubtask, preachformList);
+                                //缃杞撼鍏ユ爣璁帮紝閬垮厤涓嬫鎵弿閲嶅鐢熸垚锛堝悗缁疆娆$敱 rollTaskGroupCycle 璐熻矗锛�
+                                PatMedInhosp flagUpd = new PatMedInhosp();
+                                flagUpd.setInhospid(patMedInhosp.getInhospid());
+                                flagUpd.setScheduleCheckFlag("1");
+                                patMedInhospMapper.updatePatMedInhosp(flagUpd);
+                            }
+                        }else {
+                            //浠诲姟缁� - 鎵嬫湳闅忚
+                            if(CollectionUtils.isNotEmpty(opLevelCodeList)){
+                                PatMedOperationItem pmoi = new PatMedOperationItem();
+                                //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
+                                pmoi.setOpercheckFlag("0");
+                                pmoi.setMainFlag("1");
+                                pmoi.setDeptCodes(deptCodeList);
+                                pmoi.setWardCodes(wardCodeList);
+                                pmoi.setOpLevelCodes(opLevelCodeList);
+                                List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectOperationItemList(pmoi);
+                                for(PatMedOperationItem patMedOperationItem : patMedOperationItems){
+                                    PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOperationItem.getPatid());
+                                    if (Objects.isNull(patArchive)) {
+                                        continue;
+                                    }
+                                    PatMedInhosp patMedInhospVo = new PatMedInhosp();
+                                    patMedInhospVo.setPatid((patMedOperationItem.getPatid()));
+                                    patMedInhospVo.setScheduleCheckFlag("0");
+                                    patMedInhospVo.setInhospstate("1");
+                                    patMedInhospVo.setFuflag("1");
+                                    List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhospVo);
+                                    if(CollectionUtils.isNotEmpty(patMedInhospList)){
+                                        ServiceTaskScheduleDetail scheduleDetailVo = new ServiceTaskScheduleDetail();
+                                        scheduleDetailVo.setTaskid(serviceTask.getTaskid());
+                                        scheduleDetailVo.setScheduleid(serviceTaskSchedule.getId());
+                                        List<ServiceTaskScheduleDetail> serviceTaskScheduleDetails = serviceTaskScheduleDetailMapper.selectServiceTaskScheduleDetailList(scheduleDetailVo);
+                                        //灏佽serviceSubtask
+                                        ServiceSubtask serviceSubtask = boxedServiceSubtaskForOp(serviceTask, patMedInhospList.get(0), patMedOperationItem, patArchive, config);
+                                        List<Map<String, Object>> preachformList = new ArrayList<>();
+                                        if(StringUtils.isNotEmpty(serviceTask.getPreachformDesc())){
+                                            try {
+                                                ObjectMapper objectMapper = new ObjectMapper();
+                                                preachformList = objectMapper.readValue(serviceTask.getPreachformDesc(), List.class);
+                                            }catch (Exception e){
+                                                log.error("浠诲姟缁�(鎵嬫湳)preachformDesc瑙f瀽澶辫触,taskid={}", serviceTask.getTaskid());
+                                            }
+                                        }
+                                        scheduleSubtaskBuilder.buildSubtasksForPatient(serviceTask, serviceTaskSchedule, serviceTaskScheduleDetails, serviceSubtask, preachformList);
+                                        //缃杞撼鍏ユ爣璁帮紝閬垮厤閲嶅鐢熸垚
+                                        PatMedInhosp flagUpd = new PatMedInhosp();
+                                        flagUpd.setInhospid(patMedInhospList.get(0).getInhospid());
+                                        flagUpd.setScheduleCheckFlag("1");
+                                        patMedInhospMapper.updatePatMedInhosp(flagUpd);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
             }
         }
         return 1;
-    }
-
-    /**
-     * 鎸夌淮搴︽壘鍒版墍鏈夊尮閰嶉暱鏈熶换鍔★紝鎵归噺鐢熸垚 subtask
-     * type: 1=绉戝, 2=鐥呭尯, 3=鐤剧梾
-     */
-    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);
-            return;
-        }
-
-        // 涓�鏉� inhosp 璁板綍 鈫� 澶氫釜鍖归厤浠诲姟 鈫� 澶氭潯 subtask
-        for (Long taskId : matchedTaskIds) {
-            writeInSubTask(taskId, true, patMedInhosp1, patArchive, type, config);
-        }
-    }
-
-    private String getDimensionReason(int type) {
-        switch (type) {
-            case 1: { // 绉戝
-                return "鏈壘鍒扮瀹ゅ尮閰嶇殑闀挎湡浠诲姟";
-            }
-            case 2: { // 鐥呭尯
-                return "鏈壘鍒扮梾鍖哄尮閰嶇殑闀挎湡浠诲姟";
-            }
-            case 3: { // 鐤剧梾
-                return "鏈壘鍒扮柧鐥呭尮閰嶇殑闀挎湡浠诲姟";
-            }
-        }
-        return "澶氱淮闀挎湡浠诲姟-鍖归厤绫诲瀷涓虹┖";
-    }
-
-    private void markFlagAsNoConfig(PatMedInhosp patMedInhosp, int type, String reason) {
-        switch (type) {
-            case 1: { // 绉戝
-                patMedInhosp.setDeptcheckFlag("2");
-                patMedInhosp.setRemark(reason);
-                patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
-                break;
-            }
-            case 2: { // 鐥呭尯
-                patMedInhosp.setWardcheckFlag("2");
-                patMedInhosp.setRemark(reason);
-                patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
-                break;
-            }
-            case 3: { // 鐤剧梾
-                patMedInhosp.setDiagcheckFlag("2");
-                patMedInhosp.setRemark(reason);
-                patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
-                break;
-            }
-        }
-
-    }
-
-    private void markAllFlagsAsError(PatMedInhosp patMedInhosp, String reason) {
-        patMedInhosp.setDeptcheckFlag("2");
-        patMedInhosp.setWardcheckFlag("2");
-        patMedInhosp.setDiagcheckFlag("2");
-        patMedInhosp.setRemark(reason);
-        patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
-    }
-
-    /**
-     * 鏍规嵁缁村害绫诲瀷鏌ヨ鍖归厤鐨勯暱鏈熶换鍔� ID 鍒楄〃
-     */
-    private List<Long> findMatchingTaskIds(PatMedInhosp patMedInhosp1, int type) {
-        switch (type) {
-            case 1: { // 绉戝
-                ServiceTaskdept query = new ServiceTaskdept();
-                query.setLongtask(1L);
-                query.setDeptCode(patMedInhosp1.getLeaveldeptcode());
-                query.setDeptType("1");
-                query.setOrgid(patMedInhosp1.getOrgid());
-                return serviceTaskdeptMapper.selectServiceTaskdeptList(query).stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
-            }
-            case 2: { // 鐥呭尯
-                ServiceTaskdept query = new ServiceTaskdept();
-                query.setLongtask(1L);
-                query.setDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
-                query.setDeptType("2");
-                query.setOrgid(patMedInhosp1.getOrgid());
-                return serviceTaskdeptMapper.selectServiceTaskdeptList(query).stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
-            }
-            case 3: { // 鐤剧梾
-                if (StringUtils.isEmpty(patMedInhosp1.getLeaveicd10code())) return Collections.emptyList();
-                ServiceTaskdiag query = new ServiceTaskdiag();
-                query.setLongtask(1L);
-                query.setIcd10code(patMedInhosp1.getLeaveicd10code());
-                query.setOrgid(patMedInhosp1.getOrgid());
-                return serviceTaskdiagMapper.selectServiceTaskdiagList(query).stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
-            }
-        }
-        return Collections.emptyList();
     }
 
 
@@ -711,10 +723,11 @@
                     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());
+                serviceSubtask.setSendstate(4L);
                 i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
             } else {
                 if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
@@ -794,22 +807,18 @@
         } else {
             serviceTask = serviceTasks.get(0);
         }
-        if (Objects.isNull(patMedOperationItem.getOpid())) {
-            return;
-        }
         if (Objects.isNull(patMedOperationItem.getOplevelcode())) {
             return;
         }
-        PatMedOperation patMedOperation = patMedOperationMapper.selectPatMedOperationById(patMedOperationItem.getOpid());
-        if (Objects.isNull(patMedOperation)) {
+        if (Objects.isNull(patMedOperationItem.getPatid())) {
             return;
         }
-        PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOperation.getPatid());
+        PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOperationItem.getPatid());
         if (Objects.isNull(patArchive)) {
             return;
         }
         PatMedInhosp patMedInhosp = new PatMedInhosp();
-        patMedInhosp.setPatid(patMedOperation.getPatid());
+        patMedInhosp.setPatid((patMedOperationItem.getPatid()));
         patMedInhosp.setInhospstate("1");
         patMedInhosp.setFuflag("1");
         List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
@@ -819,12 +828,17 @@
         }
 
         //灏佽serviceSubtask
-        ServiceSubtask serviceSubtask = boxedServiceSubtaskForOp(serviceTask, patMedInhospList.get(0), patMedOperation, patMedOperationItem, patArchive, config);
+        ServiceSubtask serviceSubtask = boxedServiceSubtaskForOp(serviceTask, patMedInhospList.get(0), patMedOperationItem, patArchive, config);
         if (ObjectUtils.isEmpty(serviceSubtask)) {
             return;
         }
-        serviceSubtask.setVisitDeptCode(patMedOperation.getReqdeptcode());
-        serviceSubtask.setVisitDeptName(patMedOperation.getReqdeptname());
+        if(StringUtils.isNotEmpty(patMedOperationItem.getDeptcode())){
+            serviceSubtask.setVisitDeptCode(patMedOperationItem.getDeptcode());
+            serviceSubtask.setVisitDeptName(patMedOperationItem.getDeptname());
+        }else {
+            serviceSubtask.setVisitDeptCode(patMedOperationItem.getHospitaldistrictcode());
+            serviceSubtask.setVisitDeptName(patMedOperationItem.getHospitaldistrictname());
+        }
         //璁板綍insertServiceSubtask璇彞杩斿洖鐘舵��
         Integer i = 0;
         try {
@@ -861,6 +875,7 @@
                 //璇存槑璇ユ偅鑰呮槸琚繃婊ょ殑锛屼笉鐢ㄥ啀鎵ц浜�
                 serviceSubtask.setCreateBy(serviceTask.getCreateBy());
                 serviceSubtask.setCreateTime(new Date());
+                serviceSubtask.setSendstate(4L);
                 i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
             } else {
                 if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
@@ -967,7 +982,8 @@
             serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getHospitaldistrictname());
         }
         serviceSubtask.setLeaveicd10code(patMedInhosp1.getLeaveicd10code());
-        serviceSubtask.setLeavediagname(patMedInhosp1.getDiagname());
+        serviceSubtask.setLeavediagname(patMedInhosp1.getLeavediagname());
+        serviceSubtask.setDiagname(patMedInhosp1.getDiagname());
         serviceSubtask.setTemplateid(serviceTask.getTemplateid());
         serviceSubtask.setTemplatename(serviceTask.getTemplatename());
         serviceSubtask.setPatid(patArchive.getId());
@@ -1033,6 +1049,13 @@
             }
 
         }
+        //濡傛灉鎮h�呯殑鍏ラ櫌鍜屽嚭闄㈡椂闂翠竴鑷达紝鍙互涓嶇敤闅忚锛堝崡鍗庨檮涓�鑲跨槫涓�鐥呭尯鎻愬嚭锛�
+        if (active.equals("nhfy") && patMedInhosp1.getStarttime() != null && patMedInhosp1.getEndtime() != null && DateUtils.differentDaysByMillisecond(patMedInhosp1.getStarttime(), patMedInhosp1.getEndtime()) == 0) {
+            serviceSubtask.setRemark("鎮h�呭綋澶╁嚭闄紝涓嶇敤闅忚");
+            serviceSubtask.setResult("error");
+            //涓嶆墽琛�
+            serviceSubtask.setSendstate(4L);
+        }
 
         //鎮h�呭彂閫佹椂闂�
         if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
@@ -1047,18 +1070,18 @@
     }
 
     //灏佽serviceSubtask
-    private ServiceSubtask boxedServiceSubtaskForOp(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatMedOperation patMedOperation, PatMedOperationItem patMedOperationItem, PatArchive patArchive, String config) {
+    private ServiceSubtask boxedServiceSubtaskForOp(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatMedOperationItem patMedOperationItem, PatArchive patArchive, String config) {
         ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
         serviceSubtask.setTaskid(serviceTask.getTaskid());
         if (StringUtils.isNotEmpty(serviceTask.getLibtemplateid()))
             serviceSubtask.setLibtemplateid(Long.valueOf(serviceTask.getLibtemplateid()));
-        serviceSubtask.setNurseId(patMedOperation.getNurseId());
-        serviceSubtask.setNurseName(patMedOperation.getNurseName());
+        serviceSubtask.setNurseId(patMedOperationItem.getNurseId());
+        serviceSubtask.setNurseName(patMedOperationItem.getNurseName());
 //        serviceSubtask.setInhospid(patMedInhosp.getInhospid());
-        serviceSubtask.setDrcode(patMedOperation.getDrcode());
-        serviceSubtask.setDrname(patMedOperation.getDrname());
-        serviceSubtask.setDeptcode(patMedOperation.getDeptcode());
-        serviceSubtask.setDeptname(patMedOperation.getDeptname());
+        serviceSubtask.setDrcode(patMedOperationItem.getDrcode());
+        serviceSubtask.setDrname(patMedOperationItem.getDrname());
+        serviceSubtask.setDeptcode(patMedOperationItem.getDeptcode());
+        serviceSubtask.setDeptname(patMedOperationItem.getDeptname());
 
         serviceSubtask.setTemplateid(serviceTask.getTemplateid());
         serviceSubtask.setTemplatename(serviceTask.getTemplatename());
@@ -1070,8 +1093,8 @@
         serviceSubtask.setSex(patArchive.getSex());
         serviceSubtask.setAge(patArchive.getAge());
         serviceSubtask.setSendstate(2L);
-        serviceSubtask.setManagementDoctor(patMedOperation.getDrname());
-        serviceSubtask.setManagementDoctorCode(patMedOperation.getDrcode());
+        serviceSubtask.setManagementDoctor(patMedOperationItem.getDrname());
+        serviceSubtask.setManagementDoctorCode(patMedOperationItem.getDrcode());
 //        serviceSubtask.setStarttime(patMedInhosp.getStarttime());
 //        serviceSubtask.setEndtime(patMedInhosp.getEndtime());
 
@@ -1080,14 +1103,13 @@
         serviceSubtask.setHospType("2");
         serviceSubtask.setCreateTime(new Date());
         serviceSubtask.setUpdateTime(new Date());
-        serviceSubtask.setCreateBy(patMedOperation.getNurseName());
+        serviceSubtask.setCreateBy(patMedOperationItem.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;
@@ -1178,14 +1200,15 @@
         }
     }
 
-    private void addOperationSubTask(String config, String generationRule) {
+    @Override
+    public void addOperationSubTask(String config) {
         //            鎵嬫湳闅忚
         PatMedOperationItem pmoi = new PatMedOperationItem();
         //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
         pmoi.setOpercheckFlag("0");
         pmoi.setMainFlag("1");
 
-        List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectPatMedOperationItemList(pmoi);
+        List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectOperationItemList(pmoi);
         log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎵嬫湳鎮h�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedOperationItems) ? patMedOperationItems.size() : null);
 
         for (PatMedOperationItem opItem : patMedOperationItems) {
@@ -1199,6 +1222,10 @@
                 serviceTaskoper.setLongtask(1L);
                 serviceTaskoper.setOrgid(opItem.getOrgid());
                 serviceTaskoper.setOplevelcode(opItem.getOplevelcode());
+
+                //鏍规嵁绉戝銆佺梾鍖鸿繃婊�
+                serviceTaskoper.setDeptCode(opItem.getDeptcode());
+                serviceTaskoper.setWardCode(opItem.getHospitaldistrictcode());
 
                 List<ServiceTaskoper> serviceTaskopers = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);
                 //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
@@ -1217,13 +1244,13 @@
                 e.printStackTrace();
                 log.error("浜哄憳鎵嬫湳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
                 opItem.setOpercheckFlag("2");
-                opItem.setLongTaskReason("浜哄憳鎵嬫湳澶勭悊寮傚父锛�" + e.getMessage());
+                opItem.setLongTaskReason("浜哄憳鎵嬫湳澶勭悊寮傚父");
                 patMedOperationItemMapper.updatePatMedOperationItem(opItem);
             }
         }
     }
 
-    private void addIcd10SubTask(String config, String generationRule) {
+    private void addIcd10SubTask(String config) {
         PatMedInhosp pmjb = new PatMedInhosp();
         //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
         pmjb.setDiagcheckFlag("0");
@@ -1308,13 +1335,13 @@
                 e.printStackTrace();
                 log.error("浜哄憳鐤剧梾澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
                 pmiJB.setDiagcheckFlag("2");
-                pmiJB.setLongTaskReason("浜哄憳鐤剧梾澶勭悊寮傚父锛�" + e.getMessage());
+                pmiJB.setLongTaskReason("浜哄憳鐤剧梾澶勭悊寮傚父");
                 patMedInhospMapper.updatePatMedInhosp(pmiJB);
             }
         }
     }
 
-    private void addWardSubTask(String config, String generationRule) {
+    private void addWardSubTask(String config) {
         PatMedInhosp pmbq = new PatMedInhosp();
         //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
         pmbq.setWardcheckFlag("0");
@@ -1377,13 +1404,13 @@
                 e.printStackTrace();
                 log.error("浜哄憳鐥呭尯澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
                 pmiBQ1.setWardcheckFlag("2");
-                pmiBQ1.setLongTaskReason("浜哄憳鐥呭尯澶勭悊寮傚父锛�" + e.getMessage());
+                pmiBQ1.setLongTaskReason("浜哄憳鐥呭尯澶勭悊寮傚父");
                 patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
             }
         }
     }
 
-    private void addDeptSubTask(String config, String generationRule) {
+    private void addDeptSubTask(String config) {
         //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
         PatMedInhosp pmks = new PatMedInhosp();
         pmks.setDeptcheckFlag("0");
@@ -1437,11 +1464,370 @@
                 e.printStackTrace();
                 log.error("浜哄憳绉戝澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
                 patMedInhosp1.setDeptcheckFlag("2");
-                patMedInhosp1.setLongTaskReason("浜哄憳绉戝澶勭悊寮傚父锛�" + e.getMessage());
+                patMedInhosp1.setLongTaskReason("浜哄憳绉戝澶勭悊寮傚父");
                 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);
+
+                        String remark = patMedInhosp1.getRemark();
+                        // 绗簩姝ワ細鍒ゆ柇棣栬瑙勫垯鏄惁鏈変换鎰忎竴涓敓鎴愭垚鍔�
+                        if (primaryGeneratedCount > 0) {
+                            // 鑷冲皯鏈変竴涓瑕佽鍒欑敓鎴愭垚鍔�
+                            // 鈥斺�� 灏�=2鐨勬瑕佽鍒欏搴攆lag璁句负"2"锛堣烦杩囷級
+                            log.info("銆愬熀浜庤鍒欍�戦瑕佽鍒欐湁鎴愬姛(count={})锛屽皢娆¤瑙勫垯瀵瑰簲flag璁句负2", primaryGeneratedCount);
+                            if (deptIsSecondary) {
+                                updateCheckFlag(patMedInhosp1, 1, "2", StringUtils.isNotEmpty(remark) ? remark + ";棣栬瑙勫垯宸茬敓鎴愶紝娆¤瑙勫垯璺宠繃" : "棣栬瑙勫垯宸茬敓鎴愶紝娆¤瑙勫垯璺宠繃");
+                            }
+                            if (!active.equals("xh")) {
+                                if (wardIsSecondary) {
+                                    updateCheckFlag(patMedInhosp1, 2, "2", StringUtils.isNotEmpty(remark) ? remark + ";棣栬瑙勫垯宸茬敓鎴愶紝娆¤瑙勫垯璺宠繃" : "棣栬瑙勫垯宸茬敓鎴愶紝娆¤瑙勫垯璺宠繃");
+                                }
+                                if (diagIsSecondary) {
+                                    updateCheckFlag(patMedInhosp1, 3, "2", StringUtils.isNotEmpty(remark) ? remark + ";棣栬瑙勫垯宸茬敓鎴愶紝娆¤瑙勫垯璺宠繃" : "棣栬瑙勫垯宸茬敓鎴愶紝娆¤瑙勫垯璺宠繃");
+                                }
+                            }
+                            // 鈥斺�� 瀵逛簬=1涓旂敓鎴愭垚鍔熺殑锛屽皢鍏跺搴攆lag璁句负"1"
+                            if (deptIsPrimary && deptGenCount > 0) {
+                                updateCheckFlag(patMedInhosp1, 1, "1", StringUtils.isNotEmpty(remark) ? remark + ";绉戝棣栬瑙勫垯鐢熸垚鎴愬姛" : "绉戝棣栬瑙勫垯鐢熸垚鎴愬姛");
+                            }
+                            if (!active.equals("xh")) {
+                                if (wardIsPrimary && wardGenCount > 0) {
+                                    updateCheckFlag(patMedInhosp1, 2, "1", StringUtils.isNotEmpty(remark) ? remark + ";鐥呭尯棣栬瑙勫垯鐢熸垚鎴愬姛" : "鐥呭尯棣栬瑙勫垯鐢熸垚鎴愬姛");
+                                }
+                                if (diagIsPrimary && diagGenCount > 0) {
+                                    updateCheckFlag(patMedInhosp1, 3, "1", StringUtils.isNotEmpty(remark) ? remark + ";鐤剧梾棣栬瑙勫垯鐢熸垚鎴愬姛" : "鐤剧梾棣栬瑙勫垯鐢熸垚鎴愬姛");
+                                }
+                            }
+                            // 鈥斺�� 瀵逛簬=1浣嗙敓鎴愬け璐ョ殑锛屽皢鍏跺搴攆lag璁句负"2"
+                            if (deptIsPrimary && deptGenCount == 0) {
+                                updateCheckFlag(patMedInhosp1, 1, "2", StringUtils.isNotEmpty(remark) ? remark + ";绉戝棣栬瑙勫垯鐢熸垚澶辫触" : "绉戝棣栬瑙勫垯鐢熸垚澶辫触");
+                            }
+                            if (!active.equals("xh")) {
+                                if (wardIsPrimary && wardGenCount == 0) {
+                                    updateCheckFlag(patMedInhosp1, 2, "2", StringUtils.isNotEmpty(remark) ? remark + ";鐥呭尯棣栬瑙勫垯鐢熸垚澶辫触" : "鐥呭尯棣栬瑙勫垯鐢熸垚澶辫触");
+                                }
+                                if (diagIsPrimary && diagGenCount == 0) {
+                                    updateCheckFlag(patMedInhosp1, 3, "2", StringUtils.isNotEmpty(remark) ? remark + ";鐤剧梾棣栬瑙勫垯鐢熸垚澶辫触" : "鐤剧梾棣栬瑙勫垯鐢熸垚澶辫触");
+                                }
+                            }
+                        } else {
+                            // 鎵�鏈夐瑕佽鍒欏叏閮ㄥけ璐ワ紝灏�=1鐨刦lag璁句负"2"锛岀劧鍚庢墽琛�=2鐨勬柟娉�
+                            log.info("銆愬熀浜庤鍒欍�戦瑕佽鍒欏叏閮ㄥけ璐ワ紝灏�=1鐨刦lag璁句负2锛屽紑濮嬫墽琛屾瑕佽鍒�");
+                            if (deptIsPrimary) {
+                                updateCheckFlag(patMedInhosp1, 1, "2", StringUtils.isNotEmpty(remark) ? remark + ";绉戝棣栬瑙勫垯鍏ㄩ儴澶辫触" : "绉戝棣栬瑙勫垯鍏ㄩ儴澶辫触");
+                            }
+                            if (!active.equals("xh")) {
+                                if (wardIsPrimary) {
+                                    updateCheckFlag(patMedInhosp1, 2, "2", StringUtils.isNotEmpty(remark) ? remark + ";鐥呭尯棣栬瑙勫垯鍏ㄩ儴澶辫触" : "鐥呭尯棣栬瑙勫垯鍏ㄩ儴澶辫触");
+                                }
+                                if (diagIsPrimary) {
+                                    updateCheckFlag(patMedInhosp1, 3, "2", StringUtils.isNotEmpty(remark) ? remark + ";鐤剧梾棣栬瑙勫垯鍏ㄩ儴澶辫触" : "鐤剧梾棣栬瑙勫垯鍏ㄩ儴澶辫触");
+                                }
+                            }
+                            // 鎵ц娆¤瑙勫垯(=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("鍩轰簬瑙勫垯澶勭悊寮傚父");
+                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.setWardcheckFlag(patMedInhosp.getWardcheckFlag());
+                patMedInhosp1.setDiagcheckFlag(patMedInhosp.getDiagcheckFlag());
+                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("绉戝浠诲姟澶勭悊寮傚父");
+            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("鐥呭尯浠诲姟澶勭悊寮傚父");
+            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("鐤剧梾浠诲姟澶勭悊寮傚父");
+            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+        }
+        return generatedCount;
+    }
+
 
 }

--
Gitblit v1.9.3