|
@@ -65,6 +65,8 @@ public class RecordCheckFacade {
|
|
} else if (roleId.intValue() == CheckerRoleEnum.DEPT_SUPERVISOR.getKey()
|
|
} else if (roleId.intValue() == CheckerRoleEnum.DEPT_SUPERVISOR.getKey()
|
|
&& (ListUtil.isEmpty(checkedRecordListVO.getCheckJobTypes()) || checkedRecordListVO.getCheckJobTypes().contains(CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() + ""))) {
|
|
&& (ListUtil.isEmpty(checkedRecordListVO.getCheckJobTypes()) || checkedRecordListVO.getCheckJobTypes().contains(CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() + ""))) {
|
|
userIds.addAll(getUserIdsOfRoleId(hospitalId, deptIds, CheckerRoleEnum.DEPT_GENERAL.getKey()));
|
|
userIds.addAll(getUserIdsOfRoleId(hospitalId, deptIds, CheckerRoleEnum.DEPT_GENERAL.getKey()));
|
|
|
|
+ } else if (roleId.intValue() == CheckerRoleEnum.DEPT_GENERAL.getKey() || roleId.intValue() == CheckerRoleEnum.QUAT_GENERAL.getKey() || roleId.intValue() == CheckerRoleEnum.HOSP_GENERAL.getKey()) {
|
|
|
|
+ userIds.add(userId);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
@@ -81,7 +83,7 @@ public class RecordCheckFacade {
|
|
medQcresultDetailQueryWrapper.select("behospital_code", "cases_entry_id");
|
|
medQcresultDetailQueryWrapper.select("behospital_code", "cases_entry_id");
|
|
Map<String, Long> behospitalCodeCasesMap = medQcresultDetailService.list(medQcresultDetailQueryWrapper).stream().collect(Collectors.groupingBy(MedQcresultDetail::getBehospitalCode, Collectors.counting()));
|
|
Map<String, Long> behospitalCodeCasesMap = medQcresultDetailService.list(medQcresultDetailQueryWrapper).stream().collect(Collectors.groupingBy(MedQcresultDetail::getBehospitalCode, Collectors.counting()));
|
|
iPage.getRecords().forEach(i -> {
|
|
iPage.getRecords().forEach(i -> {
|
|
- i.setCasesEntryNum(behospitalCodeCasesMap.get(i.getBehospitalCode()).intValue());
|
|
|
|
|
|
+ i.setCasesEntryNum(behospitalCodeCasesMap.get(i.getBehospitalCode()) == null ? 0 : behospitalCodeCasesMap.get(i.getBehospitalCode()).intValue());
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
@@ -120,7 +122,7 @@ public class RecordCheckFacade {
|
|
medCheckInfo.setStatus(1);
|
|
medCheckInfo.setStatus(1);
|
|
medCheckInfo.setCheckTime(DateUtil.now());
|
|
medCheckInfo.setCheckTime(DateUtil.now());
|
|
medCheckInfoFacade.updateById(medCheckInfo);
|
|
medCheckInfoFacade.updateById(medCheckInfo);
|
|
-
|
|
|
|
|
|
+
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|