Merge branch 'dev-1.1.1' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.1

src/main/java/cn/hnthyy/thmz/controller/yf/YfWardPrescriptionController.java

@@ -373,7 +373,7 @@ public class YfWardPrescriptionController {
             String pageNos = yfWardPrescriptionService.queryYzYpPageNoStr(groupNo, wardCode, pageClass);
             resultMap.put("code", 0);
             resultMap.put("message", "查询病房近期(三天)请领单药品汇总信息成功");
-            resultMap.put("data", yfWardVos.stream().sorted(Comparator.comparing(YfWardVo::getLocation)).collect(Collectors.toList()));
+            resultMap.put("data", yfWardVos.stream().sorted(Comparator.comparing(YfWardVo::getLocation,Comparator.nullsLast(String::compareTo))).collect(Collectors.toList()));
             resultMap.put("pageNos", pageNos);
             return resultMap;
         } catch (Exception e) {