update

src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java

@@ -1946,14 +1946,7 @@ public class EntrustmentController {
         //复杂一点的业务我们放到service中去处理
         String fileFullPath = OSSDirectoryConstants.DOCUMENT_ACCEPT_DIRECTORY + "/" + entrustId + "/" + OSSDirectoryConstants.DOCUMENT_ACCEPT_DIRECTORY_DELIVER + "/alldeliverpic.docx";
         try {
-            if (ossFile.objectExist(fileFullPath)) {
+            entrustmentService.getDeliverMergePhoto(entrustId, acceptNo, caseName, deliverer1Name, deliverer2Name);
-                //ossFile.fileGet(fileFullPath,response.getOutputStream());
-            } else {
-                boolean ret = entrustmentService.getDeliverMergePhoto(entrustId, acceptNo, caseName, deliverer1Name, deliverer2Name);
-                if (ret) {
-                    //ossFile.fileGet(fileFullPath,response.getOutputStream());
-                }
-            }
         } catch (Exception err) {
             return R.failed("获取文件失败");
         }

src/main/java/digital/laboratory/platform/entrustment/controller/ExcelUploadController.java

@@ -19,8 +19,8 @@ import java.util.Map;
  * @date 2025/4/16 9:48
  */
 @RestController
-@RequestMapping("/excel")
+@RequestMapping("/papp/excel")
-@Api(tags = "20-推送数据到LabsCare平台接口管理", description = "推送数据到LabsCare平台接口管理")
+@Api(tags = "20-excel上传接口控制器接口管理", description = "excel上传接口控制器接口管理")
 public class ExcelUploadController {
 
     @Resource

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

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -44,6 +45,7 @@ public class ExcelUploadServiceImpl implements ExcelUploadService {
 
     /**
      * 上传两社人员名单excel文件
+     *
      * @param file
      * @param entrustId
      * @return
@@ -74,12 +76,16 @@ public class ExcelUploadServiceImpl implements ExcelUploadService {
             entrustmentIdentificationMaterial.setEntrustmentId(entrustment.getId());
             entrustmentIdentificationMaterial.setType("1");
             entrustmentIdentificationMaterial.setTypeName("生物样本");
-            entrustmentIdentificationMaterial.setName(datum.get("姓名") + "的毛发");
+            entrustmentIdentificationMaterial.setName(datum.get("姓名") + "毛发");
             entrustmentIdentificationMaterial.setBiologyGender(datum.get("性别"));
             entrustmentIdentificationMaterial.setBiologyType(EntrustBiologyType.HAIR.getDesc());
             entrustmentIdentificationMaterial.setMaterialAge(Integer.valueOf(datum.get("年龄")));
             entrustmentIdentificationMaterial.setRemark(datum.get("身份证号"));
             entrustmentIdentificationMaterial.setDrawPlace(datum.get("采样单位"));
+            entrustmentIdentificationMaterial.setQuantity(new BigDecimal(50));
+            entrustmentIdentificationMaterial.setUnit("毫克");
+            entrustmentIdentificationMaterial.setForm("黑色头发");
+            entrustmentIdentificationMaterial.setFormName("黑色头发");
             entrustmentIdentificationMaterial.setAnalysisOption(AnalysisOptionEnums.QUALITATIVE.getCode()); // 默认设置定性
             entrustmentIdentificationMaterial.setCandidateDrugs(CollUtil.newArrayList(drugLiteMap.containsKey(datum.get("曾吸毒种类")) ? drugLiteMap.get(datum.get("曾吸毒种类")) : heroin));
             entrustmentIdentificationMaterialList.add(entrustmentIdentificationMaterial);