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);