Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server

src/main/java/com/syjiaer/clinic/server/common/api/output/OM1101.java

@@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.common.api.output;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.syjiaer.clinic.server.common.api.annotations.OMField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -20,66 +21,91 @@ public class OM1101 extends BaseOutputModel{
     //social_user表id
     private Integer id;
     @OMField(key="baseinfo",name = "基本信息")
+    @ApiModelProperty(value = "基本信息")
     private Baseinfo baseinfo;
     @OMField(key="insuinfo",name = "参保信息")
+    @ApiModelProperty(value = "参保信息")
     private List<Insuinfo> insuinfo;
+    @ApiModelProperty(value = "身份信息")
     @OMField(key="idetinfo",name = "身份信息")
     private List<Idetinfo> iDetinfo;
     @Getter
     @Setter
     public class Baseinfo{
         @OMField(key="psn_no",name = "人员编号")
+        @ApiModelProperty(value = "人员编号")
         private String psn_no;
         @OMField(key="psn_cert_type",name = "人员证件类型")
+        @ApiModelProperty(value = "人员证件类型")
         private String psn_cert_type;
         @OMField(key="certno",name = "证件号码")
+        @ApiModelProperty(value = "证件号码")
         private String certno;
         @OMField(key="psn_name",name = "人员姓名")
+        @ApiModelProperty(value = "人员姓名")
         private String psn_name;
         @OMField(key="gend",name = "性别")
+        @ApiModelProperty(value = "性别")
         private String gend;
         @OMField(key="naty",name = "民族")
+        @ApiModelProperty(value = "民族")
         private String naty;
         @OMField(key="brdy",name = "出生日期")
         @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "出生日期")
         private LocalDate brdy;
         @OMField(key="age",name = "年龄")
+        @ApiModelProperty(value = "年龄")
         private BigDecimal age;
     }
     @Getter
     @Setter
     public class Insuinfo{
         @OMField(key = "balc", name = "余额")
+        @ApiModelProperty(value = "余额")
         private BigDecimal balc;
         @OMField(key = "insutype", name = "险种类型")
+        @ApiModelProperty(value = "险种类型")
         private String insutype;
         @OMField(key = "psn_type", name = "人员类别")
+        @ApiModelProperty(value = "人员类别")
         private String psn_type;
         @OMField(key = "psn_insu_stas", name = "人员参保状态")
+        @ApiModelProperty(value = "人员参保状态")
         private String psn_insu_stas;
         @OMField(key = "psn_insu_date", name = "个人参保日期")
+        @ApiModelProperty(value = "个人参保日期")
         private LocalDate psn_insu_date;
         @OMField(key = "paus_insu_date", name = "暂停参保日期")
+        @ApiModelProperty(value = "暂停参保日期")
         private LocalDate paus_insu_date;
         @OMField(key = "cvlserv_flag", name = "公务员标志")
+        @ApiModelProperty(value = "公务员标志")
         private String cvlserv_flag;
         @OMField(key = "insuplc_admdvs", name = "参保地医保区划")
+        @ApiModelProperty(value = "参保地医保区划")
         private String insuplc_admdvs;
         @OMField(key = "emp_name", name = "单位名称")
+        @ApiModelProperty(value = "单位名称")
         private String emp_name;
     }
     @Getter
     @Setter
     public static class Idetinfo{
         @OMField(key = "psn_idet_type", name = "人员身份类别")
+        @ApiModelProperty(value = "人员身份类别")
         private String psn_idet_type;
         @OMField(key = "psn_type_lv", name = "人员类别等级")
+        @ApiModelProperty(value = "人员类别等级")
         private String psn_type_lv;
         @OMField(key = "memo", name = "备注")
+        @ApiModelProperty(value = "备注")
         private String memo;
         @OMField(key = "begntime", name = "开始时间")
+        @ApiModelProperty(value = "开始时间")
         private LocalDateTime begntime;
         @OMField(key = "endtime", name = "结束时间")
+        @ApiModelProperty(value = "结束时间")
         private LocalDateTime endtime;
     }
 }

src/main/java/com/syjiaer/clinic/server/common/api/output/OM5267.java

@@ -1,6 +1,7 @@
 package com.syjiaer.clinic.server.common.api.output;
 
 import com.syjiaer.clinic.server.common.api.annotations.OMField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -12,21 +13,30 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class OM5267 extends BaseOutputModel{
     @OMField(key = "blo_type", name = "封锁种类")
+    @ApiModelProperty(value = "封锁种类")
     private String blo_type;
     @OMField(key = "insutype", name = "险种类型")
+    @ApiModelProperty(value = "险种类型")
     private String insutype;
     @OMField(key = "blo_rea", name = "变更原因描述")
+    @ApiModelProperty(value = "变更原因描述")
     private String blo_rea;
     @OMField(key = "psn_emp_no", name = "个人编号/单位编号")
+    @ApiModelProperty(value = "个人编号/单位编号")
     private String psn_emp_no;
     @OMField(key = "pausType", name = "暂停类别")
+    @ApiModelProperty(value = "暂停类别")
     private String pausType;
     @OMField(key = "begndate", name = "开始日期")
+    @ApiModelProperty(value = "开始日期")
     private String begndate;
     @OMField(key = "enddate", name = "终止日期")
+    @ApiModelProperty(value = "终止日期")
     private String enddate;
     @OMField(key = "opter", name = "经办人")
+    @ApiModelProperty(value = "经办人")
     private String opter;
     @OMField(key = "opt_date", name = "经办日期")
+    @ApiModelProperty(value = "经办日期")
     private String opt_date;
 }

