From 608bdb9e55b95e9d4052f8c57ac4d92c9ecde5c3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 02 七月 2026 17:17:20 +0800
Subject: [PATCH] 【市一】任务组调试
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 20 +++++++++++++++-----
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 7 +++++++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 21 +++++++++++++++++++++
smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml | 10 +++++-----
4 files changed, 48 insertions(+), 10 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 67edc33..f31c02d 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
@@ -1502,6 +1502,27 @@
}
/**
+ * 浠诲姟缁勶紙appltype=5锛夐杞撼鍏ワ細鎵弿鏂板嚭闄㈡偅鑰咃紝鎸� schedule 缁戝畾鐨勭淮搴﹀尮閰嶄换鍔＄粍锛�
+ * 涓哄懡涓殑鎮ｈ�呮寜璁″垝鏄庣粏涓�娆℃�х敓鎴愮 0 杞� N 鏉� subtask锛屽苟缃� schedulecheck_flag=1銆�
+ * 鍚庣画杞鐢� {@link #rollTaskGroupCycle()} 璐熻矗銆�
+ * <p>
+ * 涓庝富鎵弿 dealOutHospInfo 鍒嗙锛屼簰涓嶅共鎵般�傚缓璁瘡 30 鍒嗛挓鎵ц涓�娆°��
+ */
+ public void dealTaskGroupOutHosp() {
+ log.info("銆恉ealTaskGroupOutHosp銆戝紑濮嬫壂鎻忎换鍔＄粍鏂板嚭闄㈡偅鑰�");
+ if (!port.equals("8095")) {
+ return;
+ }
+ try {
+ String config = configService.selectConfigByKey("visit.early.day");
+ iPatMedInhospService.dealOutHospInfoBySchedule(config);
+ log.info("銆恉ealTaskGroupOutHosp銆戜换鍔＄粍棣栬疆绾冲叆鎵弿瀹屾垚");
+ } catch (Exception e) {
+ log.error("銆恉ealTaskGroupOutHosp銆戜换鍔＄粍鎵弿寮傚父", e);
+ }
+ }
+
+ /**
* 浠诲姟缁勶紙appltype=5锛夊惊鐜换鍔℃粴鍔ㄨ皟搴︺��
* <p>
* 鎵弿鎵�鏈� schedule_style=1 鐨勮鍒掞紝鑻ユ湰杞� subtask 鍏ㄩ儴 finalize锛坰endstate 鈭� 1/2/3锛夛紝
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 f12c0f4..546e8b0 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -349,7 +349,7 @@
serviceTaskVo.setAppltype("5");
List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(serviceTaskVo);
- if (CollectionUtils.isEmpty(serviceTasks)) {
+ if (CollectionUtils.isNotEmpty(serviceTasks)) {
for (ServiceTask serviceTask : serviceTasks) {
if(!ObjectUtils.isEmpty(serviceTask.getTaskid())){
ServiceTaskSchedule serviceTaskSchedule = new ServiceTaskSchedule();
@@ -408,7 +408,7 @@
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp.getPatid());
if (Objects.isNull(patArchive)) {
- break;
+ continue;
}
//灏佽serviceSubtask
ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp, patArchive, config, type);
@@ -418,10 +418,15 @@
ObjectMapper objectMapper = new ObjectMapper();
preachformList = objectMapper.readValue(serviceTask.getPreachformDesc(), List.class);
}catch (Exception e){
- break;
+ log.error("浠诲姟缁刾reachformDesc瑙ｆ瀽澶辫触,taskid={},inhospid={}", serviceTask.getTaskid(), patMedInhosp.getInhospid());
}
}
scheduleSubtaskBuilder.buildSubtasksForPatient(serviceTask, serviceTaskSchedule, serviceTaskScheduleDetails, serviceSubtask, preachformList);
+ //缃杞撼鍏ユ爣璁帮紝閬垮厤涓嬫鎵弿閲嶅鐢熸垚锛堝悗缁疆娆＄敱 rollTaskGroupCycle 璐熻矗锛�
+ PatMedInhosp flagUpd = new PatMedInhosp();
+ flagUpd.setInhospid(patMedInhosp.getInhospid());
+ flagUpd.setScheduleCheckFlag("1");
+ patMedInhospMapper.updatePatMedInhosp(flagUpd);
}
}else {
//浠诲姟缁� - 鎵嬫湳闅忚
@@ -439,7 +444,7 @@
for(PatMedOperationItem patMedOperationItem : patMedOperationItems){
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOperationItem.getPatid());
if (Objects.isNull(patArchive)) {
- break;
+ continue;
}
PatMedInhosp patMedInhospVo = new PatMedInhosp();
patMedInhospVo.setPatid((patMedOperationItem.getPatid()));
@@ -460,10 +465,15 @@
ObjectMapper objectMapper = new ObjectMapper();
preachformList = objectMapper.readValue(serviceTask.getPreachformDesc(), List.class);
}catch (Exception e){
- break;
+ log.error("浠诲姟缁�(鎵嬫湳)preachformDesc瑙ｆ瀽澶辫触,taskid={}", serviceTask.getTaskid());
}
}
scheduleSubtaskBuilder.buildSubtasksForPatient(serviceTask, serviceTaskSchedule, serviceTaskScheduleDetails, serviceSubtask, preachformList);
+ //缃杞撼鍏ユ爣璁帮紝閬垮厤閲嶅鐢熸垚
+ PatMedInhosp flagUpd = new PatMedInhosp();
+ flagUpd.setInhospid(patMedInhospList.get(0).getInhospid());
+ flagUpd.setScheduleCheckFlag("1");
+ patMedInhospMapper.updatePatMedInhosp(flagUpd);
}
}
}
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index ccb334c..1550953 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -314,6 +314,13 @@
#{deptcode}
</foreach>
</if>
+ <if test="icd10codeList != null and icd10codeList.size()>0">
+ AND b.leaveicd10code IN
+ <foreach collection="icd10codeList" item="icd10code" open="(" separator=","
+ close=")">
+ #{icd10code}
+ </foreach>
+ </if>
GROUP BY
b.inhospid,
a.age,
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml
index eb142d0..a8980a6 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml
@@ -20,7 +20,7 @@
<result property="deptCodes" column="dept_codes"/>
<result property="wardCodes" column="ward_codes"/>
<result property="icd10Codes" column="icd10_codes"/>
- <result property="oplevelCodes" column="remark"/>
+ <result property="oplevelCodes" column="oplevel_codes"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
@@ -44,10 +44,10 @@
next_execute_time,
schedule_benchmark,
schedule_benchmark_custom_time,
- deptCodes,
- wardCodes,
- icd10Codes,
- oplevelCodes,
+ dept_codes,
+ ward_codes,
+ icd10_codes,
+ oplevel_codes,
remark,
del_flag,
create_by,
--
Gitblit v1.9.3