关联收费项目等级

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

@@ -86,6 +86,8 @@ public class MedicalInsRuleProject implements Serializable {
     @ApiModelProperty(value = "关联项目名称")
     @TableField("correlation_project_name")
     private java.lang.String correlationProjectName;
+
+
     /**
      * 收费等级;01 甲类 02 乙类 03 丙类 04 可报丙类
      */
@@ -94,6 +96,18 @@ public class MedicalInsRuleProject implements Serializable {
     @Dict(dicCode = "change_class")
     @TableField("change_class")
     private java.lang.String changeClass;
+
+    /**
+     * 关联项目收费等级
+     */
+    /**
+     * 收费等级;01 甲类 02 乙类 03 丙类 04 可报丙类
+     */
+    @Excel(name = "关联收费项目等级", width = 15)
+    @ApiModelProperty(value = "关联收费项目等级;01 甲类 02 乙类 03 丙类 04 可报丙类")
+    @Dict(dicCode = "change_class")
+    @TableField("correlation_change_class")
+    private java.lang.String correlationChangeClass;
     /**
      * 医疗收费项目类别
      */

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterIncidentLogServiceImpl.java

@@ -36,7 +36,6 @@ public class AfterIncidentLogServiceImpl extends ServiceImpl<AfterIncidentLogMap
         afterIncidentLog.setVisitType(Constant.TREAMENT_TYPE_HOSP);
         afterIncidentLog.setInHospDate(masterAdmissionBill.getAdmissionDate());
         afterIncidentLog.setState(Constant.WATING);
-        afterIncidentLog.
         Integer medicalINsurance = 0;
         if(!"0".equals(masterAdmissionBill.getPayMethod())){
             medicalINsurance = 1;