Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一些打印的参数

Browse Source
This commit is contained in:
杨海航
2024-10-08 15:51:55 +08:00
parent 219942495b
commit 07cf0b9e26
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
View File

@@ -188,7 +188,6 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
im.setQuantity(ce.getQuantity()); // ?? im.setQuantity(ce.getQuantity()); // ??
im.setUnit(ce.getUnit()); im.setUnit(ce.getUnit());
im.setAdditionalProperties(ce.getAdditionalProperties()); im.setAdditionalProperties(ce.getAdditionalProperties());
im.setPersonName(ce.getPersonName()); im.setPersonName(ce.getPersonName());
im.setPersonCert(ce.getPersonCert()); im.setPersonCert(ce.getPersonCert());
im.setPersonId(ce.getPersonId()); im.setPersonId(ce.getPersonId());

4
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
View File

@@ -535,6 +535,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
dm.put("ac_yy", entrustment.getAcceptTime().getYear());//受理年 dm.put("ac_yy", entrustment.getAcceptTime().getYear());//受理年
dm.put("ac_mm", entrustment.getAcceptTime().getMonthValue());//受理月 dm.put("ac_mm", entrustment.getAcceptTime().getMonthValue());//受理月
dm.put("ac_day", entrustment.getAcceptTime().getDayOfMonth());//受理日 dm.put("ac_day", entrustment.getAcceptTime().getDayOfMonth());//受理日
dm.put("value1", "☑");//受理日
//条形码 因为调用feign接口的原因，图片传输过程中会受影响，这里改为在生成的地方再生成 //条形码 因为调用feign接口的原因，图片传输过程中会受影响，这里改为在生成的地方再生成
return dm; return dm;
} }
@@ -673,10 +674,11 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
eg.setMaterialName(item.getName()); eg.setMaterialName(item.getName());
eg.setFormName(StringUtils.isNotBlank(item.getColor()) ? item.getColor() + item.getFormName() : "" + item.getFormName()); eg.setFormName(StringUtils.isNotBlank(item.getColor()) ? item.getColor() + item.getFormName() : "" + item.getFormName());
eg.setSpecies(item.getTypeName()); eg.setSpecies(item.getTypeName());
eg.setPack(item.getPack()); eg.setPackComplete(item.getPackComplete());
eg.setDrugsValue(item.getDrugsValue()); eg.setDrugsValue(item.getDrugsValue());
eg.setRtSampleQuantity(item.getRtSampleQuantity()); eg.setRtSampleQuantity(item.getRtSampleQuantity());
eg.setRemark(item.getRemark()); eg.setRemark(item.getRemark());
eg.setOrderNo(item.getOrderNo());
BigDecimal totalSampleMass = new BigDecimal(0); BigDecimal totalSampleMass = new BigDecimal(0);
//因为现在有的检材可以不用复称，例如送来的一支电子烟，所以我们用送检的数量与单位进行描述即可 //因为现在有的检材可以不用复称，例如送来的一支电子烟，所以我们用送检的数量与单位进行描述即可
if (item.getSample1RepeatWeigh() == null || item.getSample1RepeatWeigh().compareTo(BigDecimal.ZERO) == 0) { if (item.getSample1RepeatWeigh() == null || item.getSample1RepeatWeigh().compareTo(BigDecimal.ZERO) == 0) {

4
src/main/java/digital/laboratory/platform/entrustment/vo/MaterialListForBookVo.java
View File

@@ -21,9 +21,9 @@ public class MaterialListForBookVo {
private String retainedSampleDes;//留存样 private String retainedSampleDes;//留存样
private String totalSampleDes;//总计描述 private String totalSampleDes;//总计描述
private String species;//种类 private String species;//种类
private String pack;//包装 private boolean packComplete;//包装
private String drugsValue;//疑似物种类 private String drugsValue;//疑似物种类
private Integer rtSampleQuantity;//留存样个数 private Integer rtSampleQuantity;//留存样个数
private String remark;//备注 private String remark;//备注
private Integer orderNo;//顺序号
} }