From 586a386b2d779e94002c8099ff62271b0e684d88 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 06 五月 2026 11:35:19 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 205 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 188 insertions(+), 17 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 505759d..19d5746 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -4,6 +4,7 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.service.IConfigService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -52,8 +53,15 @@
private ServiceSubtaskMapper serviceSubtaskMapper;
@Autowired
private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
+ @Autowired
+ private PatMedOperationMapper patMedOperationMapper;
+ @Autowired
+ private PatMedOperationItemMapper patMedOperationItemMapper;
+
@Value("${spring.profiles.active}")
private String active;
+ @Autowired
+ private IConfigService iSysConfigService;
/**
@@ -80,6 +88,16 @@
*/
@Override
public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp) {
+ if (patMedInhosp.getCry() == 0) {
+ patMedInhosp.setDeptcodeList(patMedInhosp.getLeaveldeptcodes());
+ patMedInhosp.setHospitaldistrictcodeList(patMedInhosp.getLeavehospitaldistrictcodes());
+ patMedInhosp.setLeaveldeptcodes(null);
+ patMedInhosp.setLeavehospitaldistrictcodes(null);
+ patMedInhosp.setInhospstate("0");
+ } else if (patMedInhosp.getCry() == 1) {
+ patMedInhosp.setInhospstate("1");
+ }
+
List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
@@ -205,7 +223,91 @@
@Override
public int dealOutHospInfo(String config) {
+ //1.鍏ラ櫌瀹ｆ暀
+ String helibrarySwitch = iSysConfigService.selectConfigByKey("in.helibrary.switch");
+ if (StringUtils.isNotEmpty(helibrarySwitch) && "2".equals(helibrarySwitch)) {
+ PatMedInhosp inhosp = new PatMedInhosp();
+ inhosp.setInDeptcheckFlag("0");
+ inhosp.setInhospstate("0");
+ inhosp.setFuflag("1");
+ List<PatMedInhosp> inPatMedInhosps = patMedInhospMapper.selectPatMedInhospList(inhosp);
+ //1.1 绉戝
+ for (PatMedInhosp patMedInhosp1 : inPatMedInhosps) {
+ //鑾峰彇鎮ｈ�呬俊鎭�
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
+ if (Objects.isNull(patArchive)) {
+ patMedInhosp1.setInDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ continue;
+ }
+ try {
+ //鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑鍏ラ櫌闀挎湡瀹ｆ暀浠诲姟
+ ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+ serviceTaskdept.setLongtask(1L);
+ serviceTaskdept.setDeptCode(patMedInhosp1.getDeptcode());
+ serviceTaskdept.setDeptType("1");
+ serviceTaskdept.setServiceType("17");
+ serviceTaskdept.setOrgid(patMedInhosp1.getOrgid());
+ List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+ //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+ if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
+ PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+ patMedInhosp1.setInDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆鍏ラ櫌闀挎湡瀹ｆ暀浠诲姟;" : "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆鍏ラ櫌闀挎湡瀹ｆ暀浠诲姟;");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ } else {
+ for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
+ writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 4, config);
+ }
+ }
+
+ } catch (Exception e) {
+ log.error("浜哄憳鍏ラ櫌绉戝澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ patMedInhosp1.setInDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("浜哄憳鍏ラ櫌绉戝澶勭悊鍑哄紓甯镐簡锛�" + e.getMessage());
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ }
+ }
+
+
+ //1.2 鐥呭尯
+ inhosp.setInDeptcheckFlag(null);
+ inhosp.setInWardcheckFlag("0");
+ List<PatMedInhosp> inPatMedInhospsWard = patMedInhospMapper.selectPatMedInhospList(inhosp);
+ for (PatMedInhosp patMedInhosp1 : inPatMedInhospsWard) {
+ //鑾峰彇鎮ｈ�呬俊鎭�
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
+ if (Objects.isNull(patArchive)) {
+ patMedInhosp1.setInDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ continue;
+ }
+ //鏍规嵁鎮ｈ�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑鍏ラ櫌闀挎湡瀹ｆ暀浠诲姟锛堜細鍑虹幇涓�涓棶棰橈紝绉戝鍜岀梾鍖哄彂鐨勫悓涓�涓ā鏉匡級
+ ServiceTaskdept serviceTaskWard = new ServiceTaskdept();
+ serviceTaskWard.setLongtask(1L);
+ serviceTaskWard.setDeptCode(patMedInhosp1.getHospitaldistrictcode());
+ serviceTaskWard.setDeptType("2");
+ serviceTaskWard.setServiceType("17");
+ serviceTaskWard.setOrgid(patMedInhosp1.getOrgid());
+ List<ServiceTaskdept> serviceTaskWardList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskWard);
+ //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+ if (CollectionUtils.isEmpty(serviceTaskWardList) || serviceTaskWardList.size() == 0) {
+ PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+ patMedInhosp1.setInDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ梾鍖烘湭閰嶇疆鍏ラ櫌闀挎湡瀹ｆ暀浠诲姟;");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ } else {
+ for (ServiceTaskdept serviceTaskdept1 : serviceTaskWardList) {
+ writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 5, config);
+ }
+ }
+ }
+ }
+
+ //2.鍑洪櫌闅忚
PatMedInhosp pmks = new PatMedInhosp();
//鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
pmks.setDeptcheckFlag("0");
@@ -234,13 +336,14 @@
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() + "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆闀挎湡浠诲姟;");
+ patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆绂婚櫌闀挎湡浠诲姟;");
patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
} else {
for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
@@ -284,17 +387,27 @@
continue;
}
try {
- ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
- serviceTaskdept.setLongtask(1L);
- serviceTaskdept.setDeptCode(pmiBQ1.getLeavehospitaldistrictcode());
- serviceTaskdept.setDeptType("2");
- serviceTaskdept.setOrgid(pmiBQ1.getOrgid());
- List<ServiceTaskdept> serviceTaskdeptList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+ 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 (CollectionUtils.isEmpty(serviceTaskdeptList) || serviceTaskdeptList.size() == 0) {
+ if (StringUtils.isNotEmpty(errorreason)) {
PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiBQ1.getInhospid());
pmiBQ1.setWardcheckFlag("2");
- pmiBQ1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ梾鍖烘湭閰嶇疆闀挎湡浠诲姟;");
+ pmiBQ1.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorreason : errorreason);
patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
} else {
for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
@@ -336,21 +449,40 @@
continue;
}
try {
+ String errorIcd = null;
if (StringUtils.isEmpty(pmiJB.getLeaveicd10code())) {
continue;
}
// 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
serviceTaskdiag.setLongtask(1L);
- serviceTaskdiag.setIcd10code(pmiJB.getLeaveicd10code());
+ 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 (CollectionUtils.isEmpty(serviceTaskdiags) || serviceTaskdiags.size() == 0) {
+ if (StringUtils.isNotEmpty(errorIcd)) {
PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiJB.getInhospid());
pmiJB.setDiagcheckFlag("2");
- pmiJB.setLongTaskReason(patMedInhosp.getLongTaskReason() + "鎵�鎮ｇ殑鐤剧梾鏈厤缃暱鏈熶换鍔�;");
+ 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) {
@@ -422,6 +554,48 @@
// patMedInhospMapper.updatePatMedInhosp(pmiSS);
// }
// }
+// 鎵嬫湳闅忚
+ PatMedOperationItem pmoi = new PatMedOperationItem();
+ //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
+ pmoi.setOpercheckFlag("0");
+ pmoi.setMainFlag("1");
+
+ List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectPatMedOperationItemList(pmoi);
+ log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎵嬫湳鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedOperationItems) ? patMedOperationItems.size() : null);
+
+ for (PatMedOperationItem opItem : patMedOperationItems) {
+
+ try {
+ if (StringUtils.isEmpty(opItem.getOplevelcode())) {
+ continue;
+ }
+ // 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
+ 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() + "鎵�鎮ｇ殑鎵嬫湳鏈厤缃暱鏈熶换鍔�;");
+ 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);
+ }
+ }
}
//鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭ｄ箣鍓嶇殑鍑洪櫌鎮ｈ�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
@@ -1110,18 +1284,15 @@
//濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
// log.error("鎮ｈ�呭啀鍏ラ櫌鐨剆erviceSubtask1涓�:{}", serviceSubtask1);
serviceSubtask1.setSendstate(4L);
+ serviceSubtask1.setIsVisitAgain(2);
serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
serviceSubtask1.setResult("error");
-// serviceSubtask1.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
}
}
}
}
- //灏嗘偅鍏ョ殑鍏ラ櫌鏁版嵁璁剧疆涓哄凡澶勭悊
- //鏇存柊鐘舵�佸�� patMedInhosp1.setDeptcheckFlag("0");
- //patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
} catch (Exception e) {
log.error("鍏ラ櫌鏁版嵁淇℃伅鍑哄紓甯镐簡锛歿},{}", patMedInhosp1, e.getMessage());
}
--
Gitblit v1.9.3