医嘱打印毒麻处方

src/main/java/thyyxxk/webserver/config/exception/ExceptionEnum.java

@@ -48,6 +48,8 @@ public enum ExceptionEnum implements ExceptionEnumInterface {
     TOKEN_EXPIRED(3005, "令牌已过期，请重新登录！"),
     TEST_ENVIRONMENT(3006, "测试环境已关闭请使用正式环境接口"),
 
+    ERROR_NO_MESSAGE(4003, "无需提示的返回,且catch返回完整的 Result"),
+
     // 以下是不需要提示的错误
     SLIGHTLY_ERROR(4001, "无需提示的返回。"),
     PRE_DISCHARGE_ERROR(4002, "出院预审有可疑数据。"),

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/YizhuLuRuController.java

@@ -292,9 +292,4 @@ public class YizhuLuRuController {
         return server.printPoisonousHemp(params);
     }
 
-    @PostMapping("/printPoisonousHempByConfirmMedicalOrders")
-    public ResultVo<PrintOrderVo> printPoisonousHempByConfirmMedicalOrders(@RequestBody PoisonousHempReq params) {
-        return server.printPoisonousHempByConfirmMedicalOrders(params);
-    }
-
 }

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

@@ -296,7 +296,11 @@ public class YiZhuLuRuServer {
         }
         drgOrderUpdate(patInfo.getInpatientNo() + "_" + patInfo.getAdmissTimes() + "_" + patInfo.getLedgerSn());
         sendAMessageToTheNurse(param, userCode, patInfo, "新增医嘱");
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_MESSAGE);
+
+        List<BigDecimal> orders = yiZhuList.stream().map(XinZhenYzActOrder::getActOrderNo).collect(Collectors.toList());
+        checkMap.clear();
+        checkMap.put("orders", orders);
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_MESSAGE, ExceptionEnum.SUCCESS_AND_EL_MESSAGE.getMessage(), checkMap);
     }
 
     /**
@@ -1542,19 +1546,10 @@ public class YiZhuLuRuServer {
         return map;
     }
 
-    public ResultVo<PrintOrderVo> printPoisonousHempByConfirmMedicalOrders(PoisonousHempReq params) {
-        String code = TokenUtil.getInstance().getTokenUserId();
-        QueryWrapper<?> qw = new QueryWrapper<>();
-        qw.eq("a.inpatient_no", params.getPatNo())
-                .eq("a.admiss_times", params.getTimes())
-                .eq("a.enter_oper", code)
-                .eq("a.status_flag", "1");
-        return printPoisonousHemp(params, dao.selectPoisonousHempByConfirm(qw));
-    }
 
     public ResultVo<PrintOrderVo> printPoisonousHemp(PoisonousHempReq params, List<PrintOrderVo.DrugData> drugData) {
         if (ListUtil.isBlank(drugData)) {
-            return R.fail(ExceptionEnum.LOGICAL_ERROR, "未找到相关数据");
+            return R.fail(ExceptionEnum.ERROR_NO_MESSAGE, "未找到相关数据");
         }
 
         PrintOrderVo vo = dao.selectPoisonousHempPatientInfo(params.getPatNo());
@@ -1581,7 +1576,7 @@ public class YiZhuLuRuServer {
 
     public ResultVo<PrintOrderVo> printPoisonousHemp(PoisonousHempReq params) {
         if (ListUtil.isBlank(params.getOrders())) {
-            return R.fail(ExceptionEnum.LOGICAL_ERROR, "请先选择病历。");
+            return R.fail(ExceptionEnum.ERROR_NO_MESSAGE, "请先选择医嘱。");
         }
         QueryWrapper<?> qw = new QueryWrapper<>();
         UserInfo userInfoByToken = userCache.getUserInfoByToken();