Merge branch 'master' of https://172.16.32.165/lighter/web-server

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

@@ -512,7 +512,6 @@ public class JianYanJianChaShenQingService {
                 if (StringUtil.isBlank(item.getDiagCode())) {
                     cuoWuXinXi.append(baoCunCuoWuXinXi(index, "临床诊断不能为空。"));
                 }
-
             } else {
                 if (StringUtil.isBlank(item.getInspectStuff())) {
                     cuoWuXinXi.append(baoCunCuoWuXinXi(index, "标本不能为空。"));
@@ -525,7 +524,7 @@ public class JianYanJianChaShenQingService {
             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>",
-                    "2".equals(param.getReqType()) ? "检查名" : "检验名",
+                    JC_TYPE.equals(item.getReqType()) ? "检查名" : "检验名",
                     item.getOrderName(), huanZheXinXi.getName(), huanZheXinXi.getBedNo()));
             index++;
         }
@@ -624,7 +623,6 @@ public class JianYanJianChaShenQingService {
             item.setReqNo(publicServer.getReqPageNo());
             reqNos.add(item.getReqNo());
         }
-
         insertData(param, huanZheXinXi, content);
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_MESSAGE, "操作成功", reqNos);
     }
@@ -720,7 +718,7 @@ public class JianYanJianChaShenQingService {
                 PublicServer.getInfantFlag(param.getInpatientNo()),
                 reqDate);
         try {
-            publicServer.faSongXiaoXi(patInfo, content, "2".equals(param.getReqType()) ? "新增检查" : "新增检验", TokenUtil.getInstance().getTokenUserId());
+            publicServer.faSongXiaoXi(patInfo, content, "新增检查/检验", TokenUtil.getInstance().getTokenUserId());
         } catch (Exception e) {
             log.error(e.getMessage());
         }