|
@@ -22,7 +22,6 @@ import com.github.jfcloud.gene.constants.GeneStatusEnum;
|
|
|
import com.github.jfcloud.gene.file.service.FileInfoService;
|
|
|
import com.github.jfcloud.gene.flow.entity.FlowAudit;
|
|
|
import com.github.jfcloud.gene.flow.service.FlowAuditService;
|
|
|
-import com.github.jfcloud.gene.flow.service.NotifyService;
|
|
|
import com.github.jfcloud.gene.sample.entity.*;
|
|
|
import com.github.jfcloud.gene.sample.enums.PathogenSampleTypeEnum;
|
|
|
import com.github.jfcloud.gene.sample.enums.ScientificSampleTypeEnum;
|
|
@@ -30,12 +29,8 @@ import com.github.jfcloud.gene.sample.mapper.InspectionCommissionMapper;
|
|
|
import com.github.jfcloud.gene.sample.mapper.SampleAnimalMapper;
|
|
|
import com.github.jfcloud.gene.sample.mapper.SampleCheckOrderMapper;
|
|
|
import com.github.jfcloud.gene.sample.mapper.SampleInfoMapper;
|
|
|
-import com.github.jfcloud.gene.sample.service.CommissionDetailService;
|
|
|
-import com.github.jfcloud.gene.sample.service.SampleAnimalService;
|
|
|
-import com.github.jfcloud.gene.sample.service.SampleCheckItemService;
|
|
|
-import com.github.jfcloud.gene.sample.service.SampleEditService;
|
|
|
+import com.github.jfcloud.gene.sample.service.*;
|
|
|
import com.github.jfcloud.gene.sample.vo.*;
|
|
|
-import com.github.jfcloud.gene.sys.service.DBSystemPropertiesService;
|
|
|
import com.github.jfcloud.gene.util.WordDataService;
|
|
|
import com.github.jfcloud.gene.util.WordUtil;
|
|
|
import com.github.jfcloud.rich.config.WordConfig;
|
|
@@ -50,6 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import java.lang.reflect.Field;
|
|
|
import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
+import java.util.Optional;
|
|
|
import java.util.Set;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -63,12 +59,11 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
|
|
|
private final SampleCheckOrderMapper checkOrderMapper;
|
|
|
private final CommissionDetailService commissionDetailService;
|
|
|
private final SampleCheckItemService sampleCheckItemService;
|
|
|
+ private final SampleCheckItemSerumService sampleCheckItemSerumService;
|
|
|
private final WordDataService wordDataService;
|
|
|
private final FileInfoService fileInfoService;
|
|
|
private final UserIdNameCache userIdNameCache;
|
|
|
private final FlowAuditService flowAuditService;
|
|
|
- private final DBSystemPropertiesService systemPropertiesService;
|
|
|
- private final NotifyService notifyService;
|
|
|
private final CommonSampleEditServiceImpl commonSampleEditService;
|
|
|
|
|
|
@Override
|
|
@@ -170,6 +165,13 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
+ if (ScientificSampleTypeEnum.serum.name().equals(fieldName)) {
|
|
|
+ List<SampleCheckItemSerum> sampleCheckItemSerums = JSON.parseArray(array.toJSONString(), SampleCheckItemSerum.class);
|
|
|
+ sampleCheckItemSerums.forEach(item -> item.setCheckOrderId(order.getId()));
|
|
|
+ sampleCheckItemSerumService.saveBatch(sampleCheckItemSerums);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
List<SampleCheckItem> sampleCheckItems = JSON.parseArray(array.toJSONString(), SampleCheckItem.class);
|
|
|
sampleCheckItems.forEach(item -> item.setCheckOrderId(order.getId()));
|
|
|
sampleCheckItemService.saveBatch(sampleCheckItems);
|
|
@@ -346,6 +348,19 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
|
|
|
.orElse(new SampleCheckOrderVo());
|
|
|
ReflectUtil.setFieldValue(orderObj, fieldName, orderVo);
|
|
|
}
|
|
|
+ //血清送检申请单
|
|
|
+ Optional<SampleCheckOrderVo> opt = orderList.stream().filter(x -> ScientificSampleTypeEnum.serum.name().equals(x.getApplyType())).findFirst();
|
|
|
+ if (opt.isPresent()) {
|
|
|
+ SampleCheckOrderVo sampleCheckOrderVo = opt.get();
|
|
|
+ SampleCheckSerumVo sampleCheckSerumVo = BeanUtil.copyProperties(sampleCheckOrderVo, SampleCheckSerumVo.class);
|
|
|
+ List<SampleCheckItemSerum> serumList = sampleCheckItemSerumService.list(new LambdaQueryWrapper<>(SampleCheckItemSerum.class)
|
|
|
+ .eq(SampleCheckItemSerum::getCheckOrderId, sampleCheckOrderVo.getId()));
|
|
|
+ if (CollUtil.isNotEmpty(serumList)) {
|
|
|
+ sampleCheckSerumVo.setItems(BeanUtil.copyToList(serumList, CheckItemSerumVo.class));
|
|
|
+ }
|
|
|
+ orderObj.setSerum(sampleCheckSerumVo);
|
|
|
+ }
|
|
|
+
|
|
|
sampleAnimalVo.setOrder(orderObj);
|
|
|
|
|
|
return sampleAnimalVo;
|