From 4cd55b4350e9128fbe7d5ce214cac8af94e81ca5 Mon Sep 17 00:00:00 2001 From: liupanting Date: Wed, 26 Feb 2025 17:29:23 +0800 Subject: [PATCH] up --- .../controller/DiseaseManageController.java | 33 +++++++------ .../dto/DiseaseManageInitDto.java | 49 +++++++++++++++++++ 2 files changed, 66 insertions(+), 16 deletions(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java index 320770f0..94e19dbd 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java @@ -1,10 +1,11 @@ package com.openhis.web.datadictionary.controller; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.servlet.http.HttpServletRequest; @@ -25,9 +26,9 @@ import com.openhis.common.enums.PublicationStatus; import com.openhis.common.utils.HisPageUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.datadictionary.dto.DiseaseManageDto; +import com.openhis.web.datadictionary.dto.DiseaseManageInitDto; import com.openhis.web.datadictionary.dto.DiseaseManageSelParam; import com.openhis.web.datadictionary.dto.DiseaseManageUpDto; -import com.openhis.web.datadictionary.dto.DiseaseSourceDto; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -47,24 +48,24 @@ public class DiseaseManageController { private final ConditionDefinitionMapper conditionDefinitionMapper; /** - * 病种目录分类查询 - * + * 病种目录初始化 + * * @return */ - @GetMapping("/information-category") + @GetMapping("/information-init") public R getDiseaseCategory() { + DiseaseManageInitDto diseaseManageInitDto = new DiseaseManageInitDto(); // 获取疾病目录种类 - List statusList = Arrays.asList(ConditionDefinitionSource.values()); - List diseaseSourceDtos = new ArrayList<>(); - // 取得更新值 - for (ConditionDefinitionSource detail : statusList) { - DiseaseSourceDto diseaseSourceDto = new DiseaseSourceDto(); - diseaseSourceDto.setCode(detail.getCode()); - diseaseSourceDto.setValue(detail.getValue()); - diseaseSourceDto.setInfo(detail.getInfo()); - diseaseSourceDtos.add(diseaseSourceDto); - } - return R.ok(diseaseSourceDtos); + List diseaseCategoryList = Stream.of(ConditionDefinitionSource.values()) + .map(status -> new DiseaseManageInitDto.diseaseCategory(status.getValue(), status.getInfo())) + .collect(Collectors.toList()); + diseaseManageInitDto.setDiseaseCategoryList(diseaseCategoryList); + // 获取状态 + List statusEnumOptions = Stream.of(PublicationStatus.values()) + .map(status -> new DiseaseManageInitDto.statusEnumOption(status.getValue(), status.getInfo())) + .collect(Collectors.toList()); + diseaseManageInitDto.setStatusFlagOptions(statusEnumOptions); + return R.ok(diseaseManageInitDto); } /** diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java new file mode 100644 index 00000000..8f03ee2c --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java @@ -0,0 +1,49 @@ +package com.openhis.web.datadictionary.dto; + +import java.util.ArrayList; +import java.util.List; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 疾病目录种别dto + * + * @author lpt + * @date 2025-02-25 + */ +@Data +@Accessors(chain = true) +public class DiseaseManageInitDto { + private List statusFlagOptions; + private List diseaseCategoryList; + + /** + * 状态 + */ + @Data + public static class statusEnumOption { + private Integer value; + private String info; + + public statusEnumOption(Integer value, String info) { + this.value = value; + this.info = info; + } + } + + /** + * 疾病分类 + */ + @Data + public static class diseaseCategory { + private Integer value; + private String info; + List children = new ArrayList<>(); + + public diseaseCategory(Integer value, String info) { + this.value = value; + this.info = info; + } + } +}