增加医保收入分析报表显示

src/main/java/thyyxxk/webserver/dao/his/ybkf/YbStatDao.java

@@ -30,6 +30,9 @@ public interface YbStatDao {
             "bigIllFundPooling=cast(round(sum(a.hifmi_pay),2) as decimal(12,2)), " +
             "civilServiceFund=cast(round(sum(a.cvlserv_pay),2) as decimal(12,2)), " +
             "otherFunds=cast(round(sum(isnull(a.fund_pay_sumamt,0)-isnull(a.hifp_pay,0)-isnull(a.cvlserv_pay,0)-isnull(a.hifmi_pay,0)-isnull(a.maf_pay,0)-isnull(a.hifob_pay,0)-isnull(a.hifes_pay,0)),2) as decimal(12,2)), " +
+            "mafPay=cast(round(sum(a.maf_pay),2) as decimal(12,2)), " + //医疗救助基金支出
+            "hifobPay=cast(round(sum(a.hifob_pay),2) as decimal(12,2)), " + //职工大额医疗费用补助基金支出
+            "hifesPay=cast(round(sum(a.hifes_pay),2) as decimal(12,2)), " + //企业补充医疗保险基金支出
             "allFunds=cast(round(sum(a.fund_pay_sumamt),2) as decimal(12,2)), " +
             "drugFee=cast(round(sum(isnull(a.charge_western_medicine,0) + isnull(a.charge_patent_medicine,0) + isnull(a.charge_herbal,0)),2) as decimal(12,2)), " +
             "drugFeeRatio=cast(round(sum(isnull(a.charge_western_medicine,0) + isnull(a.charge_patent_medicine,0) + isnull(a.charge_herbal,0))/sum(a.medfee_sumamt)*100,2) as decimal(12,2)), " +
@@ -71,6 +74,9 @@ public interface YbStatDao {
             "bigIllFundPooling=cast(round(sum(a.hifmi_pay),2) as decimal(12,2)), " +
             "civilServiceFund=cast(round(sum(a.cvlserv_pay),2) as decimal(12,2)), " +
             "otherFunds=cast(round(sum(isnull(a.fund_pay_sumamt,0)-isnull(a.hifp_pay,0)-isnull(a.cvlserv_pay,0)-isnull(a.hifmi_pay,0)-isnull(a.maf_pay,0)-isnull(a.hifob_pay,0)-isnull(a.hifes_pay,0)),2) as decimal(12,2)), " +
+            "mafPay=cast(round(sum(a.maf_pay),2) as decimal(12,2)), " + //医疗救助基金支出
+            "hifobPay=cast(round(sum(a.hifob_pay),2) as decimal(12,2)), " + //职工大额医疗费用补助基金支出
+            "hifesPay=cast(round(sum(a.hifes_pay),2) as decimal(12,2)), " + //企业补充医疗保险基金支出
             "allFunds=cast(round(sum(a.fund_pay_sumamt),2) as decimal(12,2)), " +
             "drugFee=cast(round(sum(isnull(a.charge_western_medicine,0) + isnull(a.charge_patent_medicine,0) + isnull(a.charge_herbal,0)),2) as decimal(12,2)), " +
             "drugFeeRatio=cast(round(sum(isnull(a.charge_western_medicine,0) + isnull(a.charge_patent_medicine,0) + isnull(a.charge_herbal,0))/sum(a.medfee_sumamt)*100,2) as decimal(12,2)), " +
@@ -93,6 +99,9 @@ public interface YbStatDao {
             "bigIllFundPooling=cast(round(sum(a.hifmi_pay),2) as decimal(12,2)), " +
             "civilServiceFund=cast(round(sum(a.cvlserv_pay),2) as decimal(12,2)), " +
             "otherFunds=cast(round(sum(isnull(a.fund_pay_sumamt,0)-isnull(a.hifp_pay,0)-isnull(a.cvlserv_pay,0)-isnull(a.hifmi_pay,0)-isnull(a.maf_pay,0)-isnull(a.hifob_pay,0)-isnull(a.hifes_pay,0)),2) as decimal(12,2)), " +
+            "mafPay=cast(round(sum(a.maf_pay),2) as decimal(12,2)), " + //医疗救助基金支出
+            "hifobPay=cast(round(sum(a.hifob_pay),2) as decimal(12,2)), " + //职工大额医疗费用补助基金支出
+            "hifesPay=cast(round(sum(a.hifes_pay),2) as decimal(12,2)), " + //企业补充医疗保险基金支出
             "allFunds=cast(round(sum(a.fund_pay_sumamt),2) as decimal(12,2)), " +
             "drugFee=cast(round(sum(isnull(a.charge_western_medicine,0) + isnull(a.charge_patent_medicine,0) + isnull(a.charge_herbal,0)),2) as decimal(12,2)), " +
             "drugFeeRatio=cast(round(sum(isnull(a.charge_western_medicine,0) + isnull(a.charge_patent_medicine,0) + isnull(a.charge_herbal,0))/sum(a.medfee_sumamt)*100,2) as decimal(12,2)), " +
@@ -115,6 +124,9 @@ public interface YbStatDao {
             "bigIllFundPooling=cast(round(sum(a.hifmi_pay),2) as decimal(12,2)), " +
             "civilServiceFund=cast(round(sum(a.cvlserv_pay),2) as decimal(12,2)), " +
             "otherFunds=cast(round(sum(isnull(a.fund_pay_sumamt,0)-isnull(a.hifp_pay,0)-isnull(a.cvlserv_pay,0)-isnull(a.hifmi_pay,0)-isnull(a.maf_pay,0)-isnull(a.hifob_pay,0)-isnull(a.hifes_pay,0)),2) as decimal(12,2)), " +
+            "mafPay=cast(round(sum(a.maf_pay),2) as decimal(12,2)), " + //医疗救助基金支出
+            "hifobPay=cast(round(sum(a.hifob_pay),2) as decimal(12,2)), " + //职工大额医疗费用补助基金支出
+            "hifesPay=cast(round(sum(a.hifes_pay),2) as decimal(12,2)), " + //企业补充医疗保险基金支出
             "allFunds=cast(round(sum(a.fund_pay_sumamt),2) as decimal(12,2)), " +
             "drugFee=cast(round(sum(isnull(a.charge_western_medicine,0) + isnull(a.charge_patent_medicine,0) + isnull(a.charge_herbal,0)),2) as decimal(12,2)), " +
             "drugFeeRatio=cast(round(sum(isnull(a.charge_western_medicine,0) + isnull(a.charge_patent_medicine,0) + isnull(a.charge_herbal,0))/sum(a.medfee_sumamt)*100,2) as decimal(12,2)), " +

src/main/java/thyyxxk/webserver/entity/ybkf/YbStatResult.java

@@ -28,5 +28,8 @@ public class YbStatResult {
     private String allFunds;
     private String yf;
     private String acctPay;
+    private String mafPay;
+    private String hifobPay;
+    private String hifesPay;
 
 }