From 8eb08cfda83df7b3b3705d6a7128be9d9a2c66da Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 6 Feb 2026 17:10:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E8=8D=AF=E5=89=82=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StudyFormFillController.java | 9 + .../main/java/com/hxhq/business/domain/Gyzj.java | 11 ++ .../com/hxhq/business/service/IGspService.java | 2 + .../com/hxhq/business/service/IGyzjService.java | 7 + .../java/com/hxhq/business/service/ISjService.java | 8 - .../hxhq/business/service/impl/GspServiceImpl.java | 21 ++- .../business/service/impl/GyzjServiceImpl.java | 204 ++++++++++++++++++++- .../hxhq/business/service/impl/MjyServiceImpl.java | 151 +++++++++------ .../hxhq/business/service/impl/SjServiceImpl.java | 9 - .../service/impl/StudyFormFillServiceImpl.java | 3 +- .../com/hxhq/business/utils/lang/GyzjJcnrUtil.java | 7 + .../hxhq/business/utils/lang/StudyFormUtil.java | 9 +- 12 files changed, 353 insertions(+), 88 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java index 2c40f5b..c1afd9b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java @@ -61,6 +61,9 @@ public class StudyFormFillController extends BaseController { * @return */ @PostMapping("/startConfiguration") + @RequiresPermissions(value = {"business:studyFormFill:bj", "business:studyFormFill:xz", + "business:nonTrialFormFill:bj", "business:nonTrialFormFill:xz", + "business:drugFormFill:bj", "business:drugFormFill:xz"}, logical = Logical.OR) public AjaxResult startConfiguration(@RequestBody StudyFormConfigurationForm form) { studyFormFillService.startConfiguration(form); return AjaxResult.success("操作成功"); @@ -72,6 +75,9 @@ public class StudyFormFillController extends BaseController { * @return */ @PostMapping("/configurationCompleted") + @RequiresPermissions(value = {"business:studyFormFill:bj", "business:studyFormFill:xz", + "business:nonTrialFormFill:bj", "business:nonTrialFormFill:xz", + "business:drugFormFill:bj", "business:drugFormFill:xz"}, logical = Logical.OR) public AjaxResult configurationCompleted(@RequestBody StudyFormConfigurationForm form) { studyFormFillService.configurationCompleted(form); return AjaxResult.success("操作成功"); @@ -83,6 +89,9 @@ public class StudyFormFillController extends BaseController { * @return */ @PostMapping("/subpackage") + @RequiresPermissions(value = {"business:studyFormFill:bj", "business:studyFormFill:xz", + "business:nonTrialFormFill:bj", "business:nonTrialFormFill:xz", + "business:drugFormFill:bj", "business:drugFormFill:xz"}, logical = Logical.OR) public AjaxResult subpackage(@RequestBody StudyFormFillSubpackageForm form) { studyFormFillService.subpackage(form); return AjaxResult.success("操作成功"); 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 aabd517..0cc3356 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 @@ -31,6 +31,9 @@ public class Gyzj extends MpBaseEntity /** 编号 */ private String bh; + /** 母液编号 */ + private String parentBh; + /** 浓度 */ @Compare(name = "浓度",nameEn = "Concentration") private String nd; @@ -245,6 +248,14 @@ public class Gyzj extends MpBaseEntity /** 归档申请人名称 */ private String gdsqrMc; + public String getParentBh() { + return parentBh; + } + + public void setParentBh(String parentBh) { + this.parentBh = parentBh; + } + public String getLy() { return ly; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java index d5b322c..9a813de 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java @@ -18,6 +18,8 @@ import com.hxhq.business.form.gyzj.SearchForm; */ public interface IGspService extends IService { + + /** * 查询供试品管理列表 * diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java index b0ef62c..684e082 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java @@ -24,6 +24,13 @@ public interface IGyzjService extends IService { //region 资源库管理 /** + * 通过编号获取给药制剂 + * @param bh + * @return + */ + public Gyzj getInfoByBh(String bh); + + /** * 开始配置 * @param form * @return diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java index 1dcd9a2..1e0ac3d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java @@ -158,14 +158,6 @@ public interface ISjService extends IService void genResource(StudyFormFill studyFormFill, Template template); /** - * 药剂存储 - * @param studyFormFill - * @param template - * @param remark - */ - void storageResource(StudyFormFill studyFormFill, Template template,String remark); - - /** * 同意归档 * @param form */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java index f8293f4..b22a46a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java @@ -57,6 +57,18 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Autowired private INoticeService noticeService; + + /** + * 药剂存储 + * @param studyFormFill + * @param template + * @param remark + */ + @Override + public void storageResource(StudyFormFill studyFormFill, Template template,String remark){ + + } + /** * 查询供试品管理列表 * @@ -1373,14 +1385,5 @@ public class GspServiceImpl extends ServiceImpl implements IGspS return "/resource/specimen/"+tab; } - /** - * 药剂存储 - * @param studyFormFill - * @param template - * @param remark - */ - @Override - public void storageResource(StudyFormFill studyFormFill, Template template,String remark){ - } } 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 0d2cbf3..55ac7f6 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 @@ -19,6 +19,9 @@ import com.hxhq.business.enums.archive.ArchiveLogTypeEnum; import com.hxhq.business.enums.study.StudyFormFillResourceTypeEnum; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.gyzj.*; +import com.hxhq.business.form.study.StudyFormConfigurationForm; +import com.hxhq.business.form.study.StudyFormFillSubpackageForm; +import com.hxhq.business.form.study.StudyFormFillSubpackageItemForm; import com.hxhq.business.service.*; import com.hxhq.business.utils.CalUnitTools; import com.hxhq.business.utils.JctUtil; @@ -66,9 +69,127 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Autowired private IStudyGyzjService studyGyzjService; + //region 表单 + + /** + * 开始配置 + * @param form + * @return + */ + @Override + public void startConfiguration(StudyFormConfigurationForm form){ + Gyzj gyzj = this.getInfoByBh(form.getBh()); + if(gyzj == null) { + gyzj = new Gyzj(); + gyzj.setBh(form.getBh()); + gyzj.setStudyId(form.getStudyId()); + gyzj.setBdId(form.getStudyFormId()); + this.save(gyzj); + } else { + gyzj.setStudyId(form.getStudyId()); + gyzj.setBdId(form.getStudyFormId()); + this.updateById(gyzj); + } + } + + + /** + * 配置完成 + * @param form + * @return + */ + @Override + public void configurationCompleted(StudyFormConfigurationForm form){ + Gyzj gyzj = this.getInfoByBh(form.getBh()); + if(gyzj == null) { + gyzj = new Gyzj(); + gyzj.setBh(form.getBh()); + gyzj.setKc(form.getKc()); + gyzj.setKcdw(form.getKcdw()); + gyzj.setStudyId(form.getStudyId()); + gyzj.setBdId(form.getStudyFormId()); + gyzj.setNd(form.getNd()); + gyzj.setNddw(form.getNddw()); + gyzj.setZjzt(ZjztEnum.rk.getValue()); + gyzj.setJyzt(JyztEnum.wjy.getValue()); + this.save(gyzj); + } else { + gyzj.setBh(form.getBh()); + gyzj.setKc(form.getKc()); + gyzj.setKcdw(form.getKcdw()); + gyzj.setStudyId(form.getStudyId()); + gyzj.setBdId(form.getStudyFormId()); + gyzj.setNd(form.getNd()); + gyzj.setNddw(form.getNddw()); + gyzj.setZjzt(ZjztEnum.rk.getValue()); + gyzj.setJyzt(JyztEnum.wjy.getValue()); + this.updateById(gyzj); + } + } + + + /** + * 分装 + * @param form + * @return + */ + @Override + public void subpackage(StudyFormFillSubpackageForm form){ + Gyzj gyzj = this.getInfoByBh(form.getBh()); + if(gyzj == null) { + gyzj = new Gyzj(); + gyzj.setBh(form.getBh()); + this.save(gyzj); + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(Gyzj::getParentBh, form.getBh()); + this.remove(queryWrapper); + List list = form.getList(); + List gyzjList = new ArrayList<>(); + List fz = new ArrayList<>(); + for (StudyFormFillSubpackageItemForm gyzjSubpackageItemForm : list) { + Gyzj subpackageGyzj = new Gyzj(); + subpackageGyzj.setParentBh(form.getBh()); + subpackageGyzj.setBh(gyzjSubpackageItemForm.getBh()); + subpackageGyzj.setKc(gyzjSubpackageItemForm.getKc()); + subpackageGyzj.setKcdw(gyzjSubpackageItemForm.getKcdw()); + subpackageGyzj.setNd(form.getNd()); + subpackageGyzj.setNddw(form.getNddw()); + subpackageGyzj.setStudyId(form.getStudyId()); + subpackageGyzj.setBdId(form.getStudyFormId()); + gyzjList.add(subpackageGyzj); + fz.add(gyzjSubpackageItemForm.getBh() + "(" + gyzjSubpackageItemForm.getKc() + gyzjSubpackageItemForm.getKcdw() + ")"); + } + this.saveBatch(gyzjList); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("母液编号", form.getBh()); + formData.put("分装个数", String.valueOf(form.getList().size())); + formData.put("分装后编号及体积",String.join(",", fz)); + formData.put("分装人", SecurityUtils.getNickName()); + gyzjJcgjService.saveJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "分装", JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null); + } + + + //endregion + + //region 资源库管理 /** + * 通过编号获取给药制剂 + * @param bh + * @return + */ + @Override + public Gyzj getInfoByBh(String bh){ + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.eq("bh", bh); + return this.getOne(queryWrapper,false); + } + + + /** * 列表 * * @param form 暂存柜 @@ -1405,8 +1526,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //更新 Resource studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList)); } - // 处置、存储 - czCc(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr); + // 存储、处置 + cc(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr); + cz(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr); } if (jcgjList.size() > 0) { gyzjJcgjService.saveBatch(jcgjList); @@ -1427,11 +1549,65 @@ public class GyzjServiceImpl extends ServiceImpl implements IG */ @Override public void storageResource(StudyFormFill studyFormFill, Template template,String remark){ - + Boolean mark = template.getProduct().equals(StudyFormFillResourceTypeEnum.gyzj.getValue()) ? true : false; + SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId()); + Long studyId = studyFormFill.getStudyId(); + String resource = studyFormFill.getResource(); + Map gyzjMap = new HashMap<>(10); + List gyzjList = new ArrayList<>(); + LinkedList jcgjList = new LinkedList<>(); + LinkedList tzList = new LinkedList<>(); + String empty = "[]"; + if (StringUtils.isNotEmpty(resource) && !StringUtils.equals(empty, resource)) { + List studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); + List tmp = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || (p.getType() != null && StudyFormFillResourceTypeEnum.gyzj.getValue() == p.getType())).collect(Collectors.toList()); + // 根据编号获取需要处置的列表 + if (tmp.size() > 0) { + List bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(Gyzj::getBh, bhList); + gyzjList = this.list(queryWrapper); + for (Gyzj gyzj : gyzjList) { + gyzjMap.put(gyzj.getBh(), gyzj); + } + for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { + Gyzj gyzj = gyzjMap.get(studyFormFillResource.getBh()); + //配置的更新type + if (studyFormFillResource.getType() == null) { + studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue()); + } else { + //使用的更新 + studyFormFillResource.setMc(gyzj.getMc()); + studyFormFillResource.setNd(gyzj.getNd()); + studyFormFillResource.setNddw(gyzj.getNddw()); + studyFormFillResource.setLy(gyzj.getLy()); + if (gyzj.getSxrq() != null) { + studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", gyzj.getSxrq())); + } + } + gyzj.setCczt(CcztEnum.Cc.getValue()); + this.updateById(gyzj); + gyzjMap.put(gyzj.getBh(), gyzj); + } + //更新 Resource + studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList)); + } + // 存储 + cc(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr); + } + if (jcgjList.size() > 0) { + gyzjJcgjService.saveBatch(jcgjList); + } + if (tzList.size() > 0) { + gyzjTzService.saveBatch(tzList); + } + if (gyzjList.size() > 0) { + studyGyzjService.saveBatch(studyId, gyzjList); + } } /** - * 处置、存储 + * 存储 * * @param studyFormFill * @param gyzjMap @@ -1439,7 +1615,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG * @param tzList * @param remark */ - public void czCc(StudyFormFill studyFormFill, Map gyzjMap, LinkedList jcgjList, LinkedList tzList, String remark, SysUser qmr) { + public void cc(StudyFormFill studyFormFill, Map gyzjMap, LinkedList jcgjList, LinkedList tzList, String remark, SysUser qmr) { String empty = "[]"; if (gyzjMap.size() > 0) { // 存储 @@ -1467,6 +1643,22 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } } + } + } + + /** + * 处置 + * + * @param studyFormFill + * @param gyzjMap + * @param jcgjList + * @param tzList + * @param remark + */ + public void cz(StudyFormFill studyFormFill, Map gyzjMap, LinkedList jcgjList, LinkedList tzList, String remark, SysUser qmr) { + String empty = "[]"; + if (gyzjMap.size() > 0) { + // 处置，库存全变为0 String czlist = studyFormFill.getCzlist(); if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) { @@ -1494,6 +1686,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } } } + + //endregion //region 档案管理 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 a91e2a9..8cadc04 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 @@ -1313,7 +1313,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList)); } // 处置、存储 - czCc(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr); + cc(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr); + cz(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr); } if (jcgjList.size() > 0) { mjyJcgjService.saveBatch(jcgjList); @@ -1328,49 +1329,114 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS /** * 药剂存储 + * * @param studyFormFill * @param template * @param remark */ @Override - public void storageResource(StudyFormFill studyFormFill, Template template,String remark){ - - } - - /** - * 开始配置 - * @param form - * @return - */ - @Override - public void startConfiguration(StudyFormConfigurationForm form){ - + public void storageResource(StudyFormFill studyFormFill, Template template, String remark) { + Boolean mark = template.getProduct().equals(StudyFormFillResourceTypeEnum.mjy.getValue()) ? true : false; + SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId()); + Long studyId = studyFormFill.getStudyId(); + String resource = studyFormFill.getResource(); + Map mjyMap = new HashMap<>(10); + List mjyList = new ArrayList<>(); + LinkedList jcgjList = new LinkedList<>(); + LinkedList tzList = new LinkedList<>(); + String empty = "[]"; + if (StringUtils.isNotEmpty(resource) && !StringUtils.equals(empty, resource)) { + List studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); + List tmp = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || (p.getType() != null && StudyFormFillResourceTypeEnum.mjy.getValue() == p.getType())).collect(Collectors.toList()); + // 根据编号获取需要处置的列表 + if (tmp.size() > 0) { + List bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(Mjy::getBh, bhList); + mjyList = this.list(queryWrapper); + for (Mjy mjy : mjyList) { + mjyMap.put(mjy.getBh(), mjy); + } + for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { + Mjy mjy = mjyMap.get(studyFormFillResource.getBh()); + //配置的更新type + if (studyFormFillResource.getType() == null) { + studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue()); + } else { + //使用的更新 + studyFormFillResource.setMc(mjy.getMc()); + studyFormFillResource.setNd(mjy.getNd()); + studyFormFillResource.setNddw(mjy.getNddw()); + studyFormFillResource.setLy(mjy.getLy()); + if (mjy.getSxrq() != null) { + studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", mjy.getSxrq())); + } + } + mjy.setCczt(CcztEnum.Cc.getValue()); + this.updateById(mjy); + mjyMap.put(mjy.getBh(), mjy); + } + //更新 Resource + studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList)); + } + // 存储 + cc(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr); + } + if (jcgjList.size() > 0) { + mjyJcgjService.saveBatch(jcgjList); + } + if (tzList.size() > 0) { + mjyTzService.saveBatch(tzList); + } + if (mjyList.size() > 0) { + studyMjyService.saveBatch(studyId, mjyList); + } } /** - * 配置完成 - * @param form - * @return + * 处置 + * + * @param studyFormFill + * @param mjyMap + * @param jcgjList + * @param tzList + * @param remark */ - @Override - public void configurationCompleted(StudyFormConfigurationForm form){ - - } - + public void cz(StudyFormFill studyFormFill, Map mjyMap, LinkedList jcgjList, LinkedList tzList, String remark, SysUser qmr) { + String empty = "[]"; + if (mjyMap.size() > 0) { - /** - * 分装 - * @param form - * @return - */ - @Override - public void subpackage(StudyFormFillSubpackageForm form){ + // 处置，库存全变为0 + String czlist = studyFormFill.getCzlist(); + if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) { + List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); + for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { + List list = new ArrayList<>(); + for (String bh : studyFormFillCz.getList()) { + Mjy mjy = mjyMap.get(bh); + if (mjy != null) { + list.add(bh); + // 稽查轨迹 + HashMap formData = new HashMap<>(2); + formData.put("处置方式", studyFormFillCz.getCzfs()); + formData.put("处置量", mjy.getKc() + mjy.getKcdw()); + jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark)); + // 台账 + tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "处置", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId())); + } + } + if (list.size() > 0) { + baseMapper.updateKcBatch(list, "0"); + } + } + } + } } /** - * 处置、存储 + * 存储 * * @param studyFormFill * @param mjyMap @@ -1378,7 +1444,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS * @param tzList * @param remark */ - public void czCc(StudyFormFill studyFormFill, Map mjyMap, LinkedList jcgjList, LinkedList tzList, String remark, SysUser qmr) { + public void cc(StudyFormFill studyFormFill, Map mjyMap, LinkedList jcgjList, LinkedList tzList, String remark, SysUser qmr) { String empty = "[]"; if (mjyMap.size() > 0) { // 存储 @@ -1406,31 +1472,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } } - // 处置，库存全变为0 - String czlist = studyFormFill.getCzlist(); - if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) { - List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); - for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { - List list = new ArrayList<>(); - for (String bh : studyFormFillCz.getList()) { - Mjy mjy = mjyMap.get(bh); - if (mjy != null) { - list.add(bh); - // 稽查轨迹 - HashMap formData = new HashMap<>(2); - formData.put("处置方式", studyFormFillCz.getCzfs()); - formData.put("处置量", mjy.getKc() + mjy.getKcdw()); - jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark)); - - // 台账 - tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "处置", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId())); - } - } - if (list.size() > 0) { - baseMapper.updateKcBatch(list, "0"); - } - } - } } } 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 9c1b3e6..dd4b4ac 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 @@ -774,16 +774,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi } } - /** - * 药剂存储 - * @param studyFormFill - * @param template - * @param remark - */ - @Override - public void storageResource(StudyFormFill studyFormFill, Template template,String remark){ - } /** * 开始配置 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 14a0b91..ea3127f 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 @@ -469,10 +469,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("存储位置", "todo"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java index 667bb66..69185ee 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java @@ -15,6 +15,13 @@ public class GyzjJcnrUtil { private static final Logger logger = LoggerFactory.getLogger(GyzjJcnrUtil.class.getName()); private static HashMap mapLang=new HashMap<>(); static { + + + mapLang.put("母液编号","母液编号"); + mapLang.put("分装个数","分装个数"); + mapLang.put("分装后编号及体积","分装后编号及体积"); + mapLang.put("分装人","分装人"); + mapLang.put("分装","分装"); mapLang.put("入库","In Storage"); mapLang.put("未入库","Not in Storage"); mapLang.put("已发放","In Use"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/StudyFormUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/StudyFormUtil.java index da37b09..a24a680 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/StudyFormUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/StudyFormUtil.java @@ -15,7 +15,14 @@ public class StudyFormUtil { private static final Logger logger = LoggerFactory.getLogger(StudyFormUtil.class.getName()); private static HashMap mapLang=new HashMap<>(); static { - mapLang.put("字段名","Field"); + + + mapLang.put("存储","Storage"); + mapLang.put("存储条件","Storage Condition"); + mapLang.put("存储位置","Storage Location"); + mapLang.put("存储药剂","存储药剂"); + + mapLang.put("原值","Old Value"); mapLang.put("新值","New Value"); mapLang.put("原因","Reason");