医嘱定义表加字段

openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java

@@ -107,6 +107,12 @@ public class AdviceBaseDto {
      */
     private String adviceTableName;
 
+    /** 所属科室 */
+    private Long orgId;
+
+    /** 所在位置 */
+    private Long locationId;
+
     /**
      * 医嘱库存集合
      */

openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -20,6 +20,8 @@
                abi.volume,
                abi.method_code,
                abi.rate_code,
+               abi.org_id,
+               abi.location_id,
                abi.dose,
                abi.dose_unit_code,
                abi.supplier,
@@ -42,6 +44,8 @@
                         T2.total_volume       AS volume,
                         T2.method_code        AS method_code,
                         T2.rate_code          AS rate_code,
+                        T2.org_id             AS org_id,
+                        T2.location_id        AS location_id,
                         CAST(T2.dose AS TEXT) AS dose,
                         T2.dose_unit_code     AS dose_unit_code,
                         T3.NAME               AS supplier,
@@ -75,6 +79,8 @@
                         T1.SIZE           AS volume,
                         ''                AS method_code,
                         ''                AS rate_code,
+                        T1.org_id         AS org_id,
+                        T1.location_id    AS location_id,
                         ''                AS dose,
                         ''                AS dose_unit_code,
                         T2.NAME           AS supplier,
@@ -106,6 +112,8 @@
                         ''                AS volume,
                         ''                AS method_code,
                         ''                AS rate_code,
+                        T1.org_id         AS org_id,
+                        T1.location_id    AS location_id,
                         ''                AS dose,
                         ''                AS dose_unit_code,
                         ''                AS supplier,

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

@@ -14,40 +14,29 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum ChargeItemContext {
+public enum ChargeItemContext implements HisEnumInterface {
 
     /**
      * 采购
      */
-    PURCHASE(1, "采购"),
+    PURCHASE(1, "1", "采购"),
 
     /**
      * 药品
      */
-    MEDICATION(2, "药品"),
+    MEDICATION(2, "2", "药品"),
 
     /**
      * 耗材
      */
-    DEVICE(3, "耗材"),
+    DEVICE(3, "3", "耗材"),
 
     /**
      * 项目
      */
-    ACTIVITY(4, "项目");
+    ACTIVITY(4, "4", "项目");
 
-    private Integer value;
+    private final Integer value;
-    private String info;
+    private final String code;
-
+    private final String info;
-    public static ChargeItemContext getByValue(Integer value) {
-        if (value == null) {
-            return null;
-        }
-        for (ChargeItemContext val : values()) {
-            if (val.getValue().equals(value)) {
-                return val;
-            }
-        }
-        return null;
-    }
 }

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

@@ -46,15 +46,4 @@ public enum ChargeItemStatus implements HisEnumInterface {
     private final String code;
     private final String info;
 
-    public static ChargeItemStatus getByValue(Integer value) {
-        if (value == null) {
-            return null;
-        }
-        for (ChargeItemStatus val : values()) {
-            if (val.getValue().equals(value)) {
-                return val;
-            }
-        }
-        return null;
-    }
 }

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java

@@ -59,6 +59,12 @@ public class DeviceDefinition extends HisBaseEntity {
     /** 最小使用单位 */
     private String minUnitCode;
 
+    /** 所属科室 */
+    private Long orgId;
+
+    /** 所在位置 */
+    private Long locationId;
+
     /** 产品型号 */
     private String modelNumber;
 

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

@@ -38,6 +38,9 @@ public class Medication extends HisBaseEntity {
     /** 所属科室 */
     private Long orgId;
 
+    /** 所在位置 */
+    private Long locationId;
+
     /** 剂型 */
     private String doseFormCode;
 

openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.ActivityDefCategory;
-import com.openhis.common.enums.PublicationStatus;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -48,6 +46,12 @@ public class ActivityDefinition extends HisBaseEntity {
     /** 使用单位 */
     private String permittedUnitCode;
 
+    /** 所属科室 */
+    private Long orgId;
+
+    /** 所在位置 */
+    private Long locationId;
+
     /** 医保标记 */
     private Integer ybFlag;