统计指标优化

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

@@ -64,10 +64,22 @@ public class AfterStatistics implements Serializable {
 	@Excel(name = "主诊医师编码", width = 15)
     @ApiModelProperty(value = "主诊医师编码")
     private java.lang.String doctorId;
-	/**收费项目类别*/
-	@Excel(name = "收费项目类别", width = 15)
-    @ApiModelProperty(value = "收费项目类别")
+    /**患者编码*/
+    @Excel(name = "患者编码", width = 15)
+    @ApiModelProperty(value = "患者编码")
+    private String patientId;
+    /**患者姓名*/
+    @Excel(name = "患者姓名", width = 15)
+    @ApiModelProperty(value = "患者姓名")
+    private String patientName;
+	/**收费项目等级*/
+	@Excel(name = "收费项目等级", width = 15)
+    @ApiModelProperty(value = "收费项目等级")
     private java.lang.String changeClass;
+    /**医疗收费项目类别*/
+    @Excel(name = "医疗收费项目类别", width = 15)
+    @ApiModelProperty(value = "医疗收费项目类别")
+    private String categoriesItems;
 	/**占比统计*/
 	@Excel(name = "占比统计", width = 15)
     @ApiModelProperty(value = "占比统计")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDatav_master_admission_billJob.java

@@ -89,7 +89,6 @@ public class XCFYDatav_master_admission_billJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
         String sql = "select * from V_YBKF_MASTER_ADMISSION_BILL where hisid is not null and pay_method!='自费' and bill_date<=:END_BILL_DATE %s  order by bill_date asc";
         Date endBillDate = DateUtil.yesterday();
         endBillDate = DateUtil.endOfDay(endBillDate);