配置管理

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

@@ -101,7 +101,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
                 it.setFactorCatalogStr(first.get().getRuleName());
             }
             it.setFactorCatalogId(it.getFactorCatalog());
-            if (it.getEnhanceType() == 1) {
+            if (it.getEnhanceType() == 1 || it.getEnhanceType() == 4) {
                 List<FactorAttrRela> inList = factorAttrRelaService.lambdaQuery().eq(FactorAttrRela::getIoType, Constant.INPUT).eq(FactorAttrRela::getFactorEnhanceId, it.getId()).list();
                 if (inList.size() > 0) {
                     inList.sort(Comparator.comparing(FactorAttrRela::getSeqNum));

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

@@ -67,10 +67,13 @@ public class MedicalInsRuleProject implements Serializable {
 	/**收费等级;01 甲类 02 乙类 03 丙类 04 可报丙类*/
 	@Excel(name = "收费等级;01 甲类 02 乙类 03 丙类 04 可报丙类", width = 15)
     @ApiModelProperty(value = "收费等级;01 甲类 02 乙类 03 丙类 04 可报丙类")
+    @Dict(dicCode = "change_class")
     private java.lang.String changeClass;
     /**医疗收费项目类别*/
     @Excel(name = "医疗收费项目类别;01\t床位费 02\t诊察费 03\t检查费 04\t化验费 05\t治疗费 06\t手术费 07\t护理费 08\t卫生材料费 09\t西药费 10\t中药饮片费 11\t中成药费 12\t一般诊疗费 13\t挂号费 14\t其他费 14012\t单病种除外内容 14013\t单病种超标准床位费 14014\t单病种定额标准费 1407\t救护车费 1408\tMRI费 1409\tCT费 1410\t彩超费 1411\t输氧费 1412\t输血费 1413\t麻醉费 1414\t麻醉相关项目费 1415\t其他医疗费", width = 15)
     @ApiModelProperty(value = "医疗收费项目类别;01\t床位费 02\t诊察费 03\t检查费 04\t化验费 05\t治疗费 06\t手术费 07\t护理费 08\t卫生材料费 09\t西药费 10\t中药饮片费 11\t中成药费 12\t一般诊疗费 13\t挂号费 14\t其他费 14012\t单病种除外内容 14013\t单病种超标准床位费 14014\t单病种定额标准费 1407\t救护车费 1408\tMRI费 1409\tCT费 1410\t彩超费 1411\t输氧费 1412\t输血费 1413\t麻醉费 1414\t麻醉相关项目费 1415\t其他医疗费")
+    @Dict(dicCode = "categories_items")
+
     private java.lang.String categoriesItems;
 	/**年龄;*/
 	@Excel(name = "年龄;", width = 15)
@@ -79,10 +82,14 @@ public class MedicalInsRuleProject implements Serializable {
 	/**医疗机构等级;*/
 	@Excel(name = "医疗机构等级;", width = 15)
     @ApiModelProperty(value = "医疗机构等级;")
+    @Dict(dicCode = "medical_ins_level")
+
     private java.lang.String medicalInsLevel;
 	/**医师级别;*/
 	@Excel(name = "医师级别;", width = 15)
     @ApiModelProperty(value = "医师级别;")
+    @Dict(dicCode = "doctor_level")
+
     private java.lang.String doctorLevel;
 	/**参保类型;*/
 	@Excel(name = "参保类型;", width = 15)