初始化his缓存

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

@@ -33,29 +33,30 @@ public class Medicine implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**药品ID*/
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "药品ID")
     private java.lang.Integer id;
-    /**药品名称*/
-    @Excel(name = "药品名称", width = 15)
-    @ApiModelProperty(value = "药品名称")
-    private java.lang.String medicineName;
-    /**药品编码*/
-    @Excel(name = "药品编码", width = 15)
-    @ApiModelProperty(value = "药品编码")
+
+    /**项目编码*/
+    @Excel(name = "项目编码", width = 15)
+    @ApiModelProperty(value = "项目编码")
     private java.lang.String medicineCode;
-    /**名称拼音*/
-    @Excel(name = "名称拼音", width = 15)
-    @ApiModelProperty(value = "名称拼音")
-    private java.lang.String namePinyin;
-    /**商品名称*/
-    @Excel(name = "商品名称", width = 15)
-    @ApiModelProperty(value = "商品名称")
-    private java.lang.String commodityName;
+    /**通用名称*/
+    @Excel(name = "通用名称", width = 15)
+    @ApiModelProperty(value = "通用名称")
+    private java.lang.String medicineName;
+//    /**名称拼音*/
+//    @Excel(name = "名称拼音", width = 15)
+//    @ApiModelProperty(value = "名称拼音")
+//    private java.lang.String namePinyin;
+//    /**商品名称*/
+//    @Excel(name = "商品名称", width = 15)
+//    @ApiModelProperty(value = "商品名称")
+//    private java.lang.String commodityName;
 
-    @Excel(name = "单价", width = 15)
-    @ApiModelProperty(value = "单价")
-    private BigDecimal price;
+//    @Excel(name = "单价", width = 15)
+//    @ApiModelProperty(value = "单价")
+//    private BigDecimal price;
     /**剂型*/
     @Excel(name = "剂型", width = 15)
     @ApiModelProperty(value = "剂型")
