Browse Source

动物样本列表,非血清样本送检返回固定1

陈长荣 1 month ago
parent
commit
1de15c6bac

+ 1 - 1
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/controller/SampleCheckItemController.java

@@ -30,7 +30,7 @@ public class SampleCheckItemController {
     public void downloadTemplate(@RequestParam(required = false) String type, HttpServletResponse response) {
         String template = "officeTemplate/sampleCheckItem.xlsx";
         String name = "送检申请单明细模板.xlsx";
-        if (ScientificSampleTypeEnum.serum.name().equals(type)) {
+        if (ScientificSampleTypeEnum.SERUM.name().equalsIgnoreCase(type)) {
             template = "officeTemplate/sampleCheckItemSerum.xlsx";
             name = "血清样本送检申请单明细模板.xlsx";
         }

+ 3 - 3
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleAnimalServiceImpl.java

@@ -172,7 +172,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
                 continue;
             }
 
-            if (ScientificSampleTypeEnum.serum.name().equals(fieldName)) {
+            if (ScientificSampleTypeEnum.SERUM.name().equalsIgnoreCase(fieldName)) {
                 List<SampleCheckItemSerum> sampleCheckItemSerums = JSON.parseArray(array.toJSONString(), SampleCheckItemSerum.class);
                 sampleCheckItemSerums.forEach(item -> item.setCheckOrderId(order.getId()));
                 sampleCheckItemSerumService.saveBatch(sampleCheckItemSerums);
@@ -199,7 +199,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
 
         //血清样本送检
         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<>();
 
             sampleAnimal.getOrder().getSerum().getItems().forEach(item -> {
@@ -399,7 +399,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
             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()) {
             SampleCheckOrderVo sampleCheckOrderVo = opt.get();
             SampleCheckSerumVo sampleCheckSerumVo = BeanUtil.copyProperties(sampleCheckOrderVo, SampleCheckSerumVo.class);