优化Entity、DTO、VO

jmai-physic/src/main/java/com/jmai/physic/dto/PhysicAmpouleCreateReq.java

@@ -8,16 +8,13 @@ import java.util.List;
 
 @Data
 public class PhysicAmpouleCreateReq {
-
-
-
+    @ApiModelProperty(value = "类型")
     private Integer type;
-
+    @ApiModelProperty(value = "部门ID")
     private Integer deptId;
-
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-
     @ApiModelProperty(value = "药品记录集")
     private List<PhysicAmpouleCreateReq.Physic> physicList;
 
@@ -25,20 +22,20 @@ public class PhysicAmpouleCreateReq {
     public static class  Physic{
         @ApiModelProperty(value = "药品名称")
         private String physicName;
-
-        private String physicType;
-
-        @ApiModelProperty(value = "药品数量")
-        private Integer physicNum;
-
         @ApiModelProperty(value = "规格")
         private String physicSpec;
+        @ApiModelProperty(value = "药品类型")
+        private String physicType;
+        @ApiModelProperty(value = "单位")
+        private String unit;
+        @ApiModelProperty(value = "厂家名称")
+        private String factoryName;
+        @ApiModelProperty(value = "失效时间")
+        private String expireDate;
 
         @ApiModelProperty(value = "批号")
         private String batchNo;
-
-        private String unit;
-
+        @ApiModelProperty(value = "药品数量")
+        private Integer physicNum;
     }
-
 }

jmai-physic/src/main/java/com/jmai/physic/dto/PhysicApplyCreateReq.java

 package com.jmai.physic.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.jmai.sys.entity.BaseVersionEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,47 +12,35 @@ import javax.validation.constraints.NotNull;
 public class PhysicApplyCreateReq {
     private Long physicApplyId;
 
-
     @NotBlank(message = "药品名称不能为空")
     @ApiModelProperty(value = "药品名称")
     private String physicName;
-
-    @ApiModelProperty(value = "药品类型")
-    private String physicType;
-
-
     @NotBlank(message = "药品规格不能为空")
-    @ApiModelProperty(value = "药品规格")
+    @ApiModelProperty(value = "规格")
     private String physicSpec;
-
+    @ApiModelProperty(value = "药品类型")
+    private String physicType;
+    @ApiModelProperty(value = "单位")
     private String unit;
+    @NotBlank(message = "生产厂家不能为空")
+    @ApiModelProperty(value = "厂家名称")
+    private String factoryName;
+    @ApiModelProperty(value = "失效时间")
+    private String expireDate;
 
+    @ApiModelProperty(value = "批号")
+    private String batchNo;
 
     @NotNull(message = "交回空安瓿不能为空")
     @ApiModelProperty(value = "交回空安瓿数量")
     private Integer returnNum;
-
     @NotNull(message = "处方数量不能为空")
     @ApiModelProperty(value = "处方数量")
     private  Integer prescriptionNum;
-
     @NotNull(message = "请领数量不能为空")
     @ApiModelProperty(value = "请领数量")
     private Integer requisitionNum;
-
     @NotNull(message = "实发数量不能为空")
     @ApiModelProperty(value = "实发数量")
     private Integer actualNum;
-
-    @ApiModelProperty(value = "批号")
-    private String batchNo;
-
-    @NotBlank(message = "生产厂家不能为空")
-    @ApiModelProperty(value = "厂家名称")
-    private String factoryName;
-
-    @ApiModelProperty(value = "失效时间")
-    private String expireDate;
-
-
 }

jmai-physic/src/main/java/com/jmai/physic/dto/PhysicInfoDTO.java

@@ -5,31 +5,26 @@ import lombok.Data;
 
 @Data
 public class PhysicInfoDTO {
+    @ApiModelProperty(value = "药品名称")
     private String physicName;
-
+    @ApiModelProperty(value = "规格")
+    private String prepnSpec;
     @ApiModelProperty(value = "药品类型")
     private String physicType;
+    @ApiModelProperty(value = "单位")
+    private String unit;
+    @ApiModelProperty(value = "厂家名称")
+    private String factoryName;
+    @ApiModelProperty(value = "失效时间")
+    private String exprieDate;
 
+    @ApiModelProperty(value = "药品类型描述")
     private String physicTypeDesc;
-
     private String pkgSpecCrit;
-
-    private String prepnSpec;
-
     private String prepnTypeDesc;
 
-
-    @ApiModelProperty(value = "失效时间")
-    private String exprieDate;
-
-
-
-    @ApiModelProperty(value = "厂家名称")
-    private String factoryName;
-
-//    @ApiModelProperty(value = "供应商")
-//    private String supplyName;
-
+    @ApiModelProperty(value = "供应商")
+    private String supplyName;
     @ApiModelProperty(value = "批号")
     private String batchNo;
 }

jmai-physic/src/main/java/com/jmai/physic/dto/PhysicRecordCreateReq.java

@@ -10,21 +10,15 @@ import java.util.List;
 public class PhysicRecordCreateReq {
     @ApiModelProperty(value = "患者姓名")
     private String sickName;
-
     private Integer sickSex;
-
     private Integer sickAge;
-
     private String sickIdCard;
-
     private String hospitalNumber;
-
     @ApiModelProperty(value = "疾病名称")
     private String diseaseName;
 
     @ApiModelProperty(value = "处方编号")
     private String  prescriptionNumber;
-
     @ApiModelProperty(value = "处方医生")
     private String  prescriptionDoctor;
 
@@ -38,15 +32,20 @@ public class PhysicRecordCreateReq {
     public static class  Physic{
         @ApiModelProperty(value = "药品名称")
         private String physicName;
-
-        @ApiModelProperty(value = "药品数量")
-        private Integer physicNum;
-
-        @ApiModelProperty(value = "规格")
+        @ApiModelProperty(value = "药品规格")
         private String physicSpec;
+        @ApiModelProperty(value = "药品类型")
+        private String physicType;
+        @ApiModelProperty(value = "单位")
+        private String unit;
+        @ApiModelProperty(value = "厂家名称")
+        private String factoryName;
+        @ApiModelProperty(value = "失效时间")
+        private String expireDate;
 
         @ApiModelProperty(value = "批号")
         private String batchNo;
-
+        @ApiModelProperty(value = "药品数量")
+        private Integer physicNum;
     }
 }

jmai-physic/src/main/java/com/jmai/physic/dto/PhysicStorageAmpouleCreateReq.java

@@ -28,21 +28,19 @@ public class PhysicStorageAmpouleCreateReq {
     public static class  Physic{
         @ApiModelProperty(value = "药品名称")
         private String physicName;
-
-        private String physicType;
-
-        @ApiModelProperty(value = "药品数量")
-        private Integer physicNum;
-
-        @ApiModelProperty(value = "规格")
+        @ApiModelProperty(value = "药品规格")
         private String physicSpec;
+        @ApiModelProperty(value = "药品类型")
+        private String physicType;
+        @ApiModelProperty(value = "单位")
+        private String unit;
+        @ApiModelProperty(value = "厂家名称")
+        private String factoryName;
 
         @ApiModelProperty(value = "批号")
         private String batchNo;
-
-        @ApiModelProperty(value = "厂家")
-        private String factoryName;
-
+        @ApiModelProperty(value = "药品数量")
+        private Integer physicNum;
     }
 
 }

jmai-physic/src/main/java/com/jmai/physic/dto/PhysicWarehouseCreateReq.java

@@ -9,32 +9,26 @@ import javax.validation.constraints.NotBlank;
 public class PhysicWarehouseCreateReq {
     private Long physicWarehouseId;
 
+    @ApiModelProperty(value = "药品名称")
     private String physicName;
+    @ApiModelProperty(value = "药品规格")
+    private String physicSpec;
     @ApiModelProperty(value = "药品类型")
     private String physicType;
-
-    private String physicSpec;
-
+    @ApiModelProperty(value = "单位")
     private String unit;
-
-    @ApiModelProperty(value = "失效时间")
-    private String expireDate;
-
     @ApiModelProperty(value = "厂家名称")
     private String factoryName;
+    @ApiModelProperty(value = "失效时间")
+    private String expireDate;
 
     @ApiModelProperty(value = "供应商")
     private String supplyName;
-
-
-
-    @ApiModelProperty(value = "批号")
-    private String batchNo;
-
     @NotBlank(message = "凭证号不能为空")
     @ApiModelProperty(value = "凭证号")
     private String voucherNo;
-
-    @ApiModelProperty(value = "数量")
+    @ApiModelProperty(value = "批号")
+    private String batchNo;
+    @ApiModelProperty(value = "药品数量")
     private Integer physicNum;
 }

jmai-physic/src/main/java/com/jmai/physic/entity/PhysicAmpoule.java

@@ -12,43 +12,40 @@ import lombok.Data;
 @TableName("physic_ampoule")
 
 public class PhysicAmpoule extends BaseVersionEntity {
-
     @ApiModelProperty(value = "药品名称")
     private String physicName;
-
-    @ApiModelProperty(value = "药品数量")
-    private Integer physicNum;
-
     @ApiModelProperty(value = "规格")
     private String physicSpec;
+    @ApiModelProperty(value = "药品类型")
+    private String physicType;
+    @ApiModelProperty(value = "单位")
+    private String unit;
+    @ApiModelProperty(value = "厂家名称")
+    private String factoryName;
+    @ApiModelProperty(value = "失效时间")
+    private String expireDate;
 
     @ApiModelProperty(value = "批号")
     private String batchNo;
+    @ApiModelProperty(value = "药品数量")
+    private Integer physicNum;
 
-    private String factoryName;
-
-    private String unit;
-
-    private String physicType;
-
+    @ApiModelProperty(value = "类型")
     private Integer type;
-
+    @ApiModelProperty(value = "订单号")
     private String orderNo;
 
+    @ApiModelProperty(value = "部门ID")
     private Long deptId;
 
-
     private Integer batchBalance;
-
     private Integer physicBalance;
 
     private String chUser;
-
     private String fhUser;
 
     @ApiModelProperty(value = "0-待处理 1-接受退回处理  2-复核人处理")
     private Integer status;
 
-
     private String remark;
 }

jmai-physic/src/main/java/com/jmai/physic/entity/PhysicApply.java

@@ -12,37 +12,32 @@ import lombok.Data;
 public class PhysicApply extends BaseVersionEntity{
     @ApiModelProperty(value = "药品名称")
     private String physicName;
-
+    @ApiModelProperty(value = "规格")
+    private String physicSpec;
     @ApiModelProperty(value = "药品类型")
     private String physicType;
-
-    private String physicSpec;
-
+    @ApiModelProperty(value = "单位")
     private String unit;
+    @ApiModelProperty(value = "厂家名称")
+    private String factoryName;
+    @ApiModelProperty(value = "失效时间")
+    private String expireDate;
+
+    @ApiModelProperty(value = "批号")
+    private String batchNo;
 
     @ApiModelProperty(value = "交回空安瓿数量")
     private Integer returnNum;
-
     @ApiModelProperty(value = "处方数量")
     private  Integer prescriptionNum;
     @ApiModelProperty(value = "请领数量")
     private Integer requisitionNum;
-
     @ApiModelProperty(value = "实发数量")
     private Integer actualNum;
 
-    @ApiModelProperty(value = "批号")
-    private String batchNo;
-
-    private String factoryName;
-
-
-    @ApiModelProperty(value = "失效时间")
-    private String expireDate;
 
     @ApiModelProperty(value = "发药部门")
     private Long fyDeptId;
-
     @ApiModelProperty(value = "领药部门")
     private Long lyDeptId;
 

jmai-physic/src/main/java/com/jmai/physic/entity/PhysicBill.java

@@ -10,52 +10,44 @@ import lombok.Data;
 @ApiModel(description = "药品专账")
 @TableName("physic_bill")
 public class PhysicBill extends BaseVersionEntity {
-
+    @ApiModelProperty(value = "部门ID")
     private Long deptId;
 
     @ApiModelProperty(value = "药品名称")
     private String physicName;
-
+    @ApiModelProperty(value = "规格")
+    private String physicSpec;
     @ApiModelProperty(value = "药品类型")
     private String physicType;
-
-    private String physicSpec;
-
-
+    @ApiModelProperty(value = "单位")
     private String unit;
-
-    @ApiModelProperty(value = "批号")
-    private String batchNo;
-
     @ApiModelProperty(value = "厂家名称")
     private String factoryName;
     @ApiModelProperty(value = "失效时间")
     private String expireDate;
 
+    @ApiModelProperty(value = "批号")
+    private String batchNo;
     @ApiModelProperty(value = "凭证号")
     private String voucherNo;
 
-
     @ApiModelProperty(value = "1-采购入库 2-申领入库 3-申领出库")
     private Integer type;
 
-
     @ApiModelProperty(value = "收入")
     private Integer acquireNum;
-
     @ApiModelProperty(value = "发出")
     private Integer expendNum;
 
     @ApiModelProperty(value = "相关申请、入库id")
     private Long refId;
 
-
     @ApiModelProperty(value = "状态 0 -待验收 1 -已完成")
     private Integer status;
 
     private String lyUser;
-
     private String fhUser;
+
     @ApiModelProperty(value = "结存")
     private Integer balance;
     @ApiModelProperty(value = "总结存")

jmai-physic/src/main/java/com/jmai/physic/entity/PhysicStorageAmpoule.java

@@ -15,25 +15,24 @@ public class PhysicStorageAmpoule extends BaseVersionEntity {
 
     @ApiModelProperty(value = "药品名称")
     private String physicName;
-    @ApiModelProperty(value = "药品数量")
-    private Integer physicNum;
     @ApiModelProperty(value = "药品规格")
     private String physicSpec;
-    @ApiModelProperty(value = "批号")
-    private String batchNo;
+    @ApiModelProperty(value = "药品类型")
+    private String physicType;
+    @ApiModelProperty(value = "单位")
+    private String unit;
     @ApiModelProperty(value = "厂家名称")
     private String factoryName;
 
-    private String unit;
-
-    private String physicType;
+    @ApiModelProperty(value = "批号")
+    private String batchNo;
+    @ApiModelProperty(value = "药品数量")
+    private Integer physicNum;
 
     @ApiModelProperty(value = "收入")
     private Integer acquireNum;
-
     @ApiModelProperty(value = "发出")
     private Integer expendNum;
-
     @ApiModelProperty(value = "类型：1-接收，2-移至销毁")
     private Integer type;
 
@@ -50,15 +49,12 @@ public class PhysicStorageAmpoule extends BaseVersionEntity {
     private Integer recycleReceiptNum;
 
     private Integer batchBalance;
-
     private Integer physicBalance;
 
     private String jsUser;
-
     private String thUser;
 
     @ApiModelProperty(value = "状态：0-待处理、1-退出人处理、2-接收人处理")
     private Integer status;
-
     private String remark;
 }

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

 package com.jmai.physic.vo;
 
+import com.jmai.physic.entity.PhysicApply;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
 @Data
-public class PhysicApplyVO {
-
-    private Long physicApplyId;
-
-    @ApiModelProperty(value = "药品名称")
-    private String physicName;
-
-    @ApiModelProperty(value = "药品类型")
-    private String physicType;
-
-    @ApiModelProperty(value = "发药部门")
-    private String fyDeptName;
-
-    @ApiModelProperty(value = "领药部门")
-    private String lyDeptName;
-
-
-    private String physicSpec;
-
-    private String unit;
-
-
-    private Integer returnNum;
-
-    private  Integer prescriptionNum;
-
-    private Integer requisitionNum;
-
-    private Integer actualNum;
-
-    @ApiModelProperty(value = "批号")
-    private String batchNo;
-
+public class PhysicApplyVO extends PhysicApply {
     private String createName;
-
-    @ApiModelProperty(value = "状态 0 -待领药 1-待审核 2 -待发药 3 -待复核 4 -完成")
-    private Integer status;
-
-    private String fyUser;
-    private String fhUser;
-    private String lyUser;
-    private String shUser;
-    private LocalDateTime createTime;
-
-
 }

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

@@ -8,6 +8,7 @@ import java.util.List;
 @Data
 public class PhysicRecordVO  extends PhysicRecord {
     private String createName;
+    private String deptName;
 
     private List<Long> prescriptionImages;
 }

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

@@ -12,4 +12,5 @@ public class PhysicWarehouseVO extends PhysicWarehouse {
     private Long physicWarehouseId;
 
     private String createName;
+    private String deptName;
 }