project新增字段

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

@@ -453,7 +453,7 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         dtoList.add(dto4);
         MedicalEnchanceDto dto5 = new MedicalEnchanceDto();
         dto5.setText("就诊类型");
-        String treatmentType = dictService.queryDictTextByKey("consultation_type", medicalInsRuleInfo.getTreatmentType().toString());
+        String treatmentType = dictService.queryDictTextByKey("treatment_type", medicalInsRuleInfo.getTreatmentType().toString());
         dto5.setValue(treatmentType);
         dto5.setComponent("a-input");
         dtoList.add(dto5);

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

@@ -56,7 +56,7 @@ public class MedicalInsRuleInfo implements Serializable {
     /**类别*/
     @Excel(name = "就诊类别", width = 15)
     @ApiModelProperty(value = "就诊类别")
-    @Dict(dicCode = "consultation_type")
+    @Dict(dicCode = "treatment_type")
     private java.lang.String treatmentType;
 	/**规则说明*/
 	@Excel(name = "规则说明", width = 15)

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

@@ -75,7 +75,7 @@ public class MedicalInsRuleProject implements Serializable {
     /**
      * 关联项目编号
      */
-    @Excel(name = "关联项目编号", width = 15)
+    @Excel(name = "关联项目编码", width = 15)
     @ApiModelProperty(value = "关联项目编号")
     @TableField("correlation_project_code")
     private java.lang.String correlationProjectCode;
@@ -88,6 +88,7 @@ public class MedicalInsRuleProject implements Serializable {
     private java.lang.String correlationProjectName;
 
 
+
     /**
      * 收费等级;01 甲类 02 乙类 03 丙类 04 可报丙类
      */
@@ -235,9 +236,41 @@ public class MedicalInsRuleProject implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 
+
+    @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 correlationProjectUseTime;
+
+
+    @ApiModelProperty(value = "规则调用场景;1=事前  2=事后  3=事前/事后 4=事中 5=事后/事中")
+    @Dict(dicCode = "call_scenario")
+    private java.lang.String callScenario;
+    @ApiModelProperty(value = "就诊类型；1=住院，2门诊")
+    @Dict(dicCode = "treatment_type")
+    private String treatmentType;
+
+    @Excel(name = "违规等级", width = 15)
+    @ApiModelProperty(value = "违规等级")
+    @Dict(dicCode = "violation_level")
+    private java.lang.Integer violationLevel;
+    @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 projectUseTime;
+
+    @Excel(name = "医疗总发生费用", width = 15)
+    @ApiModelProperty(value = "医疗总发生费用")
+    private java.math.BigDecimal medfeeSumamt;
+
+
+
+
+
     @TableField(exist = false)
     private List<String> code;
 
     @TableField(exist = false)
     private String correlationMedicalDiagnoseCode;
+
 }