临床服务类科室全成本构成分析表d的收入及诊次/床日成本计算不正确的问题修复

src/main/java/com/kcim/service/impl/StandardReportServiceImpl.java

@@ -1661,7 +1661,7 @@ public class StandardReportServiceImpl implements StandardReportService {
             item.setProfit(item.getIncome().subtract(item.getTotal()));
         }else{
             item.setIncome(BigDecimal.ZERO);
-            item.setProfit(BigDecimal.ZERO);
+            item.setProfit(item.getIncome().subtract(item.getTotal()));
         }
         //计算科室的床日成本及诊次成本
         if(responsibilityParamValueMap.containsKey(item.getResponsibilityCode())){
@@ -2078,13 +2078,13 @@ public class StandardReportServiceImpl implements StandardReportService {
         }
         DictDataVo standardShareLevel = standCostDictMaps.getStandardShareLevelMap().get(responsibility.getStandardShareLevel());
         DeptDirectMedicalCostVO deptDirectMedicalCostVO= new DeptDirectMedicalCostVO();
-        if(deptDirectMedicalCostMap.containsKey(allocationQuery.getResponsibilityCode())){
-            deptDirectMedicalCostVO=deptDirectMedicalCostMap.get(allocationQuery.getResponsibilityCode());
+        if(deptDirectMedicalCostMap.containsKey(responsibility.getResponsibilityCode())){
+            deptDirectMedicalCostVO=deptDirectMedicalCostMap.get(responsibility.getResponsibilityCode());
         }else{
             initDeptCostReport(deptDirectMedicalCostVO, responsibility,accountType, costType,standardShareLevel);
             // 初始化所有费用字段为0
             BeanUtil.initBigDecimalFieldsToZero(deptDirectMedicalCostVO);
-            deptDirectMedicalCostMap.put(allocationQuery.getResponsibilityCode(),deptDirectMedicalCostVO);
+            deptDirectMedicalCostMap.put(responsibility.getResponsibilityCode(),deptDirectMedicalCostVO);
         }
         // 根据费用类型累加到对应字段
         switch (accountType.getExpandOne()) {