202501009 更新

1.bug修复

src/main/java/digital/laboratory/platform/entrustment/convert/DrugLiteConvert.java

@@ -27,6 +27,10 @@ public class DrugLiteConvert {
     }
 
     public static List<DrugLite> getDrugLites(String drugToString) {
+        // 判断参数是否为空
+        if (drugToString == null || drugToString.isEmpty()) {
+            return Collections.emptyList();
+        }
         List<DrugLite> drugLiteList = JSONArray.parseArray(drugToString, DrugLite.class).stream().sorted(Comparator.comparing(DrugLite::getName)).collect(Collectors.toList());
         return drugLiteList;
     }

src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java

@@ -201,6 +201,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
                         .in(CollUtil.isNotEmpty(allResults), Entrustment::getOldIdentificationResult, allResults)
                         .ge(excelDTO.getStartTime() != null, Entrustment::getAcceptTime, excelDTO.getStartTime())
                         .le(excelDTO.getEndTime() != null, Entrustment::getAcceptTime, excelDTO.getEndTime())
+                        .in(Entrustment::getStatus, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus(), EntrustStatusConstants.ENTRUST_STATUS_TEST_FINISH.getStatus(), EntrustStatusConstants.ENTRUST_STATUS_COMPLETED.getStatus())
         );
         List<String> entrustIds = entrustmentList.stream().map(Entrustment::getId).collect(Collectors.toList());
         // 获取检材信息， 排序的原因是需要数据是有序的
@@ -220,10 +221,10 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
         Map<String, EntrustMaterialCheckoutResult> checkoutResultMap = checkoutResultList.stream().collect(Collectors.toMap(EntrustMaterialCheckoutResult::getId, Function.identity()));
         List<CheckoutResultExcelDTO> checkoutResultExcelDTOS = fetchCheckoutResultExcelDTOList(entrustmentList, materialGroupByEntrustMap, checkoutResultMap);
 
-        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+//        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-        response.setCharacterEncoding("utf-8");
+//        response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("检材检出结果excel表", "UTF-8").replaceAll("\\+", "%20");
+//        String fileName = URLEncoder.encode("检材检出结果excel表", "UTF-8").replaceAll("\\+", "%20");
-        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+//        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
         // 不使用默认样式
         // 空的头部样式
@@ -367,6 +368,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
                     excelDTO.setColor(StrUtil.isBlank(material.getColor()) ? formName.substring(0, formName.indexOf("色") + 1) : material.getColor());
                     excelDTO.setFormName(formName);
                     EntrustMaterialCheckoutResult entrustMaterialCheckoutResult = checkoutResultMap.get(material.getId());
+                    if (entrustMaterialCheckoutResult != null) {
                         excelDTO.setQualitativeResult(
                                 DrugLiteConvert.getDrugLites(entrustMaterialCheckoutResult.getQualitativeResult())
                                         .stream().map(DrugLite::getName).collect(Collectors.joining("、"))
@@ -374,6 +376,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
                         excelDTO.setQuantitativeResult(entrustMaterialCheckoutResult.getQuantitativeResult());
                         excelDTO.setOtherResult(entrustMaterialCheckoutResult.getOtherResult());
                         excelDTO.setRemark(entrustMaterialCheckoutResult.getCheckoutRemark());
+                    }
                     checkoutResultExcelDTOList.add(excelDTO);
                 }
             }