目录管理

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java

@@ -11,6 +11,7 @@ import java.util.stream.Stream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.openhis.common.enums.PermissionLimit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -111,11 +112,17 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
             .collect(Collectors.toList());
 
+        // 权限限制
+        List<MedicationManageInitDto.statusEnumOption> statusRestrictedOptions = Stream.of(PermissionLimit.values())
+            .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+
         medicationManageInitDto.setStatusFlagOptions(statusEnumOptions);
         medicationManageInitDto.setDomainFlagOptions(domainEnumOptions);
         medicationManageInitDto.setSupplierListOptions(supplierListOptions);
         medicationManageInitDto.setMedicationCategoryCodeOptions(medicationCategories);
         medicationManageInitDto.setStatusWeatherOptions(statusWeatherOption);
+        medicationManageInitDto.setStatusRestrictedOptions(statusRestrictedOptions);
 
         return R.ok(medicationManageInitDto);
     }
@@ -155,6 +162,8 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
         medicationManageDtoPage.getRecords().forEach(e -> {
             // 药品状态
             e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum()));
+            // 权限限制
+            e.setRestrictedEnum_enumText(EnumUtils.getInfoByValue(PermissionLimit.class, e.getRestrictedEnum()));
             // 活动标记
             // e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));
             // 适用范围

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java

@@ -54,7 +54,7 @@ public class DiseaseManageController {
      */
     @GetMapping("/information-init")
     public R<?> getDiseaseInit() {
-        
+
         DiseaseManageInitDto diseaseManageInitDto = new DiseaseManageInitDto();
         // 获取疾病目录种类
         List<DiseaseManageInitDto.diseaseCategory> diseaseCategoryList = Stream.of(ConditionDefinitionSource.values())

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java

@@ -30,16 +30,25 @@ public class MedicationManageDto {
     private Long medicationDefId;
 
     /** 药品状态 */
-//    private PublicationStatus statusEnum;
     private Integer statusEnum;
     private String statusEnum_enumText;
 
     /** 所属科室 */
+    @Dict(dictTable = "adm_organization",dictCode = "id",dictText = "name")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
+    private String orgId_dictText;
+
+    /** 所在位置 */
+    @Dict(dictTable = "adm_location",dictCode = "id",dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    private String locationId_dictText;
 
     /** 剂型 */
+    @Dict(dictCode = "dose_form_code")
     private String doseFormCode;
+    private String doseFormCode_dictText;
 
     /** 规格 */
     private String totalVolume;
@@ -61,10 +70,14 @@ public class MedicationManageDto {
     private Date expirationDate;
 
     /** 用法 */
+    @Dict(dictCode = "method_code")
     private String methodCode;
+    private String methodCode_dictText;
 
     /** 用药频次 */
+    @Dict(dictCode = "rate_code")
     private String rateCode;
+    private String rateCode_dictText;
 
     /** 单次剂量 */
     private BigDecimal dose;
@@ -85,7 +98,9 @@ public class MedicationManageDto {
     private String dddCode;
 
     /** DDD单位 */
+    @Dict(dictCode = "unit_code")
     private String dddUnitCode;
+    private String dddUnitCode_dictText;
 
     /** 药品编号 */
     private String busNo;
@@ -127,7 +142,9 @@ public class MedicationManageDto {
     private String unitCode;
 
     /** 最小单位 */
+    @Dict(dictCode = "unit_code")
     private String minUnitCode;
+    private String minUnitCode_dictText;
 
     /** 所含耗材 */
     private String comprisedText;
@@ -171,7 +188,9 @@ public class MedicationManageDto {
 
     /** 供应商 */
     @JsonSerialize(using = ToStringSerializer.class)
+    @Dict(dictTable = "adm_supplier",dictCode = "id",dictText = "name")
     private Long supplyId;
+    private String supplyId_dictText;
 
     /** 是否限制使用 */
     @Dict(dictCode = "sys_yes_no")
@@ -196,19 +215,30 @@ public class MedicationManageDto {
     private String partAttribute;
 
     /** 抗生素分类 */
+
+    @Dict(dictCode = "antibiotic_type_code")
     private String antibioticCode;
+    private String antibioticCode_dictText;
+
 
     /** 权限限制 */
     private Integer restrictedEnum;
+    private String restrictedEnum_enumText;
 
     /** 是否自制 */
+    @Dict(dictCode = "sys_yes_no")
     private Integer selfFlag;
+    private String selfFlag_dictText;
 
     /** 是否抗生素 */
+    @Dict(dictCode = "sys_yes_no")
     private Integer antibioticFlag;
+    private String antibioticFlag_dictText;
 
     /** 基药标识 */
+    @Dict(dictCode = "sys_yes_no")
     private Integer basicFlag;
+    private String basicFlag_dictText;
 
     /** 生产厂家名称 */
     private String manufacturerName;
@@ -217,7 +247,9 @@ public class MedicationManageDto {
     private String baseUnitCode;
 
     /** 当前库存数量(常规单位) */
+    @Dict(dictCode = "unit_code")
     private String baseQuantity;
+    private String baseQuantity_dictText;
 
     /** 当前库存数量(最小单位数量) */
     private String minQuantity;

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java

@@ -23,9 +23,10 @@ public class MedicationManageInitDto {
     private List<MedicationManageInitDto.dictCategoryCode> medicationCategoryCodeOptions;
     // 单位编码
     private List<MedicationManageInitDto.dictCategoryCode> unitCodeOptions;
-
     // 是/否 状态
     private List<statusEnumOption> statusWeatherOptions;
+    // 权限限制
+    private List<statusEnumOption> statusRestrictedOptions;
 
     /**
      * 状态

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java

@@ -157,6 +157,9 @@ public class MedicationManageUpDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long manufacturerId;
 
+    /** 生产厂商文本 */
+    private String manufacturerText;
+
     /** 供应商 */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long supplyId;

openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java

@@ -0,0 +1,24 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 权限限制
+ *
+ * @author liuhr
+ * @date 2025/3/25
+ */
+@Getter
+@AllArgsConstructor
+public enum PermissionLimit implements HisEnumInterface  {
+    UNRESTRICTED(1, "unrestricted", "非限制使用"),
+    RESTRICTED(2, "restricted", "限制使用"),
+    SPECIAL(3, "special", "特殊使用");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+}