Merge branch 'master' into 'master'

其他基金支出计算修改

See merge request lighter/web-server!7

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

@@ -29,7 +29,7 @@ public interface YbStatDao {
             "acctPay=cast(round(sum(a.acct_pay),2) as decimal(10,2)), " +
             "bigIllFundPooling=cast(round(sum(a.hifmi_pay),2) as decimal(10,2)), " +
             "civilServiceFund=cast(round(sum(a.cvlserv_pay),2) as decimal(10,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)),2) as decimal(10,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(10,2)), " +
             "allFunds=cast(round(sum(a.fund_pay_sumamt),2) as decimal(10,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(10,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(10,2)), " +
@@ -70,7 +70,7 @@ public interface YbStatDao {
             "fundPooling=cast(round(sum(a.hifp_pay),2) as decimal(10,2)), " +
             "bigIllFundPooling=cast(round(sum(a.hifmi_pay),2) as decimal(10,2)), " +
             "civilServiceFund=cast(round(sum(a.cvlserv_pay),2) as decimal(10,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)),2) as decimal(10,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(10,2)), " +
             "allFunds=cast(round(sum(a.fund_pay_sumamt),2) as decimal(10,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(10,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(10,2)), " +
@@ -92,7 +92,7 @@ public interface YbStatDao {
             "fundPooling=cast(round(sum(a.hifp_pay),2) as decimal(10,2)), " +
             "bigIllFundPooling=cast(round(sum(a.hifmi_pay),2) as decimal(10,2)), " +
             "civilServiceFund=cast(round(sum(a.cvlserv_pay),2) as decimal(10,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)),2) as decimal(10,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(10,2)), " +
             "allFunds=cast(round(sum(a.fund_pay_sumamt),2) as decimal(10,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(10,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(10,2)), " +
@@ -114,7 +114,7 @@ public interface YbStatDao {
             "fundPooling=cast(round(sum(a.hifp_pay),2) as decimal(10,2)), " +
             "bigIllFundPooling=cast(round(sum(a.hifmi_pay),2) as decimal(10,2)), " +
             "civilServiceFund=cast(round(sum(a.cvlserv_pay),2) as decimal(10,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)),2) as decimal(10,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(10,2)), " +
             "allFunds=cast(round(sum(a.fund_pay_sumamt),2) as decimal(10,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(10,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(10,2)), " +
@@ -216,7 +216,7 @@ public interface YbStatDao {
             "fundPooling=cast(round(sum(a.hifp_pay),2) as decimal(10,2)), " +
             "bigIllFundPooling=cast(round(sum(a.hifmi_pay),2) as decimal(10,2)), " +
             "civilServiceFund=cast(round(sum(a.cvlserv_pay),2) as decimal(10,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)),2) as decimal(10,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(10,2)), " +
             "allFunds=cast(round(sum(a.fund_pay_sumamt),2) as decimal(10,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(10,2)), " +
             "matFee=cast(round(isnull(sum(a.charge_sanitary_material),0),2) as decimal(10,2)) " +