src/main/java/com/syjiaer/clinic/server/common/api/output/OM5283.java

@@ -1,6 +1,7 @@
 package com.syjiaer.clinic.server.common.api.output;
 
 import com.syjiaer.clinic.server.common.api.annotations.OMField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -14,11 +15,15 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 public class OM5283 extends BaseOutputModel {
     @OMField(key = "fixmedins_code", name = "定点医药机构编号")
+    @ApiModelProperty(value = "定点医药机构编号")
     private String fixmedins_code;
     @OMField(key = "fixmedins_name", name = "定点医药机构名称")
+    @ApiModelProperty(value = "定点医药机构名称")
     private String fixmedins_name;
     @OMField(key = "begndate", name = "入院时间")
+    @ApiModelProperty(value = "入院时间")
     private LocalDate begndate;
     @OMField(key = "enddate", name = "出院时间")
+    @ApiModelProperty(value = "出院时间")
     private LocalDate enddate;
 }

src/main/java/com/syjiaer/clinic/server/entity/inventory/vo/InventoryPurchaseVo.java

@@ -2,7 +2,9 @@ package com.syjiaer.clinic.server.entity.inventory.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.syjiaer.clinic.server.entity.inventory.InventoryPurchase;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -26,31 +28,10 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 @TableName("inventory_purchase_view")
 @ApiModel(value = "InventoryPurchaseView对象", description = "")
-public class InventoryPurchaseVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String code;
-
-    private Integer managerUserId;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime purchaseDate;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime createDatetime;
-
-    private Integer supplierId;
-
-    private String remark;
-
-    private String shippingCode;
-
-    private String invoiceCode;
-
-    private Integer kindCount;
-
-    private BigDecimal totalPrice;
+public class InventoryPurchaseVo extends InventoryPurchase {
 
+    @ApiModelProperty("管理员名称")
     private String managerUserName;
-
+    @ApiModelProperty("供应商名称")
     private String supplierName;
 }

src/main/java/com/syjiaer/clinic/server/entity/item/param/ItemParam.java

@@ -1,10 +1,14 @@
 package com.syjiaer.clinic.server.entity.item.param;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class ItemParam {
+    @ApiModelProperty("项目id")
     private Integer id;
+    @ApiModelProperty("项目名称")
     private String name;
+    @ApiModelProperty("项目单位")
     private String unit;
 }

src/main/java/com/syjiaer/clinic/server/entity/item/vo/ItemSearchVo.java

@@ -1,54 +1,14 @@
 package com.syjiaer.clinic.server.entity.item.vo;
 
