From a0aca66d29ff697654dbdb18731d67d16aeeb7a2 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Fri, 4 Sep 2026 17:26:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E9=80=80=E8=A1=80=E6=89=93?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/BloodPrintTypeConstants.java | 4 ++++ .../com/czblood/bus/pojo/ReportParam.java | 1 + .../resources/mapper/XkBloodInfoMapper.xml | 2 +- .../controller/BackinController.java | 9 +++++++ .../busBloodbank/service/BackinService.java | 1 + .../service/impl/BackinServiceImpl.java | 24 ++++++++++++++++++- .../service/impl/BloodOutServiceImpl.java | 5 ++-- .../busBloodbank/utils/BloodOutUtil.java | 7 ++++-- 8 files changed, 46 insertions(+), 7 deletions(-) diff --git a/blood_bus/src/main/java/com/czblood/bus/constants/BloodPrintTypeConstants.java b/blood_bus/src/main/java/com/czblood/bus/constants/BloodPrintTypeConstants.java index 9bf07bc..a61f19d 100644 --- a/blood_bus/src/main/java/com/czblood/bus/constants/BloodPrintTypeConstants.java +++ b/blood_bus/src/main/java/com/czblood/bus/constants/BloodPrintTypeConstants.java @@ -28,4 +28,8 @@ public class BloodPrintTypeConstants { * 临床发血单 */ public static final String BLOOD_OUT = "BLOOD_OUT"; + /** + * 临床退血单 + */ + public static final String BLOOD_OUT_BACK = "BLOOD_OUT_BACK"; } diff --git a/blood_bus/src/main/java/com/czblood/bus/pojo/ReportParam.java b/blood_bus/src/main/java/com/czblood/bus/pojo/ReportParam.java index 5715718..3fe8b08 100644 --- a/blood_bus/src/main/java/com/czblood/bus/pojo/ReportParam.java +++ b/blood_bus/src/main/java/com/czblood/bus/pojo/ReportParam.java @@ -15,4 +15,5 @@ public class ReportParam { private String billNo; private String beinhosId; private String bloodSum; + private String userName; } diff --git a/blood_bus/src/main/resources/mapper/XkBloodInfoMapper.xml b/blood_bus/src/main/resources/mapper/XkBloodInfoMapper.xml index 952e167..81443a9 100644 --- a/blood_bus/src/main/resources/mapper/XkBloodInfoMapper.xml +++ b/blood_bus/src/main/resources/mapper/XkBloodInfoMapper.xml @@ -29,7 +29,7 @@ recycle_sign = #{recycle_sign}, Remark = #{Remark}, hos_id = #{hos_id} - where blood_no = #{blood_no} and product_no = #{blood_no} + where blood_no = #{blood_no} and product_no = #{product_no}