From 7ca6b938479aa0e58a4b2fffe9fb25cee2b9d1df Mon Sep 17 00:00:00 2001
From: liuhongrui <liuhr@ccbjb.com.cn>
Date: Tue, 25 Mar 2025 16:22:09 +0800
Subject: [PATCH] up

---
 .../impl/MedicationManageAppServiceImpl.java  | 19 +++++++++++++++----
 .../dto/MedicationManageInitDto.java          |  7 +++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
index 3448bb16..ba18dc02 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
@@ -17,7 +17,10 @@ import com.core.system.service.ISysDictTypeService;
 import com.openhis.administration.domain.Supplier;
 import com.openhis.administration.service.ISupplierService;
 import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.DeviceCategory;
+import com.openhis.common.enums.Whether;
 import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
+import com.openhis.web.datadictionary.dto.DeviceManageInitDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -99,15 +102,23 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
         // 获取药品分类
         List<SysDictData> medicalList =
             sysDictTypeService.selectDictDataByType(CommonConstants.DictName.MED_CATEGORY_CODE);
-        // 获取药品分类List
-        List<MedicationManageInitDto.dictCategoryCode> medicationListOptions = medicalList.stream()
-            .map(status -> new MedicationManageInitDto.dictCategoryCode(status.getDictValue(), status.getDictLabel()))
+        // 获取药品分类
+        List<MedicationManageInitDto.dictCategoryCode> medicationCategories = Stream.of(DeviceCategory.values())
+            .map(category -> new MedicationManageInitDto.dictCategoryCode(category.getValue(), category.getInfo()))
+            .collect(Collectors.toList());
+
+        //获取是/否 列表
+        // 获取状态
+        List<MedicationManageInitDto.statusEnumOption> statusWeatherOption = Stream.of(Whether.values())
+            .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
             .collect(Collectors.toList());
 
         medicationManageInitDto.setStatusFlagOptions(statusEnumOptions);
         medicationManageInitDto.setDomainFlagOptions(domainEnumOptions);
         medicationManageInitDto.setSupplierListOptions(supplierListOptions);
-        medicationManageInitDto.setMedicationCategoryCodeOptions(medicationListOptions);
+        medicationManageInitDto.setMedicationCategoryCodeOptions(medicationCategories);
+        medicationManageInitDto.setStatusWeatherOptions(statusWeatherOption);
+        
         return R.ok(medicationManageInitDto);
     }
 
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
index f01bb2f6..8017726a 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
@@ -25,6 +25,8 @@ public class MedicationManageInitDto {
     //单位编码
     private List<MedicationManageInitDto.dictCategoryCode> unitCodeOptions;
 
+    //是/否 状态
+    private List<statusEnumOption> statusWeatherOptions;
     /**
      * 状态
      */
@@ -72,10 +74,11 @@ public class MedicationManageInitDto {
      */
     @Data
     public static class dictCategoryCode {
-        private String value;
+        private Integer value;
         private String info;
+        List<dictCategoryCode> children = new ArrayList<>();
 
-        public dictCategoryCode(String value, String info) {
+        public dictCategoryCode(Integer value, String info) {
             this.value = value;
             this.info = info;
         }