+import com.syjiaer.clinic.server.entity.item.Item;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 @Data
-public class ItemSearchVo {
+public class ItemSearchVo  extends Item {
 
-    @ApiModelProperty("自增主键")
-    private Integer id;
-
-    @ApiModelProperty("项目创建时间")
-    private LocalDateTime createDatetime;
-
-    @ApiModelProperty("项目创建人")
-    private String createBy;
-
-    @ApiModelProperty("项目修改时间")
-    private LocalDateTime updateDatetime;
-
-    @ApiModelProperty("项目修改人")
-    private String updateBy;
-
-    @ApiModelProperty("项目名称")
-    private String name;
-
-    @ApiModelProperty("项目医保目录编码")
-    private String socialCode;
-
-    @ApiModelProperty("单位")
-    private String unit;
-
-    @ApiModelProperty("售价")
-    private BigDecimal unitPrice;
-
-    @ApiModelProperty("进货价")
-    private BigDecimal purchaseUnitPrice;
-
-    @ApiModelProperty("逻辑删除")
-    private Integer delFlag;
-
-    @ApiModelProperty("使用次数")
-    private Integer useNum;
-
-    @ApiModelProperty("全拼")
-    private String pinyinFull;
-
-    @ApiModelProperty("拼音首字母")
-    private String pinyinFirst;
 
     @ApiModelProperty("甲乙丙类")
     private String chrgitmLv;

src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java

@@ -1,12 +1,14 @@
 package com.syjiaer.clinic.server.entity.organization.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class DockerSearchQuery {
-    private Integer pageNum;
-    private Integer pageSize;
+public class DockerSearchQuery extends PageQuery {
+    @ApiModelProperty("关键字")
     private String keyword;
+    @ApiModelProperty("角色")
     private Integer role;
 
 

src/main/java/com/syjiaer/clinic/server/entity/organization/dto/OrganizationMemberSaveDto.java

@@ -2,13 +2,17 @@ package com.syjiaer.clinic.server.entity.organization.dto;
 
 import com.syjiaer.clinic.server.entity.manager.ManagerUser;
 import com.syjiaer.clinic.server.entity.organization.OrganizationMember;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class OrganizationMemberSaveDto {
+    @ApiModelProperty("成员信息")
     private OrganizationMember memberInfo;
+    @ApiModelProperty("科室ids")
     private List<Integer> sectionIds;
+    @ApiModelProperty("用户信息")
     private ManagerUser userInfo;
 }

src/main/java/com/syjiaer/clinic/server/entity/organization/vo/MemberVo.java

@@ -1,54 +0,0 @@
-package com.syjiaer.clinic.server.entity.organization.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-@Data
-public class MemberVo {
-    @ApiModelProperty("自增主键")
-    private Integer id;
-
-    @ApiModelProperty("成员电话")
-    private String tel;
-
-    @ApiModelProperty("医保人员代码")
-    private String socialMemberCode;
-
-    @ApiModelProperty("电子签名")
-    private String electronicSignature;
-
-    @ApiModelProperty("性别")
-    private String gender;
-
-    @ApiModelProperty("年龄")
-    private String age;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createDatetime;
-
-    @ApiModelProperty("身份证号")
-    private String idCardNumber;
-
-    @ApiModelProperty("所属科室")
-    private Integer sectionId;
-
-    @ApiModelProperty("备注")
-    private String memo;
-
-    @ApiModelProperty("管理员id")
-    private Integer managerUserId;
-
-    @ApiModelProperty("成员名")
-    private String name;
-
-    @ApiModelProperty("角色")
-    private Integer role;
-
-    @ApiModelProperty("删除标记")
-    private Boolean delFlag;
-
-    @ApiModelProperty("科室名称")
-    private String sectionName;
-
-}

src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationQuery.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.patient.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,11 +9,13 @@ import java.time.LocalDateTime;
 
 @Getter
 @Setter
-public class RegistrationQuery {
+public class RegistrationQuery extends PageQuery {
+    @ApiModelProperty("挂号状态 1候诊 2在诊 3已诊 0取消")
     private Integer status;
-    private Integer pageNum ;
-    private Integer pageSize ;
+    @ApiModelProperty("关键字")
     private String keyword;
+    @ApiModelProperty("开始时间")
     private LocalDateTime beginTime;
+    @ApiModelProperty("结束时间")
     private LocalDateTime endTime;
 }

src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationSaveDto.java

@@ -2,81 +2,18 @@ package com.syjiaer.clinic.server.entity.patient.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.syjiaer.clinic.server.entity.patient.PatientRegistration;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 @Data
-public class RegistrationSaveDto {
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty("科室id")
-    private Integer organizationSectionId;
-
-    @ApiModelProperty("医生id")
-    private Integer organizationDoctorId;
-
-    @ApiModelProperty("患者姓名")
-    private String name;
-
-    @ApiModelProperty("患者年龄")
-    private Integer age;
-
-    @ApiModelProperty("患者手机号")
-    private String phone;
-
-    @ApiModelProperty("就诊类型")
-    private Short visitType;
-
-    @ApiModelProperty("挂号时间")
-    private LocalDateTime createDatetime;
-
-    @ApiModelProperty("推荐")
-    private String recommendations;
-
-    @ApiModelProperty("备注")
-    private String memo;
-
-    @ApiModelProperty("预诊")
-    private String advanceDiagnosis;
-
-    @ApiModelProperty("挂号费")
-    private BigDecimal registrationMoney;
-
-    @ApiModelProperty("逻辑删除")
-    private Integer delFlag;
-
-    @ApiModelProperty("挂号类型")
-    private Integer type;
-
-    @ApiModelProperty("性别")
-    private Integer gender;
-
-    @ApiModelProperty("病人id")
-    private Integer patientInfoId;
-
-    @ApiModelProperty("挂号状态 1候诊 2在诊 3已诊 0取消")
-    private Integer status;
-
-    @ApiModelProperty("人员编号")
-    private String psnNo;
-
-    @ApiModelProperty("险种类型")
-    private String insutype;
-
-    @ApiModelProperty("就诊id 挂号后医保返会")
-    private String mdtrtId;
-
-    @ApiModelProperty("流水号")
-    private String fstNo;
-
+public class RegistrationSaveDto extends PatientRegistration {
     @ApiModelProperty("证件号码")
     private String certNo;
     @ApiModelProperty("证件类型")
     private String certType;
-
     @ApiModelProperty("医保余额")
     private BigDecimal insuBalance;
     @ApiModelProperty("预约时间")

src/main/java/com/syjiaer/clinic/server/entity/patient/vo/PatientAndRegistrationInfoVo.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.patient.vo;
 
+import com.syjiaer.clinic.server.entity.patient.PatientInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,25 +9,7 @@ import java.time.LocalDateTime;
 
 @Getter
 @Setter
-public class PatientAndRegistrationInfoVo {
-    @ApiModelProperty("自增id")
-    private Integer id;
-
-    @ApiModelProperty("患者姓名")
-    private String name;
-
-    @ApiModelProperty("手机号")
-    private String phone;
-
-    @ApiModelProperty("身份证号")
-    private String certno;
-
-    @ApiModelProperty("性别")
-    private String sex;
-
-    @ApiModelProperty("年龄")
-    private Integer age;
-
+public class PatientAndRegistrationInfoVo extends PatientInfo {
     @ApiModelProperty("就诊次数")
     private Integer visitCount;
     @ApiModelProperty("上次就诊时间")

src/main/java/com/syjiaer/clinic/server/entity/patient/vo/PatientRegistrationVo.java

@@ -1,75 +1,13 @@
 package com.syjiaer.clinic.server.entity.patient.vo;
 
+import com.syjiaer.clinic.server.entity.patient.PatientRegistration;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 @Data
-public class PatientRegistrationVo {
-
-    @ApiModelProperty("挂号id")
-    private Integer id;
-
-    @ApiModelProperty("科室id")
-    private Integer organizationSectionId;
-
-    @ApiModelProperty("医生id")
-    private Integer organizationDoctorId;
-
-    @ApiModelProperty("患者姓名")
-    private String name;
-
-    @ApiModelProperty("患者年龄")
-    private Integer age;
-
-    @ApiModelProperty("患者手机号")
-    private String phone;
-
-    @ApiModelProperty("就诊类型 初诊 复诊")
-    private Short visitType;
-
-    @ApiModelProperty("挂号时间")
-    private LocalDateTime createDatetime;
-
-    @ApiModelProperty("推荐")
-    private String recommendations;
-
-    @ApiModelProperty("备注")
-    private String memo;
-
-    @ApiModelProperty("预诊")
-    private String advanceDiagnosis;
-
-    @ApiModelProperty("挂号费")
-    private BigDecimal registrationMoney;
-
-    @ApiModelProperty("逻辑删除")
-    private Integer delFlag;
-
-    @ApiModelProperty("挂号类型 1普通挂号 2医保挂号")
-    private Integer type;
-
-    @ApiModelProperty("1男 2女")
-    private Integer gender;
-
-    @ApiModelProperty("病人id")
-    private Integer patientInfoId;
-
-    @ApiModelProperty("挂号状态 1候诊 2在诊 3已诊 0取消")
-    private Integer status;
-
-    @ApiModelProperty("人员编号")
-    private String psnNo;
-
-    @ApiModelProperty("险种类型")
-    private String insutype;
-
-    @ApiModelProperty("就诊id 挂号后医保返会")
-    private String mdtrtId;
-
-    @ApiModelProperty("流水号")
-    private String fstNo;
+public class PatientRegistrationVo extends PatientRegistration {
 
     @ApiModelProperty("证件类型")
     private String certType;

src/main/java/com/syjiaer/clinic/server/entity/patient/vo/SeeDoctorInfoVo.java

@@ -1,6 +1,7 @@
 package com.syjiaer.clinic.server.entity.patient.vo;
 
 import com.syjiaer.clinic.server.entity.patient.PatientInfo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -8,20 +9,28 @@ import java.time.LocalDateTime;
 @Data
 public class SeeDoctorInfoVo {
     //患者信息
+    @ApiModelProperty("患者信息")
     private PatientInfo patientInfo;
     //挂号医生id
+    @ApiModelProperty("挂号医生id")
     private Integer dockerId;
     //挂号医生姓名
+    @ApiModelProperty("挂号医生姓名")
     private String dockerName;
     //挂号类型
+    @ApiModelProperty("挂号类型")
     private Integer registerType;
     //医生科室名称
+    @ApiModelProperty("医生科室名称")
     private String sectionName;
     //上一次接诊时间
+    @ApiModelProperty("上一次接诊时间")
     private LocalDateTime lastSeeDoctorTime;
     //就诊次数
+    @ApiModelProperty("就诊次数")
     private Integer seeDoctorCount;
     //医保余额
+    @ApiModelProperty("医保余额")
     private BigDecimal socialBalance;
 
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryInitQuery.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.social.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,12 +9,15 @@ import java.time.LocalDateTime;
 
 @Getter
 @Setter
-public class InventoryInitQuery {
-    private Integer pageNum;
-    private Integer pageSize;
+public class InventoryInitQuery extends PageQuery {
+    @ApiModelProperty("上传状态")
     private Integer uploadStatus;
+    @ApiModelProperty("类型")
     private Integer type;
+    @ApiModelProperty("医保码")
     private String code;
+    @ApiModelProperty("创建时间")
     private LocalDateTime createTimeBefore;
+    @ApiModelProperty("创建时间")
     private LocalDateTime createTimeAfter;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryLogQuery.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.social.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,11 +9,15 @@ import java.time.LocalDateTime;
 
 @Getter
 @Setter
-public class InventoryLogQuery {
-    private Integer pageNum;
-    private Integer pageSize;
+public class InventoryLogQuery extends PageQuery {
+
+    @ApiModelProperty("上传状态")
     private Integer uploadStatus;
+    @ApiModelProperty("类型")
     private Integer socialType;
+    @ApiModelProperty("创建时间")
     private LocalDateTime createTimeBefore;
+    @ApiModelProperty("创建时间")
     private LocalDateTime createTimeAfter;
+
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryPurchaseLogQuery.java

@@ -1,13 +1,15 @@
 package com.syjiaer.clinic.server.entity.social.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class InventoryPurchaseLogQuery {
-    private Integer pageNum;
-    private Integer pageSize;
+public class InventoryPurchaseLogQuery extends PageQuery {
+    @ApiModelProperty("上传状态")
     private Integer uploadStatus;
+    @ApiModelProperty("医保类型")
     private Integer socialType;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationItemDto.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.social.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,24 +11,34 @@ import java.time.LocalDateTime;
 @Setter
 public class ReconciliationItemDto {
     // 清算类别
+    @ApiModelProperty("清算类别")
     private String reconciliationType;
     // 险种类型
+    @ApiModelProperty("险种类型")
     private String insuranceType;
     // 经办机构
+    @ApiModelProperty("经办机构")
     private String handlingInstitution;
     // 医疗费用总额
+    @ApiModelProperty("医疗费用总额")
     private BigDecimal totalMedicalCost = BigDecimal.ZERO;
     // 基金支付总额
+    @ApiModelProperty("基金支付总额")
     private BigDecimal totalFundPayment = BigDecimal.ZERO;
     // 个账支付总额
+    @ApiModelProperty("个账支付总额")
     private BigDecimal totalPersonalAccountPayment = BigDecimal.ZERO;
     // 结算笔数
+    @ApiModelProperty("结算笔数")
     private Integer settlementCount;
     // 对账结果
+    @ApiModelProperty("对账结果")
     private String reconciliationResult;
     //对账开始时间
+    @ApiModelProperty("对账开始时间")
     private LocalDateTime beginTime;
     //对账结束时间
+    @ApiModelProperty("对账结束时间")
     private LocalDateTime endTime;
 
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationLogQuery.java

@@ -1,16 +1,21 @@
 package com.syjiaer.clinic.server.entity.social.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 ReconciliationLogQuery {
-    private Integer pageNum;
-    private Integer pageSize;
+public class ReconciliationLogQuery extends PageQuery {
+    @ApiModelProperty("开始时间")
     private LocalDateTime beginTime;
+    @ApiModelProperty("结束时间")
     private LocalDateTime endTime;
+    @ApiModelProperty("对账类别")
     private String reconciliationType;
+    @ApiModelProperty("险种类型")
     private String insuranceType;
+    @ApiModelProperty("经办机构")
     private String handlingInstitution;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/RetailInventoryQuery.java

@@ -1,14 +1,17 @@
 package com.syjiaer.clinic.server.entity.social.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class RetailInventoryQuery {
-    private Integer pageNum;
-    private Integer pageSize;
+public class RetailInventoryQuery extends PageQuery {
+    @ApiModelProperty("流水号")
     private String code;
+    @ApiModelProperty("上传状态")
     private Integer uploadStatus;
+    @ApiModelProperty("医保类型")
     private Integer socialType;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/NotDoNumberVo.java

@@ -1,15 +1,21 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
 public class NotDoNumberVo {
+    @ApiModelProperty("总未上报数量")
     private long totalNumber;
+    @ApiModelProperty("3501未上报数量")
     private long number3501;
+    @ApiModelProperty("3502未上报数量")
     private long number3502;
+    @ApiModelProperty("3503未上报数量")
     private long number3503;
+    @ApiModelProperty("3505未上报数量")
     private long number3505;
 
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/ReconciliationDetailVo.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,14 +9,24 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class ReconciliationDetailVo {
+    @ApiModelProperty("人员编号")
     private String psnNo;
+    @ApiModelProperty("就诊id 挂号后医保返会")
     private String mdtrtId;
+    @ApiModelProperty("结算id")
     private String setlId;
+    @ApiModelProperty("消息id")
     private String msgid;
+    @ApiModelProperty("对账结果")
     private String stmtRslt;
+    @ApiModelProperty("退费结算标志")
     private String refdSetlFlag;
+    @ApiModelProperty("备注")
     private String memo;
+    @ApiModelProperty("医疗费总额")
     private BigDecimal medfeeSumamt;
+    @ApiModelProperty("基金支付总额")
     private BigDecimal fundPaySumamt;
+    @ApiModelProperty("个账支付总额")
     private BigDecimal acctPay;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/ReconciliationItemVo.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,20 +10,28 @@ import java.math.BigDecimal;
 @Setter
 public class ReconciliationItemVo {
     // 清算类别
+    @ApiModelProperty("清算类别")
     private String reconciliationType;
     // 险种类型
+    @ApiModelProperty("险种类型")
     private String insuranceType;
     // 经办机构
+    @ApiModelProperty("经办机构")
     private String handlingInstitution;
     // 医疗费用总额
+    @ApiModelProperty("医疗费用总额")
     private BigDecimal totalMedicalCost ;
     // 基金支付总额
+    @ApiModelProperty("基金支付总额")
     private BigDecimal totalFundPayment ;
     // 个账支付总额
+    @ApiModelProperty("个账支付总额")
     private BigDecimal totalPersonalAccountPayment ;
     // 结算笔数
+    @ApiModelProperty("结算笔数")
     private Integer settlementCount;
     // 对账结果
+    @ApiModelProperty("对账结果")
     private String reconciliationResult;
 
     public ReconciliationItemVo() {

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java

@@ -2,7 +2,9 @@ package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.syjiaer.clinic.server.entity.social.SocialDirectory;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -23,58 +25,45 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("social_directory_view")
-@ApiModel(value = "SocialDirectoryView对象", description = "")
-public class SocialDirectoryView implements Serializable {
+public class SocialDirectoryView extends SocialDirectory {
 
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    private String code;
-
-    private String name;
-
-    private String keyword;
-
-    private Integer type;
-
-    private String producer;
-
-    private LocalDateTime createDatetime;
-
-    private LocalDateTime updateDatetime;
-
-    private String versionName;
-    private String data;
 
+    @ApiModelProperty("单位")
     private String unit;
+    @ApiModelProperty("医保编码")
     private String hilistCode;
-
+    @ApiModelProperty("医保目录限价类型")
     private String hilistLmtpricType;
-
+    @ApiModelProperty("医保目录定价上限金额")
     private BigDecimal hilistPricUplmtAmt;
 
+    @ApiModelProperty("自付比例类型")
     private String selfpayPropType;
-
+    @ApiModelProperty("自付比例")
     private BigDecimal selfpayProp;
-
+    @ApiModelProperty("开始日期")
     private LocalDateTime begndate;
-
+    @ApiModelProperty("结束日期")
     private LocalDateTime enddate;
-
+    @ApiModelProperty("五笔助记码")
     private String wubi;
-
+    @ApiModelProperty("拼音")
     private String pinyin;
+    @ApiModelProperty("限制使用标志")
     private String lmtUsedFlag;
+    @ApiModelProperty("收费级别")
     private String chrgitmLv;
+    @ApiModelProperty("json")
     private JSONObject json;
 
-
+    @ApiModelProperty("最小包装单位")
     private String minPackagingUnit;
+    @ApiModelProperty("包装单位")
     private String packagingUnit;
 
+    @ApiModelProperty("库存整数量")
     private Integer inventoryWholeNumber;
+    @ApiModelProperty("库存拆分量数量")
     private Integer inventoryFragmentNumber;
 
 

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryInitVo.java

@@ -2,7 +2,9 @@ package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.syjiaer.clinic.server.entity.inventory.InventoryInit;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -24,37 +26,14 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("social_inventory_init_view")
-@ApiModel(value = "SocialInventoryInitView对象", description = "")
-public class SocialInventoryInitVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Integer id;
-
-    private String code;
-
-    private Integer wholeNumber;
-
-    private LocalDate createDate;
-
-    private Integer uploadStatus;
-
-    private String uploadMessage;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime uploadDatetime;
-
-    private Integer goodsId;
-
-    private Integer inventoryId;
-
-    private Integer fragmentNumber;
+public class SocialInventoryInitVo extends InventoryInit {
 
+    @ApiModelProperty("商品名称")
     private String name;
-
+    @ApiModelProperty("商品单位")
     private String packagingUnit;
-
+    @ApiModelProperty("最小包装单位")
     private String minPackagingUnit;
-
+    @ApiModelProperty("医保编码")
     private String hilistCode;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryLogVo.java

@@ -1,7 +1,9 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.syjiaer.clinic.server.entity.inventory.InventoryLog;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -22,53 +24,13 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("social_inventory_log_view")
-@ApiModel(value = "SocialInventoryLogView对象", description = "")
-public class SocialInventoryLogVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Integer id;
-
-    private Integer goodsId;
-
-    private Integer inventoryId;
-
-    private Integer socialType;
-
-    private Integer changeWholeNumber;
-
-    private Integer changeFragmentNumber;
-
-    private Integer beforeWholeNumber;
-
-    private Integer beforeFragmentNumber;
-
-    private Integer afterWholeNumber;
-
-    private Integer afterFragmentNumber;
-
-    private String remark;
-
-    private LocalDateTime createTime;
-
-    private Integer uploadStatus;
-
-    private String uploadMessage;
-
-    private LocalDateTime uploadDatetime;
-
-    private Integer type;
-
-    private Integer operateId;
-
-    private String operateName;
-
+public class SocialInventoryLogVo extends InventoryLog {
+    @ApiModelProperty("商品名称")
     private String name;
-
+    @ApiModelProperty("商品单位")
     private String packagingUnit;
-
+    @ApiModelProperty("最小包装单位")
     private String minPackagingUnit;
-
+    @ApiModelProperty("医保编码")
     private String hilistCode;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryPurchaseLogVo.java

@@ -1,7 +1,10 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.syjiaer.clinic.server.entity.inventory.InventoryPurchase;
+import com.syjiaer.clinic.server.entity.inventory.InventoryPurchaseLog;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -22,33 +25,14 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("social_inventory_purchase_log_view")
-@ApiModel(value = "SocialInventoryPurchaseLogView对象", description = "")
-public class SocialInventoryPurchaseLogVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Integer id;
-
-    private String inventoryPurchaseCode;
-
-    private Integer number;
-
-    private Integer uploadStatus;
-
-    private String uploadMessage;
-
-    private LocalDateTime uploadDatetime;
-
-    private Integer inventoryId;
-
-    private Integer socialType;
+public class SocialInventoryPurchaseLogVo extends InventoryPurchaseLog {
 
+    @ApiModelProperty("商品名称")
     private String name;
-
+    @ApiModelProperty("商品单位")
     private String packagingUnit;
-
+    @ApiModelProperty("最小包装单位")
     private String minPackagingUnit;
-
+    @ApiModelProperty("医保编码")
     private String hilistCode;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialItemVo.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.syjiaer.clinic.server.entity.item.Item;
+import com.syjiaer.clinic.server.entity.social.SocialItem;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -22,50 +25,27 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-public class SocialItemVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Integer id;
-
-    @ApiModelProperty("项目名称")
-    private String name;
-
-    @ApiModelProperty("医保编码")
-    private String code;
-
-    @ApiModelProperty("单位")
-    private String unit;
-
-    @ApiModelProperty("数据创建时间")
-    private LocalDateTime createDatetime;
-
-    @ApiModelProperty("版本名称")
-    private String versionName;
-
-    @ApiModelProperty("数据修改时间")
-    private LocalDateTime updateDatetime;
+public class SocialItemVo extends SocialItem {
 
 
+    @ApiModelProperty("医保目录限价类型")
     private String hilistLmtpricType;
-
+    @ApiModelProperty("医保目录定价上限金额")
     private BigDecimal hilistPricUplmtAmt;
-
-    private String chrgitmLv;
-
+    @ApiModelProperty("自付比例类型")
     private String selfpayPropType;
-
+    @ApiModelProperty("自付比例")
     private BigDecimal selfpayProp;
-
+    @ApiModelProperty("开始日期")
     private LocalDateTime begndate;
-
+    @ApiModelProperty("结束日期")
     private LocalDateTime enddate;
-
+    @ApiModelProperty("五笔助记码")
     private String wubi;
-
+    @ApiModelProperty("拼音")
     private String pinyin;
-
-
+    @ApiModelProperty("收费级别")
+    private String chrgitmLv;
 
 
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialPersonInfoVo.java

@@ -3,18 +3,26 @@ package com.syjiaer.clinic.server.entity.social.vo;
 import com.syjiaer.clinic.server.common.api.output.OM1101;
 import com.syjiaer.clinic.server.common.api.output.OM5267;
 import com.syjiaer.clinic.server.common.api.output.OM5283;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 @Data
 public class SocialPersonInfoVo {
     private Integer id;
+    @ApiModelProperty("就诊凭证类型")
     private String mdtrtCertType;
+    @ApiModelProperty("就诊凭证编号")
     private String mdtrtCertNo;
+    @ApiModelProperty("人员基本信息")
     private OM1101.Baseinfo baseinfo;
+    @ApiModelProperty("人员身份信息")
     private List<OM1101.Insuinfo> insuinfo;
+    @ApiModelProperty("人员身份信息")
     private List<OM1101.Idetinfo> iDetinfo;
+    @ApiModelProperty("5267返回数据")
     private OM5267 blockInfo;
+    @ApiModelProperty("5283返回数据")
     private OM5283 hospitalizationInfo;
 
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/ChrgitmLvOverview.java

@@ -1,12 +1,17 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class ChrgitmLvOverview {
+    @ApiModelProperty("限制使用标志")
     private String chrgitmLv;
+    @ApiModelProperty("限制使用标志名称")
     private String name;
+    @ApiModelProperty("数量")
     private Long count;
+    @ApiModelProperty("占比")
     private String ratio;
 
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/GoodsStatistics.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -7,9 +8,13 @@ import java.util.ArrayList;
 import java.util.List;
 @Data
 public class GoodsStatistics {
+    @ApiModelProperty("总成本")
     private BigDecimal totalCost;
+    @ApiModelProperty("总售价")
     private BigDecimal totalPrice;
+    @ApiModelProperty("医保商品数量")
     private Long totalSocialCount;
+    @ApiModelProperty("甲乙丙类占比")
     private List<ChrgitmLvOverview> chrgitmLvInfoList;
 
     public GoodsStatistics() {

src/main/java/com/syjiaer/clinic/server/entity/statistics/GoodsTypeRevenue.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,6 +8,8 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class GoodsTypeRevenue {
+    @ApiModelProperty("类型名称")
     private String name;
+    @ApiModelProperty("总收入")
     private BigDecimal totalRevenue;
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/PayTypeRevenue.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,7 +8,10 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class PayTypeRevenue {
+    @ApiModelProperty("支付类型")
     private Integer payType;
+    @ApiModelProperty("总收入")
     private BigDecimal totalRevenue;
+    @ApiModelProperty("支付类型名称")
     private String name;
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/PersonPayOverviewVo.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,7 +9,10 @@ import java.util.List;
 @Getter
 @Setter
 public class PersonPayOverviewVo {
+    @ApiModelProperty("日期list")
     private List<String> dateList;
+    @ApiModelProperty("会员营业额list")
     private List<BigDecimal> vipPrice;
+    @ApiModelProperty("普通用户营业额list")
     private List<BigDecimal> commonPrice;
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/RevenueOverviewVo.java

@@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.entity.statistics;
 
 import com.syjiaer.clinic.server.common.enums.GoodsTypeEnum;
 import com.syjiaer.clinic.server.common.enums.RetailOrderPayTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,16 +17,20 @@ import java.util.List;
 @Setter
 public class RevenueOverviewVo {
     //总营业额
+    @ApiModelProperty("总营业额")
     private BigDecimal totalRevenue;
     //医保销售额
+    @ApiModelProperty("医保销售额")
     private BigDecimal socialRevenue;
     //总完成单数
+    @ApiModelProperty("总完成单数")
     private Long totalOrderCount;
     //医保单数
+    @ApiModelProperty("医保单数")
     private Long socialOrderCount;
-
+    @ApiModelProperty("商品类型销售额")
     private List<GoodsTypeRevenue> goodsTypeRevenue;
-
+    @ApiModelProperty("支付类型销售额")
     private List<PayTypeRevenue> payTypeRevenue;
 
     public RevenueOverviewVo() {

src/main/java/com/syjiaer/clinic/server/entity/statistics/SalePersonReportVo.java

@@ -1,19 +1,29 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
 @Data
 public class SalePersonReportVo {
+    @ApiModelProperty("销售人员id")
     private Integer salePersonId;
+    @ApiModelProperty("销售人员姓名")
     private String salePersonName;
+    @ApiModelProperty("总营业额")
     private BigDecimal totalIncome;
+    @ApiModelProperty("微信营业额")
     private BigDecimal wechatIncome;
+    @ApiModelProperty("支付宝营业额")
     private BigDecimal aliPayIncome;
+    @ApiModelProperty("现金营业额")
     private BigDecimal cashIncome;
+    @ApiModelProperty("其他营业额")
     private BigDecimal otherIncome;
+    @ApiModelProperty("医保营业额")
     private BigDecimal socialIncome;
+    @ApiModelProperty("销售单数")
     private Long count;
 
     public SalePersonReportVo() {

src/main/java/com/syjiaer/clinic/server/entity/statistics/SalesVolumeOverviewVo.java

@@ -1,10 +1,13 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 @Data
 public class SalesVolumeOverviewVo {
+    @ApiModelProperty("日期list")
     private List<String> dateList;
+    @ApiModelProperty("消费人次list")
     private List<Long> countList;
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/TipCountVo.java

@@ -1,20 +1,27 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class TipCountVo {
     //待诊断数量
+    @ApiModelProperty("待诊断数量")
     private Long waitDiagnosisCount;
     //在诊数量
+    @ApiModelProperty("在诊数量")
     private Long diagnosingCount;
     //完诊数量
+    @ApiModelProperty("完诊数量")
     private Long completeDiaCount;
     //已收费数量
+    @ApiModelProperty("已收费数量")
     private Long chargedCount;
     //已退费数量
+    @ApiModelProperty("已退费数量")
     private Long refundedCount;
     //未收费数量
+    @ApiModelProperty("未收费数量")
     private Long unchargedCount;
 
 

src/main/java/com/syjiaer/clinic/server/entity/vip/dto/VipIntegralLogQuery.java

@@ -1,12 +1,13 @@
 package com.syjiaer.clinic.server.entity.vip.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class VipIntegralLogQuery {
+public class VipIntegralLogQuery extends PageQuery {
+    @ApiModelProperty("会员id")
     private Integer vipId;
-    private Integer pageNum;
-    private Integer pageSize;
 }