diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java index 467e790..cefb6e4 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java @@ -63,8 +63,8 @@ public class LisWorkOperController extends BaseController { return lisWorkOperService.unconfirmlog(jyrq, yq, ybh, yhdh,reason); } @GetMapping("/reglimit") - public Result reglimit( Date jyrq, String yq, String ybh, String yhdh,String btzr,String phone,String tzfs){ - return lisWorkOperService.reglimit(jyrq, yq, ybh, yhdh,btzr,phone,tzfs); + public Result reglimit( Date jyrq, String yq, String ybh, String yhdh,String qrr,String phone,String tzfs){ + return lisWorkOperService.reglimit(jyrq, yq, ybh, yhdh,qrr,phone,tzfs); } } diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java index 6ac7bba..1413ff9 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java @@ -88,10 +88,10 @@ public interface LisWorkOperService { * @param yq * @param ybh * @param yhdh - * @param btzr + * @param qrr * @param phone * @param tzfs * @return */ - Result reglimit(Date jyrq, String yq, String ybh, String yhdh, String btzr, String phone, String tzfs); + Result reglimit(Date jyrq, String yq, String ybh, String yhdh, String qrr, String phone, String tzfs); } \ No newline at end of file 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 80e8e23..4b278aa 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 @@ -1448,7 +1448,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { } @Override - public Result reglimit( Date jyrq, String yq, String ybh, String yhdh,String btzr,String phone,String tzfs){ + 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); @@ -1475,7 +1475,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { String sjys=labPat.getSjys(); String sjysname=commonUtil.getComDictNameById("SRD",sjys); if(sjysname==null||"".equals(sjysname)) {sjysname=sjys;} - if("".equals(btzr)||btzr==null) {btzr=labPat.getSjys();} + if("".equals(qrr)||qrr==null) {qrr=labPat.getSjys();} labPatwarning.setJyrq(jyrq); labPatwarning.setYq(yq); labPatwarning.setYbh(ybh); @@ -1485,7 +1485,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { labPatwarning.setTzsj(new Date()); if("2".equals(tzfs)){ labPatwarning.setTzfs("电话通知"); - labPatwarning.setQrr(btzr); + labPatwarning.setQrr(qrr); labPatwarning.setQrsj(new Date()); }else{ labPatwarning.setTzfs("系统通知");