From d940590c25d7381ba7bc08b068d223d7aa0b9c77 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 四月 2026 20:43:12 +0800
Subject: [PATCH] 南华附一 和 登陆优化
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 9b04a47..9ea5c27 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -165,6 +165,12 @@
@Value("${phoneEndHour}")
private Integer phoneEndHour;
+ @Autowired
+ private Icd10Mapper icd10Mapper;
+
+ @Value("${spring.profiles.active}")
+ private String active;
+
/**
* 鏌ヨ鍗曚竴浠诲姟锛堥殢璁匡級
*
@@ -615,10 +621,19 @@
ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
serviceTaskdiag.setTaskId(serviceTask.getTaskid());
serviceTaskdiag.setTaskName(serviceTask.getTaskName());
+ serviceTaskdiag.setServiceType(serviceTaskVO.getServiceType());
serviceTaskdiag.setLongtask(Long.valueOf(serviceTask.getLongTask()));
if (serviceTaskVO.getLongTask() == 1) serviceTaskdiag.setLongtask(1L);
serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code());
serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
+ //鍗楀崕闄勪竴鐨刬cd10code鏄湁閲嶅鐨勶紝鎵�浠ヤ笉鑳界敤鍗楀崕闄勪竴鐨刬cd10code鍘绘煡璇�
+ if (!active.equals("nhfy") && StringUtils.isEmpty(serviceTaskVO.getIcd10name())) {
+ Icd10 icd10 = new Icd10();
+ icd10.setIcdcode(serviceTaskVO.getIcd10code());
+ List<Icd10> icd10s = icd10Mapper.selectIcd10List(icd10);
+ if (CollectionUtils.isNotEmpty(icd10s))
+ serviceTaskdiag.setIcd10name(icd10s.get(0).getIcdname());
+ }
serviceTaskdiag.setGuid(serviceTask.getGuid());
serviceTaskdiag.setOrgid(serviceTask.getOrgid());
serviceTaskdiag.setCreateTime(new Date());
@@ -756,7 +771,8 @@
}
}
- } else if (serviceTaskVO.getIsoperation() != null && serviceTaskVO.getIsoperation() == 2) {
+ }
+ else if (serviceTaskVO.getIsoperation() != null && serviceTaskVO.getIsoperation() == 2) {
//浠诲姟淇敼
if (ObjectUtils.isNotEmpty(serviceTaskVO.getSendTimeslot()))
serviceTask.setSendTimeSlot(JSON.toJSONString(serviceTaskVO.getSendTimeslot()));
@@ -4182,7 +4198,7 @@
}
// 1. 鏌ヨ鍒嗙粍缁熻锛堝彂閫佹�婚噺銆佸彂閫佹垚鍔熼噺銆佸凡璇婚噺锛�
List<Map<String, Object>> groupStats = serviceSubtaskMapper.getHeLibraryCount(heLibraryCountVO);
-
+
// 2. 璁＄畻鍚勭粍鐨勫彂閫佹垚鍔熺巼鍜屽凡璇荤巼
List<Map<String, Object>> result = new ArrayList<>();
if (CollectionUtils.isNotEmpty(groupStats)) {
@@ -4199,7 +4215,7 @@
result.add(row);
}
}
-
+
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("list", result);
resultMap.put("total", result.size());
--
Gitblit v1.9.3