From a491712dea71be0682d025bb79fdc471ec157802 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 15 五月 2026 13:50:37 +0800
Subject: [PATCH] 【市一】取消Service_Task\Service_SubTask新增院区ID

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |  683 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 336 insertions(+), 347 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 5db97f8..3a0dbc4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -308,240 +308,25 @@
         }
 
         //2.鍑洪櫌闅忚
-        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.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);
-                    }
-//                    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);
+        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);
             }
         }
 
-        //鏍规嵁鎮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) {
-                //鑾峰彇鎮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);
-                        }
-//                        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);
-                }
-            }
-
-            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.selectServiceTaskdiagList(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 = "璇ユ偅鑰呮墍鍦ㄧ梾鍖烘湭閰嶇疆闀挎湡浠诲姟;";
-                        PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiJB.getInhospid());
-                        pmiJB.setDiagcheckFlag("2");
-                        pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd);
-                        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);
-                }
-            }
+        //涓芥按鐨勭壒娈婅姹傦紙闇�瑕佸厛鎵ц鐤剧梾锛屽鏋滅柧鐥呬负绌猴紝鍒欐墽琛岀瀹ゅ拰鐥呭尯锛�
+        if ("1".equals(generationRule)) {
+            addIcd10SubTask(config, generationRule);
+            //绉戝浠诲姟鏂板
+            addDeptSubTask(config, generationRule);
+            addWardSubTask(config, generationRule);
         }
 
         //鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭d箣鍓嶇殑鍑洪櫌鎮h�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
@@ -693,108 +478,6 @@
     }
 
 
-//
-//    @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;
-//    }
-
     /**
      * 鑾峰彇鍑洪櫌锛屼綇闄紝闂ㄨ瘖鏈嶅姟浜烘
      *
@@ -856,7 +539,7 @@
      * @param check         鏄惁闇�瑕佹牎楠�
      * @param patMedInhosp1 鐥呬汉鍑哄叆闄俊鎭�
      * @param patArchive    鐥呬汉淇℃伅
-     * @param type          闅忚绫诲瀷(1-绉戝锛�2-鐥呭尯锛�3-鐤剧梾锛�
+     * @param type          闅忚绫诲瀷(1-绉戝锛�2-鐥呭尯锛�3-鐤剧梾 4-鍏ラ櫌绉戝 5-鍏ラ櫌鐥呭尯)
      * @param config        閰嶇疆淇℃伅 visit.early.day
      */
     //灏嗘偅鑰呮斁鍒皊ubtask涓�
@@ -886,22 +569,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());
@@ -1035,6 +737,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 {
                 //鐢熸垚瀛愪换鍔″け璐ワ紝
@@ -1044,6 +748,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);
             }
@@ -1064,10 +770,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) {
@@ -1235,7 +941,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;
@@ -1251,6 +957,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());
@@ -1270,6 +985,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());
@@ -1277,17 +993,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);
@@ -1455,4 +1178,270 @@
         }
     }
 
+    private void addOperationSubTask(String config, String generationRule) {
+        //            鎵嬫湳闅忚
+        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, String generationRule) {
+        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, String generationRule) {
+        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, String generationRule) {
+        //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
+        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);
+            }
+        }
+    }
+
+
 }

--
Gitblit v1.9.3