up

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<ConditionDefinitionSource> statusList = Arrays.asList(ConditionDefinitionSource.values());
+        List<DiseaseManageInitDto.diseaseCategory> diseaseCategoryList = Stream.of(ConditionDefinitionSource.values())
-        List<DiseaseSourceDto> diseaseSourceDtos = new ArrayList<>();
+            .map(status -> new DiseaseManageInitDto.diseaseCategory(status.getValue(), status.getInfo()))
-        // 取得更新值
+            .collect(Collectors.toList());
-        for (ConditionDefinitionSource detail : statusList) {
+        diseaseManageInitDto.setDiseaseCategoryList(diseaseCategoryList);
-            DiseaseSourceDto diseaseSourceDto = new DiseaseSourceDto();
+        // 获取状态
-            diseaseSourceDto.setCode(detail.getCode());
+        List<DiseaseManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
-            diseaseSourceDto.setValue(detail.getValue());
+            .map(status -> new DiseaseManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
-            diseaseSourceDto.setInfo(detail.getInfo());
+            .collect(Collectors.toList());
-            diseaseSourceDtos.add(diseaseSourceDto);
+        diseaseManageInitDto.setStatusFlagOptions(statusEnumOptions);
-        }
+        return R.ok(diseaseManageInitDto);
-        return R.ok(diseaseSourceDtos);
     }
 
     /**

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<statusEnumOption> statusFlagOptions;
+    private List<diseaseCategory> 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<diseaseCategory> children = new ArrayList<>();
+
+        public diseaseCategory(Integer value, String info) {
+            this.value = value;
+            this.info = info;
+        }
+    }
+}