|
@@ -152,7 +152,8 @@ public class YfWardPrescriptionController {
|
|
|
});
|
|
|
resultMap.put("code", 0);
|
|
|
resultMap.put("message", "查询病房请领单药品汇总信息成功");
|
|
|
- resultMap.put("data", yfWardVos.stream().sorted(Comparator.comparing(YfWardVo::getLocation)));
|
|
|
+ resultMap.put("data", yfWardVos.stream().sorted(Comparator.comparing(YfWardVo::getLocation, Comparator.nullsLast(String::compareTo)))
|
|
|
+ .collect(Collectors.toList()));
|
|
|
return resultMap;
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|