eln_TD
/
eln_svr
9
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

fix：[填报表单]生成试剂，给药，麻精药，优化

master
15881625488@163.com 2 months ago
parent
e686ca174e
commit
906292833f
4 changed files with 555 additions and 495 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +107
    -87
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
  2. +257
    -234
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
  3. +188
    -164
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java
  4. +3
    -10
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java

+ 107
- 87
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java View File

@ -15,6 +15,7 @@ import com.hxhq.business.dto.study.StudyFormFillCc;
import com.hxhq.business.dto.study.StudyFormFillCz; import com.hxhq.business.dto.study.StudyFormFillCz;
import com.hxhq.business.dto.study.StudyFormFillResource; import com.hxhq.business.dto.study.StudyFormFillResource;
import com.hxhq.business.enums.archive.ArchiveLogTypeEnum; import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
import com.hxhq.business.enums.study.StudyFormFillResourceTypeEnum;
import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.enums.zykgl.*;
import com.hxhq.business.form.gyzj.*; import com.hxhq.business.form.gyzj.*;
import com.hxhq.business.service.*; import com.hxhq.business.service.*;
@ -1318,7 +1319,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
*/ */
@Override @Override
public void genResource(StudyFormFill studyFormFill, Template template, String remark) { public void genResource(StudyFormFill studyFormFill, Template template, String remark) {
System.out.println(System.currentTimeMillis());
Boolean mark = template.getProduct().equals(StudyFormFillResourceTypeEnum.gyzj.getValue()) ? true : false;
SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId()); SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId());
Long studyId = studyFormFill.getStudyId(); Long studyId = studyFormFill.getStudyId();
@ -1331,106 +1332,125 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
LinkedList<GyzjTz> tzList = new LinkedList<>(); LinkedList<GyzjTz> tzList = new LinkedList<>();
if (StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) { if (StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) {
List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class);
List<String> bhList = studyFormFillResourceList.stream().filter(p->p.getType()==null).map(StudyFormFillResource::getBh).collect(Collectors.toList());
List<String> bhList = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || p.getType().equals(StudyFormFillResourceTypeEnum.gyzj.getValue())).map(StudyFormFillResource::getBh).collect(Collectors.toList());
// 根据编号获取需要处置的列表 // 根据编号获取需要处置的列表
LambdaQueryWrapper<Gyzj> 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());
if (gyzj == null) {
gyzj = new Gyzj();
gyzj.setStudyId(studyId);
gyzj.setBdId(studyFormId);
gyzj.setZjzt(ZjztEnum.wrk.getValue());
gyzj.setJyzt(JyztEnum.wjy.getValue());
}
gyzj.setMc(studyFormFillResource.getMc());
gyzj.setBh(studyFormFillResource.getBh());
gyzj.setNd(String.valueOf(studyFormFillResource.getNdz()));
gyzj.setNddw(studyFormFillResource.getNddw());
gyzj.setKc(String.valueOf(studyFormFillResource.getKc()));
gyzj.setKcdw(studyFormFillResource.getKcdw());
gyzj.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq()));
if (gyzj.getId() == null) {
this.save(gyzj);
gyzjList.add(gyzj);
if (bhList.size() > 0) {
LambdaQueryWrapper<Gyzj> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(Gyzj::getBh, bhList);
gyzjList = this.list(queryWrapper);
for (Gyzj gyzj : gyzjList) {
gyzjMap.put(gyzj.getBh(), gyzj); gyzjMap.put(gyzj.getBh(), gyzj);
// 稽查轨迹
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()));
} else {
this.updateById(gyzj);
}
// 使用
String syl = studyFormFillResource.getSyl();
if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) {
BigDecimal kc = new BigDecimal(gyzj.getKc());
kc = kc.subtract(new BigDecimal(syl));
gyzj.setKc(kc.toString());
baseMapper.updateKc(gyzj.getId(), kc.toString());
// 使用稽查轨迹
HashMap<String, String> 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));
// 台账
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);
}
}
// 存储
String cclist = studyFormFill.getCclist();
if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) {
List<StudyFormFillCc> 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);
if (gyzj != null) {
for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) {
Gyzj gyzj = gyzjMap.get(studyFormFillResource.getBh());
//配置的才保存，或更新
if (studyFormFillResource.getType() == null) {
if (gyzj == null) {
gyzj = new Gyzj();
gyzj.setStudyId(studyId);
gyzj.setBdId(studyFormId);
gyzj.setZjzt(ZjztEnum.wrk.getValue());
gyzj.setJyzt(JyztEnum.wjy.getValue());
}
gyzj.setMc(studyFormFillResource.getMc());
gyzj.setBh(studyFormFillResource.getBh());
gyzj.setNd(String.valueOf(studyFormFillResource.getNdz()));
gyzj.setNddw(studyFormFillResource.getNddw());
gyzj.setKc(String.valueOf(studyFormFillResource.getKc()));
gyzj.setKcdw(studyFormFillResource.getKcdw());
gyzj.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq()));
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));
// 台账
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)) {
BigDecimal kc = new BigDecimal(gyzj.getKc());
kc = kc.subtract(new BigDecimal(syl));
gyzj.setKc(kc.toString());
baseMapper.updateKc(gyzj.getId(), kc.toString());
// 使用稽查轨迹
HashMap<String, String> formData = new LinkedHashMap<>();
formData.put("使用量", syl + studyFormFillResource.getSyldw());
// 稽查轨迹 // 稽查轨迹
HashMap<String, String> 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));
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()));
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);
} }
} }
} }
if (gyzjMap.size() > 0) {
// 存储
String cclist = studyFormFill.getCclist();
if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) {
List<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
List<String> list=new ArrayList<>();
for (String bh : studyFormFillCc.getList()) {
Gyzj gyzj = gyzjMap.get(bh);
if (gyzj != null) {
list.add(bh);
// 稽查轨迹
HashMap<String, String> 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(list.size()>0){
baseMapper.updateCc(list, studyFormFillCc.getCctj(), studyFormFillCc.getCcwz());
}
}
}
// 处置，库存全变为0
String czlist = studyFormFill.getCzlist();
if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) {
List<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class);
for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) {
for (String bh : studyFormFillCz.getList()) {
Gyzj gyzj = gyzjMap.get(bh);
if (gyzj != null) {
// 稽查轨迹
HashMap<String, String> 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()));
// 处置，库存全变为0
String czlist = studyFormFill.getCzlist();
if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) {
List<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class);
for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) {
List<String> list=new ArrayList<>();
for (String bh : studyFormFillCz.getList()) {
Gyzj gyzj = gyzjMap.get(bh);
if (gyzj != null) {
list.add(bh);
// 稽查轨迹
HashMap<String, String> 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(list.size()>0) {
baseMapper.updateKcBatch(list, "0");
} }
} }
baseMapper.updateKcBatch(studyFormFillCz.getList(), "0");
} }
} }
gyzjJcgjService.saveBatch(jcgjList);
gyzjTzService.saveBatch(tzList);
studyGyzjService.saveBatch(studyId, gyzjList);
if(jcgjList.size()>0){
gyzjJcgjService.saveBatch(jcgjList);
}
if(tzList.size()>0){
gyzjTzService.saveBatch(tzList);
}
if(gyzjList.size()>0){
studyGyzjService.saveBatch(studyId, gyzjList);
}
} }
//endregion //endregion

