From 55d724ddd52b2acb6e7ee2d291e04e4b6d96ad19 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 09 十一月 2026 16:06:47 +0800
Subject: [PATCH] sync: service_subtask 科室病区字段重命名对齐
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 94 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 82 insertions(+), 12 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 60785ee..06bb890 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
@@ -28,6 +28,7 @@
import com.smartor.common.LSHospTokenUtil;
import com.smartor.common.MtSubmitSmUtil;
import com.smartor.common.QwenLLMUtil;
+import com.smartor.common.SpecificArchiveConstants;
import com.smartor.domain.*;
import com.smartor.domain.VO.ServiceSubtaskDetailTraceVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -142,6 +143,12 @@
@Autowired
private ServiceSubtaskMapper serviceSubtaskMapper;
+
+ @Autowired
+ private ServiceTaskScheduleMapper serviceTaskScheduleMapper;
+
+ @Autowired
+ private ServiceTaskScheduleDetailMapper serviceTaskScheduleDetailMapper;
@Autowired
private RedisCache redisCache;
@@ -1322,10 +1329,10 @@
SysDept sysDeptVo = new SysDept();
List<SysDept> sysDepts = new ArrayList<>();
- if (ObjectUtils.isNotEmpty(serviceSubtask.getDeptcode())) {
+ if (ObjectUtils.isNotEmpty(serviceSubtask.getLeaveldeptcode())) {
sysDeptVo.setDeptType("1");
sysDeptVo.setOrgid(serviceSubtask.getOrgid());
- sysDeptVo.setDeptCode(serviceSubtask.getDeptcode());
+ sysDeptVo.setDeptCode(serviceSubtask.getLeaveldeptcode());
sysDeptService.selectDeptList(sysDeptVo);
} else if (ObjectUtils.isNotEmpty(serviceSubtask.getLeavehospitaldistrictcode())) {
sysDeptVo.setDeptType("2");
@@ -1693,6 +1700,25 @@
}
}
+ /**
+ * 閲囬泦涓芥按甯傚骞间繚鍋ラ櫌闂ㄨ瘖鎺ヨ瘖瀹屾垚璁板綍锛屽苟鎸夐厤缃敓鎴愬绉�/鍎跨妗ｆ銆�
+ * 瀹氭椂浠诲姟榛樿閲囬泦鏄ㄥぉ 00:00:00 ~ 浠婂ぉ 00:00:00銆�
+ */
+ public void collectMchArchive() {
+ try {
+ LocalDateTime todayZero = LocalDateTime.now().with(LocalTime.MIN);
+ LocalDateTime yesterdayZero = todayZero.minusDays(1);
+ Date startTime = Date.from(yesterdayZero.atZone(ZoneId.systemDefault()).toInstant());
+ Date endTime = Date.from(todayZero.atZone(ZoneId.systemDefault()).toInstant());
+ log.info("銆恈ollectMchArchive銆戝紑濮嬮噰闆嗕附姘村骞奸棬璇婃帴璇婂畬鎴愯褰�");
+ ichService.collectMchOuthospAndGenerateArchive(
+ SpecificArchiveConstants.LISHUI_MCH_ORG_ID, startTime, endTime);
+ log.info("銆恈ollectMchArchive銆戜附姘村骞奸棬璇婃帴璇婂畬鎴愯褰曢噰闆嗙粨鏉�");
+ } catch (Exception e) {
+ log.error("銆恈ollectMchArchive銆戜附姘村骞奸棬璇婃帴璇婂畬鎴愯褰曢噰闆嗗紓甯�", e);
+ }
+ }
+
public void collectHISYesterday() {
try {
// 鑾峰彇鏄ㄥぉ0鐐瑰埌浠婂ぉ0鐐圭殑鏃堕棿鑼冨洿
@@ -1912,25 +1938,69 @@
if (Objects.isNull(serviceSubtask) || CollectionUtils.isEmpty(serviceSubtaskPreachforms)) {
return false;
}
- // 鍩哄噯鏃跺埢锛氬嚭闄㈡椂闂� + 鍙戦�佹棩锛坰endDay 缂虹渷鎸� 1锛夛紝骞跺厹搴曢伩鍏� NPE/鑴忔暟鎹�
- if (serviceSubtask.getEndtime() == null) {
- log.warn("銆恑sSubtaskDeadline銆憇ubid锛歿} endtime涓虹┖锛屾棤娉曡绠楄秴鏃讹紝鎸夋湭瓒呮椂澶勭悊", serviceSubtask.getId());
- return false;
- }
ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
- int sendDay = serviceTask != null && serviceTask.getSendDay() != null ? serviceTask.getSendDay().intValue() : 1;
- Date deadline = DateUtils.addDays(serviceSubtask.getEndtime(), sendDay);
- int sumCompensateTime = CollectionUtils.isEmpty(serviceSubtaskPreachforms) ? 0 : serviceSubtaskPreachforms.stream()
+ Date deadline;
+ if (serviceTask != null && "5".equals(serviceTask.getAppltype())) {
+ // 浠诲姟缁勶細鍩哄噯 = schedule_benchmark 瑙ｆ瀽鍑虹殑鏃堕棿 + day_offset锛屼笉鍙犲姞 send_day
+ deadline = resolveTaskGroupDeadlineBase(serviceSubtask);
+ if (deadline == null) {
+ log.warn("銆恑sSubtaskDeadline銆憇ubid锛歿} 浠诲姟缁勫熀鍑嗘椂闂翠负绌猴紝鏃犳硶璁＄畻瓒呮椂锛屾寜鏈秴鏃跺鐞�", serviceSubtask.getId());
+ return false;
+ }
+ } else {
+ // 闈炰换鍔＄粍锛氬熀鍑� = 鍑洪櫌鏃堕棿 + 鍙戦�佹棩锛坰endDay 缂虹渷鎸� 1锛�
+ if (serviceSubtask.getEndtime() == null) {
+ log.warn("銆恑sSubtaskDeadline銆憇ubid锛歿} endtime涓虹┖锛屾棤娉曡绠楄秴鏃讹紝鎸夋湭瓒呮椂澶勭悊", serviceSubtask.getId());
+ return false;
+ }
+ int sendDay = serviceTask != null && serviceTask.getSendDay() != null ? serviceTask.getSendDay().intValue() : 1;
+ deadline = DateUtils.addDays(serviceSubtask.getEndtime(), sendDay);
+ }
+ int sumCompensateTime = serviceSubtaskPreachforms.stream()
.mapToInt(x -> NumberUtils.toInt(x.getCompensateTime(), 0))
.sum();
sumCompensateTime = sumCompensateTime + 1;
- // 鍙ˉ鍋挎渶鍚庝竴姝ヨ嚜韬殑琛ュ伩鏃堕棿锛堝ぉ锛夛紝鑴忓�间竴寰嬫寜 0 鍏滃簳
+ // 琛ュ伩鏃堕棿鑴忓�间竴寰嬫寜 0 鍏滃簳锛屾渶鍚庡啀鍔� 1 澶╁闄�
deadline = DateUtils.addDays(deadline, sumCompensateTime);
- // 鍑洪櫌(鍙戦��)鏃堕棿 + 鏈琛ュ伩鏃堕棿 灏忎簬褰撳墠鏃堕棿 -> 瓒呮椂
return deadline.getTime() < new Date().getTime();
}
/**
+ * 浠诲姟缁勫熀鍑嗘椂闂达細鎸� schedule_benchmark 瑙ｆ瀽鍚庡姞 day_offset銆�
+ * 0/鍏跺畠-鑷畾涔夋椂闂� 1-鍏ラ櫌 2-鍑洪櫌 3-灏辫瘖 4-鍏ョ粍
+ */
+ private Date resolveTaskGroupDeadlineBase(ServiceSubtask serviceSubtask) {
+ if (serviceSubtask.getScheduleId() == null || serviceSubtask.getScheduleDetailId() == null) {
+ return null;
+ }
+ ServiceTaskSchedule schedule = serviceTaskScheduleMapper.selectServiceTaskScheduleById(serviceSubtask.getScheduleId());
+ ServiceTaskScheduleDetail detail = serviceTaskScheduleDetailMapper.selectServiceTaskScheduleDetailById(serviceSubtask.getScheduleDetailId());
+ if (schedule == null || detail == null || detail.getDayOffset() == null) {
+ return null;
+ }
+ Date base;
+ Integer benchmark = schedule.getScheduleBenchmark() == null ? 0 : schedule.getScheduleBenchmark();
+ switch (benchmark) {
+ case 1:
+ base = serviceSubtask.getStarttime();
+ break;
+ case 2:
+ base = serviceSubtask.getEndtime();
+ break;
+ case 3:
+ base = serviceSubtask.getAdmindate();
+ break;
+ case 4:
+ base = serviceSubtask.getCreateTime();
+ break;
+ default:
+ base = schedule.getScheduleBenchmarkCustomTime();
+ break;
+ }
+ return base == null ? null : DateUtils.addDays(base, detail.getDayOffset());
+ }
+
+ /**
* 澶勭悊瓒呮椂闅忚浠诲姟
* <p>
* 鎵弿銆屽嚭闄㈡弧 deadlineDay 澶╀粛鏈畬鎴愩�嶇殑棣栨闅忚浠诲姟锛坰endstate=7 + visit_count=1锛夛紝
--
Gitblit v1.9.3