From 95b9c01de23afcfeb571b675f8c73234c42d2801 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Tue, 30 Jun 2026 11:39:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E6=B6=88=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transitPF/service/impl/RegInterfaceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java index 67e63a7..e7470ad 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java @@ -264,16 +264,16 @@ public class RegInterfaceImpl { requestInfoUtil.updateRegTransitSampleStatus(regTransitSample50,regApply); break; case "60": //上机检测 - if(Integer.parseInt(status) == 90 || Integer.parseInt(status) == 70) return new Result("-1","该标本已经作废或者已经审核，不允许再上机！"); + if(Integer.parseInt(status) == 90) return new Result("-1","该标本已经作废，不允许再上机！"); Date operdatetime = sampleSignVO.getOperdatetime(); String opercode = sampleSignVO.getOpercode(); String opername = sampleSignVO.getOpername(); String checkStatus = sampleSignVO.getCheckStatus(); - if(operdatetime == null) return new Result("-1","上机时间不能为空！"); - if(opername == null || opername.equals("")) return new Result("-1","上机人姓名不能为空！"); RegTransitSample regTransitSample60 = new RegTransitSample(); - //传了值，代表是上机，没有传，代表只是取消审核 + //传了值，代表是取消审核，没有传，代表是上机 if(checkStatus == null || checkStatus.equals("")){ + if(operdatetime == null) return new Result("-1","上机时间不能为空！"); + if(opername == null || opername.equals("")) return new Result("-1","上机人姓名不能为空！"); regTransitSample60.setOperdatetime(operdatetime); regTransitSample60.setOpercode(opercode); regTransitSample60.setOpername(opername);