|
|
|
@ -103,16 +103,16 @@ public class StatisticsService {
|
|
|
|
|
String checkDoctor = archiveMasterVo.getCheckDoctor();
|
|
|
|
|
//模糊搜索审核姓名转换工号
|
|
|
|
|
if(StringUtils.isNoneBlank(checkDoctor)){
|
|
|
|
|
String checkNames = "";
|
|
|
|
|
StringBuilder checkNames = new StringBuilder();
|
|
|
|
|
for(User user:userList){
|
|
|
|
|
if(StringUtils.isNoneBlank(user.getName()) && user.getName().contains(checkDoctor)){
|
|
|
|
|
checkNames += user.getUserName() + ",";
|
|
|
|
|
if(StringUtils.isNotBlank(checkNames)){
|
|
|
|
|
checkNames.append(",");
|
|
|
|
|
}
|
|
|
|
|
checkNames.append("'").append(user.getUserName()).append("'");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(StringUtils.isNotBlank(checkNames)){
|
|
|
|
|
checkNames = checkNames.substring(0,checkNames.length()-1);
|
|
|
|
|
archiveMasterVo.setCheckDoctor(checkNames);
|
|
|
|
|
}
|
|
|
|
|
archiveMasterVo.setCheckDoctor(checkNames.toString());
|
|
|
|
|
}
|
|
|
|
|
List<Archive_Master_Vo> list = statisticsMapper.statistics(disStartDate,disEndDate,archiveMasterVo,flag,sql);
|
|
|
|
|
for(Archive_Master_Vo statistics:list) {
|
|
|
|
|