From aecafe5b0fd2f90874e0654bacb6c83fde0de177 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 17 Apr 2026 21:04:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/GyzjServiceImpl.java | 8 +++---- .../business/service/impl/GyzjTzServiceImpl.java | 26 ++++++++++++++++++++++ .../hxhq/business/service/impl/MjyServiceImpl.java | 8 +++---- .../com/hxhq/business/utils/lang/MjyJcnrUtil.java | 2 ++ 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index d73de75..b44f96f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java @@ -915,10 +915,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Date now = new Date(); for (Gyzj gyzj : gyzjList) { //验证库存 - BigDecimal kc = new BigDecimal(gyzj.getKc()); - if (kc.compareTo(BigDecimal.ZERO) <= 0) { - throw new ServiceException("给药制剂【" + gyzj.getMc() + "】库存不足，不能发放"); - } +// BigDecimal kc = new BigDecimal(gyzj.getKc()); +// if (kc.compareTo(BigDecimal.ZERO) <= 0) { +// throw new ServiceException("给药制剂【" + gyzj.getMc() + "】库存不足，不能发放"); +// } List plffItemFilter = form.getList().stream() .filter(p -> p.getId().equals(gyzj.getId())) .collect(Collectors.toList()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java index 78697f9..bca311b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java @@ -112,18 +112,31 @@ public class GyzjTzServiceImpl extends ServiceImpl impleme gyzjTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName()); gyzjTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName()); } + else{ + gyzjTz.setLqrMc(lqr1.getNickName()); + gyzjTz.setLqrMcEn(lqr1.getUserName()); + } if (ghr1 != null && ghr2 != null) { gyzjTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName()); gyzjTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName()); + }else { + gyzjTz.setGhrMc(ghr1.getNickName()); + gyzjTz.setGhrMcEn(ghr1.getUserName()); } if (ffr1 != null && ffr2 != null) { gyzjTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName()); gyzjTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName()); + }else{ + gyzjTz.setFfrMc(ffr1.getNickName()); + gyzjTz.setFfrMcEn(ffr1.getUserName()); } if (jsr1 != null && jsr2 != null) { gyzjTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName()); gyzjTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName()); + }else{ + gyzjTz.setJsrMc(jsr1.getNickName()); + gyzjTz.setJsrMcEn(jsr1.getUserName() ); } if (qmr != null && qmr != null) { gyzjTz.setQmrId(qmr.getUserId()); @@ -164,18 +177,31 @@ public class GyzjTzServiceImpl extends ServiceImpl impleme gyzjTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName()); gyzjTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName()); } + else{ + gyzjTz.setLqrMc(lqr1.getNickName()); + gyzjTz.setLqrMcEn(lqr1.getUserName()); + } if (ghr1 != null && ghr2 != null) { gyzjTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName()); gyzjTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName()); + }else { + gyzjTz.setGhrMc(ghr1.getNickName()); + gyzjTz.setGhrMcEn(ghr1.getUserName()); } if (ffr1 != null && ffr2 != null) { gyzjTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName()); gyzjTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName()); + }else{ + gyzjTz.setFfrMc(ffr1.getNickName()); + gyzjTz.setFfrMcEn(ffr1.getUserName()); } if (jsr1 != null && jsr2 != null) { gyzjTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName()); gyzjTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName()); + }else{ + gyzjTz.setJsrMc(jsr1.getNickName()); + gyzjTz.setJsrMcEn(jsr1.getUserName() ); } if (qmr != null && qmr != null) { gyzjTz.setQmrId(qmr.getUserId()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index 93ce9ef..9ff5096 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -783,10 +783,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Date now = new Date(); for (Mjy mjy : mjyList) { //验证库存 - BigDecimal kc = new BigDecimal(mjy.getKc()); - if (kc.compareTo(BigDecimal.ZERO) <= 0) { - throw new ServiceException("麻精药【" + mjy.getMc() + "】库存不足，不能发放"); - } +// BigDecimal kc = new BigDecimal(mjy.getKc()); +// if (kc.compareTo(BigDecimal.ZERO) <= 0) { +// throw new ServiceException("麻精药【" + mjy.getMc() + "】库存不足，不能发放"); +// } List plffItemFilter = form.getList().stream() .filter(p -> p.getId().equals(mjy.getId())) .collect(Collectors.toList()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java index 0cbe036..f0414d3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java @@ -39,6 +39,8 @@ public class MjyJcnrUtil { mapLang.put("复核人","Reviewer"); mapLang.put("监督人","Supervisor"); mapLang.put("钥匙1领取人","Key 1 User"); + mapLang.put("领取人","User"); + mapLang.put("领取人2","User 2"); mapLang.put("钥匙2领取人","Key 2 User"); mapLang.put("发放人","Issuer"); mapLang.put("发放人2","Issuer 2");