添加字段

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

@@ -42,6 +42,10 @@ public class AdviceInventoryDto {
     /** 产品批号 */
     private String lotNumber;
 
+    /** 库位 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationStoreId;
+
     /** 库房id */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long locationId;

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

@@ -139,6 +139,7 @@
         T1.lot_number,
         T1.price,
         T1.location_id,
+        T1.location_store_id,
         T2.NAME AS location_name
         FROM
         wor_inventory_item AS T1

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

@@ -43,6 +43,9 @@ public class MedicationRequest extends HisBaseEntity {
     /** 请求数量 */
     private Integer quantity;
 
+    /** 执行次数 */
+    private Integer executeNum;
+
     /** 请求单位编码 */
     private String unitCode;
 

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

@@ -85,6 +85,9 @@ public class DeviceRequest extends HisBaseEntity {
     /** 就诊id */
     private Long encounterId;
 
+    /** 患者ID */
+    private Long patientId;
+
     /** 用药频次 */
     private String rateCode;