动物样本检测委托附件调整

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/lis/config/LisDb.java

@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -43,8 +44,13 @@ public class LisDb {
      */
     @SneakyThrows
     public List<Entity> query(String sql) {
-        log.info("【LIS查询列表】：\n{}", SqlFormatter.format(sql));
-        return getDb().query(sql);
+        try {
+            log.info("【LIS查询列表】：\n{}", SqlFormatter.format(sql));
+            return getDb().query(sql);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return Collections.emptyList();
+        }
     }
 
     /**

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

@@ -34,7 +34,6 @@ import com.github.jfcloud.gene.sample.mapper.SampleCheckOrderMapper;
 import com.github.jfcloud.gene.sample.mapper.SampleInfoMapper;
 import com.github.jfcloud.gene.sample.service.*;
 import com.github.jfcloud.gene.sample.vo.*;
-import com.github.jfcloud.gene.util.LocalWord;
 import com.github.jfcloud.gene.util.WordDataService;
 import com.github.jfcloud.gene.util.WordUtil;
 import com.github.jfcloud.rich.config.WordConfig;
@@ -309,8 +308,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
         sampleInfoObj.put("expireDate", WordUtil.padString(sampleInfo.getExpireDate(), 8));
 
         String modelName = "animalSampleTesting.ftl";
-//        fileInfoService.uploadFileWithFileName(modelName, fileName, sampleInfo.getId(), sampleInfo.getStatus(), dataMap);
-        LocalWord.exportWord(modelName, dataMap, fileName);
+        fileInfoService.uploadFileWithFileName(modelName, fileName, sampleInfo.getId(), sampleInfo.getStatus(), dataMap);
     }
 
     @Override