|
@@ -172,7 +172,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (ScientificSampleTypeEnum.serum.name().equals(fieldName)) {
|
|
|
|
|
|
|
+ if (ScientificSampleTypeEnum.SERUM.name().equalsIgnoreCase(fieldName)) {
|
|
|
List<SampleCheckItemSerum> sampleCheckItemSerums = JSON.parseArray(array.toJSONString(), SampleCheckItemSerum.class);
|
|
List<SampleCheckItemSerum> sampleCheckItemSerums = JSON.parseArray(array.toJSONString(), SampleCheckItemSerum.class);
|
|
|
sampleCheckItemSerums.forEach(item -> item.setCheckOrderId(order.getId()));
|
|
sampleCheckItemSerums.forEach(item -> item.setCheckOrderId(order.getId()));
|
|
|
sampleCheckItemSerumService.saveBatch(sampleCheckItemSerums);
|
|
sampleCheckItemSerumService.saveBatch(sampleCheckItemSerums);
|
|
@@ -199,7 +199,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
|
|
|
|
|
|
|
|
//血清样本送检
|
|
//血清样本送检
|
|
|
if (StrUtil.isNotBlank(sampleAnimal.getScientificSampleType()) &&
|
|
if (StrUtil.isNotBlank(sampleAnimal.getScientificSampleType()) &&
|
|
|
- sampleAnimal.getScientificSampleType().contains(ScientificSampleTypeEnum.serum.getDescription())) {
|
|
|
|
|
|
|
+ sampleAnimal.getScientificSampleType().contains(ScientificSampleTypeEnum.SERUM.getDescription())) {
|
|
|
Map<Integer, Map<String, String>> lisDictItemMap = new HashMap<>();
|
|
Map<Integer, Map<String, String>> lisDictItemMap = new HashMap<>();
|
|
|
|
|
|
|
|
sampleAnimal.getOrder().getSerum().getItems().forEach(item -> {
|
|
sampleAnimal.getOrder().getSerum().getItems().forEach(item -> {
|
|
@@ -399,7 +399,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
|
|
|
ReflectUtil.setFieldValue(orderObj, fieldName, orderVo);
|
|
ReflectUtil.setFieldValue(orderObj, fieldName, orderVo);
|
|
|
}
|
|
}
|
|
|
//血清送检申请单
|
|
//血清送检申请单
|
|
|
- Optional<SampleCheckOrderVo> opt = orderList.stream().filter(x -> ScientificSampleTypeEnum.serum.name().equals(x.getApplyType())).findFirst();
|
|
|
|
|
|
|
+ Optional<SampleCheckOrderVo> opt = orderList.stream().filter(x -> ScientificSampleTypeEnum.SERUM.name().equalsIgnoreCase(x.getApplyType())).findFirst();
|
|
|
if (opt.isPresent()) {
|
|
if (opt.isPresent()) {
|
|
|
SampleCheckOrderVo sampleCheckOrderVo = opt.get();
|
|
SampleCheckOrderVo sampleCheckOrderVo = opt.get();
|
|
|
SampleCheckSerumVo sampleCheckSerumVo = BeanUtil.copyProperties(sampleCheckOrderVo, SampleCheckSerumVo.class);
|
|
SampleCheckSerumVo sampleCheckSerumVo = BeanUtil.copyProperties(sampleCheckOrderVo, SampleCheckSerumVo.class);
|