|
|
|
@ -203,35 +203,40 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
});
|
|
|
|
|
//masterIds集合
|
|
|
|
|
List<String> masterIds = ListUtil.distinctSelect(list, Archive_Master_Vo::getId);
|
|
|
|
|
//转成逗号拼接
|
|
|
|
|
String ids = String.join(",", masterIds);
|
|
|
|
|
//获取医生缺陷数量
|
|
|
|
|
List<Archive_Master_Vo> doctorDefectNum = archiveMasterMapper.getDoctorDefectNum(ids);
|
|
|
|
|
//医生是否有缺陷
|
|
|
|
|
Map<String, Archive_Master_Vo> doctorMap = ListUtil.toMap(doctorDefectNum, Archive_Master_Vo::getArchiveDetailId);
|
|
|
|
|
Setters.<Archive_Master_Vo>instance().list(list).cycleSetProperties(p -> {
|
|
|
|
|
String doctorId = p.getId();
|
|
|
|
|
if (doctorMap.containsKey(doctorId)){
|
|
|
|
|
String faultDoctorNum = doctorMap.get(doctorId).getFaultDoctorNum();
|
|
|
|
|
p.setFaultDoctorNum(faultDoctorNum);
|
|
|
|
|
p.setNumb(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
//获取护士缺陷数量
|
|
|
|
|
List<Archive_Master_Vo> nurseDefectNum = archiveMasterMapper.getNurseDefectNum(ids);
|
|
|
|
|
//护士是否有缺陷
|
|
|
|
|
Map<String, Archive_Master_Vo> nurseMap = ListUtil.toMap(nurseDefectNum, Archive_Master_Vo::getArchiveDetailId);
|
|
|
|
|
//判断是否有缺陷就填入
|
|
|
|
|
Setters.<Archive_Master_Vo>instance().list(list).cycleSetProperties(p -> {
|
|
|
|
|
String nurseId = p.getId();
|
|
|
|
|
if (nurseMap.containsKey(nurseId)){
|
|
|
|
|
String faultNurseNum = nurseMap.get(nurseId).getFaultNurseNum();
|
|
|
|
|
p.setFaultNurseNum(faultNurseNum);
|
|
|
|
|
p.setNumb(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
//是否有退回
|
|
|
|
|
setFollowingTypeNew(ids,list);
|
|
|
|
|
//分批次
|
|
|
|
|
List<List<String>> newList = ListUtils.partition(masterIds, 1000);
|
|
|
|
|
for (List<String> messageList : newList) {
|
|
|
|
|
//转成逗号拼接
|
|
|
|
|
String ids = String.join(",", messageList);
|
|
|
|
|
//获取医生缺陷数量
|
|
|
|
|
List<Archive_Master_Vo> doctorDefectNum = archiveMasterMapper.getDoctorDefectNum(ids);
|
|
|
|
|
//医生是否有缺陷
|
|
|
|
|
Map<String, Archive_Master_Vo> doctorMap = ListUtil.toMap(doctorDefectNum, Archive_Master_Vo::getArchiveDetailId);
|
|
|
|
|
Setters.<Archive_Master_Vo>instance().list(list).cycleSetProperties(p -> {
|
|
|
|
|
String doctorId = p.getId();
|
|
|
|
|
if (doctorMap.containsKey(doctorId)){
|
|
|
|
|
String faultDoctorNum = doctorMap.get(doctorId).getFaultDoctorNum();
|
|
|
|
|
p.setFaultDoctorNum(faultDoctorNum);
|
|
|
|
|
p.setNumb(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
//获取护士缺陷数量
|
|
|
|
|
List<Archive_Master_Vo> nurseDefectNum = archiveMasterMapper.getNurseDefectNum(ids);
|
|
|
|
|
//护士是否有缺陷
|
|
|
|
|
Map<String, Archive_Master_Vo> nurseMap = ListUtil.toMap(nurseDefectNum, Archive_Master_Vo::getArchiveDetailId);
|
|
|
|
|
//判断是否有缺陷就填入
|
|
|
|
|
Setters.<Archive_Master_Vo>instance().list(list).cycleSetProperties(p -> {
|
|
|
|
|
String nurseId = p.getId();
|
|
|
|
|
if (nurseMap.containsKey(nurseId)){
|
|
|
|
|
String faultNurseNum = nurseMap.get(nurseId).getFaultNurseNum();
|
|
|
|
|
p.setFaultNurseNum(faultNurseNum);
|
|
|
|
|
p.setNumb(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
//是否有退回
|
|
|
|
|
setFollowingTypeNew(ids,list);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
return list;
|
|
|
|
|
}
|
|
|
|
@ -642,33 +647,37 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
});
|
|
|
|
|
//masterIds集合
|
|
|
|
|
List<String> masterIds = ListUtil.distinctSelect(list, Archive_Master_Vo::getId);
|
|
|
|
|
//转成逗号拼接
|
|
|
|
|
String ids = String.join(",", masterIds);
|
|
|
|
|
//获取医生缺陷数量
|
|
|
|
|
List<Archive_Master_Vo> doctorDefectNum = archiveMasterMapper.getDoctorDefectNum(ids);
|
|
|
|
|
//医生是否有缺陷
|
|
|
|
|
Map<String, Archive_Master_Vo> doctorMap = ListUtil.toMap(doctorDefectNum, Archive_Master_Vo::getArchiveDetailId);
|
|
|
|
|
Setters.<Archive_Master_Vo>instance().list(list).cycleSetProperties(p -> {
|
|
|
|
|
String doctorId = p.getId();
|
|
|
|
|
if (doctorMap.containsKey(doctorId)){
|
|
|
|
|
String faultDoctorNum = doctorMap.get(doctorId).getFaultDoctorNum();
|
|
|
|
|
p.setFaultDoctorNum(faultDoctorNum);
|
|
|
|
|
p.setNumb(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
//获取护士缺陷数量
|
|
|
|
|
List<Archive_Master_Vo> nurseDefectNum = archiveMasterMapper.getNurseDefectNum(ids);
|
|
|
|
|
//护士是否有缺陷
|
|
|
|
|
Map<String, Archive_Master_Vo> nurseMap = ListUtil.toMap(nurseDefectNum, Archive_Master_Vo::getArchiveDetailId);
|
|
|
|
|
//判断是否有缺陷就填入
|
|
|
|
|
Setters.<Archive_Master_Vo>instance().list(list).cycleSetProperties(p -> {
|
|
|
|
|
String nurseId = p.getId();
|
|
|
|
|
if (nurseMap.containsKey(nurseId)){
|
|
|
|
|
String faultNurseNum = nurseMap.get(nurseId).getFaultNurseNum();
|
|
|
|
|
p.setFaultNurseNum(faultNurseNum);
|
|
|
|
|
p.setNumb(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
//分批次
|
|
|
|
|
List<List<String>> newList = ListUtils.partition(masterIds, 1000);
|
|
|
|
|
for (List<String> messageList : newList) {
|
|
|
|
|
//转成逗号拼接
|
|
|
|
|
String ids = String.join(",", messageList);
|
|
|
|
|
//获取医生缺陷数量
|
|
|
|
|
List<Archive_Master_Vo> doctorDefectNum = archiveMasterMapper.getDoctorDefectNum(ids);
|
|
|
|
|
//医生是否有缺陷
|
|
|
|
|
Map<String, Archive_Master_Vo> doctorMap = ListUtil.toMap(doctorDefectNum, Archive_Master_Vo::getArchiveDetailId);
|
|
|
|
|
Setters.<Archive_Master_Vo>instance().list(list).cycleSetProperties(p -> {
|
|
|
|
|
String doctorId = p.getId();
|
|
|
|
|
if (doctorMap.containsKey(doctorId)){
|
|
|
|
|
String faultDoctorNum = doctorMap.get(doctorId).getFaultDoctorNum();
|
|
|
|
|
p.setFaultDoctorNum(faultDoctorNum);
|
|
|
|
|
p.setNumb(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
//获取护士缺陷数
|
|
|
|
|
List<Archive_Master_Vo> nurseDefectNum = archiveMasterMapper.getNurseDefectNum(ids);
|
|
|
|
|
//护士是否有缺陷
|
|
|
|
|
Map<String, Archive_Master_Vo> nurseMap = ListUtil.toMap(nurseDefectNum, Archive_Master_Vo::getArchiveDetailId);
|
|
|
|
|
//判断是否有缺陷就填入
|
|
|
|
|
Setters.<Archive_Master_Vo>instance().list(list).cycleSetProperties(p -> {
|
|
|
|
|
String nurseId = p.getId();
|
|
|
|
|
if (nurseMap.containsKey(nurseId)){
|
|
|
|
|
String faultNurseNum = nurseMap.get(nurseId).getFaultNurseNum();
|
|
|
|
|
p.setFaultNurseNum(faultNurseNum);
|
|
|
|
|
p.setNumb(1);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
//设置医生、护士名称和打印标识、科室、是否退回医生、是否退回护士
|
|
|
|
|
setNameAndPrintFlagNew(archiveMasterVo, list);
|
|
|
|
|
if(list!=null && list.size()>0) {
|
|
|
|
|