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 | 341 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 280 insertions(+), 61 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 509e42b..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,11 +4,13 @@
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;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
+import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
import com.smartor.service.IPatMedInhospService;
import lombok.extern.slf4j.Slf4j;
@@ -40,6 +42,8 @@
@Autowired
private ServiceTaskdiagMapper serviceTaskdiagMapper;
@Autowired
+ private ServiceTaskoperMapper serviceTaskoperMapper;
+ @Autowired
private PatArchiveMapper patArchiveMapper;
@Autowired
private PatArchiveImportMapper patArchiveImportMapper;
@@ -49,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;
/**
@@ -77,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());
@@ -138,16 +159,6 @@
public PatMedRes selectPatMedInhospListCount(PatMedReq patMedReq) {
PatMedRes patMedRes = null;
// 鑾峰彇褰撳墠鐧婚檰浜虹殑閮ㄩ棬鏉冮檺
- if (org.springframework.util.CollectionUtils.isEmpty(patMedReq.getDeptcodeList())) {
-// Long userId = SecurityUtils.getUserId();
-// List<SysDept> sysDepts = sysUserDeptMapper.selectDeptListByUserId(userId);
-// List<String> deptCode = new ArrayList<>();
-// for (SysDept sysDept : sysDepts) {
-// deptCode.add(sysDept.getDeptId().toString());
-// }
-// patMedReq.setDeptcodeList(deptCode);
-// patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
- }
patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
return patMedRes;
}
@@ -212,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");
@@ -241,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) {
@@ -291,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) {
@@ -343,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) {
@@ -373,6 +498,102 @@
pmiJB.setDiagcheckFlag("2");
pmiJB.setLongTaskReason("浜哄憳鐤剧梾澶勭悊寮傚父锛�" + e.getMessage());
patMedInhospMapper.updatePatMedInhosp(pmiJB);
+ }
+ }
+// 鎵嬫湳闅忚
+// PatMedInhosp pmss = new PatMedInhosp();
+// //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
+// pmss.setOpercheckFlag("0");
+// pmss.setInhospstate("1");
+// pmss.setFuflag("1");
+// List<PatMedInhosp> patMedInhospSSs = patMedInhospMapper.selectPatMedInhospList(pmss);
+// log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鐤剧梾鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhospSSs) ? patMedInhospSSs.size() : null);
+// for (PatMedInhosp patMedInhosp1 : patMedInhospSSs) {
+// String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+// patMedInhosp1.setTagname(tagname);
+// }
+//
+// for (PatMedInhosp pmiSS : patMedInhospSSs) {
+// //鑾峰彇鎮ｈ�呬俊鎭�
+// PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(pmiSS.getPatid());
+// if (Objects.isNull(patArchive)) {
+// pmiSS.setDiagcheckFlag("2");
+// pmiSS.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
+// patMedInhospMapper.updatePatMedInhosp(pmiSS);
+// continue;
+// }
+// try {
+//// if (StringUtils.isEmpty(pmiSS.getLeaveicd10code())) {
+//// continue;
+//// }
+// // 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
+// ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
+// serviceTaskoper.setLongtask(1L);
+// serviceTaskoper.setOrgid(pmiSS.getOrgid());
+// //todo
+// serviceTaskoper.setOplevelcode("");
+//
+// List<ServiceTaskoper> serviceTaskopers = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);
+// //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+// if (CollectionUtils.isEmpty(serviceTaskopers) || serviceTaskopers.size() == 0) {
+// PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiSS.getInhospid());
+// pmiSS.setOpercheckFlag("2");
+// pmiSS.setLongTaskReason(patMedInhosp.getLongTaskReason() + "鎵�鎮ｇ殑鎵嬫湳鏈厤缃暱鏈熶换鍔�;");
+// patMedInhospMapper.updatePatMedInhosp(pmiSS);
+// } else {
+// for (ServiceTaskoper serviceTaskoper1 : serviceTaskopers) {
+// writeInSubTask(serviceTaskoper1.getTaskId(), true, pmiSS, patArchive, 3, config);
+// }
+// }
+//
+// } catch (Exception e) {
+// e.printStackTrace();
+// log.error("浜哄憳鎵嬫湳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+// pmiSS.setOpercheckFlag("2");
+// pmiSS.setLongTaskReason("浜哄憳鎵嬫湳澶勭悊寮傚父锛�" + e.getMessage());
+// 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);
}
}
}
@@ -391,6 +612,7 @@
/**
* 澶氱淮搴﹂殢璁�
+ *
* @param config
* @return
*/
@@ -429,14 +651,12 @@
* 鎸夌淮搴︽壘鍒版墍鏈夊尮閰嶉暱鏈熶换鍔★紝鎵归噺鐢熸垚 subtask
* type: 1=绉戝, 2=鐥呭尯, 3=鐤剧梾
*/
- private void processTasksByDimension(PatMedInhosp patMedInhosp1,
- PatArchive patArchive,
- String config, int type) {
+ private void processTasksByDimension(PatMedInhosp patMedInhosp1, PatArchive patArchive, String config, int type) {
List<Long> matchedTaskIds = findMatchingTaskIds(patMedInhosp1, type);
if (CollectionUtils.isEmpty(matchedTaskIds)) {
- String reason = getDimensionReason(type);
- markFlagAsNoConfig(patMedInhosp1, type, reason);
+ String reason = getDimensionReason(type);
+ markFlagAsNoConfig(patMedInhosp1, type, reason);
return;
}
@@ -446,11 +666,11 @@
}
}
- private String getDimensionReason(int type){
+ private String getDimensionReason(int type) {
switch (type) {
case 1: { // 绉戝
return "鏈壘鍒扮瀹ゅ尮閰嶇殑闀挎湡浠诲姟";
- }
+ }
case 2: { // 鐥呭尯
return "鏈壘鍒扮梾鍖哄尮閰嶇殑闀挎湡浠诲姟";
}
@@ -461,9 +681,7 @@
return "澶氱淮闀挎湡浠诲姟-鍖归厤绫诲瀷涓虹┖";
}
- private void markFlagAsNoConfig(PatMedInhosp patMedInhosp,
- int type,
- String reason){
+ private void markFlagAsNoConfig(PatMedInhosp patMedInhosp, int type, String reason) {
switch (type) {
case 1: { // 绉戝
patMedInhosp.setDeptcheckFlag("2");
@@ -487,14 +705,14 @@
}
- private void markAllFlagsAsError(PatMedInhosp patMedInhosp,
- String reason){
+ private void markAllFlagsAsError(PatMedInhosp patMedInhosp, String reason) {
patMedInhosp.setDeptcheckFlag("2");
patMedInhosp.setWardcheckFlag("2");
patMedInhosp.setDiagcheckFlag("2");
patMedInhosp.setRemark(reason);
patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
}
+
/**
* 鏍规嵁缁村害绫诲瀷鏌ヨ鍖归厤鐨勯暱鏈熶换鍔� ID 鍒楄〃
*/
@@ -506,8 +724,7 @@
query.setDeptCode(patMedInhosp1.getLeaveldeptcode());
query.setDeptType("1");
query.setOrgid(patMedInhosp1.getOrgid());
- return serviceTaskdeptMapper.selectServiceTaskdeptList(query)
- .stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
+ return serviceTaskdeptMapper.selectServiceTaskdeptList(query).stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
}
case 2: { // 鐥呭尯
ServiceTaskdept query = new ServiceTaskdept();
@@ -515,8 +732,7 @@
query.setDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
query.setDeptType("2");
query.setOrgid(patMedInhosp1.getOrgid());
- return serviceTaskdeptMapper.selectServiceTaskdeptList(query)
- .stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
+ return serviceTaskdeptMapper.selectServiceTaskdeptList(query).stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
}
case 3: { // 鐤剧梾
if (StringUtils.isEmpty(patMedInhosp1.getLeaveicd10code())) return Collections.emptyList();
@@ -524,8 +740,7 @@
query.setLongtask(1L);
query.setIcd10code(patMedInhosp1.getLeaveicd10code());
query.setOrgid(patMedInhosp1.getOrgid());
- return serviceTaskdiagMapper.selectServiceTaskdiagList(query)
- .stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
+ return serviceTaskdiagMapper.selectServiceTaskdiagList(query).stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
}
}
return Collections.emptyList();
@@ -691,13 +906,12 @@
}
/**
- *
- * @param taskid 浠诲姟id
- * @param check 鏄惁闇�瑕佹牎楠�
+ * @param taskid 浠诲姟id
+ * @param check 鏄惁闇�瑕佹牎楠�
* @param patMedInhosp1 鐥呬汉鍑哄叆闄俊鎭�
- * @param patArchive 鐥呬汉淇℃伅
- * @param type 闅忚绫诲瀷(1-绉戝锛�2-鐥呭尯锛�3-鐤剧梾锛�
- * @param config 閰嶇疆淇℃伅 visit.early.day
+ * @param patArchive 鐥呬汉淇℃伅
+ * @param type 闅忚绫诲瀷(1-绉戝锛�2-鐥呭尯锛�3-鐤剧梾锛�
+ * @param config 閰嶇疆淇℃伅 visit.early.day
*/
//灏嗘偅鑰呮斁鍒皊ubtask涓�
private void writeInSubTask(Long taskid, Boolean check, PatMedInhosp patMedInhosp1, PatArchive patArchive, Integer type, String config) {
@@ -752,7 +966,7 @@
//鍏堝垽鏂竴涓嬶紝鏄惁闇�瑕佹牎楠�
if (check && (Objects.isNull(serviceSubtask.getTaskSituation()) || serviceSubtask.getTaskSituation() != 6)) {
//鍦ㄦ柊澧炰箣鍓嶏紝鍏堥�氳繃鎮ｈ�匢D锛宻endstate=2鏌ヨ涓�涓嬶紝鍦ㄦ墍鏈夐暱鏈熶换鍔′腑锛屾槸涓嶆槸杩樻湁璇ユ偅鑰呭緟鎵ц鐨勪换鍔★紝鏈夌殑璇�,姣旇緝涔嬪墠鐨別ndtime鏄惁灏忎簬褰撳墠鐨別ndtaime,濡傛灉涔嬪墠鐨勫皬浜庣幇鍦ㄧ殑锛屽垯鐩存帴灏嗕箣鍓嶇殑鍋滄帀锛堝師鍥犲啀鍏ラ櫌锛�
- ServiceSubtaskVO subtask = new ServiceSubtaskVO();
+ ServiceSubtaskEntity subtask = new ServiceSubtaskEntity();
subtask.setPatid(patArchive.getId());
subtask.setSendstate(2L);
subtask.setTaskid(taskid);
@@ -995,7 +1209,7 @@
serviceSubtask.setLongSendTime(newDate);
serviceSubtask.setVisitTime(newDate);
- if (patMedInhosp1.getFudate() != null) serviceSubtask.setVisitTime(patMedInhosp1.getFudate());
+// if (patMedInhosp1.getFudate() != null && !patMedInhosp1.getOrgid().equals("47255004333112711A1001")) serviceSubtask.setVisitTime(patMedInhosp1.getFudate());
//濡傛灉鏄�氱煡鐨勮瘽锛岄渶瑕佹彁鍓嶅嚑澶╁皢閫氳繃鐭俊鍙戝嚭鍘伙紙鍏蜂綋鍑犲ぉ锛岃繖涓彲浠ラ厤缃湪sys_conf琛ㄤ腑锛�
if ("3".equals(serviceTask.getType())) {
serviceSubtask.setVisitTime(minusDay(newDate, StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
@@ -1049,7 +1263,7 @@
for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
try {
//鑾峰彇褰撳墠鍏ラ櫌鎮ｈ�呯殑寰呮墽琛岀殑鍑洪櫌瀛愪换鍔￠殢璁夸俊鎭�
- ServiceSubtaskVO subtask = new ServiceSubtaskVO();
+ ServiceSubtaskEntity subtask = new ServiceSubtaskEntity();
subtask.setPatid(patMedInhosp1.getPatid());
subtask.setSendstate(2L);
List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
@@ -1060,20 +1274,25 @@
//涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
continue;
}
- if (serviceSubtask1.getEndtime().before(patMedInhosp1.getStarttime())) {
- //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
-// log.error("鎮ｈ�呭啀鍏ラ櫌鐨剆erviceSubtask1涓�:{}", serviceSubtask1);
- serviceSubtask1.setSendstate(4L);
- serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
- serviceSubtask1.setResult("error");
-// serviceSubtask1.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ //鏅畞 鍑洪櫌棣栨锛�7澶╋級闅忚涓�瀹氳鍋�
+ boolean firstVisit = false;
+ if (serviceSubtask1.getOrgid().equals("47255004333112711A1001") && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
+ firstVisit = true;
}
+ if (!firstVisit) {
+ if (serviceSubtask1.getEndtime().before(patMedInhosp1.getStarttime())) {
+ //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
+// log.error("鎮ｈ�呭啀鍏ラ櫌鐨剆erviceSubtask1涓�:{}", serviceSubtask1);
+ serviceSubtask1.setSendstate(4L);
+ serviceSubtask1.setIsVisitAgain(2);
+ serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
+ serviceSubtask1.setResult("error");
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ }
+ }
+
}
}
- //灏嗘偅鍏ョ殑鍏ラ櫌鏁版嵁璁剧疆涓哄凡澶勭悊
- //鏇存柊鐘舵�佸�� patMedInhosp1.setDeptcheckFlag("0");
- //patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
} catch (Exception e) {
log.error("鍏ラ櫌鏁版嵁淇℃伅鍑哄紓甯镐簡锛歿},{}", patMedInhosp1, e.getMessage());
}
--
Gitblit v1.9.3