From 2d6018d0d3a4e21ddf805d8f2eaae7260f512c1a Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 02 三月 2026 11:23:17 +0800
Subject: [PATCH] 【丽水】更新出院状态
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 266 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 223 insertions(+), 43 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 fd3b395..509e42b 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -253,13 +253,16 @@
for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config);
}
- patMedInhosp1.setDeptcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+// patMedInhosp1.setDeptcheckFlag("1");
+// patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
}
} catch (Exception e) {
e.printStackTrace();
- log.error("浜哄憳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ log.error("浜哄憳绉戝澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ patMedInhosp1.setDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("浜哄憳绉戝澶勭悊寮傚父锛�" + e.getMessage());
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
}
}
@@ -304,14 +307,17 @@
for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiBQ1, patArchive, 2, config);
}
- pmiBQ1.setWardcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+// pmiBQ1.setWardcheckFlag("1");
+// patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
}
} catch (Exception e) {
e.printStackTrace();
- log.error("浜哄憳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ log.error("浜哄憳鐥呭尯澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ pmiBQ1.setWardcheckFlag("2");
+ pmiBQ1.setLongTaskReason("浜哄憳鐥呭尯澶勭悊寮傚父锛�" + e.getMessage());
+ patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
}
}
@@ -357,13 +363,16 @@
for (ServiceTaskdiag serviceTaskdept1 : serviceTaskdiags) {
writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiJB, patArchive, 3, config);
}
- pmiJB.setDiagcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(pmiJB);
+// pmiJB.setDiagcheckFlag("1");
+// patMedInhospMapper.updatePatMedInhosp(pmiJB);
}
} catch (Exception e) {
e.printStackTrace();
- log.error("浜哄憳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ log.error("浜哄憳鐤剧梾澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ pmiJB.setDiagcheckFlag("2");
+ pmiJB.setLongTaskReason("浜哄憳鐤剧梾澶勭悊寮傚父锛�" + e.getMessage());
+ patMedInhospMapper.updatePatMedInhosp(pmiJB);
}
}
}
@@ -379,6 +388,149 @@
}
return 1;
}
+
+ /**
+ * 澶氱淮搴﹂殢璁�
+ * @param config
+ * @return
+ */
+ public int dealOutHospInfoByDimension(String config) {
+ // 涓�娆℃�ф煡鍑烘墍鏈夐渶瑕佸鐞嗙殑鍑洪櫌鎮ｈ�咃紙涓変釜缁村害浠绘剰涓�涓湭瀹屾垚锛�
+ List<PatMedInhosp> patList = patMedInhospMapper.selectNeedProcessList();
+ log.info("銆愮粺涓�鎵弿銆戝緟澶勭悊鎮ｈ�呮暟锛歿}", patList.size());
+
+ for (PatMedInhosp patMedInhosp1 : patList) {
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
+ if (Objects.isNull(patArchive)) {
+ // 涓変釜缁村害閮芥爣璁颁负澶辫触
+ markAllFlagsAsError(patMedInhosp1, "鎮ｈ�呭熀鏈俊鎭负绌�");
+ continue;
+ }
+
+ // 鈹�鈹� 缁村害1锛氱瀹� 鈹�鈹�
+ if ("0".equals(patMedInhosp1.getDeptcheckFlag())) {
+ processTasksByDimension(patMedInhosp1, patArchive, config, 1);
+ }
+
+ // 鈹�鈹� 缁村害2锛氱梾鍖� 鈹�鈹�锛堟柊鍗庡尰闄㈣烦杩囷級
+ if (!active.equals("xh") && "0".equals(patMedInhosp1.getWardcheckFlag())) {
+ processTasksByDimension(patMedInhosp1, patArchive, config, 2);
+ }
+
+ // 鈹�鈹� 缁村害3锛氱柧鐥� 鈹�鈹�锛堟柊鍗庡尰闄㈣烦杩囷級
+ if (!active.equals("xh") && "0".equals(patMedInhosp1.getDiagcheckFlag())) {
+ processTasksByDimension(patMedInhosp1, patArchive, config, 3);
+ }
+ }
+ return 1;
+ }
+
+ /**
+ * 鎸夌淮搴︽壘鍒版墍鏈夊尮閰嶉暱鏈熶换鍔★紝鎵归噺鐢熸垚 subtask
+ * type: 1=绉戝, 2=鐥呭尯, 3=鐤剧梾
+ */
+ private void processTasksByDimension(PatMedInhosp patMedInhosp1,
+ PatArchive patArchive,
+ String config, int type) {
+ List<Long> matchedTaskIds = findMatchingTaskIds(patMedInhosp1, type);
+
+ if (CollectionUtils.isEmpty(matchedTaskIds)) {
+ String reason = getDimensionReason(type);
+ markFlagAsNoConfig(patMedInhosp1, type, reason);
+ return;
+ }
+
+ // 涓�鏉� inhosp 璁板綍 鈫� 澶氫釜鍖归厤浠诲姟 鈫� 澶氭潯 subtask
+ for (Long taskId : matchedTaskIds) {
+ writeInSubTask(taskId, true, patMedInhosp1, patArchive, type, config);
+ }
+ }
+
+ private String getDimensionReason(int type){
+ switch (type) {
+ case 1: { // 绉戝
+ return "鏈壘鍒扮瀹ゅ尮閰嶇殑闀挎湡浠诲姟";
+ }
+ case 2: { // 鐥呭尯
+ return "鏈壘鍒扮梾鍖哄尮閰嶇殑闀挎湡浠诲姟";
+ }
+ case 3: { // 鐤剧梾
+ return "鏈壘鍒扮柧鐥呭尮閰嶇殑闀挎湡浠诲姟";
+ }
+ }
+ return "澶氱淮闀挎湡浠诲姟-鍖归厤绫诲瀷涓虹┖";
+ }
+
+ private void markFlagAsNoConfig(PatMedInhosp patMedInhosp,
+ int type,
+ String reason){
+ switch (type) {
+ case 1: { // 绉戝
+ patMedInhosp.setDeptcheckFlag("2");
+ patMedInhosp.setRemark(reason);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+ break;
+ }
+ case 2: { // 鐥呭尯
+ patMedInhosp.setWardcheckFlag("2");
+ patMedInhosp.setRemark(reason);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+ break;
+ }
+ case 3: { // 鐤剧梾
+ patMedInhosp.setDiagcheckFlag("2");
+ patMedInhosp.setRemark(reason);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+ break;
+ }
+ }
+
+ }
+
+ private void markAllFlagsAsError(PatMedInhosp patMedInhosp,
+ String reason){
+ patMedInhosp.setDeptcheckFlag("2");
+ patMedInhosp.setWardcheckFlag("2");
+ patMedInhosp.setDiagcheckFlag("2");
+ patMedInhosp.setRemark(reason);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+ }
+ /**
+ * 鏍规嵁缁村害绫诲瀷鏌ヨ鍖归厤鐨勯暱鏈熶换鍔� ID 鍒楄〃
+ */
+ private List<Long> findMatchingTaskIds(PatMedInhosp patMedInhosp1, int type) {
+ switch (type) {
+ case 1: { // 绉戝
+ ServiceTaskdept query = new ServiceTaskdept();
+ query.setLongtask(1L);
+ query.setDeptCode(patMedInhosp1.getLeaveldeptcode());
+ query.setDeptType("1");
+ query.setOrgid(patMedInhosp1.getOrgid());
+ return serviceTaskdeptMapper.selectServiceTaskdeptList(query)
+ .stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
+ }
+ case 2: { // 鐥呭尯
+ ServiceTaskdept query = new ServiceTaskdept();
+ query.setLongtask(1L);
+ query.setDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
+ query.setDeptType("2");
+ query.setOrgid(patMedInhosp1.getOrgid());
+ return serviceTaskdeptMapper.selectServiceTaskdeptList(query)
+ .stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
+ }
+ case 3: { // 鐤剧梾
+ if (StringUtils.isEmpty(patMedInhosp1.getLeaveicd10code())) return Collections.emptyList();
+ ServiceTaskdiag query = new ServiceTaskdiag();
+ query.setLongtask(1L);
+ query.setIcd10code(patMedInhosp1.getLeaveicd10code());
+ query.setOrgid(patMedInhosp1.getOrgid());
+ return serviceTaskdiagMapper.selectServiceTaskdiagList(query)
+ .stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
+ }
+ }
+ return Collections.emptyList();
+ }
+
//
// @Override
@@ -538,16 +690,26 @@
return calendar.getTime();
}
+ /**
+ *
+ * @param taskid 浠诲姟id
+ * @param check 鏄惁闇�瑕佹牎楠�
+ * @param patMedInhosp1 鐥呬汉鍑哄叆闄俊鎭�
+ * @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) {
String longTaskReason = patMedInhosp1.getLongTaskReason();
+ String orgId = patMedInhosp1.getOrgid();
if (StringUtils.isEmpty(longTaskReason)) longTaskReason = "";
ServiceTask st = new ServiceTask();
st.setTaskid(taskid);
st.setSendState(2L);
List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
ServiceTask serviceTask = null;
- if(CollectionUtils.isEmpty(serviceTasks)){
+ if (CollectionUtils.isEmpty(serviceTasks)) {
if (type == 1) {
log.info("璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓猴細{}", taskid);
patMedInhosp1.setDeptcheckFlag("2");
@@ -565,7 +727,7 @@
patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
return;
}
- }else {
+ } else {
serviceTask = serviceTasks.get(0);
}
if (Objects.isNull(patMedInhosp1.getEndtime())) {
@@ -573,7 +735,7 @@
}
//灏佽serviceSubtask
ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive, config);
- if(ObjectUtils.isEmpty(serviceSubtask)){
+ if (ObjectUtils.isEmpty(serviceSubtask)) {
return;
}
if (type != 2) {
@@ -595,7 +757,7 @@
subtask.setSendstate(2L);
subtask.setTaskid(taskid);
List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
- log.info("璇ユ偅鑰呭緟鎵ц鐨勪换鍔�:{}", CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.size() : null);
+// log.info("璇ユ偅鑰呭緟鎵ц鐨勪换鍔�:{}", CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.size() : null);
if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
@@ -607,7 +769,7 @@
Date endTime = serviceSubtask.getEndtime();
Date endTime1 = serviceSubtask1.getEndtime();
//鍑洪櫌鏃堕棿鍒ょ┖锛屽鏋滀负绌鸿烦杩�
- if(ObjectUtils.isEmpty(endTime)){
+ if (ObjectUtils.isEmpty(endTime)) {
serviceSubtask.setResult("error");
serviceSubtask.setRemark("鍑洪櫌鏃堕棿涓虹┖锛宻erviceSubtask鐨処d涓�" + serviceSubtask.getId());
serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
@@ -616,7 +778,7 @@
if (aBoolean) i = 1;
continue;
}
- if(ObjectUtils.isEmpty(endTime1)){
+ if (ObjectUtils.isEmpty(endTime1)) {
serviceSubtask1.setResult("error");
serviceSubtask1.setRemark("鍑洪櫌鏃堕棿涓虹┖锛宻erviceSubtask鐨処d涓�" + serviceSubtask1.getId());
serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
@@ -625,27 +787,36 @@
if (aBoolean) i = 1;
continue;
}
- if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")) {
- //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
- serviceSubtask1.setSendstate(4L);
- if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
- serviceSubtask.setRemark(serviceSubtask.getRemark() + ",绉戝/鐥呭尯鎮ｈ�呭啀鍏ラ櫌");
- else serviceSubtask.setRemark("绉戝/鐥呭尯鎮ｈ�呭啀鍏ラ櫌");
- serviceSubtask1.setResult("error");
- serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
- serviceSubtask1.setUpdateTime(new Date());
- Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
- if (aBoolean) i = 1;
- } else {
- //鐩稿弽,鍒欏皢褰撴湁鐨勬暟鎹仠鎺�
- serviceSubtask.setResult("error");
- serviceSubtask.setSendstate(4L);
- if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
- serviceSubtask.setRemark(serviceSubtask.getRemark() + ",褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
- else serviceSubtask.setRemark("褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
- serviceSubtask.setCreateBy(serviceTask.getCreateBy());
- serviceSubtask.setCreateTime(new Date());
- i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ //鍐嶅叆闄㈤�昏緫
+ //鏅畞 鍑洪櫌棣栨锛�7澶╋級闅忚涓�瀹氳鍋�
+ boolean firstVisit = false;
+ if (orgId.equals("47255004333112711A1001") && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
+ firstVisit = true;
+ }
+ if (!firstVisit) {
+ //鏅畞鐨勪笉闇�瑕佸皢涔嬪墠鐨勪换鍔″仠鎺夛紝鍏ㄧ敓鎴�
+ if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")) {
+ //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
+ serviceSubtask1.setSendstate(4L);
+ if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
+ serviceSubtask.setRemark(serviceSubtask.getRemark() + ",绉戝/鐥呭尯鎮ｈ�呭啀鍏ラ櫌");
+ else serviceSubtask.setRemark("绉戝/鐥呭尯鎮ｈ�呭啀鍏ラ櫌");
+ serviceSubtask1.setResult("error");
+ serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
+ serviceSubtask1.setUpdateTime(new Date());
+ Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ if (aBoolean) i = 1;
+ } else {
+ //鐩稿弽,鍒欏皢褰撴湁鐨勬暟鎹仠鎺�
+ serviceSubtask.setResult("error");
+ serviceSubtask.setSendstate(4L);
+ if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
+ serviceSubtask.setRemark(serviceSubtask.getRemark() + ",褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
+ else serviceSubtask.setRemark("褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
+ serviceSubtask.setCreateBy(serviceTask.getCreateBy());
+ serviceSubtask.setCreateTime(new Date());
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ }
}
} else if (type == 3) {
//type=3 琛ㄧず鐤剧梾
@@ -698,14 +869,14 @@
}
//灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
- if(i == 1){
+ if (i == 1) {
PatMedInhosp patMedInhosp2 = new PatMedInhosp();
patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
if (type == 1) patMedInhosp2.setDeptcheckFlag("1");
if (type == 2) patMedInhosp2.setWardcheckFlag("1");
if (type == 3) patMedInhosp2.setDiagcheckFlag("1");
patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
- }else {
+ } else {
//鐢熸垚瀛愪换鍔″け璐ワ紝
log.info("鐢熸垚瀛愪换鍔″け璐erviceSubtask鐨則askid涓猴細{},patid涓猴細{}", serviceSubtask.getTaskid(), serviceSubtask.getPatid());
PatMedInhosp patMedInhosp2 = new PatMedInhosp();
@@ -815,6 +986,9 @@
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();
}
@@ -825,13 +999,19 @@
//濡傛灉鏄�氱煡鐨勮瘽锛岄渶瑕佹彁鍓嶅嚑澶╁皢閫氳繃鐭俊鍙戝嚭鍘伙紙鍏蜂綋鍑犲ぉ锛岃繖涓彲浠ラ厤缃湪sys_conf琛ㄤ腑锛�
if ("3".equals(serviceTask.getType())) {
serviceSubtask.setVisitTime(minusDay(newDate, StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
- //鍒ゆ柇鏄笉鏄櫙瀹�
- if (patMedInhosp1.getOrgid().equals("47255004333112711A1001"))
- serviceSubtask.setVisitTime(null);
-
//濡傛灉璇ュ嚭闄㈣褰曟湁闅忚鏃堕棿锛屽垯鐢ㄤ粬鑷繁鐨勯殢璁挎椂闂�
- if (patMedInhosp1.getFudate() != null)
+ if (patMedInhosp1.getFudate() != null) {
serviceSubtask.setVisitTime(minusDay(patMedInhosp1.getFudate(), StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
+ } else {
+ //鍒ゆ柇鏄笉鏄櫙瀹�
+ if (patMedInhosp1.getOrgid().equals("47255004333112711A1001")) {
+ serviceSubtask.setVisitTime(null);
+ //涓嶆墽琛�
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setRemark("鏅畞娌℃湁缁欓殢璁挎椂闂达紝涓嶅彂閫侀�氱煡鐭俊");
+ }
+ }
+
}
//鎮ｈ�呭彂閫佹椂闂�
--
Gitblit v1.9.3