From 098ab63c434dd8c16449e2ee0729e4d393cf4620 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Sat, 9 May 2026 14:33:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=A2=9E=E5=8A=A0=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transitPF/service/impl/RegInterfaceImpl.java | 6 ++++++ .../src/main/resources/mapper/RegLisReportMapper.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 57ec4bc..1187271 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 @@ -235,15 +235,21 @@ public class RegInterfaceImpl { Date signTime = sampleSignVO.getSignTime(); String signUserName = sampleSignVO.getSignUserName(); String signUserCode = sampleSignVO.getSignUserCode(); + String dstHospCode = sampleSignVO.getDstHospCode(); //签收机构代码 + String dstHospName = sampleSignVO.getDstHospName(); //签收机构名称 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(dstHospCode == null || dstHospCode.equals("")) return new Result("-1","dstHospCode标本签收机构代码不能为空！"); + if(dstHospName == null || dstHospName.equals("")) return new Result("-1","dstHospName标本签收机构名称不能为空！"); if(Integer.parseInt(status) >= 50) continue;//return new Result("0","该标本已经签收！"); RegTransitSample regTransitSample50 = new RegTransitSample(); regTransitSample50.setBarcode(barcode); regTransitSample50.setSignInTime(signTime); regTransitSample50.setSignInUserCode(signUserCode); regTransitSample50.setSignInUserName(signUserName); + regTransitSample50.setDstHospCode(dstHospCode); + regTransitSample50.setDstHospCode(dstHospName); regTransitSample50.setStatus("50"); List collect3 = regTransitSampleList1.stream().filter(regTransitSample2 -> diff --git a/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml b/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml index 16945fd..31df69c 100644 --- a/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml @@ -16,7 +16,7 @@ and brlyname = #{brlyname} and yljg = #{yljg} and barcode_zt = #{barcode_zt} - order by barcode_zt + order by dybz ,sqsj desc