|
@@ -1009,15 +1009,17 @@ public class ConsoleFacade {
|
|
|
sameThirdLevelPercentStr
|
|
|
= df.format(BigDecimal.valueOf(sameThirdLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
|
|
|
}
|
|
|
-
|
|
|
- if("内科".equals(filterOrderVO.getDeptClass())){
|
|
|
+ if (StringUtil.isBlank(filterOrderVO.getDeptClass()) || filterOrderVO.getDeptClass().equals("全院")) {
|
|
|
+ item.setDeptName("全院");
|
|
|
+ }else if("内科".equals(filterOrderVO.getDeptClass())){
|
|
|
item.setDeptClassId("01");
|
|
|
item.setDeptClass("内科");
|
|
|
+ item.setDeptName("全部科室");
|
|
|
}else if("外科".equals(filterOrderVO.getDeptClass())){
|
|
|
item.setDeptClassId("1030000");
|
|
|
item.setDeptClass("外科");
|
|
|
+ item.setDeptName("全部科室");
|
|
|
}
|
|
|
- item.setDeptName("全院");
|
|
|
item.setEntryNum(entryNum);
|
|
|
item.setSameNum(sameNum);
|
|
|
item.setMrNum(mrNum);
|