Compare commits
1 Commits
bugfix-403
...
荀彧
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
706c679f68 |
@@ -178,7 +178,8 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
|
|||||||
inpatientAdviceParam.setEncounterIds(null);
|
inpatientAdviceParam.setEncounterIds(null);
|
||||||
Integer exeStatus = inpatientAdviceParam.getExeStatus();
|
Integer exeStatus = inpatientAdviceParam.getExeStatus();
|
||||||
inpatientAdviceParam.setExeStatus(null);
|
inpatientAdviceParam.setExeStatus(null);
|
||||||
// requestStatus由前端tab控制,后端SQL已通过CASE条件处理校对状态过滤,无需再作为SQL条件
|
// requestStatus由前端tab控制,需在后端过滤
|
||||||
|
Integer requestStatus = inpatientAdviceParam.getRequestStatus();
|
||||||
inpatientAdviceParam.setRequestStatus(null);
|
inpatientAdviceParam.setRequestStatus(null);
|
||||||
// 构建查询条件
|
// 构建查询条件
|
||||||
QueryWrapper<InpatientAdviceParam> queryWrapper
|
QueryWrapper<InpatientAdviceParam> queryWrapper
|
||||||
@@ -292,6 +293,16 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
|
|||||||
inpatientAdvicePage.setTotal(filteredList.size());
|
inpatientAdvicePage.setTotal(filteredList.size());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 按请求状态(tab切换)过滤医嘱
|
||||||
|
if (requestStatus != null) {
|
||||||
|
List<InpatientAdviceDto> statusFilteredList = inpatientAdvicePage.getRecords().stream()
|
||||||
|
.filter(advice -> requestStatus.equals(advice.getRequestStatus()))
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
inpatientAdvicePage.setRecords(statusFilteredList);
|
||||||
|
inpatientAdvicePage.setTotal(statusFilteredList.size());
|
||||||
|
}
|
||||||
|
|
||||||
return R.ok(inpatientAdvicePage);
|
return R.ok(inpatientAdvicePage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user