From c3117a0c5c7b2b69c56cfc50fe5c199c2c2276c1 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 15 五月 2026 13:50:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 270 insertions(+), 23 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..1c4d159 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -57,6 +57,8 @@
private PatMedOperationMapper patMedOperationMapper;
@Autowired
private PatMedOperationItemMapper patMedOperationItemMapper;
+ @Autowired
+ private ServiceTaskRuleMapper serviceTaskRuleMapper;
@Value("${spring.profiles.active}")
private String active;
@@ -307,27 +309,13 @@
}
}
- //2.鍑洪櫌闅忚
- String generationRule = iSysConfigService.selectConfigByKey("multitask.generation.rule");
- //generationRule 0:鎵�鏈夋湇鍔￠兘鐢熸垚; 1:涓撶梾浠诲姟浼樺厛
- if ("0".equals(generationRule)) {
- //绉戝浠诲姟鏂板
- addDeptSubTask(config, generationRule);
- //鏍规嵁鎮ｈ�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
- if (!active.equals("xh")) {
- addWardSubTask(config, generationRule);
- addIcd10SubTask(config, generationRule);
- addOperationSubTask(config, generationRule);
- }
+ //2.鍑洪櫌闅忚 - 鍩轰簬瑙勫垯鐨勪换鍔＄敓鎴�
+ addSubTaskByRule(config);
+ //鏍规嵁鎮ｈ�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
+ if (!active.equals("xh")) {
+ addOperationSubTask(config);
}
- //涓芥按鐨勭壒娈婅姹傦紙闇�瑕佸厛鎵ц鐤剧梾锛屽鏋滅柧鐥呬负绌猴紝鍒欐墽琛岀瀹ゅ拰鐥呭尯锛�
- if ("1".equals(generationRule)) {
- addIcd10SubTask(config, generationRule);
- //绉戝浠诲姟鏂板
- addDeptSubTask(config, generationRule);
- addWardSubTask(config, generationRule);
- }
//鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭ｄ箣鍓嶇殑鍑洪櫌鎮ｈ�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
PatMedInhosp patMedInhosp = new PatMedInhosp();
@@ -1178,7 +1166,7 @@
}
}
- private void addOperationSubTask(String config, String generationRule) {
+ private void addOperationSubTask(String config) {
// 鎵嬫湳闅忚
PatMedOperationItem pmoi = new PatMedOperationItem();
//鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
@@ -1223,7 +1211,7 @@
}
}
- private void addIcd10SubTask(String config, String generationRule) {
+ private void addIcd10SubTask(String config) {
PatMedInhosp pmjb = new PatMedInhosp();
//鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
pmjb.setDiagcheckFlag("0");
@@ -1314,7 +1302,7 @@
}
}
- private void addWardSubTask(String config, String generationRule) {
+ private void addWardSubTask(String config) {
PatMedInhosp pmbq = new PatMedInhosp();
//鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
pmbq.setWardcheckFlag("0");
@@ -1383,7 +1371,7 @@
}
}
- private void addDeptSubTask(String config, String generationRule) {
+ private void addDeptSubTask(String config) {
//鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
PatMedInhosp pmks = new PatMedInhosp();
pmks.setDeptcheckFlag("0");
@@ -1443,5 +1431,264 @@
}
}
+ /**
+ * 鍩轰簬瑙勫垯鐨勪换鍔＄敓鎴愭柟娉�
+ * 鏍规嵁鎮ｈ�呯闄㈢瀹ゆ垨鐥呭尯鏌ヨservice_task_rule锛岃幏鍙杁eptRule銆亀radRule銆乨iagRule
+ * 鏍规嵁瑙勫垯鍊煎喅瀹氳皟鐢ㄥ摢涓柟娉曠敓鎴愰殢璁夸换鍔�
+ */
+ private void addSubTaskByRule(String config) {
+ // 鑾峰彇鎵�鏈夐渶瑕佸鐞嗙殑鍑洪櫌鎮ｈ�咃紙绉戝缁村害鏈鐞嗭級
+ PatMedInhosp pmks = new PatMedInhosp();
+ pmks.setDeptcheckFlag("0");
+ pmks.setInhospstate("1");
+ pmks.setFuflag("1");
+ List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(pmks);
+ log.info("銆愬熀浜庤鍒欍�戦渶瑕佸鐞嗙殑鍑洪櫌鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhosps) ? patMedInhosps.size() : null);
+
+ for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
+ // 鑾峰彇鎮ｈ�呭熀鏈俊鎭�
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
+ if (Objects.isNull(patArchive)) {
+ patMedInhosp1.setDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
+ 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());
+
+ // 鍒ゆ柇鏄惁鏈夎鍒欎负"1"锛堥鍏堟墽琛岋級
+ boolean hasPrimaryRule = "1".equals(rule.getDeptRule()) || "1".equals(rule.getWradRule()) || "1".equals(rule.getDiagRule());
+
+ if (hasPrimaryRule) {
+ // 鏈夐瑕佽鍒欙紝鍙墽琛岄瑕佽鍒欏搴旂殑鏂规硶
+ int generatedCount = 0;
+
+ // 鎸夐『搴忥細绉戝 -> 鐥呭尯 -> 鐤剧梾
+ if ("1".equals(rule.getDeptRule())) {
+ log.info("銆愬熀浜庤鍒欍�戞墽琛岀瀹ら瑕佽鍒�");
+ generatedCount += addDeptSubTaskForPatient(patMedInhosp1, patArchive, config);
+ }
+
+ if (!active.equals("xh")) {
+ if ("1".equals(rule.getWradRule())) {
+ log.info("銆愬熀浜庤鍒欍�戞墽琛岀梾鍖洪瑕佽鍒�");
+ generatedCount += addWardSubTaskForPatient(patMedInhosp1, patArchive, config);
+ }
+
+ if ("1".equals(rule.getDiagRule())) {
+ log.info("銆愬熀浜庤鍒欍�戞墽琛岀柧鐥呴瑕佽鍒�");
+ generatedCount += addIcd10SubTaskForPatient(patMedInhosp1, patArchive, config);
+ }
+ }
+
+ // 濡傛灉棣栬瑙勫垯鐢熸垚鐨勫瓙浠诲姟涓虹┖锛屽垯璋冪敤鍏朵粬娆¤瑙勫垯鐨勬柟娉�
+ if (generatedCount == 0) {
+ log.info("銆愬熀浜庤鍒欍�戦瑕佽鍒欐湭鐢熸垚瀛愪换鍔★紝寮�濮嬫墽琛屾瑕佽鍒�");
+
+ if (!"1".equals(rule.getDeptRule()) && StringUtils.isNotEmpty(rule.getDeptRule())) {
+ log.info("銆愬熀浜庤鍒欍�戞墽琛岀瀹ゆ瑕佽鍒�");
+ addDeptSubTaskForPatient(patMedInhosp1, patArchive, config);
+ }
+
+ if (!active.equals("xh")) {
+ if (!"1".equals(rule.getWradRule()) && StringUtils.isNotEmpty(rule.getWradRule())) {
+ log.info("銆愬熀浜庤鍒欍�戞墽琛岀梾鍖烘瑕佽鍒�");
+ addWardSubTaskForPatient(patMedInhosp1, patArchive, config);
+ }
+
+ if (!"1".equals(rule.getDiagRule()) && StringUtils.isNotEmpty(rule.getDiagRule())) {
+ log.info("銆愬熀浜庤鍒欍�戞墽琛岀柧鐥呮瑕佽鍒�");
+ addIcd10SubTaskForPatient(patMedInhosp1, patArchive, config);
+ }
+ }
+ }
+ } else {
+ // 娌℃湁棣栬瑙勫垯锛堥兘鏄�"2"鎴栧叾浠栵級锛屽叏閮ㄧ敓鎴�
+ log.info("銆愬熀浜庤鍒欍�戞棤棣栬瑙勫垯锛屾墽琛屽叏閮ㄧ敓鎴愰�昏緫");
+ addDeptSubTaskForPatient(patMedInhosp1, patArchive, config);
+ if (!active.equals("xh")) {
+ addWardSubTaskForPatient(patMedInhosp1, patArchive, config);
+ addIcd10SubTaskForPatient(patMedInhosp1, patArchive, config);
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("銆愬熀浜庤鍒欍�戞偅鑰厈}澶勭悊寮傚父锛歿}", patMedInhosp1.getInhospid(), e.getMessage());
+ patMedInhosp1.setDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("鍩轰簬瑙勫垯澶勭悊寮傚父锛�" + e.getMessage());
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ }
+ }
+ }
+
+ /**
+ * 涓哄崟涓偅鑰呯敓鎴愮瀹ょ淮搴︾殑瀛愪换鍔�
+ *
+ * @return 鐢熸垚鐨勫瓙浠诲姟鏁伴噺
+ */
+ private int addDeptSubTaskForPatient(PatMedInhosp patMedInhosp1, PatArchive patArchive, String config) {
+ int generatedCount = 0;
+ try {
+ //鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟
+ ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+ serviceTaskdept.setLongtask(1L);
+ serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
+ serviceTaskdept.setDeptType("1");
+ serviceTaskdept.setServiceType("2");
+ serviceTaskdept.setOrgid(patMedInhosp1.getOrgid());
+ List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+
+ if (CollectionUtils.isEmpty(serviceTaskdepts)) {
+ PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+ patMedInhosp1.setDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆绂婚櫌闀挎湡浠诲姟;");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ } else {
+ for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
+ writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config);
+ generatedCount++;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("銆愮瀹や换鍔°�戞偅鑰厈}澶勭悊寮傚父锛歿}", patMedInhosp1.getInhospid(), e.getMessage());
+ patMedInhosp1.setDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("绉戝浠诲姟澶勭悊寮傚父锛�" + e.getMessage());
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ }
+ return generatedCount;
+ }
+
+ /**
+ * 涓哄崟涓偅鑰呯敓鎴愮梾鍖虹淮搴︾殑瀛愪换鍔�
+ *
+ * @return 鐢熸垚鐨勫瓙浠诲姟鏁伴噺
+ */
+ private int addWardSubTaskForPatient(PatMedInhosp patMedInhosp1, PatArchive patArchive, String config) {
+ int generatedCount = 0;
+ try {
+ String errorreason = null;
+ List<ServiceTaskdept> serviceTaskdeptList = null;
+ if (!StringUtils.isEmpty(patMedInhosp1.getLeavehospitaldistrictcode())) {
+ ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+ serviceTaskdept.setLongtask(1L);
+ serviceTaskdept.setDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
+ serviceTaskdept.setDeptType("2");
+ serviceTaskdept.setServiceType("2");
+ serviceTaskdept.setOrgid(patMedInhosp1.getOrgid());
+ serviceTaskdeptList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+ if (CollectionUtils.isEmpty(serviceTaskdeptList)) {
+ errorreason = "璇ユ偅鑰呮墍鍦ㄧ梾鍖烘湭閰嶇疆闀挎湡浠诲姟;";
+ }
+ } else {
+ errorreason = "绂婚櫌鐥呭尯涓虹┖;";
+ }
+
+ if (StringUtils.isNotEmpty(errorreason)) {
+ PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+ patMedInhosp1.setWardcheckFlag("2");
+ patMedInhosp1.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorreason : errorreason);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ } else {
+ for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
+ writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 2, config);
+ generatedCount++;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("銆愮梾鍖轰换鍔°�戞偅鑰厈}澶勭悊寮傚父锛歿}", patMedInhosp1.getInhospid(), e.getMessage());
+ patMedInhosp1.setWardcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("鐥呭尯浠诲姟澶勭悊寮傚父锛�" + e.getMessage());
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ }
+ return generatedCount;
+ }
+
+ /**
+ * 涓哄崟涓偅鑰呯敓鎴愮柧鐥呯淮搴︾殑瀛愪换鍔�
+ *
+ * @return 鐢熸垚鐨勫瓙浠诲姟鏁伴噺
+ */
+ private int addIcd10SubTaskForPatient(PatMedInhosp patMedInhosp1, PatArchive patArchive, String config) {
+ int generatedCount = 0;
+ try {
+ if (StringUtils.isEmpty(patMedInhosp1.getLeaveicd10code())) {
+ return 0;
+ }
+
+ ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
+ serviceTaskdiag.setLongtask(1L);
+ serviceTaskdiag.setServiceType("2");
+ if (active.equals("nhfy")) {
+ serviceTaskdiag.setIcd10name(patMedInhosp1.getLeavediagname());
+ if (StringUtils.isEmpty(patMedInhosp1.getLeavediagname())) {
+ PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+ patMedInhosp1.setDiagcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("璇ユ偅鑰呬富璇婃柇鍚嶇О涓虹┖;");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ return 0;
+ }
+ } else {
+ serviceTaskdiag.setIcd10code(patMedInhosp1.getLeaveicd10code());
+ }
+ serviceTaskdiag.setOrgid(patMedInhosp1.getOrgid());
+ List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagListByIcdName(serviceTaskdiag);
+
+ if (CollectionUtils.isEmpty(serviceTaskdiags)) {
+ PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+ patMedInhosp1.setDiagcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("璇ユ偅鑰呮墍鎮ｇ柧鐥呮湭閰嶇疆闀挎湡浠诲姟;");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ } 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("璇ョ瀹ゆ垨鐥呭尯瀵逛簬鎮ｈ�呮墍鎮ｇ柧鐥呮湭閰嶇疆闀挎湡浠诲姟,鎮ｈ�咃細{}", patMedInhosp1.getInhospid());
+ PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+ patMedInhosp1.setDiagcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("璇ョ瀹ゆ垨鐥呭尯瀵逛簬鎮ｈ�呮墍鎮ｇ柧鐥呮湭閰嶇疆闀挎湡浠诲姟;");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("銆愮柧鐥呬换鍔°�戞偅鑰厈}澶勭悊寮傚父锛歿}", patMedInhosp1.getInhospid(), e.getMessage());
+ patMedInhosp1.setDiagcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("鐤剧梾浠诲姟澶勭悊寮傚父锛�" + e.getMessage());
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ }
+ return generatedCount;
+ }
+
}
--
Gitblit v1.9.3