|
@@ -1090,7 +1090,7 @@ public class ConsoleFacade {
|
|
|
}else {
|
|
|
mapCode.put("operation",operationBehospitalCode);
|
|
|
}
|
|
|
- if(ListUtil.isEmpty(operationBehospitalCode)||ListUtil.isEmpty(operationPathologyBehospitalCode)){
|
|
|
+ if(ListUtil.isEmpty(operationBehospitalCode)||ListUtil.isEmpty(pathologyBehospitalCode)){
|
|
|
mapCode.put("operationPathology",null);
|
|
|
}else {
|
|
|
for (String operation : operationBehospitalCode) {
|
|
@@ -1098,7 +1098,7 @@ public class ConsoleFacade {
|
|
|
operationPathologyBehospitalCode.add(operation);
|
|
|
}
|
|
|
}
|
|
|
- mapCode.put("operationPathology",operationBehospitalCode);
|
|
|
+ mapCode.put("operationPathology",operationPathologyBehospitalCode);
|
|
|
}
|
|
|
if(ListUtil.isEmpty(bacterialCultureCode)){
|
|
|
mapCode.put("bacterialCulture",null);
|
|
@@ -3011,6 +3011,9 @@ public class ConsoleFacade {
|
|
|
firMap.put("num",operationFeeNum);
|
|
|
};
|
|
|
firMap.put("name","手术相关记录完成率");
|
|
|
+ if("0.0".equals(num)){
|
|
|
+ num = "0.00";
|
|
|
+ }
|
|
|
firMap.put("notCopiedStr",StringUtils.isEmpty(num) ? "0.00%":(num+"%"));
|
|
|
|
|
|
retList.add(firMap);
|