@@ -64,46 +65,46 @@ public class Medicine implements Serializable {
     @Excel(name = "规格", width = 15)
     @ApiModelProperty(value = "规格")
     private java.lang.String regSpe;
-    /**包装材质*/
-    @Excel(name = "包装材质", width = 15)
-    @ApiModelProperty(value = "包装材质")
-    private java.lang.String packageMaterial;
-    /**最小包装数量*/
-    @Excel(name = "最小包装数量", width = 15)
-    @ApiModelProperty(value = "最小包装数量")
-    private java.lang.String moq;
-    /**最小制剂单位*/
-    @Excel(name = "最小制剂单位", width = 15)
-    @ApiModelProperty(value = "最小制剂单位")
-    private java.lang.String mdu;
-    /**最小包装单位*/
-    @Excel(name = "最小包装单位", width = 15)
-    @ApiModelProperty(value = "最小包装单位")
-    private java.lang.String mpu;
+//    /**包装材质*/
+//    @Excel(name = "包装材质", width = 15)
+//    @ApiModelProperty(value = "包装材质")
+//    private java.lang.String packageMaterial;
+//    /**最小包装数量*/
+//    @Excel(name = "最小包装数量", width = 15)
+//    @ApiModelProperty(value = "最小包装数量")
+//    private java.lang.String moq;
+//    /**最小制剂单位*/
+//    @Excel(name = "最小制剂单位", width = 15)
+//    @ApiModelProperty(value = "最小制剂单位")
+//    private java.lang.String mdu;
+//    /**最小包装单位*/
+//    @Excel(name = "最小包装单位", width = 15)
+//    @ApiModelProperty(value = "最小包装单位")
+//    private java.lang.String mpu;
     /**药品企业(厂家)*/
     @Excel(name = "药品企业(厂家)", width = 15)
     @ApiModelProperty(value = "药品企业(厂家)")
     private java.lang.String medicineEnterprise;
-    /**批准文号*/
-    @Excel(name = "批准文号", width = 15)
-    @ApiModelProperty(value = "批准文号")
-    private java.lang.String approvalNumber;
-    /**药品本位码*/
-    @Excel(name = "药品本位码", width = 15)
-    @ApiModelProperty(value = "药品本位码")
-    private java.lang.String drugStandardCode;
-    /**医保甲乙类*/
-    @Excel(name = "医保甲乙类", width = 15)
-    @ApiModelProperty(value = "医保甲乙类")
-    private java.lang.String medicalInsAbclass;
-    /**医保编号*/
-    @Excel(name = "医保编号", width = 15)
-    @ApiModelProperty(value = "医保编号")
-    private java.lang.String medicalInsNumber;
-    /**版本号*/
-    @Excel(name = "版本号", width = 15)
-    @ApiModelProperty(value = "版本号")
-    private java.lang.Integer revision;
+//    /**批准文号*/
+//    @Excel(name = "批准文号", width = 15)
+//    @ApiModelProperty(value = "批准文号")
+//    private java.lang.String approvalNumber;
+//    /**药品本位码*/
+//    @Excel(name = "药品本位码", width = 15)
+//    @ApiModelProperty(value = "药品本位码")
+//    private java.lang.String drugStandardCode;
+//    /**医保甲乙类*/
+//    @Excel(name = "医保甲乙类", width = 15)
+//    @ApiModelProperty(value = "医保甲乙类")
+//    private java.lang.String medicalInsAbclass;
+//    /**医保编号*/
+//    @Excel(name = "医保编号", width = 15)
+//    @ApiModelProperty(value = "医保编号")
+//    private java.lang.String medicalInsNumber;
+//    /**版本号*/
+//    @Excel(name = "版本号", width = 15)
+//    @ApiModelProperty(value = "版本号")
+//    private java.lang.Integer revision;
     /**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
@@ -121,37 +122,32 @@ public class Medicine implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
     /**状态*/
-    @Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
     private java.lang.String state;
     /**父节点;父节点的药品编码*/
-    @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;
+
+//    /**财务编码*/
+//    @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")
@@ -169,25 +165,29 @@ public class Medicine implements Serializable {
     @ApiModelProperty(value = "计价单位")
     private java.lang.String unitAccount;
     /**最高销售限价*/
-    @Excel(name = "最高销售限价", width = 15)
+    @Excel(name = "最高销售限价（元）", width = 15)
     @ApiModelProperty(value = "最高销售限价")
     private java.lang.String maxSaleLimit;
     /**医保结算支付价*/
-    @Excel(name = "医保结算支付价", width = 15)
+    @Excel(name = "医保结算支付价（元）", width = 15)
     @ApiModelProperty(value = "医保结算支付价")
-    private java.math.BigDecimal medicalPrice;
+    private String medicalPrice;
     /**拆分比率*/
     @Excel(name = "拆分比率", width = 15)
     @ApiModelProperty(value = "拆分比率")
     private java.lang.String splitRatio;
     /**最小销售计价单位*/
-    @Excel(name = "最小销售计价单位", width = 15)
+    @Excel(name = "最小销售计价单位（元）", width = 15)
     @ApiModelProperty(value = "最小销售计价单位")
     private java.lang.String minSaleUnit;
+    /**最小销售限价*/
+    @Excel(name = "最小销售限价", width = 15)
+    @ApiModelProperty(value = "最小销售限价")
+    private String  minSaleLimit;
     /**最小医保结算支付价*/
     @Excel(name = "最小医保结算支付价", width = 15)
     @ApiModelProperty(value = "最小医保结算支付价")
-    private java.math.BigDecimal minBillingPrice;
+    private String minBillingPrice;
     /**发票项目*/
     @Excel(name = "发票项目", width = 15)
     @ApiModelProperty(value = "发票项目")
@@ -195,13 +195,14 @@ public class Medicine implements Serializable {
     /**是否医保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;
+    private java.lang.String isMedical;
+    /**挂网状态*/
+    @Excel(name = "药品标识", width = 15)
+    @ApiModelProperty(value = "药品标识")
+    private java.lang.String drugLabel;
+    /**挂网状态*/
+    @Excel(name = "挂网状态", width = 15)
+    @ApiModelProperty(value = "挂网状态: in=挂网，out=暂停挂网，none=无")
+    private java.lang.String gridStatus;
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/projectcache/HisMedicalProjectCache.java

@@ -44,7 +44,7 @@ public class HisMedicalProjectCache {
     @Autowired
     IOperativeItemsService operativeItemsService;
 
-    @PostConstruct
+//    @PostConstruct
     public void initHisMedicalProjectCache() {
         long count = medicalInsuranceDrugsService.lambdaQuery().isNotNull(MedicalInsuranceDrugs::getItemIdHosp).isNotNull(MedicalInsuranceDrugs::getMedicineCode).count();
 

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

@@ -20,6 +20,7 @@ import org.jeecg.common.system.vo.DictQuery;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.*;
 import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
+import org.jeecg.modules.medical.ruleengine.projectcache.HisMedicalProjectCache;
 import org.jeecg.modules.system.entity.SysDict;
 import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.system.model.SysDictTree;
@@ -71,6 +72,8 @@ public class SysDictController {
 	private DictQueryBlackListHandler dictQueryBlackListHandler;
 	@Autowired
 	private RedisUtil redisUtil;
+	@Autowired
+	private  HisMedicalProjectCache hisMedicalProjectCache;
 
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result<IPage<SysDict>> queryPageList(SysDict sysDict,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -487,6 +490,14 @@ public class SysDictController {
 		return result;
 	}
 
+
+	@RequestMapping(value = "/refleshHisCache")
+	public Result<?> refleshHisCache() {
+		Result<?> result = new Result<SysDict>();
+		hisMedicalProjectCache.initHisMedicalProjectCache();
+		return result;
+	}
+
 	/**
 	 * 导出excel
 	 *