住院临时医嘱拆分属性追加

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

@@ -125,6 +125,11 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
             .collect(Collectors.toList());
 
+        //住院临时医嘱拆分属性的枚举
+        List<MedicationManageInitDto.statusEnumOption> tempOrderSplitPropertyOptions = Stream.of(TempOrderSplitPropertyCode.values())
+            .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+
         medicationManageInitDto.setStatusFlagOptions(statusEnumOptions);
         medicationManageInitDto.setDomainFlagOptions(domainEnumOptions);
         medicationManageInitDto.setSupplierListOptions(supplierListOptions);
@@ -132,6 +137,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
         medicationManageInitDto.setStatusWeatherOptions(statusWeatherOption);
         medicationManageInitDto.setStatusRestrictedOptions(statusRestrictedOptions);
         medicationManageInitDto.setPartAttributeEnumOptions(partAttributeEnumOptions);
+        medicationManageInitDto.setTempOrderSplitPropertyEnumOptions(tempOrderSplitPropertyOptions);
 
         return R.ok(medicationManageInitDto);
     }

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

@@ -190,8 +190,8 @@ public class MedicationManageDto {
     private Long manufacturerId;
 
     /** 供应商 */
-    @JsonSerialize(using = ToStringSerializer.class)
     @Dict(dictTable = "adm_supplier", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long supplyId;
     private String supplyId_dictText;
 
@@ -276,4 +276,8 @@ public class MedicationManageDto {
     /** 最高零售价 */
     private BigDecimal maximumRetailPrice;
 
+    /** 住院临时医嘱拆分属性 */
+    private Integer thoPartAttributeEnum;
+    private String thoPartAttributeEnum_enumText;
+
 }

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

@@ -3,6 +3,8 @@ package com.openhis.web.datadictionary.dto;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -29,6 +31,8 @@ public class MedicationManageInitDto {
     private List<statusEnumOption> statusRestrictedOptions;
     // 拆分属性
     private List<statusEnumOption> partAttributeEnumOptions;
+    //住院临时医嘱拆分属性
+    private List<statusEnumOption> tempOrderSplitPropertyEnumOptions;
 
     /**
      * 状态
@@ -63,6 +67,8 @@ public class MedicationManageInitDto {
      */
     @Data
     public static class supplierListOption {
+
+        @JsonSerialize(using = ToStringSerializer.class)
         private Long value;
         private String label;
 

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

@@ -245,4 +245,6 @@ public class MedicationManageUpDto {
     /** 基药标识 */
     private Integer basicFlag;
 
+    /** 住院临时医嘱拆分属性 */
+    private Integer thoPartAttributeEnum;
 }

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

@@ -59,6 +59,7 @@
         T6.characteristic,
         T6.national_drug_code,
         T6.part_attribute_enum,
+        T6.tho_part_attribute_enum,
         T6.antibiotic_code,
         T6.restricted_enum,
         T6.self_flag,
@@ -131,6 +132,7 @@
         T1.characteristic,
         T1.national_drug_code,
         T1.part_attribute_enum,
+        T1.tho_part_attribute_enum,
         T1.antibiotic_code,
         T1.restricted_enum,
         T1.self_flag,
@@ -225,6 +227,7 @@
         T1.characteristic,
         T1.national_drug_code,
         T1.part_attribute_enum,
+        T1.tho_part_attribute_enum,
         T1.antibiotic_code,
         T1.restricted_enum,
         T1.self_flag,

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

@@ -0,0 +1,27 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 住院临时医嘱拆分属性的枚举
+ *
+ * @author liuhr
+ *
+ * @date 2025/3/28
+ */
+@Getter
+@AllArgsConstructor
+public enum TempOrderSplitPropertyCode implements HisEnumInterface {
+
+    TEMP_ORDER_MIN_UNIT_CEIL(1, "temp_order_min_unit_ceil", "临时医嘱按最小单位每次量向上取整"),
+    TEMP_ORDER_PACKAGE(2, "temp_order_package", "临时医嘱按包装单位开立"),
+    TEMP_ORDER_MIN_UNIT_TOTAL_CEIL(3, "temp_order_min_unit_total_ceil", "临时医嘱按最小单位总量向上取整"),
+    TEMP_ORDER_PACKAGE_UNIT_CEIL(4, "temp_order_package_unit_ceil", "临时医嘱按包装单位每次量向上取整");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+}

openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java

@@ -156,4 +156,7 @@ public class MedicationDefinition extends HisBaseEntity {
     /** 基药标识 */
     private Integer basicFlag;
 
+    /** 住院临时医嘱拆分属性 */
+    private Integer thoPartAttributeEnum;
+
 }

openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java

@@ -198,5 +198,6 @@ public class MedicationDetail extends HisBaseEntity {
     private String manufacturerText;
     /** 用量限定 */
     private BigDecimal usageLimit;
-
+    /** 住院临时医嘱拆分属性 */
+    private Integer thoPartAttributeEnum;
 }