From df13f27e9cae2d7b112ef0dda85cba456ecef32b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 16:45:09 +0800
Subject: [PATCH] 远场和近场的数据解析的单位和指标需要重新对应+报告生成放在复核结束里面
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index c5856b2..d171ba1 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -109,6 +109,13 @@
return Result.success(insOrderPlanService.verifyPlan(sampleId, laboratory, type, tell));
}
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "绾犳澶嶆牳")
+ @PostMapping("/verifyPlan2")
+ public Result<?> verifyPlan2(Integer sampleId, String laboratory, Integer type, String tell) throws IOException {
+ return Result.success(insOrderPlanService.verifyPlan2(sampleId, laboratory, type, tell));
+ }
+
@ValueAuth
@ApiOperation(value = "鏍￠獙妫�楠屼换鍔℃彁浜�")
@PostMapping("/checkSubmitPlan")
@@ -122,6 +129,13 @@
public Result<?> submitPlan(@RequestBody SubmitPlanDto submitPlanDto) {
int num = insOrderPlanService.submitPlan(submitPlanDto);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
+ }
+
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "妫�楠屼换鍔℃挙閿�鎻愪氦")
+ @PostMapping("/cancelSubmitPlan")
+ public Result cancelSubmitPlan(Integer orderStateId) {
+ return Result.success(insOrderPlanService.cancelSubmitPlan(orderStateId));
}
@ValueClassify("璁惧")
@@ -238,7 +252,6 @@
@ValueAuth
@PostMapping("/getInsProduct2")
@ApiOperation("鏌ョ湅妫�楠屽巻鍙�")
- //杩欓噷鐨刬d鏄牱鍝乮d
public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request, Integer num) {
return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request, num));
}
@@ -267,7 +280,6 @@
@ValueAuth
@PostMapping("/getCheckUser")
@ApiOperation("鑾峰彇褰撳墠妫�楠屼换鍔＄殑鎵�鏈夋楠屽憳淇℃伅")
- //杩欓噷鐨勪紶鍙傛槸鏍峰搧id,绛夋楠屼换鍔￠偅鍧楀叏鏀逛簡涔嬪悗杩欓噷灏辨病闂
public Result<?> getCheckUser(Integer id,String sonLaboratory) {
List<InsSampleUser> insSampleUsers = insSampleUserMapper.selectList(Wrappers.<InsSampleUser>lambdaQuery()
.eq(InsSampleUser::getState, 0) //妫�楠屼汉
--
Gitblit v1.9.3