diff --git a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
index 7634bfc..4d9ec2f 100644
--- a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
+++ b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
@@ -97,6 +97,33 @@ public class ZycxServiceImpl implements ZycxService {
         List<String> pdfUrlList = new ArrayList<>();
         for (int i = 0; i < sqh.length; i++) {
             sqhOne = sqh[i];
+
+            LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqhOne);
+            if(labReqmainOne == null) return new Result("-1","没有找到申请单数据！");
+            String zt = labReqmainOne.getZt().trim();
+
+            //采样
+            if(status.equals("12")){
+                if(!zt.equals("1") && !zt.equals("8") && !zt.equals("11")){
+                    return new Result("-1","该条码已经送检或者上机或者已审核，不允许做采样操作！");
+                }
+            }
+
+            //送检
+            if(status.equals("13")) {
+                if (!zt.equals("1") && !zt.equals("8") && !zt.equals("11") && !zt.equals("12")) {
+                    return new Result("-1","该条码已经送检或者上机或者已审核，不允许再送检！");
+                }
+            }
+
+            //作废
+            if(status.equals("9")){
+                //log.info("传入的状态：{},判断的状态：{}",status,zt);
+                if(!zt.equals("1") && !zt.equals("8") && !zt.equals("11") && !zt.equals("12")){
+                    return new Result("-1","该条码已经送检或者上机或者已审核，不允许作废！");
+                }
+            }
+
             if(sp.equals("1")){
                 Result result = execSQDExecSP(sqhOne, userid, status, yljg);
                 if(!result.getCode().equals("0")) return result;
@@ -106,9 +133,7 @@ public class ZycxServiceImpl implements ZycxService {
             }
 
 
-            LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqhOne);
-            if(labReqmainOne == null) return new Result("-1","没有找到申请单数据！");
-            String zt = labReqmainOne.getZt();
+
             //打印条码
             if(status.equals("11")){
 //                Result result = printBarCode(sqhOne);
@@ -130,8 +155,6 @@ public class ZycxServiceImpl implements ZycxService {
                     labReqmain.setZt("12");
                     labReqmain.setSqh(sqhOne);
                     commonUtil.updateLabReqmain(labReqmain);
-                }else{
-                    return new Result("-1","该条码已经送检或者上机或者已审核，不允许做采样操作！");
                 }
             }
 
@@ -142,20 +165,17 @@ public class ZycxServiceImpl implements ZycxService {
                     labReqmain.setZt("13");
                     labReqmain.setSqh(sqhOne);
                     commonUtil.updateLabReqmain(labReqmain);
-                }else{
-                    return new Result("-1","该条码已经送检或者上机或者已审核，不允许再送检！");
                 }
             }
 
             //作废
             if(status.equals("9")){
+                //log.info("传入的状态：{},判断的状态：{}",status,zt);
                 if(zt.equals("1") || zt.equals("8") || zt.equals("11") || zt.equals("12")){
                     LabReqmain labReqmain = new LabReqmain();
                     labReqmain.setZt("9");
                     labReqmain.setSqh(sqhOne);
                     commonUtil.updateLabReqmain(labReqmain);
-                }else{
-                    return new Result("-1","该条码已经送检或者上机或者已审核，不允许作废！");
                 }
             }
 
@@ -266,6 +286,7 @@ public class ZycxServiceImpl implements ZycxService {
         }
     }
 
+    @Transactional
     public Result execSQDExecHTTP(String sqh,String userid,String status,String yljg){
         SetReqStatus setReqStatus = new SetReqStatus();
         setReqStatus.setStatus(status);