From 6e3d0a2097a4d841e941a84ec54780a67eb60ba1 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 10 七月 2026 09:22:56 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 132 +++++++++++++------------------------------
1 files changed, 41 insertions(+), 91 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 14acb1a..b81b373 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.*;
@@ -28,6 +29,7 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.Cacheable;
@@ -119,7 +121,7 @@
private IServiceTaskScheduleService serviceTaskScheduleService;
@Autowired
- private com.smartor.common.ScheduleSubtaskBuilder scheduleSubtaskBuilder;
+ private ScheduleSubtaskBuilder scheduleSubtaskBuilder;
@Autowired
private FtpService ftpService;
@@ -408,6 +410,13 @@
serviceSubtaskRes.setSendstateView(1L);
if (serviceSubtaskRes.getSendstate() == 6) serviceSubtaskRes.setSendstateView(2L);
if (serviceSubtaskRes.getSendstate() == 4) serviceSubtaskRes.setSendstateView(3L);
+ // 濉厖褰撳墠琛ュ伩
+ if (StringUtils.isEmpty(serviceSubtask.getCurrentPreachform())){
+ if(StringUtils.isNotEmpty(serviceSubtask.getPreachform())){
+ //榛樿鍙栫涓�涓�
+ serviceSubtaskRes.setCurrentPreachform(serviceSubtask.getPreachform().split(",")[0]);
+ }
+ }
serviceSubtaskResList.add(serviceSubtaskRes);
}
return serviceSubtaskResList;
@@ -721,16 +730,27 @@
ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
- serviceTaskoper.setOplevelcode(serviceTaskVO.getOplevelcode());
+// serviceTaskoper.setOplevelcode(serviceTaskVO.getOplevelcode());
serviceTaskoper.setTaskId(serviceTask.getTaskid());
serviceTaskoper.setTaskName(serviceTask.getTaskName());
serviceTaskoper.setLongtask(Long.valueOf(serviceTask.getLongTask()));
serviceTaskoper.setGuid(serviceTask.getGuid());
serviceTaskoper.setOrgid(serviceTask.getOrgid());
serviceTaskoper.setCreateTime(new Date());
+ //閰嶇疆绉戝銆佺梾鍖�
+ serviceTaskoper.setDeptCode(serviceTaskVO.getDeptcode());
+ serviceTaskoper.setDeptName(serviceTaskVO.getDeptname());
+ serviceTaskoper.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
+ serviceTaskoper.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
+ //澶氶�夋墜鏈瓑绾�
if (StringUtils.isNotEmpty(serviceTaskVO.getOplevelcode())) {
- log.info("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
- serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ String[] opLevelcodes = serviceTaskVO.getOplevelcode().split(",");
+ for (String opLevelcode : opLevelcodes) {
+ //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
+ log.info("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
+ serviceTaskoper.setOplevelcode(opLevelcode);
+ serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ }
}
} else if (serviceTaskVO.getAppltype().equals("5")) {
@@ -747,10 +767,14 @@
scheduleVO.setOrgid(serviceTask.getOrgid());
scheduleVO.setCampusid(serviceTask.getCampusid());
scheduleVO.setCreateBy(serviceTask.getCreateBy());
+
+ scheduleVO.setDeptCodes(serviceTaskVO.getDeptcode());
+ scheduleVO.setWardCodes(serviceTaskVO.getLeavehospitaldistrictcode());
+ scheduleVO.setIcd10Codes(serviceTaskVO.getIcd10code());
+ scheduleVO.setOplevelCodes(serviceTaskVO.getOplevelcode());
+
log.info("----serviceTaskSchedule鐨勫�间负锛歿}", scheduleVO);
serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
- // 缁戝畾缁村害鍐欐潯浠惰〃锛堜緵 HIS 鑷姩绾冲叆鍖归厤锛宭ongtask 鎭�=1锛�
- bindDimensionCondition(serviceTask, serviceTaskVO);
} else {
ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
serviceTaskdept.setTaskId(serviceTask.getTaskid());
@@ -846,7 +870,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,11 +1100,12 @@
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);
- // 鍏堟竻鏃х淮搴︽潯浠惰〃锛屽啀鎸夋渶鏂板叆鍙傞噸鍐欙紙闃茶繃鏈熺淮搴︽畫鐣欏鑷磋绾冲叆锛�
- clearDimensionCondition(serviceTask.getTaskid());
- bindDimensionCondition(serviceTask, serviceTaskVO);
}
}
if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
@@ -1145,7 +1170,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) {
@@ -1199,86 +1224,6 @@
Map<String, Integer> map = new HashMap<>();
map.put("taskId", serviceTask.getTaskid().intValue());
return map;
- }
-
- /**
- * 浠诲姟缁勶紙appltype=5锛夌粦瀹氱淮搴﹀啓鏉′欢琛紝渚� HIS 鑷姩绾冲叆鍖归厤銆�
- * longtask 鎭�=1锛堝惁鍒欑嫭绔嬫壂鎻�/涓绘壂鎻忔寜 longtask=1 鏌ヤ笉鍒帮級銆�
- * 澶嶇敤鐜版湁 service_taskdept锛堢瀹eptType=1/鐥呭尯deptType=2锛夈�乻ervice_taskdiag锛堢柧鐥咃級銆�
- * 鎵嬫湳缁村害鏈湡涓嶅啓锛堟殏涓嶆敮鎸佽嚜鍔ㄧ撼鍏ワ級銆�
- */
- private void bindDimensionCondition(ServiceTask serviceTask, ServiceTaskVO vo) {
- // 绉戝
- if (StringUtils.isNotEmpty(vo.getDeptcode())) {
- for (String deptCode : vo.getDeptcode().split(",")) {
- if (StringUtils.isEmpty(deptCode)) continue;
- ServiceTaskdept d = new ServiceTaskdept();
- d.setTaskId(serviceTask.getTaskid());
- d.setTaskName(serviceTask.getTaskName());
- d.setOrgid(serviceTask.getOrgid());
- d.setLongtask(1L);
- d.setDeptCode(deptCode);
- d.setDeptType("1");
- d.setServiceType(vo.getServiceType());
- serviceTaskdeptService.insertServiceTaskdept(d);
- }
- }
- // 鐥呭尯
- if (StringUtils.isNotEmpty(vo.getLeavehospitaldistrictcode())) {
- for (String wardCode : vo.getLeavehospitaldistrictcode().split(",")) {
- if (StringUtils.isEmpty(wardCode)) continue;
- ServiceTaskdept d = new ServiceTaskdept();
- d.setTaskId(serviceTask.getTaskid());
- d.setTaskName(serviceTask.getTaskName());
- d.setOrgid(serviceTask.getOrgid());
- d.setLongtask(1L);
- d.setDeptCode(wardCode);
- d.setDeptType("2");
- d.setServiceType(vo.getServiceType());
- serviceTaskdeptService.insertServiceTaskdept(d);
- }
- }
- // 鐤剧梾锛堢敤 split(",")锛屽嬁鐓ф妱 appltype=3 鐜扮綉鐨� split("$") bug锛�
- if (StringUtils.isNotEmpty(vo.getIcd10code())) {
- String[] codes = vo.getIcd10code().split(",");
- String[] names = StringUtils.isNotEmpty(vo.getIcd10name()) ? vo.getIcd10name().split(",") : new String[0];
- for (int i = 0; i < codes.length; i++) {
- if (StringUtils.isEmpty(codes[i])) continue;
- ServiceTaskdiag dg = new ServiceTaskdiag();
- dg.setTaskId(serviceTask.getTaskid());
- dg.setTaskName(serviceTask.getTaskName());
- dg.setOrgid(serviceTask.getOrgid());
- dg.setLongtask(1L);
- dg.setServiceType(vo.getServiceType());
- dg.setIcd10code(codes[i]);
- dg.setIcd10name(i < names.length ? names[i] : null);
- dg.setGuid(serviceTask.getGuid());
- dg.setCreateTime(new Date());
- serviceTaskdiagService.insertServiceTaskdiag(dg);
- }
- }
- }
-
- /**
- * 浠诲姟缁勪慨鏀规椂锛屽厛杞垹璇� task 鏃х殑缁村害鏉′欢琛ㄨ褰曪紙闃茶繃鏈熺淮搴︽畫鐣欏鑷磋绾冲叆锛夈��
- */
- private void clearDimensionCondition(Long taskId) {
- ServiceTaskdept dq = new ServiceTaskdept();
- dq.setTaskId(taskId);
- List<ServiceTaskdept> depts = serviceTaskdeptService.selectServiceTaskdeptList(dq);
- if (CollectionUtils.isNotEmpty(depts)) {
- for (ServiceTaskdept d : depts) {
- serviceTaskdeptService.deleteServiceTaskdeptById(d.getId());
- }
- }
- ServiceTaskdiag gq = new ServiceTaskdiag();
- gq.setTaskId(taskId);
- List<ServiceTaskdiag> diags = serviceTaskdiagService.selectServiceTaskdiagList(gq);
- if (CollectionUtils.isNotEmpty(diags)) {
- for (ServiceTaskdiag g : diags) {
- serviceTaskdiagService.deleteServiceTaskdiagById(g.getId());
- }
- }
}
@Override
@@ -4695,6 +4640,11 @@
return resultMap;
}
+ @Override
+ public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds) {
+ return serviceSubtaskMapper.statQuestionOption(taskIds);
+ }
+
private Boolean saveServiceSubtaskDetail(ServiceSubtask serviceSubtask) {
Boolean result = true;
//3.4 濡傛灉3.1鎴�3.2涓簍rue鐨勮瘽锛屾牴鎹畉ype鍒ゆ柇浠�涔堢被鍨�
--
Gitblit v1.9.3