From f6e0861676162f838804ffcdbf30f76bbf43a00d Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Fri, 27 Mar 2026 15:40:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transitPF/controller/dict/RegDictController.java | 8 ++++++++ .../transitPF/service/impl/RegInterfaceImpl.java | 6 +++++- .../transitPF/service/impl/RegRequestInfoServiceImpl.java | 1 + .../service/impl/RegTransitSampleServiceImpl.java | 2 +- .../src/main/resources/mapper/RegItemclassMapper.xml | 8 +++++--- .../src/main/resources/mapper/RegLisReportMapper.xml | 1 + 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java index f3597a6..4b5f3d0 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java @@ -99,6 +99,14 @@ public class RegDictController extends BaseController { @Log(title = SysLogConstants.DICT, businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@Validated @RequestBody RegDict post) { + String loginYLJG = getLoginUser().getSysLoginParam().getLoginYLJG(); + if(loginYLJG == null || loginYLJG.equals("")) return AjaxResult.error("没有获取到登录的医疗机构！"); + //匹配字典类型 + if(Arrays.stream(dict_type).anyMatch(post.getDictType():: equals)){ + post.setHospital_id(Integer.parseInt(loginYLJG)); + }else{ + post.setHospital_id(0); //默认医疗机构为0 + } if (!regDictService.checkDictNameUnique(post)) { return error("修改字典'" + post.getDictName() + "'失败，字典名称已存在"); } else if (!regDictService.checkDictCodeUnique(post)) { 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 b989a54..81b64ba 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 @@ -230,7 +230,7 @@ public class RegInterfaceImpl { if(signTime == null) return new Result("-1","signTime标本签收时间不能为空！"); if(signUserName == null || signUserName.equals("")) return new Result("-1","signUserName标本签收人员姓名不能为空！"); if(signUserCode == null || signUserCode.equals("")) return new Result("-1","signUserCode标本签收人员不能为空！"); - if(Integer.parseInt(status) > 50) continue;//return new Result("0","该标本已经签收！"); + if(Integer.parseInt(status) >= 50) continue;//return new Result("0","该标本已经签收！"); RegTransitSample regTransitSample50 = new RegTransitSample(); regTransitSample50.setBarcode(barcode); regTransitSample50.setSignInTime(signTime); @@ -250,6 +250,7 @@ public class RegInterfaceImpl { if(reportTime == null) return new Result("-1","审核时间不能为空！"); if(reportUserCode == null || reportUserCode.equals("")) return new Result("-1","审核人代码不能为空！"); if(reportUserName == null || reportUserName.equals("")) return new Result("-1","审核人姓名不能为空！"); + if(Integer.parseInt(status) >= 70) continue; RegTransitSample regTransitSample70 = new RegTransitSample(); regTransitSample70.setBarcode(barcode); regTransitSample70.setReportTime(reportTime); @@ -267,6 +268,7 @@ public class RegInterfaceImpl { if(cancelTime == null) return new Result("-1","cancelTime申请作废时间不能为空！"); if(cancelCode == null || cancelCode.equals("")) return new Result("-1","cancelCode申请作废代码不能为空！"); if(cancelName == null || cancelName.equals("")) return new Result("-1","cancelName申请作废名称不能为空！"); + if(Integer.parseInt(status) == 90) continue; RegTransitSample regTransitSample90 = new RegTransitSample(); regTransitSample90.setBarcode(barcode); regTransitSample90.setCancelTime(cancelTime); @@ -284,6 +286,8 @@ public class RegInterfaceImpl { if(backTime == null) return new Result("-1","backTime标本退回时间不能为空！"); if(backUserCode == null || backUserCode.equals("")) return new Result("-1","backUserCode标本退回人员代码不能为空！"); if(backUserName == null || backUserName.equals("")) return new Result("-1","backUserName标本退回人员姓名不能为空！"); + if(Integer.parseInt(status) == 100) continue; + if(Integer.parseInt(status) == 90) return new Result("-1","已作废的标本不允许退回！"); RegTransitSample regTransitSample100 = new RegTransitSample(); regTransitSample100.setBarcode(barcode); regTransitSample100.setBackTime(backTime); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java index 895112b..c3f98ef 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java @@ -567,6 +567,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { String patId = regRequestInfoDTO.getPatId(); String loginYLJG = SecurityUtils.getLoginUser().getSysLoginParam().getLoginYLJG(); RegApply regApply = regRequestInfoMapper.getPatInfo(patId, loginYLJG); + if(regApply == null) return new Result("0","没有查到数据！"); RegApply regApply1 = new RegApply(); regApply1.setPatId(regApply.getPatId()); regApply1.setPatType(regApply.getPatType()); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java index 8bc2d12..658ce11 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java @@ -59,7 +59,7 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService { return regInterfaceImpl.addTransitSample(jsonStr); case "delTransitSample": //删除数据接口 return regInterfaceImpl.delTransitSample(jsonStr); - case "queryTransitSample": //查询数据接口 + case "queryTransitSample": //查询条码数据接口 return regInterfaceImpl.queryTransitSample(jsonStr); case "update": //修改状态 return regInterfaceImpl.updateStatus(jsonStr); diff --git a/pf_transitPF/src/main/resources/mapper/RegItemclassMapper.xml b/pf_transitPF/src/main/resources/mapper/RegItemclassMapper.xml index 51365dd..e0dd1b0 100644 --- a/pf_transitPF/src/main/resources/mapper/RegItemclassMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegItemclassMapper.xml @@ -19,11 +19,12 @@ + select itemclass_id, itemclass_code, itemclass_name, itemclass_sort, status, create_by, create_time, remark, - itemclass_tips,itemclass_bkcolor,itemclass_yblx,itemclass_printcnt,itemclass_kn + itemclass_tips,itemclass_bkcolor,itemclass_yblx,itemclass_printcnt,itemclass_kn,classid from Reg_itemclass @@ -81,6 +82,7 @@ status = #{status}, remark = #{remark}, update_by = #{updateBy}, + classid = #{classid}, update_time = getdate() where itemclass_id = #{itemclassId} @@ -88,7 +90,6 @@ insert into Reg_itemclass( - itemclass_id, itemclass_code, itemclass_name, itemclass_Tips, @@ -100,9 +101,9 @@ status, remark, create_by, + classid, create_time )values( - #{itemclassId}, #{itemclassCode}, #{itemclassName}, #{itemclassTips}, @@ -114,6 +115,7 @@ #{status}, #{remark}, #{createBy}, + #{classid}, getdate() ) diff --git a/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml b/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml index 6f13597..46194ee 100644 --- a/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml @@ -14,6 +14,7 @@ and ch = #{ch} and jzbz = #{jzbz} and brlyname = #{brlyname} + and yljg = #{yljg}