From 791db185065237f451226dd6820ad48b569d7f7f Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Sun, 18 Jan 2026 17:51:07 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86]=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82?= =?UTF-8?q?=EF=BC=8C=E9=BA=BB=E7=B2=BE=E8=8D=AF=EF=BC=8C=E5=8F=91=E6=94=BE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hxhq/business/domain/GyzjFfjl.java | 2 +- .../java/com/hxhq/business/service/impl/GyzjServiceImpl.java | 10 +++++++++- .../java/com/hxhq/business/service/impl/MjyServiceImpl.java | 9 +++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java index ca58188..46b3b99 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java @@ -25,7 +25,7 @@ public class GyzjFfjl extends MpBaseEntity private Integer jyzt; /** 给药制剂id */ - private Long gyzjId; + private Long gyzjId; /** 名称 */ private String mc; 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 199b639..a4e26ce 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 @@ -593,6 +593,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzjList.size() <= 0) { throw new ServiceException("药剂已被发放,请不要重复发放"); } + QueryWrapper gyzjFfjlQueryWrapper = Wrappers.query(); + gyzjFfjlQueryWrapper.in("gyzj_id", form.getIds()); + List gyzjFfjlList = gyzjFfjlService.list(gyzjFfjlQueryWrapper); + for (GyzjFfjl gyzjFfjl : gyzjFfjlList) { + gyzjFfjl.setZcgId(zcg.getId()); + } String glyj = ""; for (Gyzj gyzj : gyzjList) { //更新暂存柜id @@ -623,7 +629,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG zcgService.updateById(zcg); this.updateBatchById(gyzjList); gyzjJcgjService.saveBatch(gyzjJcgjList); - + if(gyzjFfjlList.size()>0){ + gyzjFfjlService.updateBatchById(gyzjFfjlList); + } } 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 43c215e..b3aedc5 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 @@ -594,6 +594,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (mjyList.size() <= 0) { throw new ServiceException("药剂已被发放,请不要重复发放"); } + QueryWrapper mjyFfjlQueryWrapper = Wrappers.query(); + mjyFfjlQueryWrapper.in("mjy_id", form.getIds()); + List mjyFfjlList = mjyFfjlService.list(mjyFfjlQueryWrapper); + for (MjyFfjl mjyFfjl : mjyFfjlList) { + mjyFfjl.setZcgId(zcg.getId()); + } String glyj = ""; for (Mjy mjy : mjyList) { //更新暂存柜id @@ -624,6 +630,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS zcgService.updateById(zcg); this.updateBatchById(mjyList); mjyJcgjService.saveBatch(mjyJcgjList); + if(mjyFfjlList.size()>0){ + mjyFfjlService.updateBatchById(mjyFfjlList); + } }