|
@@ -2071,11 +2071,11 @@ public class StandardReportServiceImpl implements StandardReportService {
|
|
|
if (accountType == null) {
|
|
if (accountType == null) {
|
|
|
return; // 添加 null 检查
|
|
return; // 添加 null 检查
|
|
|
}
|
|
}
|
|
|
|
|
+ DictDataVo costType = standCostDictMaps.getCostTypeMap().get(String.valueOf(account.getCostType()));
|
|
|
//只处理医疗成本
|
|
//只处理医疗成本
|
|
|
- if(!NumberConstant.ONE_S.equals(accountType.getExpandOne()) ){
|
|
|
|
|
|
|
+ if(!NumberConstant.ONE_S.equals(costType.getExpandOne()) ){
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- DictDataVo costType = standCostDictMaps.getCostTypeMap().get(String.valueOf(account.getCostType()));
|
|
|
|
|
DictDataVo standardShareLevel = standCostDictMaps.getStandardShareLevelMap().get(responsibility.getStandardShareLevel());
|
|
DictDataVo standardShareLevel = standCostDictMaps.getStandardShareLevelMap().get(responsibility.getStandardShareLevel());
|
|
|
DeptDirectMedicalCostVO deptDirectMedicalCostVO= new DeptDirectMedicalCostVO();
|
|
DeptDirectMedicalCostVO deptDirectMedicalCostVO= new DeptDirectMedicalCostVO();
|
|
|
if(deptDirectMedicalCostMap.containsKey(allocationQuery.getResponsibilityCode())){
|
|
if(deptDirectMedicalCostMap.containsKey(allocationQuery.getResponsibilityCode())){
|