From 1400e91e8c807fb40707d1f4cd88a99b096242d8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 八月 2025 09:45:16 +0800
Subject: [PATCH] 生成总报告数值为空逻辑校验
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 339e4e6..6c23578 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
@@ -7,10 +7,7 @@
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.mapper.InsSampleUserMapper;
-import com.yuanchu.mom.pojo.InsOrderFile;
-import com.yuanchu.mom.pojo.InsOrderState;
-import com.yuanchu.mom.pojo.InsProductResult;
-import com.yuanchu.mom.pojo.InsSampleUser;
+import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.InsProductResultVo;
@@ -67,6 +64,13 @@
}
@ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "鏍峰搧缂栧彿鏇存敼")
+ @PostMapping("/changeSampleCode")
+ public Result changeSampleCode(@RequestBody InsSample insSample) {
+ return Result.success(insOrderPlanService.changeSampleCode(insSample.getId(),insSample.getSampleCode()));
+ }
+
+ @ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "璁ら浠诲姟璁″垝")
@PostMapping("/claimInsOrderPlan")
public Result claimInsOrderPlan(@RequestBody InsOrderPlanDTO data) {
@@ -107,6 +111,13 @@
@PostMapping("/verifyPlan")
public Result<?> verifyPlan(Integer sampleId, String laboratory, Integer type, String tell) throws IOException {
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
@@ -245,7 +256,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));
}
@@ -258,7 +268,7 @@
}
@ValueClassify("妫�楠屼换鍔�")
- @ApiOperation(value = "鎵爜鍑哄簱")
+ @ApiOperation(value = "鎵爜鍑哄簱(鍙湁澶嶆牳缁撴潫鎵嶄細璋冪敤)")
@PostMapping("/outInsOrderState")
public Result outInsOrderState(String sonLaboratory, String sampleCode,String entrustCode) {
return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode,entrustCode));
@@ -274,7 +284,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