药品

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

@@ -117,9 +117,9 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             // 药品状态
             e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum()));
             // 活动标记
-            e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));
+//            e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));
             // 适用范围
-            e.setDomainEnum_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getDomainEnum()));
+//            e.setDomainEnum_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getDomainEnum()));
         });
 
         // 返回【药品录列表DTO】分页

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

@@ -49,7 +49,7 @@ import lombok.extern.slf4j.Slf4j;
  * @date 2025-02-20
  */
 @RestController
-@RequestMapping("/datadictionary/diagnosistreatment")
+@RequestMapping("/data-dictionary/diagnosis-treatment")
 @Slf4j
 @AllArgsConstructor
 public class DiagnosisTreatmentController {

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

@@ -77,6 +77,15 @@ public class MedicationManageDto {
     /** 药品定义 */
     private String definition;
 
+    /** 用量限定 */
+    private BigDecimal usageLimit;
+
+    /** DDD值 */
+    private String dddCode;
+
+    /** DDD单位 */
+    private String dddUnitCode;
+
     /** 药品编号 */
     private String busNo;
 
@@ -116,7 +125,7 @@ public class MedicationManageDto {
     private String unitCode;
 
     /** 最小单位 */
-    private String minUnitCode;
+//    private String minUnitCode;
 
     /** 所含耗材 */
     private String comprisedText;
@@ -170,4 +179,40 @@ public class MedicationManageDto {
     /** 产品特性 */
     private Integer characteristic;
 
+    /** 贯标国家编码 */
+    private String nationalDrugCode;
+
+    /** 拆分属性 */
+    private String partAttribute;
+
+    /** 抗生素分类 */
+    private String antibioticCode;
+
+    /** 权限限制 */
+    private Integer restrictedEnum;
+
+    /** 是否自制 */
+    private Integer selfFlag;
+
+    /** 是否抗生素 */
+    private Integer antibioticFlag;
+
+    /** 基药标识 */
+    private Integer basicFlag;
+
+    /** 生产厂家名称 */
+    private String manufacturerName;
+
+    /** 常规单位 */
+    private String baseUnitCode;
+
+    /** 当前库存数量(常规单位) */
+    private String baseQuantity;
+
+    /** 最小单位 */
+    private String minUnitCode;
+
+    /** 当前库存数量(最小单位数量) */
+    private String minQuantity;
+
 }