药品字段整合

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/ConsumableMaterialController.java

@@ -43,7 +43,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  * @Date:   2023-04-23
  * @Version: V1.0
  */
-@Api(tags="consumable_material")
+@Api(tags="医用耗材目录")
 @RestController
 @RequestMapping("/medical/consumableMaterial")
 @Slf4j

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/ConsumableMaterial.java

@@ -48,6 +48,42 @@ public class ConsumableMaterial implements Serializable {
 	@Excel(name = "耗材版本", width = 15)
     @ApiModelProperty(value = "耗材版本")
     private java.lang.String consumableVersion;
+	/**耗材材质*/
+	@Excel(name = "耗材材质", width = 15)
+    @ApiModelProperty(value = "耗材材质")
+    private java.lang.String consumableMaterial;
+	/**注册备案产品名称*/
+	@Excel(name = "注册备案产品名称", width = 15)
+    @ApiModelProperty(value = "注册备案产品名称")
+    private java.lang.String registeredProductName;
+	/**企业名称*/
+	@Excel(name = "企业名称", width = 15)
+    @ApiModelProperty(value = "企业名称")
+    private java.lang.String companyName;
+	/**产品名称*/
+	@Excel(name = "产品名称", width = 15)
+    @ApiModelProperty(value = "产品名称")
+    private java.lang.String productName;
+	/**注册备案号*/
+	@Excel(name = "注册备案号", width = 15)
+    @ApiModelProperty(value = "注册备案号")
+    private java.lang.String registrationNumber;
+	/**计量单位*/
+	@Excel(name = "计量单位", width = 15)
+    @ApiModelProperty(value = "计量单位")
+    private java.lang.String unit;
+	/**一级分类*/
+	@Excel(name = "一级分类", width = 15)
+    @ApiModelProperty(value = "一级分类")
+    private java.lang.String oneCategory;
+	/**二级分类*/
+	@Excel(name = "二级分类", width = 15)
+    @ApiModelProperty(value = "二级分类")
+    private java.lang.String twoCategory;
+	/**三级分类*/
+	@Excel(name = "三级分类", width = 15)
+    @ApiModelProperty(value = "三级分类")
+    private java.lang.String threeCategory;
 	/**说明*/
 	@Excel(name = "说明", width = 15)
     @ApiModelProperty(value = "说明")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/Medicine.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: medicine
  * @Author: jeecg-boot
- * @Date:   2023-04-23
+ * @Date:   2023-05-17 23:35:41
  * @Version: V1.0
  */
 @Data
@@ -32,96 +32,172 @@ import lombok.experimental.Accessors;
 public class Medicine implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**药品ID*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**药品ID*/
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "药品ID")
     private java.lang.Integer id;
-	/**药品名称*/
-	@Excel(name = "药品名称", width = 15)
+    /**药品名称*/
+    @Excel(name = "药品名称", width = 15)
     @ApiModelProperty(value = "药品名称")
     private java.lang.String medicineName;
-	/**药品编码*/
-	@Excel(name = "药品编码", width = 15)
+    /**药品编码*/
+    @Excel(name = "药品编码", width = 15)
     @ApiModelProperty(value = "药品编码")
     private java.lang.String medicineCode;
-	/**名称拼音*/
-	@Excel(name = "名称拼音", width = 15)
+    /**名称拼音*/
+    @Excel(name = "名称拼音", width = 15)
     @ApiModelProperty(value = "名称拼音")
     private java.lang.String namePinyin;
-	/**商品名称*/
-	@Excel(name = "商品名称", width = 15)
+    /**商品名称*/
+    @Excel(name = "商品名称", width = 15)
     @ApiModelProperty(value = "商品名称")
     private java.lang.String commodityName;
-	/**注册剂型*/
-	@Excel(name = "注册剂型", width = 15)
-    @ApiModelProperty(value = "注册剂型")
+    /**剂型*/
+    @Excel(name = "剂型", width = 15)
+    @ApiModelProperty(value = "剂型")
     private java.lang.String regDosForm;
-	/**注册规格*/
-	@Excel(name = "注册规格", width = 15)
-    @ApiModelProperty(value = "注册规格")
+    /**规格*/
+    @Excel(name = "规格", width = 15)
+    @ApiModelProperty(value = "规格")
     private java.lang.String regSpe;
-	/**包装材质*/
-	@Excel(name = "包装材质", width = 15)
+    /**包装材质*/
+    @Excel(name = "包装材质", width = 15)
     @ApiModelProperty(value = "包装材质")
     private java.lang.String packageMaterial;
-	/**最小包装数量*/
-	@Excel(name = "最小包装数量", width = 15)
+    /**最小包装数量*/
+    @Excel(name = "最小包装数量", width = 15)
     @ApiModelProperty(value = "最小包装数量")
     private java.lang.String moq;
-	/**最小制剂单位*/
-	@Excel(name = "最小制剂单位", width = 15)
+    /**最小制剂单位*/
+    @Excel(name = "最小制剂单位", width = 15)
     @ApiModelProperty(value = "最小制剂单位")
     private java.lang.String mdu;
-	/**最小包装单位*/
-	@Excel(name = "最小包装单位", width = 15)
+    /**最小包装单位*/
+    @Excel(name = "最小包装单位", width = 15)
     @ApiModelProperty(value = "最小包装单位")
     private java.lang.String mpu;
