From e686ca174efec9819b4b1fed1df6b4b69a0fbf0c Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 30 Jan 2026 19:08:08 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E5=A1=AB=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=8D=95]=E4=BD=BF=E7=94=A8=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/dto/study/StudyFormFillResource.java | 85 +++-- .../enums/study/StudyFormFillResourceTypeEnum.java | 61 ++++ .../business/service/impl/GyzjJcgjServiceImpl.java | 2 + .../business/service/impl/GyzjServiceImpl.java | 406 +++++++++++---------- .../business/service/impl/MjyJcgjServiceImpl.java | 2 + .../hxhq/business/service/impl/MjyServiceImpl.java | 2 +- .../hxhq/business/service/impl/SjServiceImpl.java | 2 +- .../service/impl/StudyFormFillServiceImpl.java | 1 + 8 files changed, 338 insertions(+), 223 deletions(-) create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormFillResourceTypeEnum.java diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillResource.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillResource.java index 1019e97..83c6703 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillResource.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillResource.java @@ -4,38 +4,81 @@ package com.hxhq.business.dto.study; * @author tanfei */ public class StudyFormFillResource { - /** - * mc : 生理盐水 - * bh : slys202601220002 - * ph : - * nd : 30mg/mL - * source : 配置 - * type : 1 - * sxrq : 2026-01-12 16:03:27 - * ndz : 30 - * nddw : mg/mL - * kc : 36000 - * kcdw : mL - * syl : 20 - * syldw : mL + * 名称 */ - private String mc; + + /** + * 编号 + */ private String bh; + + /** + * 批号 + */ private String ph; + + /** + * 浓度 + */ private String nd; + + /** + * 来源 + */ private String source; - private int type; + + /** + * 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品（产生的为null） + */ + private Integer type; + + /** + * 失效日期 + */ private String sxrq; - private int ndz; + + /** + * 浓度值 + */ + private Integer ndz; + + /** + * 浓度单位 + */ private String nddw; + + /** + * 库存 + */ private String kc; + + /** + * 库存单位 + */ private String kcdw; + + /** + * 使用量 + */ private String syl; + + /** + * 使用量单位 + */ private String syldw; + + /** + * 有效周期 + */ private String yxzq; + + /** + * 有效周期单位 + */ private String yxzqdw; + public String getMc() { return mc; } @@ -76,11 +119,11 @@ public class StudyFormFillResource { this.source = source; } - public int getType() { + public Integer getType() { return type; } - public void setType(int type) { + public void setType(Integer type) { this.type = type; } @@ -92,11 +135,11 @@ public class StudyFormFillResource { this.sxrq = sxrq; } - public int getNdz() { + public Integer getNdz() { return ndz; } - public void setNdz(int ndz) { + public void setNdz(Integer ndz) { this.ndz = ndz; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormFillResourceTypeEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormFillResourceTypeEnum.java new file mode 100644 index 0000000..20c4c01 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormFillResourceTypeEnum.java @@ -0,0 +1,61 @@ +package com.hxhq.business.enums.study; + +/** + * 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品（产生的为null） + * @author tanfei + */ +public enum StudyFormFillResourceTypeEnum { + + /** + * 试剂 + */ + sj(1, "试剂"), + + /** + * 给药制剂 + */ + gyzj(3, "给药制剂"), + + /** + * 麻精药 + */ + mjy(5, "麻精药"), + + /** + * 供试品 + */ + gsp(7, "供试品"); + + private int value; + private String text; + + StudyFormFillResourceTypeEnum(int value, String text) { + this.value = value; + this.text = text; + } + + public int getValue() { + return value; + } + + public void setValue(int value) { + this.value = value; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public static StudyFormFillResourceTypeEnum getEnumByValue(int type) { + for (StudyFormFillResourceTypeEnum bt : values()) { + if (bt.value == type) { + return bt; + } + } + return null; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java index 7124da8..c1da08e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java @@ -11,6 +11,7 @@ import com.hxhq.business.utils.lang.GyzjJcnrUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.StringUtils; import com.hxhq.system.api.domain.SysUser; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.GyzjJcgjMapper; import com.hxhq.business.service.IGyzjJcgjService; @@ -60,6 +61,7 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i * @param remark 备注 */ @Override + @Async public void saveJcgj(Long gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ GyzjJcgj gyzjJcgj = new GyzjJcgj(); gyzjJcgj.setGyzjId(gyzjId); 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 24428b1..d1b9e49 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 @@ -150,16 +150,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } /** - * 解档 + * 解档 * * @param form */ @Override @Transactional(rollbackFor = Exception.class) public void jd(JdForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -167,7 +167,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzjOld == null) { throw new ServiceException("给药制剂不存在或已删除"); } - if(!gyzjOld.getGdsqrId().equals(qmr.getUserId())){ + if (!gyzjOld.getGdsqrId().equals(qmr.getUserId())) { throw new ServiceException("只有归档申请人才能操作"); } if (!gyzjOld.getZjzt().equals(ZjztEnum.gd.getValue())) { @@ -177,22 +177,22 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setZjzt(ZjztEnum.djd.getValue()); this.updateById(gyzjOld); //稽查轨迹 - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "申请解档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "申请解档"); } /** - * 借阅 + * 借阅 * * @param form */ @Override @Transactional(rollbackFor = Exception.class) public void jy(JyForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -200,7 +200,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzjOld == null) { throw new ServiceException("给药制剂不存在或已删除"); } - if(!gyzjOld.getGdsqrId().equals(qmr.getUserId())){ + if (!gyzjOld.getGdsqrId().equals(qmr.getUserId())) { throw new ServiceException("只有归档申请人才能操作"); } if (!gyzjOld.getZjzt().equals(ZjztEnum.gd.getValue())) { @@ -218,22 +218,22 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(),formData, qmr, form.getRemark()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "申请借阅"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "申请借阅"); } /** - * 批量归档 + * 批量归档 * * @param form */ @Override @Transactional(rollbackFor = Exception.class) public void plgd(GdForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -254,9 +254,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzj.setGdsqrId(qmr.getUserId()); gyzj.setGdsqrMc(qmr.getNickName()); //稽查轨迹 - gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark())); + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark())); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzj.getId(), gyzj.getMc(), gyzj.getBh(), gyzj.getNd()+gyzj.getNddw(), "申请归档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzj.getId(), gyzj.getMc(), gyzj.getBh(), gyzj.getNd() + gyzj.getNddw(), "申请归档"); } this.updateBatchById(gyzjList); gyzjJcgjService.saveBatch(gyzjJcgjList); @@ -264,16 +264,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } /** - * 归档 + * 归档 * * @param form */ @Override @Transactional(rollbackFor = Exception.class) public void gd(GdForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -291,23 +291,23 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setGdsqrMc(qmr.getNickName()); this.updateById(gyzjOld); //稽查轨迹 - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "申请归档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "申请归档"); } /** - * 批量锁定 + * 批量锁定 * * @param form */ @Override @Transactional(rollbackFor = Exception.class) public void plsd(SdForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -323,7 +323,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //锁定 gyzj.setZjzt(ZjztEnum.ysd.getValue()); //region 稽查轨迹 - gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark())); + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark())); } this.updateBatchById(gyzjList); gyzjJcgjService.saveBatch(gyzjJcgjList); @@ -331,16 +331,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } /** - * 锁定 + * 锁定 * * @param form */ @Override @Transactional(rollbackFor = Exception.class) public void sd(SdForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -354,21 +354,21 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setZjzt(ZjztEnum.ysd.getValue()); this.updateById(gyzjOld); //稽查轨迹 - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()); } /** - * 解锁 + * 解锁 * * @param form */ @Override @Transactional(rollbackFor = Exception.class) public void js(JsForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -387,7 +387,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } /** - * 批量处置药剂 + * 批量处置药剂 * * @param form */ @@ -396,7 +396,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void plczyj(PlczyjForm form) { SysUser clr = SecurityUtils.getLoginUser().getSysUser(); //验证处理人密码 - checkPassword(clr,form.getClrmm(),false); + checkPassword(clr, form.getClrmm(), false); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); @@ -432,9 +432,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("处置原因", gyzjPlffItemFilter.get(0).getCzyy()); formData.put("处置量", gyzjPlffItemFilter.get(0).getCzl() + gyzj.getKcdw()); formData.put("处置人", clr.getNickName()); - gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(),formData, clr, null)); + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(), formData, clr, null)); //台账 - gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",gyzjPlffItemFilter.get(0).getCzl(),gyzj.getKcdw(),gyzjPlffItemFilter.get(0).getCzyy())); + gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(), null, null, null, null, null, null, null, null, clr, "处置药剂", gyzjPlffItemFilter.get(0).getCzl(), gyzj.getKcdw(), gyzjPlffItemFilter.get(0).getCzyy())); } else { throw new ServiceException("给药制剂【" + gyzj.getMc() + "】不存在或已删除"); @@ -447,7 +447,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG /** - * 处置药剂 + * 处置药剂 * * @param form */ @@ -457,7 +457,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser clr = SecurityUtils.getLoginUser().getSysUser(); //验证处理人密码 - checkPassword(clr,form.getClrmm(),false); + checkPassword(clr, form.getClrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -495,13 +495,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("处置人", clr.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, clr, null); //台账 - gyzjTzService.saveTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",form.getCzl(),gyzjOld.getKcdw(),form.getCzyy()); + gyzjTzService.saveTz(gyzjOld.getId(), null, null, null, null, null, null, null, null, clr, "处置药剂", form.getCzl(), gyzjOld.getKcdw(), form.getCzyy()); this.updateById(gyzjOld); } /** - * 批量处置容器 + * 批量处置容器 * * @param form */ @@ -512,11 +512,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr,form.getClrmm(),true); + checkPassword(clr, form.getClrmm(), true); //验证复核人密码 - checkPassword(fhr,form.getFhrmm(),true); + checkPassword(fhr, form.getFhrmm(), true); //验证监督人密码 - checkPassword(jdr,form.getJdrmm(),true); + checkPassword(jdr, form.getJdrmm(), true); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -545,7 +545,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("监督人", jdr.getNickName()); gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, clr, null)); //台账 - gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,gyzjPlffItemFilter.get(0).getCzyy())); + gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(), null, null, null, null, null, null, null, null, clr, "处置容器", null, null, gyzjPlffItemFilter.get(0).getCzyy())); gyzj.setRqzt(RqztEnum.ycz.getValue()); } else { throw new ServiceException("给药制剂【" + gyzj.getMc() + "】不存在或已删除"); @@ -557,7 +557,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } /** - * 处置容器 + * 处置容器 * * @param form */ @@ -568,11 +568,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr,form.getClrmm(),true); + checkPassword(clr, form.getClrmm(), true); //验证复核人密码 - checkPassword(fhr,form.getFhrmm(),true); + checkPassword(fhr, form.getFhrmm(), true); //验证监督人密码 - checkPassword(jdr,form.getJdrmm(),true); + checkPassword(jdr, form.getJdrmm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -593,16 +593,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("处置人", clr.getNickName()); formData.put("复核人", fhr.getNickName()); formData.put("监督人", jdr.getNickName()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, clr,null); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, clr, null); //台账 - gyzjTzService.saveTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,form.getCzyy()); + gyzjTzService.saveTz(gyzjOld.getId(), null, null, null, null, null, null, null, null, clr, "处置容器", null, null, form.getCzyy()); gyzjOld.setRqzt(RqztEnum.ycz.getValue()); this.updateById(gyzjOld); } /** - * 钥匙发放 + * 钥匙发放 * * @param form */ @@ -613,11 +613,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); //验证领取人1密码 - checkPassword(lqr1,form.getLqr1mm(),true); + checkPassword(lqr1, form.getLqr1mm(), true); //验证领取人2密码 - checkPassword(lqr2,form.getLqr2mm(),true); + checkPassword(lqr2, form.getLqr2mm(), true); //验证发放人密码 - checkPassword(ffr1,form.getFfrmm(),true); + checkPassword(ffr1, form.getFfrmm(), true); Zcg zcg = zcgService.getById(form.getZcgId()); if (zcg == null) { throw new ServiceException("暂存柜不存在或已删除"); @@ -650,7 +650,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("钥匙1领取人", lqr1.getNickName()); formData.put("钥匙2领取人", lqr2.getNickName()); formData.put("发放人", ffr1.getNickName()); - gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, null,null)); + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, null, null)); } if (StringUtils.isBlank(zcg.getGlyj())) { zcg.setGlyj(glyj); @@ -665,14 +665,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG zcgService.updateById(zcg); this.updateBatchById(gyzjList); gyzjJcgjService.saveBatch(gyzjJcgjList); - if(gyzjFfjlList.size()>0){ + if (gyzjFfjlList.size() > 0) { gyzjFfjlService.updateBatchById(gyzjFfjlList); } } /** - * 发放 + * 发放 * * @param form */ @@ -684,13 +684,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); //验证领取人1密码 - checkPassword(lqr1,form.getLqr1mm(),true); + checkPassword(lqr1, form.getLqr1mm(), true); //验证领取人2密码 - checkPassword(lqr2,form.getLqr2mm(),true); + checkPassword(lqr2, form.getLqr2mm(), true); //验证发放人1密码 - checkPassword(ffr1,form.getFfr1mm(),true); + checkPassword(ffr1, form.getFfr1mm(), true); //验证发放人2密码 - checkPassword(ffr2,form.getFfr2mm(),true); + checkPassword(ffr2, form.getFfr2mm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -704,7 +704,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Date now = new Date(); //region 发放记录，试验物资 - gyzjFfjlService.ff(form,gyzjOld, lqr1, lqr2, ffr1, ffr2, now); + gyzjFfjlService.ff(form, gyzjOld, lqr1, lqr2, ffr1, ffr2, now); //endregion //稽查轨迹 @@ -717,9 +717,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("领取人2", lqr2.getNickName()); formData.put("发放人", ffr1.getNickName()); formData.put("发放人2", ffr2.getNickName()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1,form.getRemark()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, form.getRemark()); //台账 - gyzjTzService.saveTz(gyzjOld.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",gyzjOld.getKc(),gyzjOld.getKcdw(),form.getRemark()); + gyzjTzService.saveTz(gyzjOld.getId(), lqr1, lqr2, null, null, ffr1, ffr2, null, null, null, "领取发放", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark()); //region 更新发放信息 gyzjOld.setCkl(gyzjOld.getKc()); @@ -736,7 +736,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG /** - * 批量发放 + * 批量发放 * * @param form */ @@ -748,13 +748,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); //验证领取人1密码 - checkPassword(lqr1,form.getLqr1mm(),true); + checkPassword(lqr1, form.getLqr1mm(), true); //验证领取人2密码 - checkPassword(lqr2,form.getLqr2mm(),true); + checkPassword(lqr2, form.getLqr2mm(), true); //验证发放人1密码 - checkPassword(ffr1,form.getFfr1mm(),true); + checkPassword(ffr1, form.getFfr1mm(), true); //验证发放人2密码 - checkPassword(ffr2,form.getFfr2mm(),true); + checkPassword(ffr2, form.getFfr2mm(), true); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); @@ -787,9 +787,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("领取人2", lqr2.getNickName()); formData.put("发放人", ffr1.getNickName()); formData.put("发放人2", ffr2.getNickName()); - gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1,plffItemFilter.get(0).getRemark())); + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, plffItemFilter.get(0).getRemark())); //台账 - gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",gyzj.getKc(),gyzj.getKcdw(),plffItemFilter.get(0).getRemark())); + gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(), lqr1, lqr2, null, null, ffr1, ffr2, null, null, null, "领取发放", gyzj.getKc(), gyzj.getKcdw(), plffItemFilter.get(0).getRemark())); //region 更新发放信息 gyzj.setCkl(gyzj.getKc()); gyzj.setCkldw(gyzj.getKcdw()); @@ -810,16 +810,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } /** - * 编辑 + * 编辑 * * @param form */ @Override @Transactional(rollbackFor = Exception.class) public void bj(BjForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -840,7 +840,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG throw new ServiceException("你没有修改任何内容"); } for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr,null)); + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null)); } gyzjOld.setMcbj(form.getMc()); gyzjOld.setNdbj(form.getNd()); @@ -858,16 +858,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } /** - * 审核编辑 + * 审核编辑 * * @param form */ @Override @Transactional(rollbackFor = Exception.class) public void shbj(ShbjForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -892,13 +892,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setNddw(gyzjOld.getNddwbj()); gyzjOld.setNd(gyzjOld.getNdbj()); gyzjOld.setMc(gyzjOld.getMcbj()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData,qmr,null); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData, qmr, null); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】同意编辑",gyzjOld.getBjrId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】同意编辑", gyzjOld.getBjrId(), getUrlQz("gyzjList")); } else { - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, qmr,null); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, qmr, null); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】拒绝编辑",gyzjOld.getBjrId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】拒绝编辑", gyzjOld.getBjrId(), getUrlQz("gyzjList")); } //清空编辑信息 gyzjOld.setMcbj(null); @@ -917,16 +917,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG /** - * 修改库存 + * 修改库存 * * @param form */ @Override @Transactional(rollbackFor = Exception.class) public void xgkc(XgkcForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -945,10 +945,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG throw new ServiceException("你没有修改任何内容"); } List gyzjJcgjList = new ArrayList<>(); - + //region 稽查轨迹 for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr,null)); + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null)); } //endregion @@ -965,16 +965,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG /** - * 审核修改库存 + * 审核修改库存 * * @param form */ @Override @Transactional(rollbackFor = Exception.class) public void shxgkc(ShxgkcForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -993,18 +993,18 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("申请备注", gyzjOld.getKcbjbz()); formData.put("审核备注", form.getRemark()); if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr,null); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr, null); gyzjOld.setKcdw(gyzjOld.getKcdwbj()); gyzjOld.setKc(gyzjOld.getKcbj()); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】同意修改库存",gyzjOld.getKcbjrId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】同意修改库存", gyzjOld.getKcbjrId(), getUrlQz("gyzjList")); } else { - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, qmr,null); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, qmr, null); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】拒绝修改库存",gyzjOld.getKcbjrId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】拒绝修改库存", gyzjOld.getKcbjrId(), getUrlQz("gyzjList")); } //台账 - gyzjTzService.saveTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,qmr,"修改库存",gyzjOld.getKcbj(),gyzjOld.getKcdw(),gyzjOld.getKcbjbz()); + gyzjTzService.saveTz(gyzjOld.getId(), null, null, null, null, null, null, null, null, qmr, "修改库存", gyzjOld.getKcbj(), gyzjOld.getKcdw(), gyzjOld.getKcbjbz()); gyzjOld.setKcbj(null); gyzjOld.setKcdwbj(null); @@ -1015,7 +1015,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG /** - * 申请归还 + * 申请归还 * * @param form */ @@ -1025,9 +1025,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser ghr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); //验证归还人1密码 - checkPassword(ghr1,form.getGhr1mm(),true); + checkPassword(ghr1, form.getGhr1mm(), true); //验证归还人2密码 - checkPassword(ghr2,form.getGhr2mm(),true); + checkPassword(ghr2, form.getGhr2mm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1071,7 +1071,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } /** - * 确认归还 + * 确认归还 * * @param form */ @@ -1081,10 +1081,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); //验证接收人1密码 - checkPassword(jsr1,form.getJsr1mm(),true); + checkPassword(jsr1, form.getJsr1mm(), true); //验证接收人2密码 - checkPassword(jsr2,form.getJsr2mm(),true); - + checkPassword(jsr2, form.getJsr2mm(), true); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1105,7 +1105,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } gyzjFfjlService.gh(form, gyzjOld, ghr1, ghr2, jsr1, jsr2); // 台账 - gyzjTzService.saveTz(gyzjOld.getId(),null,null,ghr1,ghr2,null,null,jsr1,jsr2,null,"归还",form.getRkl(), gyzjOld.getKcdw(),form.getRemark()); + gyzjTzService.saveTz(gyzjOld.getId(), null, null, ghr1, ghr2, null, null, jsr1, jsr2, null, "归还", form.getRkl(), gyzjOld.getKcdw(), form.getRemark()); // 稽查轨迹 Map formData = new LinkedHashMap<>(); @@ -1118,8 +1118,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("库管员2", jsr2.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, jsr1, SecurityUtils.getNickName()); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】确认归还",ghr1.getUserId(),getUrlQz("gyzjList")); - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】确认归还",ghr2.getUserId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】确认归还", ghr1.getUserId(), getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】确认归还", ghr2.getUserId(), getUrlQz("gyzjList")); // 更新 gyzjOld.setKc(form.getRkl()); gyzjOld.setGhzytj(null); @@ -1132,7 +1132,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG /** - * 申请入库 + * 申请入库 * * @param form */ @@ -1142,9 +1142,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser qmr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); //验证签名人1密码 - checkPassword(qmr1,form.getQmr1mm(),true); + checkPassword(qmr1, form.getQmr1mm(), true); //验证签名人2密码 - checkPassword(qmr2,form.getQmr2mm(),true); + checkPassword(qmr2, form.getQmr2mm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1182,7 +1182,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } /** - * 确认入库 + * 确认入库 * * @param form */ @@ -1192,9 +1192,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); //验证接收人1密码 - checkPassword(jsr1,form.getJsr1mm(),true); + checkPassword(jsr1, form.getJsr1mm(), true); //验证接收人2密码 - checkPassword(jsr2,form.getJsr2mm(),true); + checkPassword(jsr2, form.getJsr2mm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1216,13 +1216,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { SysUser qmr1 = sysUserService.selectUserById(form.getQmr1Id()); SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意入库", JcmcysEnum.green.getValue(), formData, jsr1,null); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意入库", JcmcysEnum.green.getValue(), formData, jsr1, null); gyzjOld.setKc(form.getRkl()); gyzjOld.setZjzt(ZjztEnum.rk.getValue()); //台账 - gyzjTzService.saveTz(gyzjOld.getId(),null,null,qmr1,qmr2,null,null,jsr1,jsr2,null,"给药制剂入库",form.getRkl(),gyzjOld.getKcdw(),form.getRemark()); + gyzjTzService.saveTz(gyzjOld.getId(), null, null, qmr1, qmr2, null, null, jsr1, jsr2, null, "给药制剂入库", form.getRkl(), gyzjOld.getKcdw(), form.getRemark()); } else { - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝入库", JcmcysEnum.red.getValue(), formData, jsr1,null); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝入库", JcmcysEnum.red.getValue(), formData, jsr1, null); } // 更新 gyzjOld.setRkzytj(null); @@ -1244,11 +1244,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG */ @Override public void cc(CcForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); - SysUser qmr2=sysUserService.selectUserById(form.getQmr2Id()); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); //验证签名人密码 - checkPassword(qmr,form.getQmr1mm(),true); - checkPassword(qmr2,form.getQmr2mm(),true); + checkPassword(qmr, form.getQmr1mm(), true); + checkPassword(qmr2, form.getQmr2mm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1272,7 +1272,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("签名人2", qmr.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, null, form.getRemark()); //台账 - gyzjTzService.saveTz(gyzjOld.getId(),null,null,qmr,qmr2,null,null,null,null,null,"存储",gyzjOld.getKc(),gyzjOld.getKcdw(),form.getRemark()); + gyzjTzService.saveTz(gyzjOld.getId(), null, null, qmr, qmr2, null, null, null, null, null, "存储", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark()); } @@ -1283,11 +1283,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG */ @Override public void qc(CcForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); - SysUser qmr2=sysUserService.selectUserById(form.getQmr2Id()); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); //验证签名人密码 - checkPassword(qmr,form.getQmr1mm(),true); - checkPassword(qmr2,form.getQmr2mm(),true); + checkPassword(qmr, form.getQmr1mm(), true); + checkPassword(qmr2, form.getQmr2mm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1306,17 +1306,18 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("签名人2", qmr.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "取出", JcmcysEnum.green.getValue(), formData, null, form.getRemark()); //台账 - gyzjTzService.saveTz(gyzjOld.getId(),null,null,qmr,qmr2,null,null,null,null,null,"取出",gyzjOld.getKc(),gyzjOld.getKcdw(),form.getRemark()); + gyzjTzService.saveTz(gyzjOld.getId(), null, null, qmr, qmr2, null, null, null, null, null, "取出", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark()); } /** * 表单生成 + * * @param studyFormFill * @param template * @param remark */ @Override - public void genResource(StudyFormFill studyFormFill, Template template,String remark) { + public void genResource(StudyFormFill studyFormFill, Template template, String remark) { System.out.println(System.currentTimeMillis()); SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId()); @@ -1328,9 +1329,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG List gyzjList = new ArrayList<>(); LinkedList jcgjList = new LinkedList<>(); LinkedList tzList = new LinkedList<>(); - if(StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) { + if (StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) { List studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); - List bhList = studyFormFillResourceList.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); + List bhList = studyFormFillResourceList.stream().filter(p->p.getType()==null).map(StudyFormFillResource::getBh).collect(Collectors.toList()); // 根据编号获取需要处置的列表 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(Gyzj::getBh, bhList); @@ -1341,7 +1342,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { Gyzj gyzj = gyzjMap.get(studyFormFillResource.getBh()); - if(gyzj == null) { + if (gyzj == null) { gyzj = new Gyzj(); gyzj.setStudyId(studyId); gyzj.setBdId(studyFormId); @@ -1355,20 +1356,20 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzj.setKc(String.valueOf(studyFormFillResource.getKc())); gyzj.setKcdw(studyFormFillResource.getKcdw()); gyzj.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq())); - if(gyzj.getId() == null) { + if (gyzj.getId() == null) { this.save(gyzj); gyzjList.add(gyzj); gyzjMap.put(gyzj.getBh(), gyzj); // 稽查轨迹 - jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "配制完成",JcmcysEnum.green.getValue(), null, null, qmr,remark)); + jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "配制完成", JcmcysEnum.green.getValue(), null, null, qmr, remark)); // 台账 - tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"配制完成" ,gyzj.getKc(),gyzj.getKcdw(), remark,studyFormFill.getId())); + tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "配制完成", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); } else { this.updateById(gyzj); } // 使用 String syl = studyFormFillResource.getSyl(); - if(StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { + if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { BigDecimal kc = new BigDecimal(gyzj.getKc()); kc = kc.subtract(new BigDecimal(syl)); gyzj.setKc(kc.toString()); @@ -1377,9 +1378,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG HashMap formData = new LinkedHashMap<>(); formData.put("使用量", syl + studyFormFillResource.getSyldw()); // 稽查轨迹 - jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "使用",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr,remark)); + jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "使用", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); // 台账 - tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"使用" ,syl,studyFormFillResource.getSyldw(), remark,studyFormFill.getId())); + tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "使用", syl, studyFormFillResource.getSyldw(), remark, studyFormFill.getId())); } gyzjMap.put(gyzj.getBh(), gyzj); } @@ -1387,39 +1388,42 @@ public class GyzjServiceImpl extends ServiceImpl implements IG // 存储 String cclist = studyFormFill.getCclist(); - if(StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) { + if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) { List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { baseMapper.updateCc(studyFormFillCc.getList(), studyFormFillCc.getCctj(), studyFormFillCc.getCcwz()); for (String bh : studyFormFillCc.getList()) { Gyzj gyzj = gyzjMap.get(bh); - // 稽查轨迹 - HashMap formData = new HashMap<>(); - formData.put("存储位置", studyFormFillCc.getCcwz()); - formData.put("存储条件", studyFormFillCc.getCctj()); - jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "存储",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr,remark)); - // 台账 - tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"存储" ,gyzj.getKc(),gyzj.getKcdw(), remark,studyFormFill.getId())); + if (gyzj != null) { + // 稽查轨迹 + HashMap formData = new HashMap<>(); + formData.put("存储位置", studyFormFillCc.getCcwz()); + formData.put("存储条件", studyFormFillCc.getCctj()); + jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); + // 台账 + tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "存储", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); + } } } } // 处置，库存全变为0 String czlist = studyFormFill.getCzlist(); - if(StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) { + if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) { List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { for (String bh : studyFormFillCz.getList()) { Gyzj gyzj = gyzjMap.get(bh); - // 稽查轨迹 - HashMap formData = new HashMap<>(); - formData.put("处置方式", studyFormFillCz.getCzfs()); - formData.put("处置量", gyzj.getKc() + gyzj.getKcdw()); - jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr,remark)); - - // 台账 - tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"处置" ,gyzj.getKc(),gyzj.getKcdw(), remark,studyFormFill.getId())); - + if (gyzj != null) { + // 稽查轨迹 + HashMap formData = new HashMap<>(); + formData.put("处置方式", studyFormFillCz.getCzfs()); + formData.put("处置量", gyzj.getKc() + gyzj.getKcdw()); + jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); + + // 台账 + tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "处置", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); + } } baseMapper.updateKcBatch(studyFormFillCz.getList(), "0"); } @@ -1440,7 +1444,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG * @return 给药制剂集合 */ @Override - public List queryArchiveList(SearchForm form){ + public List queryArchiveList(SearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("t.del_flag", "0"); queryWrapper.eq("t.`dazt`", DaztEnum.ygd.getValue()); @@ -1470,10 +1474,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG * 同意归档 */ @Override - public void tygd(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void tygd(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1489,19 +1493,19 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //稽查轨迹 gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "同意归档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "同意归档"); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】同意归档",gyzjOld.getGdsqrId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】同意归档", gyzjOld.getGdsqrId(), getUrlQz("gyzjList")); } /** * 拒绝归档 */ @Override - public void jjgd(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void jjgd(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1520,19 +1524,19 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("原因", form.getRemark()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "拒绝归档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "拒绝归档"); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】拒绝归档",gyzjOld.getGdsqrId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】拒绝归档", gyzjOld.getGdsqrId(), getUrlQz("gyzjList")); } /** * 同意解档 */ @Override - public void tyjd(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void tyjd(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1549,19 +1553,19 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //稽查轨迹 gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "同意解档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "同意解档"); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】同意解档",gyzjOld.getGdsqrId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】同意解档", gyzjOld.getGdsqrId(), getUrlQz("gyzjList")); } /** * 拒绝解档 */ @Override - public void jjjd(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void jjjd(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1579,9 +1583,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("原因", form.getRemark()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "拒绝解档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "拒绝解档"); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】拒绝解档",gyzjOld.getGdsqrId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】拒绝解档", gyzjOld.getGdsqrId(), getUrlQz("gyzjList")); } @@ -1589,10 +1593,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG * 同意借阅 */ @Override - public void tyjy(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void tyjy(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1613,19 +1617,19 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq())); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "同意借阅"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "同意借阅"); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】同意借阅",gyzjOld.getGdsqrId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】同意借阅", gyzjOld.getGdsqrId(), getUrlQz("gyzjList")); } /** * 拒绝借阅 */ @Override - public void jjjy(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void jjjy(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1647,19 +1651,19 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("原因", form.getRemark()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "拒绝借阅"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "拒绝借阅"); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】拒绝借阅",gyzjOld.getGdsqrId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】拒绝借阅", gyzjOld.getGdsqrId(), getUrlQz("gyzjList")); } /** * 确认归还 */ @Override - public void qrgh(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void qrgh(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1675,9 +1679,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //稽查轨迹 gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "确认归还"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "确认归还"); //通知 - noticeService.save("给药制剂【"+gyzjOld.getMc()+"】确认归还",gyzjOld.getGdsqrId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【" + gyzjOld.getMc() + "】确认归还", gyzjOld.getGdsqrId(), getUrlQz("gyzjList")); } @@ -1685,19 +1689,19 @@ public class GyzjServiceImpl extends ServiceImpl implements IG * 借阅到期自动归还 */ @Override - public void autoJyExpireReturn(){ + public void autoJyExpireReturn() { QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.eq("jyzt",JyztEnum.jyz.getValue()); + queryWrapper.eq("jyzt", JyztEnum.jyz.getValue()); queryWrapper.apply("jyjsrq<{0}", DateUtils.getTime()); - List gyzjList=this.list(queryWrapper); - List gyzjFfjlJcgjList=new ArrayList<>(); - for(Gyzj gyzj:gyzjList){ + List gyzjList = this.list(queryWrapper); + List gyzjFfjlJcgjList = new ArrayList<>(); + for (Gyzj gyzj : gyzjList) { gyzj.setJyzt(JyztEnum.wjy.getValue()); //稽查轨迹 gyzjFfjlJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "到期自动归还", JcmcysEnum.green.getValue(), null, null, null)); } this.updateBatchById(gyzjList); - if(gyzjFfjlJcgjList.size()>0){ + if (gyzjFfjlJcgjList.size() > 0) { gyzjJcgjService.saveBatch(gyzjFfjlJcgjList); } } @@ -1706,23 +1710,25 @@ public class GyzjServiceImpl extends ServiceImpl implements IG /** * 验证密码 + * * @param user * @param qmrmm */ - public void checkPassword(SysUser user,String qmrmm,Boolean needName){ - if(StringUtils.isBlank(qmrmm)){ + public void checkPassword(SysUser user, String qmrmm, Boolean needName) { + if (StringUtils.isBlank(qmrmm)) { throw new ServiceException("签名密码不能为空"); } - sysUserService.checkPassword(user,qmrmm,needName); + sysUserService.checkPassword(user, qmrmm, needName); } /** * 获取通知的跳转url + * * @param tab * @return */ - private String getUrlQz(String tab){ - return "/resource/gyzj/"+tab; + private String getUrlQz(String tab) { + return "/resource/gyzj/" + tab; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java index 668543a..cd40fba 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java @@ -11,6 +11,7 @@ import com.hxhq.business.utils.lang.MjyJcnrUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.StringUtils; import com.hxhq.system.api.domain.SysUser; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.MjyJcgjMapper; import com.hxhq.business.service.IMjyJcgjService; @@ -60,6 +61,7 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl * @param remark 备注 */ @Override + @Async public void saveJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyId); 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 109da53..c348ebb 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 @@ -1235,7 +1235,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS LinkedList tzList = new LinkedList<>(); if(StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) { List studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); - List bhList = studyFormFillResourceList.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); + List bhList = studyFormFillResourceList.stream().filter(p->p.getType()==null).map(StudyFormFillResource::getBh).collect(Collectors.toList()); // 根据编号获取需要处置的列表 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(Mjy::getBh, bhList); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java index 903fc39..5cc9294 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java @@ -653,7 +653,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi LinkedList tzList = new LinkedList<>(); if(StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) { List studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); - List bhList = studyFormFillResourceList.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); + List bhList = studyFormFillResourceList.stream().filter(p->p.getType()==null).map(StudyFormFillResource::getBh).collect(Collectors.toList()); // 根据编号获取需要处置的试剂列表 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(Sj::getBh, bhList); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java index 30cacc2..b13944b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java @@ -447,6 +447,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl