From c1f47dd490c6c8d69708eb7cda2330bb89623257 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 02 三月 2026 11:20:12 +0800
Subject: [PATCH] 【丽水】多维度随访
---
smartor/src/main/java/com/smartor/service/IPatMedInhospService.java | 8 ++
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 190 +++++++++++++++++++++++++++++++++--------------
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 12 +++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 15 +++
smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java | 6 +
5 files changed, 173 insertions(+), 58 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index f750193..ae799e1 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -412,6 +412,21 @@
}
}
+ /**
+ * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
+ */
+ public void dealOutHospInfoByDimension() {
+ String config = configService.selectConfigByKey("visit.early.day");
+ if (port.equals("8095")) {
+ //鍑洪櫌琛�
+ iPatMedInhospService.dealOutHospInfoByDimension(config);
+ //闂ㄨ瘖琛�(鏂板崕鐨勬殏鏃朵笉鍋氶棬璇婇殢璁�)
+ if (!active.equals("xh")) {
+// iPatMedOuthospService.dealOutpatientInfo();
+ }
+ }
+ }
+
/**
* 澶勭悊鎵嬫湳淇℃伅锛岃繘鍏ュ瓙浠诲姟琛�
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java
index 55ea74e..f8fc62a 100644
--- a/smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java
@@ -93,4 +93,10 @@
public List<PatMedRes> getDeptRanking(PatMedReq patMedReq);
+
+ /**
+ * 鏌ヨ涓変釜缁村害浠绘剰涓�涓湭澶勭悊鐨勫嚭闄㈡偅鑰�
+ * @return
+ */
+ public List<PatMedInhosp> selectNeedProcessList();
}
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
index 3d5c568..680bee7 100644
--- a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
@@ -93,6 +93,14 @@
public int dealOutHospInfo(String config);
/**
+ * 澶勭悊浠巋is鍙栨潵鐨勫嚭闄㈡暟鎹�
+ *
+ * @param
+ * @return 缁撴灉
+ */
+ public int dealOutHospInfoByDimension(String config);
+
+ /**
* 鑾峰彇鍑洪櫌锛屼綇闄紝闂ㄨ瘖鏈嶅姟浜烘
*
* @param patMedReq
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 aa20bd1..509e42b 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -389,75 +389,149 @@
return 1;
}
- public int dealOutHospInfo1(String config) {
- //鑾峰彇浠诲姟淇℃伅
- ServiceTask st = new ServiceTask();
- st.setDelFlag("0");
- st.setLongTask(1);
- List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
- log.info("銆恉ealOutHospInfo1銆戣幏鍙栧埌{}涓暱鏈熶换鍔�", serviceTasks.size());
+ /**
+ * 澶氱淮搴﹂殢璁�
+ * @param config
+ * @return
+ */
+ public int dealOutHospInfoByDimension(String config) {
+ // 涓�娆℃�ф煡鍑烘墍鏈夐渶瑕佸鐞嗙殑鍑洪櫌鎮ｈ�咃紙涓変釜缁村害浠绘剰涓�涓湭瀹屾垚锛�
+ List<PatMedInhosp> patList = patMedInhospMapper.selectNeedProcessList();
+ log.info("銆愮粺涓�鎵弿銆戝緟澶勭悊鎮ｈ�呮暟锛歿}", patList.size());
- PatMedInhosp pmks = new PatMedInhosp();
- //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
- pmks.setDeptcheckFlag("0");
- pmks.setInhospstate("1");
- pmks.setFuflag("1");
- List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(pmks);
-
- log.info("dealOutHospInfo1 闇�瑕佸鐞嗙殑鍑洪櫌閮ㄩ棬鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhosps)
- ? patMedInhosps.size() : null);
- for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
- String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
- patMedInhosp1.setTagname(tagname);
- }
-
- //绉戝
- for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
- //鐥呬汉杞闀挎湡浠诲姟 闀挎湡浠诲姟閰嶇疆闅忚
- for(ServiceTask serviceTask : serviceTasks) {
-
- }
- //鑾峰彇鎮ｈ�呬俊鎭�
+ for (PatMedInhosp patMedInhosp1 : patList) {
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
if (Objects.isNull(patArchive)) {
- patMedInhosp1.setDeptcheckFlag("2");
- patMedInhosp1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ // 涓変釜缁村害閮芥爣璁颁负澶辫触
+ markAllFlagsAsError(patMedInhosp1, "鎮ｈ�呭熀鏈俊鎭负绌�");
continue;
}
- try {
- //鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟
- ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
- serviceTaskdept.setLongtask(1L);
- serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
- serviceTaskdept.setDeptType("1");
- 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);
+ // 鈹�鈹� 缁村害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
// public int dealOutHospInfo() {
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 610243b..3934f1a 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -1091,4 +1091,16 @@
) AS combined_data
</select>
+ <!-- 鏌ヨ涓変釜缁村害浠绘剰涓�涓湭澶勭悊鐨勫嚭闄㈡偅鑰� -->
+ <select id="selectNeedProcessList" resultMap="PatMedInhospResult">
+ SELECT * FROM pat_med_inhosp
+ WHERE inhospstate = '1'
+ AND fuflag = '1'
+ AND del_flag = '0'
+ AND (
+ dept_check_flag = '0'
+ OR ward_check_flag = '0'
+ OR diag_check_flag = '0'
+ )
+ </select>
</mapper>
--
Gitblit v1.9.3