-	/**药品企业*/
-	@Excel(name = "药品企业", width = 15)
-    @ApiModelProperty(value = "药品企业")
+    /**药品企业(厂家)*/
+    @Excel(name = "药品企业(厂家)", width = 15)
+    @ApiModelProperty(value = "药品企业(厂家)")
     private java.lang.String medicineEnterprise;
-	/**批准文号*/
-	@Excel(name = "批准文号", width = 15)
+    /**批准文号*/
+    @Excel(name = "批准文号", width = 15)
     @ApiModelProperty(value = "批准文号")
     private java.lang.String approvalNumber;
-	/**药品本位码*/
-	@Excel(name = "药品本位码", width = 15)
+    /**药品本位码*/
+    @Excel(name = "药品本位码", width = 15)
     @ApiModelProperty(value = "药品本位码")
     private java.lang.String drugStandardCode;
-	/**医保甲乙类*/
-	@Excel(name = "医保甲乙类", width = 15)
+    /**医保甲乙类*/
+    @Excel(name = "医保甲乙类", width = 15)
     @ApiModelProperty(value = "医保甲乙类")
     private java.lang.String medicalInsAbclass;
-	/**医保编号*/
-	@Excel(name = "医保编号", width = 15)
+    /**医保编号*/
+    @Excel(name = "医保编号", width = 15)
     @ApiModelProperty(value = "医保编号")
     private java.lang.String medicalInsNumber;
-	/**版本号*/
-	@Excel(name = "版本号", width = 15)
+    /**版本号*/
+    @Excel(name = "版本号", width = 15)
     @ApiModelProperty(value = "版本号")
     private java.lang.Integer revision;
-	/**创建人*/
+    /**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    /**创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
-	/**更新人*/
+    /**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    /**更新时间*/
+    @JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
+    /**状态*/
+    @Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
     private java.lang.String state;
-	/**父节点;父节点的药品编码*/
-	@Excel(name = "父节点;父节点的药品编码", width = 15)
+    /**父节点;父节点的药品编码*/
+    @Excel(name = "父节点;父节点的药品编码", width = 15)
     @ApiModelProperty(value = "父节点;父节点的药品编码")
     private java.lang.String parentNode;
+    /**剂型*/
+    @Excel(name = "剂型", width = 15)
+    @ApiModelProperty(value = "剂型")
+    private java.lang.String dosageForm;
+    /**财务编码*/
+    @Excel(name = "财务编码", width = 15)
+    @ApiModelProperty(value = "财务编码")
+    private java.lang.String financialOde;
+    /**病案项目*/
+    @Excel(name = "病案项目", width = 15)
+    @ApiModelProperty(value = "病案项目")
+    private java.lang.String caseProject;
+    /**病案编码*/
+    @Excel(name = "病案编码", width = 15)
+    @ApiModelProperty(value = "病案编码")
+    private java.lang.String caseCode;
+    /**项目名称*/
+    @Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    private java.lang.String projectName;
+    /**项目内涵*/
+    @Excel(name = "项目内涵", width = 15)
+    @ApiModelProperty(value = "项目内涵")
+    private java.lang.String projectConnotation;
+    /**产品ID*/
+    @Excel(name = "产品ID", width = 15)
+    @ApiModelProperty(value = "产品ID")
+    private java.lang.String productId;
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+    /**生育保险是否支付*/
+    @Excel(name = "生育保险是否支付", width = 15)
+    @ApiModelProperty(value = "生育保险是否支付")
+    private java.lang.Integer isPay;
+    /**计价单位*/
+    @Excel(name = "计价单位", width = 15)
+    @ApiModelProperty(value = "计价单位")
+    private java.lang.String unitAccount;
+    /**最高销售限价*/
+    @Excel(name = "最高销售限价", width = 15)
+    @ApiModelProperty(value = "最高销售限价")
+    private java.lang.String maxSaleLimit;
+    /**医保结算支付价*/
+    @Excel(name = "医保结算支付价", width = 15)
+    @ApiModelProperty(value = "医保结算支付价")
+    private java.math.BigDecimal medicalPrice;
+    /**拆分比率*/
+    @Excel(name = "拆分比率", width = 15)
+    @ApiModelProperty(value = "拆分比率")
+    private java.lang.String splitRatio;
+    /**最小销售计价单位*/
+    @Excel(name = "最小销售计价单位", width = 15)
+    @ApiModelProperty(value = "最小销售计价单位")
+    private java.lang.String minSaleUnit;
+    /**最小医保结算支付价*/
+    @Excel(name = "最小医保结算支付价", width = 15)
+    @ApiModelProperty(value = "最小医保结算支付价")
+    private java.math.BigDecimal minBillingPrice;
+    /**发票项目*/
+    @Excel(name = "发票项目", width = 15)
+    @ApiModelProperty(value = "发票项目")
+    private java.lang.String invoiceItem;
+    /**是否医保0否1是*/
+    @Excel(name = "是否医保0否1是", width = 15)
+    @ApiModelProperty(value = "是否医保0否1是")
+    private java.lang.Integer isMedical;
+    /**省本级自付比例*/
+    @Excel(name = "省本级自付比例", width = 15)
+    @ApiModelProperty(value = "省本级自付比例")
+    private java.lang.String pTypePct;
+    /**最小销售限价*/
+    @Excel(name = "最小销售限价", width = 15)
+    @ApiModelProperty(value = "最小销售限价")
+    private java.math.BigDecimal minSaleLimit;
 }