From 1577fd7ee29d1b0b7eea979264d5dcdbeab52743 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 五月 2026 13:42:48 +0800
Subject: [PATCH] 1首先执行 2次要执行 如果设置了1，只生成1的，2的不生成；如果1的没有生成成功，才会生成2
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 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 d34e294..66cdb84 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -651,19 +651,13 @@
serviceTaskdiag.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
serviceTaskdiag.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
//鍗楀崕闄勪竴鐨刬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());
- }
-
log.info("----serviceTaskdiag鐨勫�间负锛歿}", serviceTaskdiag);
- if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
+ if (!StringUtils.isEmpty(serviceTaskVO.getIcd10name())) {
+ String[] Icd10Names = serviceTaskVO.getIcd10name().split(",");
String[] Icd10codes = serviceTaskVO.getIcd10code().split(",");
- for (String icd10code : Icd10codes) {
- serviceTaskdiag.setIcd10code(icd10code);
+ for (int i = 0; i < Icd10Names.length; i++) {
+ serviceTaskdiag.setIcd10code(Icd10codes[i]);
+ serviceTaskdiag.setIcd10name(Icd10Names[i]);
serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
}
}
@@ -2416,7 +2410,7 @@
* @return
*/
@Override
-// @Cacheable(value = "sfStatistics", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
+ @Cacheable(value = "sfStatistics", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
public List<ServiceSubtaskStatistic> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq) {
log.info("getSfStatistics鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
String groupKey = "drcode";
--
Gitblit v1.9.3