规则id更名

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

@@ -123,7 +123,7 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         }
         List<DictDto> dictDtos = sysDictService.queryDictByKeys(Arrays.asList(medicalInsRuleInfo.getSelectedRoles().split(",")));
         MedicalInsRuleProject medicalInsRuleProject = new MedicalInsRuleProject();
-        medicalInsRuleProject.setMedicineInsRuleInfoId(id);
+        medicalInsRuleProject.setMedicalInsRuleInfoId(id);
         if(StringUtils.hasText(projectName)){
             medicalInsRuleProject.setProjectName(projectName);
         }

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

@@ -39,7 +39,7 @@ public class MedicalInsRuleProject implements Serializable {
 	/**医保规则ID*/
 	@Excel(name = "医保规则ID", width = 15)
     @ApiModelProperty(value = "医保规则ID")
-    private java.lang.Integer medicineInsRuleInfoId;
+    private java.lang.Integer medicalInsRuleInfoId;
 	/**医保主数据类型;MEDICINE（药品主数据表）、CONSUMABLE_METERIAL(耗材主数据表)、DIAGNOSIS_TREATMENT（诊疗主数据表）、DIAGNOSIS(诊断主数据表)、OPERATIVE(手术主数据表)*/
 	@Excel(name = "医保主数据类型;MEDICINE（药品主数据表）、CONSUMABLE_METERIAL(耗材主数据表)、DIAGNOSIS_TREATMENT（诊疗主数据表）、DIAGNOSIS(诊断主数据表)、OPERATIVE(手术主数据表)", width = 15)
     @ApiModelProperty(value = "医保主数据类型;MEDICINE（药品主数据表）、CONSUMABLE_METERIAL(耗材主数据表)、DIAGNOSIS_TREATMENT（诊疗主数据表）、DIAGNOSIS(诊断主数据表)、OPERATIVE(手术主数据表)")

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

@@ -33,13 +33,13 @@ public class MedicalInsRuleProjectDiagnose 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;
 	/**医保规则id*/
 	@Excel(name = "医保规则id", width = 15)
     @ApiModelProperty(value = "医保规则id")
-    private java.lang.Integer medicineInsRuleInfoId;
+    private java.lang.Integer medicalInsRuleInfoId;
 	/**医保规则项目编码*/
 	@Excel(name = "医保规则项目编码", width = 15)
     @ApiModelProperty(value = "医保规则项目编码")

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

@@ -144,37 +144,37 @@ public class RuleEngine {
         try {
 
             MemeryPageUtil.batchDeal(medicalInsRuleInfoIdList, 1000, pageDataList -> {
-                List<MedicalInsRuleProject> medicalInsRuleProjectList = medicalInsRuleProjectService.lambdaQuery().in(MedicalInsRuleProject::getMedicineInsRuleInfoId, pageDataList).list();
+                List<MedicalInsRuleProject> medicalInsRuleProjectList = medicalInsRuleProjectService.lambdaQuery().in(MedicalInsRuleProject::getMedicalInsRuleInfoId, pageDataList).list();
                 if (CollectionUtil.isNotEmpty(medicalInsRuleProjectList)) {
                     MedicalInsRuleProject medicalInsRuleProject = null;
                     for (int index = 0; index < medicalInsRuleProjectList.size(); index++) {
                         medicalInsRuleProject = medicalInsRuleProjectList.get(index);
                         if (StringUtils.isNotBlank(medicalInsRuleProject.getProjectCode())) {
                             if (itemCodeAndRuleIdMap.containsKey(medicalInsRuleProject.getProjectCode())) {
-                                itemCodeAndRuleIdMap.get(medicalInsRuleProject.getProjectCode()).add(medicalInsRuleProject.getMedicineInsRuleInfoId());
+                                itemCodeAndRuleIdMap.get(medicalInsRuleProject.getProjectCode()).add(medicalInsRuleProject.getMedicalInsRuleInfoId());
                             } else {
                                 Set<Integer> ruleIdSet = new HashSet<>();
-                                ruleIdSet.add(medicalInsRuleProject.getMedicineInsRuleInfoId());
+                                ruleIdSet.add(medicalInsRuleProject.getMedicalInsRuleInfoId());
                                 itemCodeAndRuleIdMap.put(medicalInsRuleProject.getProjectCode(), ruleIdSet);
                             }
                         }
                         if (StringUtils.isNotBlank(medicalInsRuleProject.getCorrelationProjectCode())) {
                             if (itemCodeAndRuleIdMap.containsKey(medicalInsRuleProject.getCorrelationProjectCode())) {
-                                itemCodeAndRuleIdMap.get(medicalInsRuleProject.getCorrelationProjectCode()).add(medicalInsRuleProject.getMedicineInsRuleInfoId());
+                                itemCodeAndRuleIdMap.get(medicalInsRuleProject.getCorrelationProjectCode()).add(medicalInsRuleProject.getMedicalInsRuleInfoId());
                             } else {
                                 Set<Integer> ruleIdSet = new HashSet<>();
-                                ruleIdSet.add(medicalInsRuleProject.getMedicineInsRuleInfoId());
+                                ruleIdSet.add(medicalInsRuleProject.getMedicalInsRuleInfoId());
                                 itemCodeAndRuleIdMap.put(medicalInsRuleProject.getCorrelationProjectCode(), ruleIdSet);
                             }
                         }
-                        List<MedicalInsRuleProjectDiagnose> medicalInsRuleProjectDiagnoseList = medicalInsRuleProjectDiagnoseService.lambdaQuery().eq(MedicalInsRuleProjectDiagnose::getMedicineInsRuleInfoId, medicalInsRuleProject.getMedicineInsRuleInfoId()).list();
+                        List<MedicalInsRuleProjectDiagnose> medicalInsRuleProjectDiagnoseList = medicalInsRuleProjectDiagnoseService.lambdaQuery().eq(MedicalInsRuleProjectDiagnose::getMedicineInsRuleInfoId, medicalInsRuleProject.getMedicalInsRuleInfoId()).list();
                         if (CollectionUtil.isNotEmpty(medicalInsRuleProjectDiagnoseList)) {
                             for (MedicalInsRuleProjectDiagnose medicalInsRuleProjectDiagnose : medicalInsRuleProjectDiagnoseList) {
                                 if (itemCodeAndRuleIdMap.containsKey(medicalInsRuleProjectDiagnose.getMedicalDiagnoseCode())) {
-                                    itemCodeAndRuleIdMap.get(medicalInsRuleProjectDiagnose.getMedicalDiagnoseCode()).add(medicalInsRuleProject.getMedicineInsRuleInfoId());
+                                    itemCodeAndRuleIdMap.get(medicalInsRuleProjectDiagnose.getMedicalDiagnoseCode()).add(medicalInsRuleProject.getMedicalInsRuleInfoId());
                                 } else {
                                     Set<Integer> ruleIdSet = new HashSet<>();
-                                    ruleIdSet.add(medicalInsRuleProject.getMedicineInsRuleInfoId());
+                                    ruleIdSet.add(medicalInsRuleProject.getMedicalInsRuleInfoId());
                                     itemCodeAndRuleIdMap.put(medicalInsRuleProjectDiagnose.getMedicalDiagnoseCode(), ruleIdSet);
                                 }
                             }
@@ -201,10 +201,10 @@ public class RuleEngine {
      */
     public void setMIDProjectCodeToRedis(MedicalInsRuleProject medicalInsRuleProject) {
         redisTemplate.opsForHash().put(Constant.MEDICAL_RULE_CACHE_KEY + "_" + Constant.TREATMEN_TYPE_MID_INCIDENT_WARNING,
-                medicalInsRuleProject.getProjectCode(), medicalInsRuleProject.getMedicineInsRuleInfoId());
+                medicalInsRuleProject.getProjectCode(), medicalInsRuleProject.getMedicalInsRuleInfoId());
         if (StringUtils.isNotBlank(medicalInsRuleProject.getCorrelationProjectCode())) {
             redisTemplate.opsForHash().put(Constant.MEDICAL_RULE_CACHE_KEY + "_" + Constant.TREATMEN_TYPE_MID_INCIDENT_WARNING,
-                    medicalInsRuleProject.getCorrelationProjectCode(), medicalInsRuleProject.getMedicineInsRuleInfoId());
+                    medicalInsRuleProject.getCorrelationProjectCode(), medicalInsRuleProject.getMedicalInsRuleInfoId());
         }
     }