dev

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

@@ -2,6 +2,7 @@ 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.ChargeOrder;
 import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord;
 import com.syjiaer.clinic.server.entity.patient.PatientInfo;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,45 +12,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 @Data
-public class ChargeDetailVo {
+public class ChargeDetailVo extends ChargeOrder {
-    @ApiModelProperty("自增主键")
-    private Integer id;
-
-    @ApiModelProperty("业务主键")
-    private String code;
-
-    @ApiModelProperty("管理员ID")
-    private Integer managerUserId;
-
-    @ApiModelProperty("打折前总价")
-    private BigDecimal preTotalPrice;
-
-    @ApiModelProperty("打折后总价")
-    private BigDecimal totalPrice;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createDatetime;
-
-    @ApiModelProperty("状态值 0未完成 1已完成 2已取消 3已退款")
-    private Integer status;
-
-    @ApiModelProperty("1医保 2微信支付 3支付宝支付 4现金支付 5其他")
-    private Integer payType;
-
-    @ApiModelProperty("支付时间")
-    private LocalDateTime payTime;
-
-    @ApiModelProperty("患者id")
-    private Integer patientId;
-
-    @ApiModelProperty("医保用户id")
-    private Integer socialUserId;
-
-    @ApiModelProperty("销售人id")
-    private Integer salePersonId;
-
-    @ApiModelProperty("病例id")
-    private Integer medicalRecordId;
     @ApiModelProperty("销售人姓名")
     private String salePersonName;
 

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

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.charge.vo;
 
+import com.syjiaer.clinic.server.entity.goods.Goods;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -7,106 +8,8 @@ import java.math.BigDecimal;
 import java.util.List;
 
 @Data
-public class ChargeGoodsListVo {
+public class ChargeGoodsListVo extends Goods {
 
-    @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 BigDecimal selectedPrice;
     @ApiModelProperty("选择的数量")

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

@@ -1,48 +1,13 @@
 package com.syjiaer.clinic.server.entity.charge.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 ChargeItemListVo {
+public class ChargeItemListVo 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 itemName;
-
-    @ApiModelProperty("项目医保目录编码")
-    private String itemSocialCode;
-
-    @ApiModelProperty("单位")
-    private String unit;
-
-    @ApiModelProperty("售价")
-    private BigDecimal unitPrice;
-
-    @ApiModelProperty("进货价")
-    private BigDecimal purchaseUnitPrice;
-
-    @ApiModelProperty("逻辑删除")
-    private Integer delFlag;
-    @ApiModelProperty("是否为组套 0为false 1为true")
-    private Boolean isGroup;
-
     @ApiModelProperty("选择的单价")
     private BigDecimal selectedPrice;
     @ApiModelProperty("选择的数量")

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

@@ -1,42 +1,14 @@
 package com.syjiaer.clinic.server.entity.charge.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.syjiaer.clinic.server.entity.charge.ChargeOrder;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 @Data
-public class ChargePrintOrderVo {
+public class ChargePrintOrderVo extends ChargeOrder {
-    private Integer id;
-
-    private String code;
-
-    private Integer managerUserId;
-
-    private BigDecimal preTotalPrice;
-
-    private BigDecimal totalPrice;
-
-    private LocalDateTime createDatetime;
-
-    private Integer status;
-
-    private Integer payType;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime payTime;
-
-    private Integer patientId;
-
-    private Integer socialUserId;
-
-    private String diagnosisCode;
-
-    private LocalDate createDate;
-
-    private BigDecimal totalCost;
-
-    private Integer salePersonId;
 
     private String salePersonName;
 }

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

@@ -1,58 +1,13 @@
 package com.syjiaer.clinic.server.entity.charge.vo;
 
+import com.syjiaer.clinic.server.entity.patient.PatientInfo;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+
 @Data
-public class PatientPrintInfoVo {
+public class PatientPrintInfoVo extends PatientInfo {
-    private Integer id;
-
-    private String name;
-
-    private String phone;
-
-    private String certNo;
-
-    private Integer sex;
     private String sexStr;
-
-    private Integer age;
-
-    private String certType;
-
-    private String source;
-
-    private String nation;
-
-    private String area;
-
-    private String address;
-
-    private String remark;
-
-    private LocalDateTime createDatetime;
-
-    private Integer levelId;
-
-    private Integer exp;
-
-    private Integer integralBalance;
-
-    private Integer isBindSocial;
-
-    private BigDecimal balance;
-
-    private LocalDate birthday;
-
-    private LocalDateTime lastVisitTime;
-
-    private String beforeMedicalHistory;
-
-    private String allergyHistory;
-
-    private BigDecimal socialBalance;
-
-    private String insutype;
 }

src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java

@@ -179,8 +179,8 @@ public class ChargeService extends BaseService {
             itemDetail.setItemId(item.getId());
             itemDetail.setDiagnosisCode(diaCode);
             itemDetail.setNumber(item.getSelectedNum());
-            itemDetail.setName(item.getItemName());
+            itemDetail.setName(item.getName());
-            itemDetail.setSocialCode(item.getItemSocialCode());
+            itemDetail.setSocialCode(item.getSocialCode());
             itemDetail.setUnit(item.getSelectedUnit());
             itemDetail.setUnitPrice(item.getSelectedPrice());
             mdItmeList.add(itemDetail);
@@ -238,7 +238,7 @@ public class ChargeService extends BaseService {
             if (dbService.getIsGroup()) {
                 List<ItemGroupList> itemGroupList = itemGroupListMapper.selectList(new QueryWrapper<ItemGroupList>().eq("item_id", dbService.getId()).eq("del_flag",false));
                 if (itemGroupList.isEmpty()) {
-                    throw new MessageException("组套:" + service.getItemName() + "没有绑定商品数据");
+                    throw new MessageException("组套:" + service.getName() + "没有绑定商品数据");
                 }
 
                 for (ItemGroupList itemGroup : itemGroupList) {
@@ -282,8 +282,8 @@ public class ChargeService extends BaseService {
                 itemList.setNumber(service.getSelectedNum());
                 itemList.setSubTotalPrice(service.getUnitPrice());
                 itemList.setUnit(service.getSelectedUnit());
-                itemList.setName(service.getItemName());
+                itemList.setName(service.getName());
-                itemList.setSocialCode(service.getItemSocialCode());
+                itemList.setSocialCode(service.getSocialCode());
                 itemList.setFeedetlSn(fsn);
                 itemList.setCreateDate(nowLocalDate);
                 itemList.setCreateTime(nowLocalDateTime);

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

@@ -327,15 +327,15 @@ public class CheckService extends BaseService {
                 fsiOrderDtos.setChrgType("02");
                 // 传啥不知道 ----字典表没有
                 fsiOrderDtos.setDrordBhvr("0");
-                fsiOrderDtos.setHilistCode(itemInfo.getItemSocialCode());
+                fsiOrderDtos.setHilistCode(itemInfo.getSocialCode());
-                fsiOrderDtos.setHilistName(itemInfo.getItemName());
+                fsiOrderDtos.setHilistName(itemInfo.getName());
                 fsiOrderDtos.setHilistDosform(itemInfo.getSelectedUnit());
                 //穿啥不知道 写死的
                 fsiOrderDtos.setHilistLv("01");
                 //把itemInfo.getSelectedUnit()转化成BigDecimal价格
                 fsiOrderDtos.setHilistPric(itemInfo.getSelectedPrice());
-                fsiOrderDtos.setHosplistCode(itemInfo.getItemSocialCode());
+                fsiOrderDtos.setHosplistCode(itemInfo.getSocialCode());
-                fsiOrderDtos.setHosplistName(itemInfo.getItemName());
+                fsiOrderDtos.setHosplistName(itemInfo.getName());
                 //数量 取diagnosis_medical_goods_list number字段
                 fsiOrderDtos.setCnt(BigDecimal.valueOf(itemInfo.getSelectedNum()));
                 fsiOrderDtos.setPric(itemInfo.getUnitPrice());