+ 257
- 234
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
File diff suppressed because it is too large
View File


+ 188
- 164
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java View File

@ -14,6 +14,7 @@ import com.hxhq.business.dto.study.StudyFormFillCc;
import com.hxhq.business.dto.study.StudyFormFillCz; import com.hxhq.business.dto.study.StudyFormFillCz;
import com.hxhq.business.dto.study.StudyFormFillResource; import com.hxhq.business.dto.study.StudyFormFillResource;
import com.hxhq.business.enums.archive.ArchiveLogTypeEnum; import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
import com.hxhq.business.enums.study.StudyFormFillResourceTypeEnum;
import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.enums.zykgl.*;
import com.hxhq.business.form.gsp.GspGdForm; import com.hxhq.business.form.gsp.GspGdForm;
import com.hxhq.business.form.gsp.GspJyForm; import com.hxhq.business.form.gsp.GspJyForm;
@ -43,8 +44,7 @@ import org.springframework.transaction.annotation.Transactional;
* @date 2025-12-22 * @date 2025-12-22
*/ */
@Service @Service
public class SjServiceImpl extends ServiceImpl<SjMapper, Sj> implements ISjService
{
public class SjServiceImpl extends ServiceImpl<SjMapper, Sj> implements ISjService {
@Autowired @Autowired
private ISysUserService sysUserService; private ISysUserService sysUserService;
@ -73,35 +73,34 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
* @return 试剂库存 * @return 试剂库存
*/ */
@Override @Override
public List<SjListDto> queryList(SjSearchListForm form)
{
public List<SjListDto> queryList(SjSearchListForm form) {
QueryWrapper<Sj> queryWrapper = Wrappers.query(); QueryWrapper<Sj> queryWrapper = Wrappers.query();
queryWrapper.eq("s.del_flag", 0); queryWrapper.eq("s.del_flag", 0);
if(StringUtils.isNotEmpty(form.getMc())) {
if (StringUtils.isNotEmpty(form.getMc())) {
queryWrapper.like("s.mc", form.getMc()); queryWrapper.like("s.mc", form.getMc());
} }
if(StringUtils.isNotEmpty(form.getBh())) {
if (StringUtils.isNotEmpty(form.getBh())) {
queryWrapper.like("s.bh", form.getBh()); queryWrapper.like("s.bh", form.getBh());
} }
if(StringUtils.isNotEmpty(form.getStartDate())) {
if (StringUtils.isNotEmpty(form.getStartDate())) {
queryWrapper.ge("s.sxr", form.getStartDate()); queryWrapper.ge("s.sxr", form.getStartDate());
} }
if(StringUtils.isNotEmpty(form.getEndDate())) {
if (StringUtils.isNotEmpty(form.getEndDate())) {
queryWrapper.le("s.sxr", form.getEndDate()); queryWrapper.le("s.sxr", form.getEndDate());
} }
if(form.getZjzt() != null) {
if (form.getZjzt() != null) {
queryWrapper.eq("s.zjzt", form.getZjzt()); queryWrapper.eq("s.zjzt", form.getZjzt());
} }
if(form.getJyzt() != null) {
if (form.getJyzt() != null) {
queryWrapper.eq("s.jyzt", form.getJyzt()); queryWrapper.eq("s.jyzt", form.getJyzt());
} }
if(StringUtils.isNotEmpty(form.getDeptName())) {
if (StringUtils.isNotEmpty(form.getDeptName())) {
queryWrapper.like("d.dept_name", form.getDeptName()); queryWrapper.like("d.dept_name", form.getDeptName());
} }
if(StringUtils.isNotEmpty(form.getStudyName())) {
if (StringUtils.isNotEmpty(form.getStudyName())) {
queryWrapper.like("t.name", form.getStudyName()); queryWrapper.like("t.name", form.getStudyName());
} }
if(form.getArchive() != null && form.getArchive() == DaztEnum.ygd.getValue()) {
if (form.getArchive() != null && form.getArchive() == DaztEnum.ygd.getValue()) {
queryWrapper.in("s.zjzt", ZjztEnum.dgd.getValue(), ZjztEnum.gd.getValue(), ZjztEnum.djd.getValue()); queryWrapper.in("s.zjzt", ZjztEnum.dgd.getValue(), ZjztEnum.gd.getValue(), ZjztEnum.djd.getValue());
} else { } else {
queryWrapper.isNotNull("s.zjzt"); queryWrapper.isNotNull("s.zjzt");
@ -116,13 +115,13 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
queryWrapper.eq("s.del_flag", 0); queryWrapper.eq("s.del_flag", 0);
queryWrapper.and(p -> p.apply("(s.zjzt = {0} OR (s.zjzt IS NULL AND s.study_form_id = {1}))" queryWrapper.and(p -> p.apply("(s.zjzt = {0} OR (s.zjzt IS NULL AND s.study_form_id = {1}))"
, ZjztEnum.rk.getValue(), form.getStudyFormId())); , ZjztEnum.rk.getValue(), form.getStudyFormId()));
if(StringUtils.isNotEmpty(form.getMc())) {
if (StringUtils.isNotEmpty(form.getMc())) {
queryWrapper.like("s.mc", form.getMc()); queryWrapper.like("s.mc", form.getMc());
} }
if(StringUtils.isNotEmpty(form.getBh())) {
if (StringUtils.isNotEmpty(form.getBh())) {
queryWrapper.like("s.bh", form.getBh()); queryWrapper.like("s.bh", form.getBh());
} }
if(StringUtils.isNotEmpty(form.getStudyName())) {
if (StringUtils.isNotEmpty(form.getStudyName())) {
queryWrapper.like("t.name", form.getStudyName()); queryWrapper.like("t.name", form.getStudyName());
} }
queryWrapper.orderByDesc("s.id"); queryWrapper.orderByDesc("s.id");
@ -186,7 +185,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
// 台账 // 台账
sjTzService.saveTz(sjOld.getId(), qmr.getUserId(), qmr.getNickName(), qmr.getUserName(), sjTzService.saveTz(sjOld.getId(), qmr.getUserId(), qmr.getNickName(), qmr.getUserName(),
"修改库存", "Change Inventory", form.getKc(), form.getKcdw(), form.getKcbjbz());
"修改库存", "Change Inventory", form.getKc(), form.getKcdw(), form.getKcbjbz());
} }
@Override @Override
@ -205,12 +204,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
if (!sjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { if (!sjOld.getZjzt().equals(ZjztEnum.rk.getValue())) {
throw new SecurityException("试剂【" + sjOld.getMc() + "】不是入库状态，不能处置"); throw new SecurityException("试剂【" + sjOld.getMc() + "】不是入库状态，不能处置");
} }
if(!NumberUtils.isParsable(form.getCzl())) {
if (!NumberUtils.isParsable(form.getCzl())) {
throw new ServiceException("请输入正确的处置量"); throw new ServiceException("请输入正确的处置量");
} }
BigDecimal czl = new BigDecimal(form.getCzl()); BigDecimal czl = new BigDecimal(form.getCzl());
BigDecimal kc = new BigDecimal(sjOld.getKc()); BigDecimal kc = new BigDecimal(sjOld.getKc());
if(czl.compareTo(kc) > 0) {
if (czl.compareTo(kc) > 0) {
throw new ServiceException("处置量不应大于库存量"); throw new ServiceException("处置量不应大于库存量");
} }
kc = kc.subtract(czl); kc = kc.subtract(czl);
@ -264,12 +263,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
if (!sj.getZjzt().equals(ZjztEnum.rk.getValue())) { if (!sj.getZjzt().equals(ZjztEnum.rk.getValue())) {
throw new SecurityException("试剂【" + sj.getMc() + "】不是入库状态，不能处置"); throw new SecurityException("试剂【" + sj.getMc() + "】不是入库状态，不能处置");
} }
if(!NumberUtils.isParsable(itemForm.getCzl())) {
if (!NumberUtils.isParsable(itemForm.getCzl())) {
throw new ServiceException("请输入正确的处置量"); throw new ServiceException("请输入正确的处置量");
} }
BigDecimal czl = new BigDecimal(itemForm.getCzl()); BigDecimal czl = new BigDecimal(itemForm.getCzl());
BigDecimal kc = new BigDecimal(sj.getKc()); BigDecimal kc = new BigDecimal(sj.getKc());
if(czl.compareTo(kc) > 0) {
if (czl.compareTo(kc) > 0) {
throw new ServiceException("处置量不应大于库存量"); throw new ServiceException("处置量不应大于库存量");
} }
kc = kc.subtract(czl); kc = kc.subtract(czl);
@ -347,7 +346,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
Map<String, String> formDataEn = new LinkedHashMap<>(); Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark()); formDataEn.put("Comment", form.getRemark());
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "锁定试剂", "Lock Reagent",JcmcysEnum.green.getValue(),
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "锁定试剂", "Lock Reagent", JcmcysEnum.green.getValue(),
JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
} }
@ -410,7 +409,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
Map<String, String> formDataEn = new LinkedHashMap<>(); Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark()); formDataEn.put("Comment", form.getRemark());
sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁试剂","Unlock Reagent",
sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁试剂", "Unlock Reagent",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
} }
@ -432,7 +431,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
if (!sjOld.getJyzt().equals(JyztEnum.wjy.getValue())) { if (!sjOld.getJyzt().equals(JyztEnum.wjy.getValue())) {
throw new SecurityException("试剂【" + sjOld.getMc() + "】不是未借阅状态，不能借阅"); throw new SecurityException("试剂【" + sjOld.getMc() + "】不是未借阅状态，不能借阅");
} }
if(!sjOld.getGdsqrId().equals(qmr.getUserId())){
if (!sjOld.getGdsqrId().equals(qmr.getUserId())) {
throw new ServiceException("只有归档申请人才能操作"); throw new ServiceException("只有归档申请人才能操作");
} }
//申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作； //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作；
@ -472,7 +471,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
if (!sjOld.getZjzt().equals(ZjztEnum.gd.getValue())) { if (!sjOld.getZjzt().equals(ZjztEnum.gd.getValue())) {
throw new SecurityException("试剂【" + sjOld.getMc() + "】未归档，不能解档"); throw new SecurityException("试剂【" + sjOld.getMc() + "】未归档，不能解档");
} }
if(!sjOld.getGdsqrId().equals(qmr.getUserId())){
if (!sjOld.getGdsqrId().equals(qmr.getUserId())) {
throw new ServiceException("只有归档申请人才能操作"); throw new ServiceException("只有归档申请人才能操作");
} }
//申请解档后，制剂状态更新为待解档，等待档案员审核期间无法进行其他操作； //申请解档后，制剂状态更新为待解档，等待档案员审核期间无法进行其他操作；
@ -618,7 +617,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
} else { } else {
queryWrapper.isNotNull("t.zjzt"); queryWrapper.isNotNull("t.zjzt");
} }
if(StringUtils.isNotEmpty(form.getLy())) {
if (StringUtils.isNotEmpty(form.getLy())) {
queryWrapper.like("t.ly", form.getLy()); queryWrapper.like("t.ly", form.getLy());
} }
if (StringUtils.isNoneBlank(form.getMc())) { if (StringUtils.isNoneBlank(form.getMc())) {
@ -639,6 +638,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
@Override @Override
public void genResource(StudyFormFill studyFormFill, Template template) { public void genResource(StudyFormFill studyFormFill, Template template) {
Boolean mark = template.getProduct().equals(StudyFormFillResourceTypeEnum.sj.getValue()) ? true : false;
SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId()); SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId());
Long studyId = studyFormFill.getStudyId(); Long studyId = studyFormFill.getStudyId();
@ -651,143 +651,166 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
List<Sj> sjList = new ArrayList<>(); List<Sj> sjList = new ArrayList<>();
LinkedList<SjJcgj> jcgjList = new LinkedList<>(); LinkedList<SjJcgj> jcgjList = new LinkedList<>();
LinkedList<SjTz> tzList = new LinkedList<>(); LinkedList<SjTz> tzList = new LinkedList<>();
if(StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) {
if (StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) {
List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class);
List<String> bhList = studyFormFillResourceList.stream().filter(p->p.getType()==null).map(StudyFormFillResource::getBh).collect(Collectors.toList());
// 根据编号获取需要处置的试剂列表
LambdaQueryWrapper<Sj> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(Sj::getBh, bhList);
sjList = this.list(queryWrapper);
for (Sj sj : sjList) {
sjMap.put(sj.getBh(), sj);
}
for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) {
Sj sj = sjMap.get(studyFormFillResource.getBh());
if(sj == null) {
sj = new Sj();
sj.setStudyId(studyId);
sj.setStudyFormId(studyFormId);
sj.setDeptId(deptId);
sj.setZjzt(ZjztEnum.rk.getValue());
sj.setJyzt(JyztEnum.wjy.getValue());
sj.setDeptId(template.getDeptId());
}
sj.setMc(studyFormFillResource.getMc());
sj.setBh(studyFormFillResource.getBh());
sj.setNd(String.valueOf(studyFormFillResource.getNdz()));
sj.setNddw(studyFormFillResource.getNddw());
sj.setKc(studyFormFillResource.getKc());
sj.setKcdw(studyFormFillResource.getKcdw());
sj.setLy(studyFormFillResource.getSource());
sj.setSxr(DateUtils.parseDate(studyFormFillResource.getSxrq()));
sj.setPzrq(studyFormFill.getStartDate());
sj.setYxzq(studyFormFillResource.getYxzq());
sj.setYxzqdw(studyFormFillResource.getYxzqdw());
if(sj.getId() == null) {
this.save(sj);
sjList.add(sj);
List<String> bhList = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || p.getType().equals(StudyFormFillResourceTypeEnum.sj.getValue())).map(StudyFormFillResource::getBh).collect(Collectors.toList());
// 根据编号获取需要处置的列表
if (bhList.size() > 0) {
LambdaQueryWrapper<Sj> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(Sj::getBh, bhList);
sjList = this.list(queryWrapper);
for (Sj sj : sjList) {
sjMap.put(sj.getBh(), sj); sjMap.put(sj.getBh(), sj);
// 稽查轨迹
SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "配制完成", "Formulation Completed",
JcmcysEnum.green.getValue(), null, null, qmr);
jcgjList.add(sjJcgj);
// 台账
SjTz sjTz = sjTzService.genTz(sj.getId(), "配制完成", "Formulation Completed", sj.getKc(), sj.getKcdw(), null, qmr);
tzList.add(sjTz);
} else {
this.updateById(sj);
} }
// 使用
String syl = studyFormFillResource.getSyl();
if(StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) {
BigDecimal kc = new BigDecimal(sj.getKc());
kc = kc.subtract(new BigDecimal(syl));
baseMapper.updateKc(sj.getId(), kc.toString());
// 使用稽查轨迹
Map<String, String> jcnrMap = new LinkedHashMap<>();
jcnrMap.put("使用量", syl + studyFormFillResource.getSyldw());
Map<String, String> jcnrEnMap = new LinkedHashMap<>();
jcnrEnMap.put("Usage Amount", syl + studyFormFillResource.getSyldw());
SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "使用", "Usage",
JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr);
jcgjList.add(sjJcgj);
// 台账
SjTz sjTz = sjTzService.genTz(sj.getId(), "使用", "Usage", syl, studyFormFillResource.getKcdw(), null, qmr);
tzList.add(sjTz);
for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) {
Sj sj = sjMap.get(studyFormFillResource.getBh());
//配置的才保存，或更新
if (studyFormFillResource.getType() == null) {
if (sj == null) {
sj = new Sj();
sj.setStudyId(studyId);
sj.setStudyFormId(studyFormId);
sj.setDeptId(deptId);
sj.setZjzt(ZjztEnum.rk.getValue());
sj.setJyzt(JyztEnum.wjy.getValue());
sj.setDeptId(template.getDeptId());
}
sj.setMc(studyFormFillResource.getMc());
sj.setBh(studyFormFillResource.getBh());
sj.setNd(String.valueOf(studyFormFillResource.getNdz()));
sj.setNddw(studyFormFillResource.getNddw());
sj.setKc(studyFormFillResource.getKc());
sj.setKcdw(studyFormFillResource.getKcdw());
sj.setLy(studyFormFillResource.getSource());
sj.setSxr(DateUtils.parseDate(studyFormFillResource.getSxrq()));
sj.setPzrq(studyFormFill.getStartDate());
sj.setYxzq(studyFormFillResource.getYxzq());
sj.setYxzqdw(studyFormFillResource.getYxzqdw());
if (sj.getId() == null) {
this.save(sj);
sjList.add(sj);
sjMap.put(sj.getBh(), sj);
// 稽查轨迹
SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "配制完成", "Formulation Completed",
JcmcysEnum.green.getValue(), null, null, qmr);
jcgjList.add(sjJcgj);
// 台账
SjTz sjTz = sjTzService.genTz(sj.getId(), "配制完成", "Formulation Completed", sj.getKc(), sj.getKcdw(), null, qmr);
tzList.add(sjTz);
} else {
this.updateById(sj);
}
}
// 使用
String syl = studyFormFillResource.getSyl();
if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) {
BigDecimal kc = new BigDecimal(sj.getKc());
kc = kc.subtract(new BigDecimal(syl));
baseMapper.updateKc(sj.getId(), kc.toString());
// 使用稽查轨迹
Map<String, String> jcnrMap = new LinkedHashMap<>();
jcnrMap.put("使用量", syl + studyFormFillResource.getSyldw());
Map<String, String> jcnrEnMap = new LinkedHashMap<>();
jcnrEnMap.put("Usage Amount", syl + studyFormFillResource.getSyldw());
SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "使用", "Usage",
JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr);
jcgjList.add(sjJcgj);
// 台账
SjTz sjTz = sjTzService.genTz(sj.getId(), "使用", "Usage", syl, studyFormFillResource.getKcdw(), null, qmr);
tzList.add(sjTz);
}
sjMap.put(sj.getBh(), sj);
} }
sjMap.put(sj.getBh(), sj);
} }
} }
// 存储
String cclist = studyFormFill.getCclist();
if(StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) {
List<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
baseMapper.updateCc(studyFormFillCc.getList(), studyFormFillCc.getCctj(), studyFormFillCc.getCcwz());
for (String bh : studyFormFillCc.getList()) {
Sj sj = sjMap.get(bh);
// 稽查轨迹
LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
jcnrMap.put("存储位置", studyFormFillCc.getCcwz());
jcnrMap.put("存储条件", studyFormFillCc.getCctj());
LinkedHashMap<String, String> jcnrEnMap = new LinkedHashMap<>();
jcnrEnMap.put("Storage Location", studyFormFillCc.getCcwz());
jcnrEnMap.put("Storage Condition", studyFormFillCc.getCctj());
SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "存储", "Storage",
JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr);
jcgjList.add(sjJcgj);
// 台账
SjTz sjTz = sjTzService.genTz(sj.getId(), "存储", "Storage", sj.getKc(), sj.getKcdw(), null, qmr);
tzList.add(sjTz);
if (sjMap.size() > 0) {
// 存储
String cclist = studyFormFill.getCclist();
if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) {
List<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
List<String> list = new ArrayList<>();
for (String bh : studyFormFillCc.getList()) {
Sj sj = sjMap.get(bh);
if (sj != null) {
list.add(bh);
// 稽查轨迹
LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
jcnrMap.put("存储位置", studyFormFillCc.getCcwz());
jcnrMap.put("存储条件", studyFormFillCc.getCctj());
LinkedHashMap<String, String> jcnrEnMap = new LinkedHashMap<>();
jcnrEnMap.put("Storage Location", studyFormFillCc.getCcwz());
jcnrEnMap.put("Storage Condition", studyFormFillCc.getCctj());
SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "存储", "Storage",
JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr);
jcgjList.add(sjJcgj);
// 台账
SjTz sjTz = sjTzService.genTz(sj.getId(), "存储", "Storage", sj.getKc(), sj.getKcdw(), null, qmr);
tzList.add(sjTz);
}
}
if(list.size()>0){
baseMapper.updateCc(list, studyFormFillCc.getCctj(), studyFormFillCc.getCcwz());
}
} }
} }
}
// 处置，库存全变为0
String czlist = studyFormFill.getCzlist();
if(StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) {
List<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class);
for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) {
for (String bh : studyFormFillCz.getList()) {
Sj sj = sjMap.get(bh);
// 稽查轨迹
LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
jcnrMap.put("处置方式", studyFormFillCz.getCzfs());
jcnrMap.put("处置量", sj.getKc() + sj.getKcdw());
LinkedHashMap<String, String> jcnrEnMap = new LinkedHashMap<>();
jcnrEnMap.put("Dispose Method", studyFormFillCz.getCzfs());
jcnrEnMap.put("Amount", sj.getKc() + sj.getKcdw());
SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "处置", "Dispose",
JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr);
jcgjList.add(sjJcgj);
// 台账
SjTz sjTz = sjTzService.genTz(sj.getId(), "处置", "Dispose", sj.getKc(), sj.getKcdw(), null, qmr);
tzList.add(sjTz);
// 处置，库存全变为0
String czlist = studyFormFill.getCzlist();
if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) {
List<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class);
for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) {
List<String> list = new ArrayList<>();
for (String bh : studyFormFillCz.getList()) {
Sj sj = sjMap.get(bh);
if (sj != null) {
list.add(bh);
// 稽查轨迹
LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
jcnrMap.put("处置方式", studyFormFillCz.getCzfs());
jcnrMap.put("处置量", sj.getKc() + sj.getKcdw());
LinkedHashMap<String, String> jcnrEnMap = new LinkedHashMap<>();
jcnrEnMap.put("Dispose Method", studyFormFillCz.getCzfs());
jcnrEnMap.put("Amount", sj.getKc() + sj.getKcdw());
SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "处置", "Dispose",
JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr);
jcgjList.add(sjJcgj);
// 台账
SjTz sjTz = sjTzService.genTz(sj.getId(), "处置", "Dispose", sj.getKc(), sj.getKcdw(), null, qmr);
tzList.add(sjTz);
}
}
if(list.size()>0){
baseMapper.updateKcBatch(list, "0");
}
} }
baseMapper.updateKcBatch(studyFormFillCz.getList(), "0");
} }
} }
sjJcgjService.saveBatch(jcgjList);
sjTzService.saveBatch(tzList);
studySjService.saveBatch(studyId, sjList);
if(jcgjList.size()>0){
sjJcgjService.saveBatch(jcgjList);
}
if(jcgjList.size()>0){
sjTzService.saveBatch(tzList);
}
if(jcgjList.size()>0){
studySjService.saveBatch(studyId, sjList);
}
} }
@Override @Override
@ -812,12 +835,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
Map<String, String> formDataEn = new LinkedHashMap<>(); Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark()); formDataEn.put("Comment", form.getRemark());
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving",
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意归档"); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意归档");
noticeService.save("试剂【"+sj.getMc()+"】同意归档",sj.getGdsqrId(),getUrlQz());
noticeService.save("试剂【" + sj.getMc() + "】同意归档", sj.getGdsqrId(), getUrlQz());
} }
@ -843,12 +866,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
Map<String, String> formDataEn = new LinkedHashMap<>(); Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark()); formDataEn.put("Comment", form.getRemark());
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving",
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝归档"); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝归档");
noticeService.save("试剂【"+sj.getMc()+"】拒绝归档",sj.getGdsqrId(),getUrlQz());
noticeService.save("试剂【" + sj.getMc() + "】拒绝归档", sj.getGdsqrId(), getUrlQz());
} }
@ -874,12 +897,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
Map<String, String> formDataEn = new LinkedHashMap<>(); Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark()); formDataEn.put("Comment", form.getRemark());
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving",
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意解档"); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意解档");
noticeService.save("试剂【"+sj.getMc()+"】同意解档",sj.getGdsqrId(),getUrlQz());
noticeService.save("试剂【" + sj.getMc() + "】同意解档", sj.getGdsqrId(), getUrlQz());
} }
@ -905,12 +928,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
Map<String, String> formDataEn = new LinkedHashMap<>(); Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark()); formDataEn.put("Comment", form.getRemark());
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving",
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝解档"); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝解档");
noticeService.save("试剂【"+sj.getMc()+"】拒绝解档",sj.getGdsqrId(),getUrlQz());
noticeService.save("试剂【" + sj.getMc() + "】拒绝解档", sj.getGdsqrId(), getUrlQz());
} }
@ -938,12 +961,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
Map<String, String> formDataEn = new LinkedHashMap<>(); Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark()); formDataEn.put("Comment", form.getRemark());
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out",
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意借阅"); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意借阅");
noticeService.save("试剂【"+sj.getMc()+"】同意借阅",sj.getGdsqrId(),getUrlQz());
noticeService.save("试剂【" + sj.getMc() + "】同意借阅", sj.getGdsqrId(), getUrlQz());
} }
@ -969,12 +992,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
Map<String, String> formDataEn = new LinkedHashMap<>(); Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark()); formDataEn.put("Comment", form.getRemark());
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out",
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝借阅"); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝借阅");
noticeService.save("试剂【"+sj.getMc()+"】拒绝借阅",sj.getGdsqrId(),getUrlQz());
noticeService.save("试剂【" + sj.getMc() + "】拒绝借阅", sj.getGdsqrId(), getUrlQz());
} }
@ -1000,7 +1023,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
Map<String, String> formDataEn = new LinkedHashMap<>(); Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark()); formDataEn.put("Comment", form.getRemark());
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation",
sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "确认归还"); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "确认归还");
@ -1009,9 +1032,10 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
/** /**
* 获取通知的跳转url * 获取通知的跳转url
*
* @return * @return
*/ */
private String getUrlQz(){
return "/resource/reagent";
private String getUrlQz() {
return "/resource/reagent";
} }
} }

+ 3
- 10
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java View File

@ -438,16 +438,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void genResource(StudyFormFill studyFormFill, String remark) { public void genResource(StudyFormFill studyFormFill, String remark) {
Template template = templateService.getById(studyFormFill.getTemplateId()); Template template = templateService.getById(studyFormFill.getTemplateId());
// 处置，存放，用量 // 处置，存放，用量
if (template.getProduct().equals(ProductEnum.Sj.getValue())) {
sjService.genResource(studyFormFill, template);
}
if (template.getProduct().equals(ProductEnum.Gyzj.getValue())) {
gyzjService.genResource(studyFormFill, template, remark);
}
if (template.getProduct().equals(ProductEnum.Mjy.getValue())) {
mjyService.genResource(studyFormFill, template, remark);
}
//todo使用，存储
sjService.genResource(studyFormFill, template);
gyzjService.genResource(studyFormFill, template, remark);
mjyService.genResource(studyFormFill, template, remark);
} }
/** /**

Write Preview
Loading…
Cancel
Save