病理送检附件调整

jfcloud-gene-biz/pom.xml

@@ -56,7 +56,7 @@
     <dependency>
       <groupId>com.github.jfcloud</groupId>
       <artifactId>jfcloud-aew-rich-text</artifactId>
-      <version>k6.8</version>
+      <version>k6.8.2</version>
     </dependency>
 
     <dependency>

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/file/service/impl/FileInfoServiceImpl.java

@@ -22,7 +22,6 @@ import com.github.jfcloud.gene.file.vo.FileVo;
 import com.github.jfcloud.gene.flow.entity.FlowFileVersion;
 import com.github.jfcloud.gene.util.WordUtil;
 import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.docx4j.Docx4J;
 import org.springframework.stereotype.Service;
@@ -70,7 +69,6 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         return vo;
     }
 
-    @SneakyThrows
     @Override
     public void uploadFileWithFileName(String modelName, String fileName, Long flowId, String flowStatus, JSONObject dataMap) {
         log.info("流程id={} status={} 模板modelName={} 生成文档：{}", flowId, flowStatus, modelName, fileName);
@@ -99,6 +97,9 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
                         .setTemplateName(modelName)
                         .insert();
             }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException("附件生成失败");
         }
     }
 

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

@@ -43,7 +43,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -162,7 +161,7 @@ public class SamplePathologicalServiceImpl extends ServiceImpl<SamplePathologica
         JSONArray images = new JSONArray();
         dataMap.put("images", images);
 
-        //实验名称
+        //实验
         List<PreExperimentVo> experiments = pathologicalVo.getExperiments();
         AtomicInteger experimentIndex = new AtomicInteger(0);
         experiments.forEach(item -> {
@@ -180,6 +179,14 @@ public class SamplePathologicalServiceImpl extends ServiceImpl<SamplePathologica
             }
         });
 
+        //预实验申请人负责人
+        if (pathologicalVo.getPreApplicantLeaderId() != null) {
+            String base64 = userIdNameCache.getSignBase64(pathologicalVo.getPreApplicantLeaderId());
+            if (StrUtil.isNotBlank(base64)) {
+                dataMap.put("preApplicantLeaderSign", base64);
+            }
+        }
+
         JSONObject sampleInfoObj = JSON.parseObject(JSON.toJSONStringWithDateFormat(sampleInfo, DatePattern.NORM_DATETIME_PATTERN));
         dataMap.put("sampleInfo", sampleInfoObj);
         JSONObject pathologicalObj = JSON.parseObject(JSON.toJSONStringWithDateFormat(pathologicalVo, DatePattern.NORM_DATETIME_PATTERN));
@@ -189,6 +196,18 @@ public class SamplePathologicalServiceImpl extends ServiceImpl<SamplePathologica
         String applyDateStr = DateUtil.format(sampleInfo.getApplyTime(), DatePattern.NORM_DATE_PATTERN);
         sampleInfoObj.put("applyDate", applyDateStr);
 
+        //检测人员
+        if (StrUtil.isNotEmpty(sampleInfo.getInspector())) {
+            String inspectorName = JSON.parseArray(sampleInfo.getInspector())
+                    .stream()
+                    .map(user -> {
+                        JSONObject obj = (JSONObject) user;
+                        return obj.getString("name");
+                    })
+                    .collect(Collectors.joining("、"));
+            sampleInfoObj.put("inspectorName", inspectorName);
+        }
+
         //实验人员
         if (StrUtil.isNotEmpty(pathologicalVo.getPrePeople())) {
             String joinName = JSON.parseArray(pathologicalVo.getPrePeople())
@@ -201,12 +220,6 @@ public class SamplePathologicalServiceImpl extends ServiceImpl<SamplePathologica
             pathologicalObj.put("prePeopleName", joinName);
         }
 
-        //课题负责人
-        if (Objects.nonNull(pathologicalVo.getSubjectLeaderId())) {
-            String subjectLeaderSign = userIdNameCache.getSignBase64(pathologicalVo.getSubjectLeaderId());
-            dataMap.put("subjectLeaderSign", subjectLeaderSign);
-        }
-
         //查询审核记录
         List<FlowAudit> flowAudits = flowAuditService.auditList(sampleId,"sample." + sampleInfo.getType(), true);
         //项目管理部审核