From c84a43328bb3f65b1e75dd7c78d2154b099f5216 Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Mon, 30 Mar 2026 17:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8D=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RegTransitSampleServiceImpl.java        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java
index 447f3be..d829be6 100644
--- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java
+++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java
@@ -132,19 +132,23 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
                         return new Result("-1", barcode+"标本已经签收或者上机，不能再进行送检操作！");
                     if (affirmUserName == null || affirmUserName.equals(""))
                         return new Result("-1", "affirmUserName标本采集人姓名不能为空！");
-                    regTransitSample.setAffirmTime(commonUtil.getCurrentTime());//affirmTime
-                    regTransitSample.setAffirmUserCode(affirmUserCode);
-                    regTransitSample.setAffirmUserName(affirmUserName);
-                    regTransitSample.setStatus("20");
+                    if(statusSample.equals("10") || statusSample.equals("30")){
+                        regTransitSample.setAffirmTime(commonUtil.getCurrentTime());//affirmTime
+                        regTransitSample.setAffirmUserCode(affirmUserCode);
+                        regTransitSample.setAffirmUserName(affirmUserName);
+                        regTransitSample.setStatus("20");
+
+                        regApply.setStatus("10");
+                        requestInfoUtil.updateRegTransitSampleStatus(regTransitSample,regApply);
+                    }
 
-                    regApply.setStatus("10");
-                    requestInfoUtil.updateRegTransitSampleStatus(regTransitSample,regApply);
                     break;
                 case "30": //标本送检
                     if (dstHospName == null || dstHospName.equals("")) return new Result("-1", "dstHospName不能为空！");
                     if (sendUserName == null || sendUserName.equals(""))
                         return new Result("-1", "sendUserName不能为空！");
                     if (statusSample.equals("30")) return new Result("-1", "该标本已经送检！");
+                    if (statusSample.equals("10")) return new Result("-1","该条码还没有打印，不允许送出！");
                     if (Integer.parseInt(statusSample) > 30)
                         return new Result("-1", barcode+"标本已经签收或者上机，不能再进行送检操作！");
                     regTransitSample.setDstHospCode(dstHospCode);