From 705ea484d46e3626cdaf69c19f3ea319db119bca Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Sat, 10 Jan 2026 09:43:58 +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?=E5=8F=91=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/business/domain/Gyzj.java | 167 --------------------- .../java/com/hxhq/business/domain/GyzjFfjl.java | 86 +---------- .../com/hxhq/business/dto/gyzj/FfjlListDto.java | 43 ------ .../java/com/hxhq/business/form/gyzj/FfForm.java | 20 --- .../java/com/hxhq/business/form/gyzj/PlffForm.java | 6 +- .../hxhq/business/service/IGyzjFfjlService.java | 8 +- .../business/service/impl/GyzjFfjlServiceImpl.java | 29 ++-- .../business/service/impl/GyzjServiceImpl.java | 44 +----- .../resources/mapper/business/GyzjFfjlMapper.xml | 2 +- .../main/resources/mapper/business/GyzjMapper.xml | 2 +- 10 files changed, 34 insertions(+), 373 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java index 5f4ec6a..83b7392 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java @@ -145,52 +145,6 @@ public class Gyzj extends MpBaseEntity @TableField(updateStrategy = FieldStrategy.IGNORED) private String kcbjrMc; - /** 出库量 */ - private String ckl; - - /** 出库量单位 */ - private String ckldw; - - /** 发放转移条件 */ - private String ffzytj; - - /** 出库毛重 */ - private String ckmz; - - /** 出库毛重单位 */ - private String ckmzdw; - - /** 领取人1id */ - private Long lqr1Id; - - /** 领取人2id */ - private Long lqr2Id; - - /** 发放人1id */ - private Long ffr1Id; - - /** 发放人2id */ - private Long ffr2Id; - - /** 领取人1名称 */ - private String lqr1Mc; - - /** 领取人2名称 */ - private String lqr2Mc; - - /** 发放人1名称 */ - private String ffr1Mc; - - /** 发放人2名称 */ - private String ffr2Mc; - - /** 发放日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date ffrq; - - /** 发放备注 */ - private String ffbz; - /** 发放目的ids */ private String mdIds; @@ -336,127 +290,6 @@ public class Gyzj extends MpBaseEntity this.mdIds = mdIds; } - public Date getFfrq() { - return ffrq; - } - - public void setFfrq(Date ffrq) { - this.ffrq = ffrq; - } - - public String getCkl() { - return ckl; - } - - public void setCkl(String ckl) { - this.ckl = ckl; - } - - public String getCkldw() { - return ckldw; - } - - public void setCkldw(String ckldw) { - this.ckldw = ckldw; - } - - public String getFfzytj() { - return ffzytj; - } - - public void setFfzytj(String ffzytj) { - this.ffzytj = ffzytj; - } - - public String getCkmz() { - return ckmz; - } - - public void setCkmz(String ckmz) { - this.ckmz = ckmz; - } - - public String getCkmzdw() { - return ckmzdw; - } - - public void setCkmzdw(String ckmzdw) { - this.ckmzdw = ckmzdw; - } - - public Long getLqr1Id() { - return lqr1Id; - } - - public void setLqr1Id(Long lqr1Id) { - this.lqr1Id = lqr1Id; - } - - public Long getLqr2Id() { - return lqr2Id; - } - - public void setLqr2Id(Long lqr2Id) { - this.lqr2Id = lqr2Id; - } - - public Long getFfr1Id() { - return ffr1Id; - } - - public void setFfr1Id(Long ffr1Id) { - this.ffr1Id = ffr1Id; - } - - public Long getFfr2Id() { - return ffr2Id; - } - - public void setFfr2Id(Long ffr2Id) { - this.ffr2Id = ffr2Id; - } - - public String getLqr1Mc() { - return lqr1Mc; - } - - public void setLqr1Mc(String lqr1Mc) { - this.lqr1Mc = lqr1Mc; - } - - public String getLqr2Mc() { - return lqr2Mc; - } - - public void setLqr2Mc(String lqr2Mc) { - this.lqr2Mc = lqr2Mc; - } - - public String getFfr1Mc() { - return ffr1Mc; - } - - public void setFfr1Mc(String ffr1Mc) { - this.ffr1Mc = ffr1Mc; - } - - public String getFfr2Mc() { - return ffr2Mc; - } - - public void setFfr2Mc(String ffr2Mc) { - this.ffr2Mc = ffr2Mc; - } - - - public String getFfbz() { - return ffbz; - } - - public void setFfbz(String ffbz) { - this.ffbz = ffbz; - } - public Long getBjrId() { return bjrId; } 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 69ade8e..d4e33a0 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 @@ -58,12 +58,6 @@ public class GyzjFfjl extends MpBaseEntity /** 发放转移条件 */ private String ffzytj; - /** 出库毛重 */ - private String ckmz; - - /** 出库毛重单位 */ - private String ckmzdw; - /** 领取人1id */ private Long lqr1Id; @@ -110,25 +104,12 @@ public class GyzjFfjl extends MpBaseEntity /** 归还转移条件 */ private String ghzytj; - - /** 入库毛重 */ - private String rkmz; - - /** 入库毛重单位 */ - private String rkmzdw; - /** 入库量 */ private String rkl; /** 入库单位 */ private String rkldw; - /** 减少量 */ - private String jsl; - - /** 减少量单位 */ - private String jsldw; - /** 使用量 */ private String syl; @@ -189,20 +170,20 @@ public class GyzjFfjl extends MpBaseEntity this.mdOther = mdOther; } - public String getRkmz() { - return rkmz; + public String getSyl() { + return syl; } - public void setRkmz(String rkmz) { - this.rkmz = rkmz; + public void setSyl(String syl) { + this.syl = syl; } - public String getRkmzdw() { - return rkmzdw; + public String getSyldw() { + return syldw; } - public void setRkmzdw(String rkmzdw) { - this.rkmzdw = rkmzdw; + public void setSyldw(String syldw) { + this.syldw = syldw; } public String getRkwz() { @@ -221,22 +202,6 @@ public class GyzjFfjl extends MpBaseEntity this.rktj = rktj; } - public String getJsl() { - return jsl; - } - - public void setJsl(String jsl) { - this.jsl = jsl; - } - - public String getJsldw() { - return jsldw; - } - - public void setJsldw(String jsldw) { - this.jsldw = jsldw; - } - public Date getJyksrq() { return jyksrq; } @@ -261,21 +226,6 @@ public class GyzjFfjl extends MpBaseEntity this.mdIds = mdIds; } - public String getSyl() { - return syl; - } - - public void setSyl(String syl) { - this.syl = syl; - } - - public String getSyldw() { - return syldw; - } - - public void setSyldw(String syldw) { - this.syldw = syldw; - } public Long getZcgId() { return zcgId; @@ -508,26 +458,6 @@ public class GyzjFfjl extends MpBaseEntity return ffzytj; } - public void setCkmz(String ckmz) - { - this.ckmz = ckmz; - } - - public String getCkmz() - { - return ckmz; - } - - public void setCkmzdw(String ckmzdw) - { - this.ckmzdw = ckmzdw; - } - - public String getCkmzdw() - { - return ckmzdw; - } - public void setLqr1Id(Long lqr1Id) { this.lqr1Id = lqr1Id; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java index 535c552..4e2c047 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java @@ -40,18 +40,6 @@ public class FfjlListDto { /** 入库单位 */ private String rkldw; - /** 入库毛重 */ - private String rkmz; - - /** 入库毛重单位 */ - private String rkmzdw; - - /** 出库毛重 */ - private String ckmz; - - /** 出库毛重单位 */ - private String ckmzdw; - /** 领取人1名称 */ private String lqr1Mc; @@ -110,22 +98,6 @@ public class FfjlListDto { this.mdMcs = mdMcs; } - public String getRkmz() { - return rkmz; - } - - public void setRkmz(String rkmz) { - this.rkmz = rkmz; - } - - public String getRkmzdw() { - return rkmzdw; - } - - public void setRkmzdw(String rkmzdw) { - this.rkmzdw = rkmzdw; - } - public String getJsr1Mc() { return jsr1Mc; } @@ -230,21 +202,6 @@ public class FfjlListDto { this.rkldw = rkldw; } - public String getCkmz() { - return ckmz; - } - - public void setCkmz(String ckmz) { - this.ckmz = ckmz; - } - - public String getCkmzdw() { - return ckmzdw; - } - - public void setCkmzdw(String ckmzdw) { - this.ckmzdw = ckmzdw; - } public String getLqr1Mc() { return lqr1Mc; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java index 384e421..3ea9c18 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java @@ -23,12 +23,6 @@ public class FfForm { /** 目的其他 */ private String mdOther; - /** 出库毛重 */ - private String ckmz; - - /** 出库毛重单位 */ - private String ckmzdw; - /** 领取人1Id */ private Long lqr1Id; @@ -69,13 +63,6 @@ public class FfForm { this.mdOther = mdOther; } - public String getCkmzdw() { - return ckmzdw; - } - - public void setCkmzdw(String ckmzdw) { - this.ckmzdw = ckmzdw; - } public Long getId() { return id; @@ -109,13 +96,6 @@ public class FfForm { this.mdIds = mdIds; } - public String getCkmz() { - return ckmz; - } - - public void setCkmz(String ckmz) { - this.ckmz = ckmz; - } public Long getLqr1Id() { return lqr1Id; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffForm.java index ee91ff6..6f99977 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffForm.java @@ -8,7 +8,7 @@ import java.util.List; public class PlffForm { /** 给药制剂列表 */ - private List list; + private List list; /** 给药制剂ids */ private Long[] ids; @@ -45,11 +45,11 @@ public class PlffForm { this.ids = ids; } - public List getList() { + public List getList() { return list; } - public void setList(List list) { + public void setList(List list) { this.list = list; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java index 2c2a28d..6198f56 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java @@ -116,11 +116,7 @@ public interface IGyzjFfjlService extends IService { /** * 发放 - * @param zytj - * @param remark - * @param mdIds - * @param mdMcs - * @param mdOther + * @param form * @param gyzj * @param lqr1 * @param lqr2 @@ -128,6 +124,6 @@ public interface IGyzjFfjlService extends IService { * @param ffr2 * @param time */ - public void ff( String zytj, String remark, String mdIds,String mdMcs, String mdOther,Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time); + public void ff(FfForm form,Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java index e58e4b2..598fb44 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java @@ -423,11 +423,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjl.setRkwz(form.getRkwz()); gyzjFfjl.setRktj(form.getRktj()); gyzjFfjl.setGhzytj(form.getGhzytj()); - gyzjFfjl.setRkmz(form.getRkl()); - gyzjFfjl.setRkmzdw(gyzj.getKcdw()); - - gyzjFfjl.setJsl(syl.toString()); - gyzjFfjl.setJsldw(gyzj.getKcdw()); + gyzjFfjl.setRkl(form.getRkl()); + gyzjFfjl.setRkldw(gyzj.getKcdw()); gyzjFfjl.setSyl(syl.toString()); gyzjFfjl.setSyldw(gyzj.getKcdw()); gyzjFfjl.setGhr1Id(ghr1.getUserId()); @@ -470,7 +467,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i */ @Override @Transactional(rollbackFor = Exception.class) - public void ff( String zytj, String remark, String mdIds,String mdMcs,String mdOther, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) { + public void ff( FfForm form, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) { //region 新增发放记录 GyzjFfjl gyzjFfjl = new GyzjFfjl(); @@ -485,8 +482,6 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjl.setCctj(gyzj.getCctj()); gyzjFfjl.setCkl(gyzj.getKc()); gyzjFfjl.setCkldw(gyzj.getKcdw()); - gyzjFfjl.setCkmz(gyzj.getCkl()); - gyzjFfjl.setCkmzdw(gyzj.getKcdw()); gyzjFfjl.setLqr1Id(lqr1.getUserId()); gyzjFfjl.setLqr2Id(lqr2.getUserId()); gyzjFfjl.setFfr1Id(ffr1.getUserId()); @@ -495,18 +490,18 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjl.setLqr2Mc(lqr2.getNickName()); gyzjFfjl.setFfr1Mc(ffr1.getNickName()); gyzjFfjl.setFfr2Mc(ffr2.getNickName()); - gyzjFfjl.setFfzytj(zytj); + gyzjFfjl.setFfzytj(form.getZytj()); gyzjFfjl.setFfrq(time); - gyzjFfjl.setFfbz(remark); - gyzjFfjl.setMdIds(mdIds); - gyzjFfjl.setMdOther(mdOther); + gyzjFfjl.setFfbz(form.getRemark()); + gyzjFfjl.setMdIds( form.getMdIds()); + gyzjFfjl.setMdOther(form.getMdOther()); this.save(gyzjFfjl); //endregion //region 新增试验物资 - if(StringUtils.isNoneBlank(mdIds)){ + if(StringUtils.isNoneBlank(form.getMdIds())){ List studyGyzjs=new ArrayList<>(); - String [] tmp=mdIds.split(","); + String [] tmp=form.getMdIds().split(","); for(String s :tmp){ StudyGyzj studyGyzj=new StudyGyzj(); studyGyzj.setStudyId(Long.parseLong(s)); @@ -522,10 +517,10 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i //region 稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("出库量", gyzj.getKc() + gyzj.getKcdw()); - formData.put("转移条件", zytj); + formData.put("转移条件", form.getZytj()); formData.put("出库净重", gyzj.getKc() + gyzj.getKcdw()); - formData.put("目的", mdMcs); - formData.put("备注", remark); + formData.put("目的", form.getMdMcs()); + formData.put("备注", form.getRemark()); gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); //endregion 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 724ca94..6d411c5 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 @@ -767,14 +767,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Date now = new Date(); //region 发放记录，试验物资 - gyzjFfjlService.ff( form.getZytj(), form.getRemark(), form.getMdIds(),form.getMdMcs(),form.getMdOther(),gyzjOld, lqr1, lqr2, ffr1, ffr2, now); + gyzjFfjlService.ff( form,gyzjOld, lqr1, lqr2, ffr1, ffr2, now); //endregion //region 稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("出库量", gyzjOld.getKc() + gyzjOld.getKcdw()); formData.put("转移条件", form.getZytj()); - formData.put("出库净重", gyzjOld.getKc() + gyzjOld.getKcdw()); formData.put("目的", form.getMdMcs()); formData.put("备注", form.getRemark()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), @@ -788,22 +787,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //endregion //region 更新发放信息 - gyzjOld.setCkl(gyzjOld.getKc()); - gyzjOld.setCkldw(gyzjOld.getKcdw()); - gyzjOld.setFfzytj(form.getZytj()); - gyzjOld.setCkmz(form.getCkmz()); - gyzjOld.setCkmzdw(form.getCkmzdw()); - gyzjOld.setLqr1Id(lqr1.getUserId()); - gyzjOld.setLqr2Id(lqr2.getUserId()); - gyzjOld.setFfr1Id(ffr1.getUserId()); - gyzjOld.setFfr2Id(ffr2.getUserId()); - gyzjOld.setLqr1Mc(lqr1.getNickName()); - gyzjOld.setLqr2Mc(lqr2.getNickName()); - gyzjOld.setFfr1Mc(ffr1.getNickName()); - gyzjOld.setFfr2Mc(ffr2.getNickName()); - gyzjOld.setFfr2Mc(ffr2.getNickName()); - gyzjOld.setFfrq(now); - gyzjOld.setFfbz(form.getRemark()); gyzjOld.setMdIds(form.getMdIds()); gyzjOld.setMdOther(form.getMdOther()); gyzjOld.setZjzt(ZjztEnum.yff.getValue()); @@ -849,11 +832,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (kc.compareTo(BigDecimal.ZERO) <= 0) { throw new ServiceException("给药制剂【" + gyzj.getMc() + "】库存不足，不能发放"); } - List plffItemFilter = form.getList().stream() + List plffItemFilter = form.getList().stream() .filter(p -> p.getId().equals(gyzj.getId())) .collect(Collectors.toList()); if (plffItemFilter.size() > 0) { - gyzjFfjlService.ff( plffItemFilter.get(0).getZytj(), plffItemFilter.get(0).getRemark(), plffItemFilter.get(0).getMdIds(),plffItemFilter.get(0).getMdMcs(),plffItemFilter.get(0).getMdOther(), gyzj, lqr1, lqr2, ffr1, ffr2, now); + gyzjFfjlService.ff(plffItemFilter.get(0), gyzj, lqr1, lqr2, ffr1, ffr2, now); + //region 稽查轨迹 GyzjJcgj gyzjJcgj = new GyzjJcgj(); gyzjJcgj.setGyzjId(gyzj.getId()); @@ -863,7 +847,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("出库量", gyzj.getKc() + gyzj.getKcdw()); formData.put("转移条件", plffItemFilter.get(0).getZytj()); - formData.put("出库净重", plffItemFilter.get(0).getCkmz() + gyzj.getKcdw()); formData.put("目的", plffItemFilter.get(0).getMdIds()); formData.put("备注", plffItemFilter.get(0).getRemark()); gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); @@ -871,6 +854,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); gyzjJcgjList.add(gyzjJcgj); //endregion + //region 台账 GyzjTz gyzjTz = new GyzjTz(); gyzjTz.setGyzjId(gyzj.getId()); @@ -882,27 +866,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjTz.setRemark(plffItemFilter.get(0).getRemark()); gyzjTzList.add(gyzjTz); //endregion + //region 更新发放信息 - gyzj.setCkl(gyzj.getKc()); - gyzj.setCkldw(gyzj.getKcdw()); - gyzj.setFfzytj(plffItemFilter.get(0).getZytj()); - gyzj.setCkmz(plffItemFilter.get(0).getCkmz()); - gyzj.setCkmzdw(plffItemFilter.get(0).getCkmzdw()); - gyzj.setLqr1Id(lqr1.getUserId()); - gyzj.setLqr2Id(lqr2.getUserId()); - gyzj.setFfr1Id(ffr1.getUserId()); - gyzj.setFfr2Id(ffr2.getUserId()); - gyzj.setLqr1Mc(lqr1.getNickName()); - gyzj.setLqr2Mc(lqr2.getNickName()); - gyzj.setFfr1Mc(ffr1.getNickName()); - gyzj.setFfr2Mc(ffr2.getNickName()); - gyzj.setFfr2Mc(ffr2.getNickName()); - gyzj.setFfrq(now); - gyzj.setFfbz(plffItemFilter.get(0).getRemark()); gyzj.setMdIds(plffItemFilter.get(0).getMdIds()); gyzj.setMdOther(plffItemFilter.get(0).getMdOther()); gyzj.setZjzt(ZjztEnum.yff.getValue()); //endregion + } else { throw new ServiceException("给药制剂【" + gyzj.getMc() + "】不存在或已删除"); } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml index 78a9c85..d2a182d 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.jyzt,t.cctj,t.ccwz,t.create_time,t.bjzt,t.kcbjzt,t.rqzt,t.ghzt - ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz + ,t.ckl,t.ckldw,t.ffzytj,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz ,z.mc as zcgMc FROM `t_gyzj` t left join `t_zcg` z on z.id=t.zcg_id