src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeQuery.java

@@ -1,14 +1,11 @@
 package com.syjiaer.clinic.server.entity.charge.dto;
 
-import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 @Data
-public class ChargeQuery extends PageQuery {
-    @ApiModelProperty("患者名称")
+public class ChargeQuery {
  private String patientName;
-    @ApiModelProperty("患者id")
+ private Integer pageNum;
+ private Integer pageSize;
  private Integer patientId;
 
 }

src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeSaveDto.java

@@ -17,6 +17,7 @@ import java.util.List;
 @Setter
 public class ChargeSaveDto {
     @ApiModelProperty("自增id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     @ApiModelProperty("患者id")

src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeOrderPrintVo.java

@@ -3,22 +3,15 @@ package com.syjiaer.clinic.server.entity.charge.vo;
 import com.syjiaer.clinic.server.entity.charge.ChargeGoodsList;
 import com.syjiaer.clinic.server.entity.charge.ChargeItemList;
 import com.syjiaer.clinic.server.entity.charge.ChargeSocialPayLog;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 @Data
 public class ChargeOrderPrintVo {
-    @ApiModelProperty("诊所名称")
     private String sortName;
-    @ApiModelProperty("订单信息")
     private ChargePrintOrderVo chargeOrder;
-    @ApiModelProperty("用户信息")
     private PatientPrintInfoVo patientInfo;
-    @ApiModelProperty("商品详情")
     private List<ChargeGoodsList> chargeGoodsLists;
-    @ApiModelProperty("服务详情")
     private List<ChargeItemList> chargeItemLists;
-    @ApiModelProperty("医保付费信息")
     private ChargeSocialPayLog chargeSocialPayLog;
 }

src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargePrintOrderVo.java

@@ -2,7 +2,6 @@ package com.syjiaer.clinic.server.entity.charge.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.syjiaer.clinic.server.entity.charge.ChargeOrder;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -10,6 +9,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 @Data
 public class ChargePrintOrderVo extends ChargeOrder {
-    @ApiModelProperty("销售人名称")
+
     private String salePersonName;
 }

src/main/java/com/syjiaer/clinic/server/entity/charge/vo/PatientPrintInfoVo.java

@@ -1,7 +1,6 @@
 package com.syjiaer.clinic.server.entity.charge.vo;
 
 import com.syjiaer.clinic.server.entity.patient.PatientInfo;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -10,6 +9,5 @@ import java.time.LocalDateTime;
 
 @Data
 public class PatientPrintInfoVo extends PatientInfo {
-    @ApiModelProperty("性别字符串")
     private String sexStr;
 }

src/main/java/com/syjiaer/clinic/server/entity/common/dto/CommonLogQuery.java

@@ -1,18 +1,15 @@
 package com.syjiaer.clinic.server.entity.common.dto;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
 @Data
-public class CommonLogQuery extends PageQuery {
-    @ApiModelProperty("管理员名称")
+public class CommonLogQuery {
+    private Integer pageNum;
+    private Integer pageSize;
     private String managerName;
-    @ApiModelProperty("操作信息")
     private String message;
-    @ApiModelProperty("开始时间")
     private LocalDateTime beginTime;
-    @ApiModelProperty("结束时间")
     private LocalDateTime endTime;
 }

src/main/java/com/syjiaer/clinic/server/entity/common/dto/PageQuery.java

@@ -1,12 +0,0 @@
-package com.syjiaer.clinic.server.entity.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class PageQuery {
-    @ApiModelProperty("页码")
-    private Integer pageNum;
-    @ApiModelProperty("页大小")
-    private Integer pageSize;
-}

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ChargeQueueQuery.java

@@ -1,19 +1,15 @@
 package com.syjiaer.clinic.server.entity.diagnosis.dto;
 
-import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
 @Data
-public class ChargeQueueQuery extends PageQuery {
-    @ApiModelProperty("患者姓名")
+public class ChargeQueueQuery {
     private String patientName;
-    @ApiModelProperty("收费状态")
+    private Integer pageNum;
+    private Integer pageSize;
     private Integer status;
-    @ApiModelProperty("创建时间")
     private LocalDateTime beginTime;
-    @ApiModelProperty("创建时间")
     private LocalDateTime endTime;
 }

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/GoodsRetailDto.java

@@ -1,6 +1,5 @@
 package com.syjiaer.clinic.server.entity.diagnosis.dto;
 
-import com.syjiaer.clinic.server.entity.goods.Goods;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,8 +7,105 @@ import lombok.Setter;
 import java.math.BigDecimal;
 @Getter
 @Setter
-public class GoodsRetailDto extends Goods {
+public class GoodsRetailDto {
+    @ApiModelProperty("自增主键")
+    private Integer id;
 
+    @ApiModelProperty("商品名称")
+    private String name;
+
+    @ApiModelProperty("商品类型")
+    private Integer type;
+
+    @ApiModelProperty("通用名")
+    private String commonName;
+
+    @ApiModelProperty("医保目录编码")
+    private String hilistCode;
+
+    @ApiModelProperty("单价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty("进货价")
+    private BigDecimal purchaseUnitPrice;
+
+    @ApiModelProperty("生厂商")
+    private String producer;
+
+    @ApiModelProperty("条形码")
+    private String barcode;
+
+    @ApiModelProperty("最小制剂单位")
+    private String medicineDosageUnit;
+
+    @ApiModelProperty("最小包装数量")
+    private Integer minPackagingNumber;
+
+    @ApiModelProperty("最小包装单位")
+    private String minPackagingUnit;
+
+    @ApiModelProperty("保质期")
+    private Integer expiryTime;
+
+    @ApiModelProperty("国药准字")
+    private String approvalCode;
+
+    @ApiModelProperty("拓展字段")
+    private String extra;
+
+    @ApiModelProperty("分类ID")
+    private Integer cateId;
+
+    @ApiModelProperty("软删除 1为删除")
+    private Integer deleted;
+
+    @ApiModelProperty("利润分类")
+    private String profitCate;
+
+    @ApiModelProperty("标签")
+    private String tags;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("利率")
+    private Double interestRate;
+
+    @ApiModelProperty("库存整数量	")
+    private Integer inventoryWholeNumber;
+
+    @ApiModelProperty("标识码 由追溯码生成")
+    private String idCode;
+
+    @ApiModelProperty("库存分数量")
+    private Integer inventoryFragmentNumber;
+
+    @ApiModelProperty("0不允许拆零 1允许拆零")
+    private Boolean trdnFlag;
+
+    @ApiModelProperty("拆零价格")
+    private BigDecimal disassemblyPrice;
+
+    @ApiModelProperty("最小制剂数量")
+    private String medicineDosageNum;
+
+    @ApiModelProperty("包装单位")
+    private String packagingUnit;
+
+    @ApiModelProperty("售卖模式")
+    private Integer pricingModel;
+
+    @ApiModelProperty("加成率 30=30%")
+    private Integer makeUp;
+
+    @ApiModelProperty("0禁售 1可售")
+    private Boolean status;
+
+    @ApiModelProperty("库存预警数量")
+    private Integer inventoryWarnNumber;
+
+    @ApiModelProperty("到期预警天数")
+    private Integer expiryWarnDays;
     @ApiModelProperty("选择的数量")
     private Integer selectedNum;
     @ApiModelProperty("选择的单位")

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ItemRetailDto.java

@@ -1,6 +1,5 @@
 package com.syjiaer.clinic.server.entity.diagnosis.dto;
 
-import com.syjiaer.clinic.server.entity.item.Item;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -10,7 +9,40 @@ import java.time.LocalDateTime;
 
 @Getter
 @Setter
-public class ItemRetailDto extends Item {
+public class ItemRetailDto {
+
+    @ApiModelProperty("自增主键")
+    private Integer id;
+
+    @ApiModelProperty("项目创建时间")
+    private LocalDateTime createDatetime;
+
+    @ApiModelProperty("项目创建人")
+    private String createBy;
+
+    @ApiModelProperty("项目修改时间")
+    private LocalDateTime updateDatetime;
+
+    @ApiModelProperty("项目修改人")
+    private String updateBy;
+
+    @ApiModelProperty("项目名称")
+    private String itemName;
+
+    @ApiModelProperty("项目医保目录编码")
+    private String itemSocialCode;
+
+    @ApiModelProperty("单位")
+    private String unit;
+
+    @ApiModelProperty("售价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty("进货价")
+    private BigDecimal purchaseUnitPrice;
+
+    @ApiModelProperty("逻辑删除")
+    private Integer delFlag;
 
     @ApiModelProperty("数量")
     private Integer selectedNum;

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/ChargeQueueVo.java

@@ -1,13 +1,28 @@
 package com.syjiaer.clinic.server.entity.diagnosis.vo;
 
 
-import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 @Data
-public class ChargeQueueVo extends Diagnosis {
+public class ChargeQueueVo {
+
+    @ApiModelProperty("自增id")
+    private Integer id;
+
+    @ApiModelProperty("患者id")
+    private Integer patientId;
+
+    @ApiModelProperty("诊断code")
+    private String code;
+
+    @ApiModelProperty("挂单id")
+    private Integer registrationId;
+    @ApiModelProperty("状态")
+    private Integer status;
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
 
     @ApiModelProperty("患者名称")
     private String patientName;

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalHistoryVo.java

@@ -3,7 +3,6 @@ package com.syjiaer.clinic.server.entity.diagnosis.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeItemListVo;
-import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis;
 import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord;
 import com.syjiaer.clinic.server.entity.patient.PatientInfo;
 import com.syjiaer.clinic.server.entity.patient.vo.PatientAndRegistrationInfoVo;
@@ -13,8 +12,23 @@ import lombok.Data;
 import java.time.LocalDateTime;
 import java.util.List;
 @Data
-public class MedicalHistoryVo extends Diagnosis {
+public class MedicalHistoryVo {
+    @ApiModelProperty("自增id")
+    private Integer id;
 
+    @ApiModelProperty("患者id")
+    private Integer patientId;
+
+    @ApiModelProperty("诊断code")
+    private String code;
+
+    @ApiModelProperty("挂单id")
+    private Integer registrationId;
+    @ApiModelProperty("状态")
+    private Integer status;
+    @ApiModelProperty("接诊时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
     @ApiModelProperty("挂单信息")
     private PatientAndRegistrationInfoVo registrationInfoVo;
     @ApiModelProperty("患者信息")

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalRecordVo.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeItemListVo;
-import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis;
 import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord;
 import com.syjiaer.clinic.server.entity.patient.PatientInfo;
 import com.syjiaer.clinic.server.entity.patient.PatientRegistration;
@@ -17,7 +16,24 @@ import java.time.LocalDateTime;
 import java.util.List;
 @Getter
 @Setter
-public class MedicalRecordVo extends Diagnosis {
+public class MedicalRecordVo {
+    @ApiModelProperty("自增id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("患者id")
+    private Integer patientId;
+
+    @ApiModelProperty("诊断code")
+    private String code;
+
+    @ApiModelProperty("挂单id")
+    private Integer registrationId;
+    @ApiModelProperty("状态")
+    private Integer status;
+    @ApiModelProperty("接诊时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
     @ApiModelProperty("挂单信息")
     private PatientRegistration patientRegistration;
     @ApiModelProperty("患者信息")

src/main/java/com/syjiaer/clinic/server/entity/goods/dto/GoodsQuery.java

@@ -1,35 +1,27 @@
 package com.syjiaer.clinic.server.entity.goods.dto;
 
-import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.List;
 @Setter
 @Getter
-public class GoodsQuery extends PageQuery {
-    @ApiModelProperty("关键字")
+public class GoodsQuery {
+
     private String keyword;
-    @ApiModelProperty("分类id")
     private Integer cateId;
-    @ApiModelProperty("最小利率")
     private Integer minInterestRate;
-    @ApiModelProperty("最大利率")
     private Integer maxInterestRate;
-    @ApiModelProperty("库存数量")
     private Integer inventoryNumber;
-    @ApiModelProperty("销售状态")
     private Boolean saleStatus;
-    @ApiModelProperty("利率区间")
+    private Integer pageSize;
+    private Integer pageNum;
     private List<interestRateInterval>  interestRateIntervalList;
 
     @Setter
     @Getter
-    public static class interestRateInterval {
-        @ApiModelProperty("最小利率")
+    public class interestRateInterval {
         private Double min;
-        @ApiModelProperty("最大利率")
         private Double max;
 
     }

src/main/java/com/syjiaer/clinic/server/entity/goods/vo/GoodsDetailVo.java

@@ -1,7 +1,5 @@
 package com.syjiaer.clinic.server.entity.goods.vo;
 
-import com.syjiaer.clinic.server.entity.goods.Goods;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,25 +8,81 @@ import java.time.LocalDate;
 
 @Getter
 @Setter
-public class GoodsDetailVo extends Goods {
+public class GoodsDetailVo {
+    private Integer id;
 
+    private String name;
+
+    private Integer type;
+
+    private String commonName;
+
+    private String hilistCode;
+
+    private BigDecimal unitPrice;
+
+    private BigDecimal purchaseUnitPrice ;
+
+    private String producer;
+
+    private String barcode;
+
+    private String medicineDosageUnit;
+
+    private Integer minPackagingNumber;
+
+    private String minPackagingUnit;
+
+    private Integer expiryTime;
+
+    private String approvalCode;
+
+    private String extra;
+
+    private Integer cateId;
+
+    private Integer deleted;
+
+    private String profitCate;
+
+    private String tags;
+
+    private String remark;
+
+    private Double interestRate;
+
+    private Integer inventoryWholeNumber;
+
+    private String idCode;
+
+    private Integer inventoryFragmentNumber;
+
+    private Boolean trdnFlag;
+
+    private BigDecimal disassemblyPrice;
+
+    private String medicineDosageNum;
+
+    private String packagingUnit;
+
+    private Integer pricingModel;
+
+    private Integer makeUp;
+    private Boolean status;
+
+    private String cateName;
+    private Boolean saleStatus;
 
     //最近效期
-    @ApiModelProperty("最近效期")
     private LocalDate recentlyExpiryDate ;
     //药品成本
-    @ApiModelProperty("药品成本")
     private BigDecimal costPrice  = BigDecimal.ZERO;
     //医保限价
-    @ApiModelProperty("医保限价")
     private BigDecimal hilistPricUplmtAmt = BigDecimal.ZERO;
     //支付比例
-    @ApiModelProperty("支付比例")
     private BigDecimal selfpayProp;
     //限制说明
-    @ApiModelProperty("限制说明")
     private String hilistLmtpricType;
     //甲乙丙类
-    @ApiModelProperty("甲乙丙类")
     private String chrgitmLv;
 }

src/main/java/com/syjiaer/clinic/server/entity/goods/vo/GoodsSearchVo.java

@@ -1,7 +1,6 @@
 package com.syjiaer.clinic.server.entity.goods.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.syjiaer.clinic.server.entity.goods.Goods;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,14 +8,126 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
-public class GoodsSearchVo extends Goods {
+public class GoodsSearchVo {
+    @ApiModelProperty("自增主键")
+    private Integer id;
+
+    @ApiModelProperty("商品名称")
+    private String name;
+
+    @ApiModelProperty("商品类型")
+    private Integer type;
+
+    @ApiModelProperty("通用名")
+    private String commonName;
+
+    @ApiModelProperty("医保目录编码")
+    private String hilistCode;
+
+    @ApiModelProperty("单价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty("进货价")
+    private BigDecimal purchaseUnitPrice;
+
+    @ApiModelProperty("生厂商")
+    private String producer;
+
+    @ApiModelProperty("条形码")
+    private String barcode;
+
+    @ApiModelProperty("最小制剂单位")
+    private String medicineDosageUnit;
+
+    @ApiModelProperty("最小包装数量")
+    private Integer minPackagingNumber;
+
+    @ApiModelProperty("最小包装单位")
+    private String minPackagingUnit;
+
+    @ApiModelProperty("保质期")
+    private Integer expiryTime;
+
+    @ApiModelProperty("国药准字")
+    private String approvalCode;
+
+    @ApiModelProperty("拓展字段")
+    private String extra;
+
+    @ApiModelProperty("分类ID")
+    private Integer cateId;
+
+    @ApiModelProperty("软删除 1为删除")
+    private Integer deleted;
+
+    @ApiModelProperty("利润分类")
+    private String profitCate;
+
+    @ApiModelProperty("标签")
+    private String tags;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("利率")
+    private Double interestRate;
+
+    @ApiModelProperty("库存整数量	")
+    private Integer inventoryWholeNumber;
+
+    @ApiModelProperty("标识码 由追溯码生成")
+    private String idCode;
+
+    @ApiModelProperty("库存分数量")
+    private Integer inventoryFragmentNumber;
+
+    @ApiModelProperty("0不允许拆零 1允许拆零")
+    private Boolean trdnFlag;
+
+    @ApiModelProperty("拆零价格")
+    private BigDecimal disassemblyPrice;
+
+    @ApiModelProperty("最小制剂数量")
+    private String medicineDosageNum;
+
+    @ApiModelProperty("包装单位")
+    private String packagingUnit;
+
+    @ApiModelProperty("售卖模式")
+    private Integer pricingModel;
+
+    @ApiModelProperty("加成率 30=30%")
+    private Integer makeUp;
+
+    @ApiModelProperty("库存预警数量")
+    private Integer inventoryWarnNumber;
+
+    @ApiModelProperty("到期预警天数")
+    private Integer expiryWarnDays;
+
+    @ApiModelProperty("使用次数")
+    private Integer useNum;
+
+    @ApiModelProperty("销售状态")
+    private Boolean saleStatus;
+
+    @ApiModelProperty("全拼")
+    private String pinyinFull;
+
+    @ApiModelProperty("拼音首字母")
+    private String pinyinFirst;
+
     @ApiModelProperty("甲乙丙类")
     private String category;
+
+    @ApiModelProperty("限制条件")
+    private String limit;
     @ApiModelProperty("库存")
     private String inventory;
     @ApiModelProperty("效期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime lifespan;
+
     @ApiModelProperty("库存")
     private String specifications;
 }

src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java

@@ -172,7 +172,7 @@ public class DiagnosisService extends BaseService {
             itemDetail.setUnit(dbItem.getUnit());
             itemDetail.setUnitPrice(dbItem.getUnitPrice());
             if (item.getSelectedNum() == null || item.getSelectedNum() <= 0) {
-                throw new MessageException("[" + item.getName() + "]数量为0");
+                throw new MessageException("[" + item.getItemName() + "]数量为0");
             }
             itemDetail.setNumber(item.getSelectedNum());
             itemLists.add(itemDetail);