|
@@ -124,7 +124,7 @@ public class ConsoleByDeptFacade {
|
|
|
//质控病历总数
|
|
|
List<NumDTO> totleNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterByDeptVO);
|
|
|
Map<String, NumDTO> totleMap = ListUtil.isEmpty(totleNumList)
|
|
|
- ? null
|
|
|
+ ? new HashMap<>()
|
|
|
: EntityUtil.makeEntityMap(totleNumList, "name");
|
|
|
//甲级病历
|
|
|
qcresultFilterByDeptVO.setLevel("甲");
|
|
@@ -162,6 +162,11 @@ public class ConsoleByDeptFacade {
|
|
|
if (thirdMap.containsKey(deptName)) {
|
|
|
thirdLevelNum = thirdMap.get(deptName).getNum();
|
|
|
}
|
|
|
+ //总病历数为0
|
|
|
+ if (totleNum == 0) {
|
|
|
+ retMap.put(deptName, Lists.newLinkedList());
|
|
|
+ continue;
|
|
|
+ }
|
|
|
NumDTO totleNumDTO = new NumDTO();
|
|
|
totleNumDTO.setName("累计质控病历数");
|
|
|
totleNumDTO.setTotleNum(totleNum);
|
|
@@ -250,7 +255,7 @@ public class ConsoleByDeptFacade {
|
|
|
continue;
|
|
|
}
|
|
|
//病历数
|
|
|
- Integer mrNum = mrMap.get(deptMap).getNum();
|
|
|
+ Integer mrNum = mrMap.get(deptName).getNum();
|
|
|
//没有缺陷
|
|
|
if (!qcEntryMap.containsKey(deptName)) {
|
|
|
retMap.put(deptName, Lists.newLinkedList());
|