药品

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;
+
 }

openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml

@@ -20,6 +20,9 @@
         T2.dose_unit_code,
         T2.max_unit,
         T2.definition,
+        T2.usage_limit,
+        T2.ddd_code,
+        T2.ddd_unit_code,
         T1.bus_no,
         T1.name,
         T1.domain_enum,
@@ -32,7 +35,6 @@
         T1.merchandise_py_str,
         T1.merchandise_wb_str,
         T1.unit_code,
-        T1.min_unit_code,
         T1.comprised_text,
         T1.ingredient,
         T1.part_percent,
@@ -48,9 +50,24 @@
         T1.restricted_flag,
         T1.restricted_scope,
         T1.children_flag,
-        T1.characteristic
+        T1.characteristic,
+        T1.national_drug_code,
+        T1.part_attribute,
+        T1.antibiotic_code
+        T1.restricted_enum
+        T1.self_flag
+        T1.antibiotic_flag
+        T1.basic_flag
+        T1.remark,
+        T3.manufacturer_name,
+        T4.base_unit_code,
+        T4.base_quantity,
+        T4.min_unit_code,
+        T4.min_quantity
         FROM med_medication_definition T1
-        LEFT JOIN med_medication T2 on T1.id = T2.medication_def_id
+        LEFT JOIN med_medication T2 ON T1.id = T2.medication_def_id
+        LEFT JOIN adm_supplier T3 ON T1.manufacturer_id = T3.id
+        LEFT JOIN wor_inventory_item T4 ON  T1.id = T4.item_id
         <where>
             T1.delete_flag = '0'
             <if test="searchKey!=null and searchKey!='' ">
@@ -79,6 +96,7 @@
         ORDER BY T1.bus_no
         LIMIT #{pageSize} OFFSET #{offset}
     </select>
+
     <select id="getOne" resultType="com.openhis.web.datadictionary.dto.MedicationManageDto">
         SELECT T2.id,
         T2.medication_def_id,
@@ -138,6 +156,7 @@
             </if>
         </where>
     </select>
+
     <select id="getPageCount" resultType="java.lang.Long">
         SELECT COUNT(*)
         FROM med_medication_definition T1
@@ -168,6 +187,7 @@
             </if>
         </where>
     </select>
+
     <select id="getList" resultType="com.openhis.web.datadictionary.dto.MedicationManageDto">
         SELECT T2.id,
         T2.medication_def_id,
@@ -244,4 +264,5 @@
         </where>
         ORDER BY T1.bus_no
     </select>
+
 </mapper>