住院医生

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -107,7 +107,8 @@ public class YiZhuLuRuServer {
     public ResultVo<List<XinZhenYzActOrder>> huoQuYiZhuShuJu(YiZhuFeiYongChaXunTiaoJian param) {
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.eq("a.inpatient_no", param.getPatNo()).eq("a.admiss_times", param.getTimes());
-        qw.orderByDesc("a.act_order_no");
+//        qw.orderByDesc("a.act_order_no");
+        qw.orderByAsc("a.order_time");
         List<XinZhenYzActOrder> yiZhuList = dao.huoQuYiZhuShuJu(qw);
         // 还有那些没有被匹配的子级医嘱
         Map<BigDecimal, XinZhenYzActOrder> wuFuJiYiZhu = yiZhuList.stream().collect(Collectors.toMap(XinZhenYzActOrder::getActOrderNo, a -> a, (k1, k2) -> k1));
@@ -161,6 +162,7 @@ public class YiZhuLuRuServer {
             if (ListUtil.notBlank(zy.getChildren())) {
                 zy.getChildren().get(zy.getChildren().size() - 1).setOrderGroup("└");
                 list.addAll(zy.getChildren());
+                zy.setChildren(null);
             }
         }
         return ResultVoUtil.success(list);
@@ -310,7 +312,7 @@ public class YiZhuLuRuServer {
             }
             // 判断是不是抗菌药物
             XinZhenYzActOrder kssItem = drug.get(data.getOrderCode().trim() + data.getSerial().trim());
-            if (kssItem.getKjywFlag() != null && kssItem.getKjywFlag() == 1) {
+            if (kssItem != null && kssItem.getKjywFlag() != null && kssItem.getKjywFlag() == 1) {
                 YzActRecordKss kss = new YzActRecordKss();
                 kss.setActOrderNo(data.getActOrderNo());
                 kss.setChargeCode(data.getOrderCode());