From 7245942e7b3801054f42f19f3cf05714a3639a26 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 01 七月 2026 17:41:20 +0800
Subject: [PATCH] 【景宁】任务组开发
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 21f547c..40a747d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -16,6 +16,7 @@
import com.ruoyi.system.mapper.SysConfigMapper;
import com.smartor.common.FtpService;
import com.smartor.common.MtSubmitSmUtil;
+import com.smartor.common.ScheduleSubtaskBuilder;
import com.smartor.config.PhoneUtils;
import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
import com.smartor.domain.*;
@@ -119,7 +120,7 @@
private IServiceTaskScheduleService serviceTaskScheduleService;
@Autowired
- private com.smartor.common.ScheduleSubtaskBuilder scheduleSubtaskBuilder;
+ private ScheduleSubtaskBuilder scheduleSubtaskBuilder;
@Autowired
private FtpService ftpService;
@@ -747,8 +748,12 @@
scheduleVO.setOrgid(serviceTask.getOrgid());
scheduleVO.setCampusid(serviceTask.getCampusid());
scheduleVO.setCreateBy(serviceTask.getCreateBy());
- scheduleVO.setDeptcodes(serviceTask.getDeptcode());
- scheduleVO.setLeavehospitaldistrictcode(serviceTask.getLeavehospitaldistrictcode());
+
+ scheduleVO.setDeptCodes(serviceTaskVO.getDeptcode());
+ scheduleVO.setWardCodes(serviceTaskVO.getLeavehospitaldistrictcode());
+ scheduleVO.setIcd10Codes(serviceTaskVO.getIcd10code());
+ scheduleVO.setOplevelCodes(serviceTaskVO.getOplevelcode());
+
log.info("----serviceTaskSchedule鐨勫�间负锛歿}", scheduleVO);
serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
} else {
@@ -846,7 +851,7 @@
List<ServiceTaskScheduleDetail> detailList =
serviceTaskScheduleService.selectDetailByScheduleid(schedule.getId());
scheduleSubtaskBuilder.buildSubtasksForPatient(
- serviceTask, serviceTaskVO, schedule, detailList, patTaskRelevance, serviceSubtask);
+ serviceTask, serviceTaskVO.getPreachformList(), schedule, detailList, patTaskRelevance, serviceSubtask);
continue;
}
@@ -1076,6 +1081,10 @@
scheduleVO.setTaskid(serviceTask.getTaskid());
scheduleVO.setOrgid(serviceTask.getOrgid());
scheduleVO.setCampusid(serviceTask.getCampusid());
+ scheduleVO.setDeptCodes(serviceTaskVO.getDeptcode());
+ scheduleVO.setWardCodes(serviceTaskVO.getLeavehospitaldistrictcode());
+ scheduleVO.setIcd10Codes(serviceTaskVO.getIcd10code());
+ scheduleVO.setOplevelCodes(serviceTaskVO.getOplevelcode());
scheduleVO.setCreateBy(serviceTask.getUpdateBy());
serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
}
@@ -1142,7 +1151,7 @@
serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
serviceSubtask.setCreateBy(serviceTask.getUpdateBy());
scheduleSubtaskBuilder.buildSubtasksForPatient(
- serviceTask, serviceTaskVO, schedule, detailList, patTaskRelevance, serviceSubtask);
+ serviceTask, serviceTaskVO.getPreachformList(), schedule, detailList, patTaskRelevance, serviceSubtask);
continue;
}
if (patTaskRelevance.getIsoperation() == 2) {
--
Gitblit v1.9.3