收入量统计报表bug修复

src/main/java/thyyxxk/webserver/service/highreport/AllStatisticsService.java

@@ -288,7 +288,8 @@ public class AllStatisticsService {
                 String zy_yzb = String.valueOf(m2.get("zy_yzb"));
                 if(dept2.equals(dept1)){
                     m1.put("zy_yzb", zy_yzb);
-                    m1.put("zy_zfy", zy_zfy);
+                    // 这里特指统计药品费的科室总费用
+                    m1.put("yp_zfy", zy_zfy);
                     m1.put("zy_ypf", zy_ypf);
                     all_yzb = DecimalUtil.multiply(new BigDecimal(DecimalUtil.divide(DecimalUtil.add(mz_ypf, zy_ypf), DecimalUtil.add(mz_zfy, zy_zfy), 4)), new BigDecimal(100)) + "";
                     flag = false;
@@ -316,6 +317,8 @@ public class AllStatisticsService {
             // 住院药占比有而门诊药占比没有的科室也要加上
             if(flag){
                 String zy_yzb = String.valueOf(m1.get("zy_yzb"));
+                String zy_zfy = String.valueOf(m1.get("zy_zfy"));
+                m1.put("yp_zfy", zy_zfy);
                 m1.put("all_yzb", zy_yzb);
                 yzbList.add(m1);
             }
@@ -336,7 +339,8 @@ public class AllStatisticsService {
                 String zy_hzb = String.valueOf(m2.get("zy_hzb"));
                 if(dept2.equals(dept1)){
                     m1.put("zy_hzb", zy_hzb);
-                    m1.put("zy_zfy", zy_zfy);
+                    // 这里特指统计耗材费的科室总费用
+                    m1.put("hc_zfy", zy_zfy);
                     m1.put("zy_hcf", zy_hcf);
                     all_hzb = DecimalUtil.multiply(new BigDecimal(DecimalUtil.divide(DecimalUtil.add(mz_hcf, zy_hcf), DecimalUtil.add(mz_zfy, zy_zfy), 4)), new BigDecimal(100)) + "";
                     flag = false;
@@ -364,6 +368,8 @@ public class AllStatisticsService {
             // 住院药占比有而门诊药占比没有的科室也要加上
             if(flag){
                 String zy_hzb = String.valueOf(m1.get("zy_hzb"));
+                String zy_zfy = String.valueOf(m1.get("zy_zfy"));
+                m1.put("hc_zfy", zy_zfy);
                 m1.put("all_hzb", zy_hzb);
                 hzbList.add(m1);
             }