From ceb6cdffdd5ed0f2b2d83fd5c2286c50a950e910 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 20 七月 2024 17:00:48 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
index 5066add..e8d3cea 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
@@ -1,5 +1,7 @@
package com.smartor.service.impl;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.SvyLibScript;
@@ -13,6 +15,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -50,25 +53,26 @@
*/
@Override
public List<SvyLibScript> selectSvyLibScriptList(SvyLibScript svyLibTopic) {
- //娣诲姞棰樼洰
-
- List<SvyLibScript> svyLibTopics = svyLibTopicMapper.selectSvyLibScriptList(svyLibTopic);
+ List<SvyLibScript> svyLibScripts = svyLibTopicMapper.selectSvyLibScriptList(svyLibTopic);
//鑾峰彇棰樼洰閫夐」
- for (int j = 0; j < svyLibTopics.size(); j++) {
- log.info("闂id涓猴細{}", svyLibTopics.get(j).getSvyscriptId());
- if (StringUtils.isNotEmpty(svyLibTopics.get(j).getScripttype()) && svyLibTopics.get(j).getScripttype().equals("3") || svyLibTopics.get(j).getId() == null) {
+ for (int j = 0; j < svyLibScripts.size(); j++) {
+ log.info("闂id涓猴細{}", svyLibScripts.get(j).getId());
+ if (StringUtils.isNotEmpty(svyLibScripts.get(j).getIcd10Name()))
+ svyLibScripts.get(j).setIcd10NameList(JSONArray.parseArray(svyLibScripts.get(j).getIcd10Name(), String.class));
+
+ if (StringUtils.isNotEmpty(svyLibScripts.get(j).getScriptType()) && svyLibScripts.get(j).getScriptType().equals("3") || svyLibScripts.get(j).getId() == null) {
//浣滅瓟棰橈紝涓嶉渶瑕侀�夐」
continue;
} else {
SvyLibScriptOption svyLibTopicoption = new SvyLibScriptOption();
- svyLibTopicoption.setTopicid(svyLibTopics.get(j).getId());
+ svyLibTopicoption.setTopicid(svyLibScripts.get(j).getId());
List<SvyLibScriptOption> svyLibTopicoptions = svyLibScriptOptionMapper.selectSvyLibScriptOptionList(svyLibTopicoption);
//灏嗘煡璇㈠嚭鐨勯�夐」鐩斁鍒伴鐩腑
- svyLibTopics.get(j).setSvyLibScriptOptions(svyLibTopicoptions);
+ svyLibScripts.get(j).setSvyLibScriptOptions(svyLibTopicoptions);
}
}
- return svyLibTopics;
+ return svyLibScripts;
}
/**
@@ -87,6 +91,10 @@
@Override
public Integer saveOrUpdateScript(SvyLibScript svyLibTopic) {
Integer i = null;
+ if (CollectionUtils.isNotEmpty(svyLibTopic.getIcd10NameList()) && svyLibTopic.getIcd10NameList().size() > 0) {
+ //灏嗘暟缁勮浆鎴愬瓧绗︿覆
+ svyLibTopic.setIcd10Name(JSON.toJSONString(svyLibTopic.getIcd10NameList()));
+ }
//瀵归鐩繘琛屽鐞�
if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 1) {
@@ -112,7 +120,7 @@
svyLibScriptOptionMapper.updateSvyLibScriptOption(svyLibTopicoption);
} else if (svyLibTopicoption.getIsoperation() != null && svyLibTopicoption.getIsoperation() == 3) {
//鍒犻櫎
- svyLibScriptOptionMapper.deleteSvyLibScriptOptionByOptionid(svyLibTopicoption.getOptionid());
+ svyLibScriptOptionMapper.deleteSvyLibScriptOptionByOptionid(svyLibTopicoption.getId());
}
}
}
--
Gitblit v1.9.3