diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabResultwarningMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabResultwarningMapper.xml index d2b2fdf..6999fd7 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabResultwarningMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabResultwarningMapper.xml @@ -9,7 +9,7 @@ and yq = #{yq,jdbcType=CHAR} and ybh = #{ybh,jdbcType=VARCHAR} - + delete from lab_resultwarning where jyrq = #{jyrq} and yq = #{yq} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java index 4b278aa..1c31a0a 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java @@ -1451,15 +1451,15 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { public Result reglimit( Date jyrq, String yq, String ybh, String yhdh,String qrr,String phone,String tzfs){ log.info("登记危急值{}",tzfs); int problemId = ServletUtils.getParameterToInt("problemId", 0); - LabPatwarning labPatwarning=commonUtil.getLabPatwarning(jyrq, yq, ybh); - if (labPatwarning != null) { - if(problemId<5) { + if(problemId<5) { + LabPatwarning labPatwarning0=commonUtil.getLabPatwarning(jyrq, yq, ybh); + if (labPatwarning0 != null) { return new Result("4", "该标本已经登记,是否重新登记?", 5); } - commonUtil.deleteLabPatwarning(jyrq, yq, ybh); - commonUtil.deleteLabResultwarning(jyrq, yq, ybh); } - labPatwarning =new LabPatwarning(); + commonUtil.deleteLabPatwarning(jyrq, yq, ybh); + commonUtil.deleteLabResultwarning(jyrq, yq, ybh); + LabPatwarning labPatwarning =new LabPatwarning(); LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh); List labResultList = commonUtil.getLabResultList(jyrq, yq, ybh); String jzbz=labPat.getJzbz().trim();