From efaa2a7a5b7d9d1a36f4d6a7e275d2b76f6cd9d3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 06 八月 2026 18:06:09 +0800
Subject: [PATCH] 【景宁】查询随访任务组科室关联列表、查询随访任务组疾病关联列表
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 111 insertions(+), 2 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 87fe1b8..36c346d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -86,6 +86,8 @@
@Autowired
private IServiceTaskdeptService serviceTaskdeptService;
+ @Autowired
+ private IServiceTaskmedicalService serviceTaskmedicalService;
@Autowired
private IServiceTaskdiagService serviceTaskdiagService;
@@ -396,6 +398,17 @@
}
}
serviceTaskVO.setPatTaskRelevances(patTaskRelevances);
+ if(StringUtils.isNotEmpty(serviceTaskVO.getAppltype()) && serviceTaskVO.getAppltype().equals("5")){
+ //浠诲姟缁勪俊鎭�
+ ServiceTaskSchedule schedule = serviceTaskScheduleService.selectByTaskid(serviceTaskVO.getTaskid());
+ if (ObjectUtils.isNotEmpty(schedule)) {
+ ServiceTaskScheduleVO serviceTaskScheduleVO = DtoConversionUtils.sourceToTarget(schedule, ServiceTaskScheduleVO.class);
+ List<ServiceTaskScheduleDetail> scheduleDetailList =
+ serviceTaskScheduleService.selectDetailByScheduleid(schedule.getId());
+ serviceTaskScheduleVO.setDetailList(scheduleDetailList);
+ serviceTaskVO.setServiceTaskScheduleVO(serviceTaskScheduleVO);
+ }
+ }
return serviceTaskVO;
}
@@ -600,9 +613,30 @@
* @return 缁撴灉
*/
@Override
- public int insertServiceSubtask(ServiceSubtask serviceSubtask) {
+ public Map<String, Object> insertServiceSubtask(ServiceSubtask serviceSubtask) {
serviceSubtask.setCreateTime(DateUtils.getNowDate());
- return serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+ String taskId = rsaPublicKeyExample.encryptedData(serviceSubtask.getTaskid().toString(), pub_key);
+ String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
+ String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
+ ServiceOutPath serviceOutPath = new ServiceOutPath();
+ serviceOutPath.setParam1(taskId);
+ serviceOutPath.setParam2(patid);
+ serviceOutPath.setCreateTime(new Date());
+ serviceOutPath.setParam6(subId);
+ serviceOutPath.setOrgid(serviceSubtask.getOrgid());
+ iServiceOutPathService.insertServiceOutPath(serviceOutPath);
+ //杞垚16杩涘埗
+ String format = String.format("%03X", serviceOutPath.getId());
+ serviceOutPath.setRadix(format);
+ serviceOutPath.setUpdateTime(new Date());
+ iServiceOutPathService.updateServiceOutPath(serviceOutPath);
+
+ Map<String, Object> result = new HashMap<>();
+ result.put("url", localIP + ":" + req_path + "/wt?p=" + format);
+ result.put("subId",serviceSubtask.getId());
+ return result;
}
/**
@@ -873,6 +907,36 @@
log.info("----serviceTaskSchedule鐨勫�间负锛歿}", scheduleVO);
serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
+ } else if (serviceTaskVO.getAppltype().equals("6")) {
+ ServiceTaskmedical serviceTaskmedical = new ServiceTaskmedical();
+ serviceTaskmedical.setTaskId(serviceTask.getTaskid());
+ serviceTaskmedical.setTaskName(serviceTask.getTaskName());
+ serviceTaskmedical.setServiceType(serviceTaskVO.getServiceType());
+ serviceTaskmedical.setLongtask(Long.valueOf(serviceTask.getLongTask()));
+ if (serviceTaskVO.getLongTask() == 1) serviceTaskmedical.setLongtask(1L);
+ serviceTaskmedical.setMedicalCode(serviceTaskVO.getIcd10code());
+ serviceTaskmedical.setMedicalName(serviceTaskVO.getIcd10name());
+ serviceTaskmedical.setGuid(serviceTask.getGuid());
+ serviceTaskmedical.setOrgid(serviceTask.getOrgid());
+ serviceTaskmedical.setCreateTime(new Date());
+ serviceTaskmedical.setDeptCode(serviceTaskVO.getDeptcode());
+ serviceTaskmedical.setDeptName(serviceTaskVO.getDeptname());
+ serviceTaskmedical.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
+ serviceTaskmedical.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
+ //鍗楀崕闄勪竴鐨刬cd10code鏄湁閲嶅鐨勶紝鎵�浠ヤ笉鑳界敤鍗楀崕闄勪竴鐨刬cd10code鍘绘煡璇�
+ log.info("----serviceTaskmedical鐨勫�间负锛歿}", serviceTaskmedical);
+ if (!StringUtils.isEmpty(serviceTaskVO.getMedicalName())) {
+ String[] medicalNames = serviceTaskVO.getMedicalName().split(",");
+ String[] medicalcodes = serviceTaskVO.getMedicalCode().split(",");
+ String[] medicalCompanys = serviceTaskVO.getMedicalCompany().split(",");
+ for (int i = 0; i < medicalNames.length; i++) {
+ serviceTaskmedical.setMedicalCode(medicalNames[i]);
+ serviceTaskmedical.setMedicalName(medicalcodes[i]);
+ if (ObjectUtils.isNotEmpty(medicalCompanys))
+ serviceTaskmedical.setMedicalCompany(medicalcodes[i]);
+ serviceTaskmedicalService.insertServiceTaskmedical(serviceTaskmedical);
+ }
+ }
} else {
ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
serviceTaskdept.setTaskId(serviceTask.getTaskid());
@@ -1146,6 +1210,51 @@
}
}
+ } else if (serviceTaskVO.getAppltype().equals("6")) {
+ ServiceTaskmedical serviceTaskmedical = new ServiceTaskmedical();
+ serviceTaskmedical.setTaskId(serviceTask.getTaskid());
+ serviceTaskmedical.setTaskName(serviceTask.getTaskName());
+ if (StringUtils.isEmpty(serviceTaskVO.getIcd10code())) {
+ throw new BaseException("鑽搧缂栫爜涓虹┖");
+ }
+ serviceTaskmedical.setLongtask(Long.valueOf(serviceTask.getLongTask()));
+ serviceTaskmedical.setMedicalName(serviceTaskVO.getMedicalName());
+ serviceTaskmedical.setGuid(serviceTask1.getGuid());
+ serviceTaskmedical.setServiceType(serviceTask1.getServiceType());
+ serviceTaskmedical.setOrgid(serviceTask1.getOrgid());
+ serviceTaskmedical.setDeptCode(serviceTask1.getDeptcode());
+ serviceTaskmedical.setDeptName(serviceTask1.getDeptname());
+ serviceTaskmedical.setWardCode(serviceTask1.getLeavehospitaldistrictcode());
+ serviceTaskmedical.setWardName(serviceTask1.getLeavehospitaldistrictname());
+ serviceTaskmedical.setUpdateTime(new Date());
+ if (StringUtils.isNotEmpty(serviceTaskVO.getMedicalCode())) {
+ String[] medicalCodes = serviceTaskVO.getMedicalCode().split(",");
+ String[] medicalNames = serviceTaskVO.getMedicalName().split(",");
+ String[] medicalCompany = serviceTaskVO.getMedicalCompany().split(",");
+ if (!active.equals("nhfy") && !active.equals("druid")) {
+ if (medicalCodes.length != medicalNames.length) {
+ throw new BaseException("鑽搧缂栫爜鍜岃嵂鍝佸悕绉版暟閲忎笉涓�鑷�");
+ }
+ }
+ for (int i = 0; i < medicalCodes.length; i++) {
+ //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
+ ServiceTaskmedical serviceTaskmedical1 = new ServiceTaskmedical();
+ serviceTaskmedical1.setTaskId(serviceTaskVO.getTaskid());
+ serviceTaskmedical1.setMedicalCode(medicalCodes[i]);
+ serviceTaskmedical1.setMedicalName(medicalNames[i]);
+ List<ServiceTaskmedical> serviceTaskmedicals = serviceTaskmedicalService.selectServiceTaskmedicalList(serviceTaskmedical1);
+ serviceTaskmedical.setMedicalCode(medicalCodes[i]);
+ serviceTaskmedical.setMedicalName(medicalNames[i]);
+ log.info("----serviceTaskmedical鏇存柊鐨勫�间负锛歿}", serviceTaskmedical);
+ if (CollectionUtils.isNotEmpty(serviceTaskmedicals)) {
+ serviceTaskmedical.setId(serviceTaskmedicals.get(0).getId());
+ serviceTaskmedicalService.updateServiceTaskmedical(serviceTaskmedical);
+ } else {
+ serviceTaskmedicalService.insertServiceTaskmedical(serviceTaskmedical);
+ }
+ }
+ }
+
} else if (serviceTaskVO.getAppltype().equals("4")) {
ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
// if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) {
--
Gitblit v1.9.3