完善可销毁药品信息

jmai-physic/src/main/java/com/jmai/physic/vo/PhysicDestroyNumVO.java

@@ -6,17 +6,24 @@ import lombok.Data;
 
 
 @Data
 @Data
 public class PhysicDestroyNumVO {
 public class PhysicDestroyNumVO {
-
-
     @ApiModelProperty(value = "药品名称")
     @ApiModelProperty(value = "药品名称")
     private String physicName;
     private String physicName;
-    @ApiModelProperty(value = "规格")
+    @ApiModelProperty(value = "药品规格")
     private String physicSpec;
     private String physicSpec;
-    @ApiModelProperty(value = "批号")
-    private String batchNo;
+    @ApiModelProperty(value = "药品类型")
+    private String physicType;
+    @ApiModelProperty(value = "生产厂家")
     private String factoryName;
     private String factoryName;
+    @ApiModelProperty(value = "单位")
     private String unit;
     private String unit;
-    private String remark;
+    @ApiModelProperty(value = "过期日期")
+    private String expireDate;
+
+    @ApiModelProperty(value = "批号")
+    private String batchNo;
     @ApiModelProperty(value = "剩余数量/可销毁数量")
     @ApiModelProperty(value = "剩余数量/可销毁数量")
     private Integer destroyNum;
     private Integer destroyNum;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }
 }

jmai-physic/src/main/resources/mapper/PhysicStorageAmpouleMapper.xml

@@ -46,9 +46,11 @@
         SELECT
         SELECT
             s.physic_name,
             s.physic_name,
             s.physic_spec,
             s.physic_spec,
+            s.physic_type,
             s.batch_no,
             s.batch_no,
             s.factory_name,
             s.factory_name,
             s.unit,
             s.unit,
+            s.expire_date,
             (IFNULL(s.total_physic_num, 0) - IFNULL(d.total_destroy_num, 0)) AS destroyNum
             (IFNULL(s.total_physic_num, 0) - IFNULL(d.total_destroy_num, 0)) AS destroyNum
         FROM (
         FROM (
             -- 按药品名称、规格、批号、厂家分组统计physic_storage_ampoule表中的physic_num数量
             -- 按药品名称、规格、批号、厂家分组统计physic_storage_ampoule表中的physic_num数量