xiaochan 3 лет назад
Родитель
Сommit
1f87aba7b3

+ 3 - 2
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingServer.java

@@ -405,8 +405,9 @@ public class JianYanJianChaShenQingServer {
             }
             xm.add(item.getOrderCode().trim());
             content.add(String.format("%s:<span style='color:#409eff'>【%s】</span><br>" +
-                    "患者姓名:<span style='color:#409eff'>【%s】</span><br>" +
-                    "床位:<span style='color:#409eff'>【%s】</span>", param.getReqType().equals("2") ? "检查名" : "检验名", item.getOrderName(), huanZheXinXi.getName(), huanZheXinXi.getBedNo()));
+                            "患者姓名:<span style='color:#409eff'>【%s】</span><br>" +
+                            "床位:<span style='color:#409eff'>【%s】</span>", param.getReqType().equals("2") ? "检查名" : "检验名",
+                    item.getOrderName(), huanZheXinXi.getName(), huanZheXinXi.getBedNo()));
             index++;
         }
         String tingYong = publicServer.xiangMuXianZhi(xm, true);

+ 1 - 1
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -818,7 +818,7 @@ public class YiZhuLuRuServer {
         publicServer.faSongXiaoXi(dao.huoQuHuanZheXinXi(yz.getInpatientNo(), yz.getAdmissTimes()),
                 Stream.of(String.format("医嘱名:【%s】,<br>" +
                         "医嘱号:【%s】,<br>" +
-                        "撤销原因【%s】", yz.getOrderName(), yz.getActOrderNo(), content)).collect(Collectors.toList()),
+                        "撤销原因【%s】", yz.getOrderName(), yz.getActOrderNo().toString(), content)).collect(Collectors.toList()),
                 "撤销医嘱", TokenUtil.getTokenUserId());
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "医嘱撤销成功。");
     }