病理送检增加预实验申请人负责人

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/entity/SamplePathological.java

@@ -136,6 +136,12 @@ public class SamplePathological extends BaseEntity {
     @Schema(description = "预实验申请人姓名")
     private String preApplicantName;
 
+    @Schema(description = "预实验申请人负责人id")
+    private Long preApplicantLeaderId;
+
+    @Schema(description = "预实验申请人负责人姓名")
+    private String preApplicantLeaderName;
+
     @Schema(description = "预实验的内容")
     private String preContent;
 

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleAnimalImagingServiceImpl.java → jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleAnimalImagingServiceImpl.java

@@ -1,4 +1,4 @@
-package com.github.jfcloud.gene.sample.service.impl;
+package com.github.jfcloud.gene.sample.service.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DatePattern;
@@ -24,7 +24,6 @@ import com.github.jfcloud.gene.sample.mapper.SampleAnimalImagingMapper;
 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.vo.HtmlParseVo;
@@ -207,9 +206,6 @@ public class SampleAnimalImagingServiceImpl extends ServiceImpl<SampleAnimalImag
         sampleInfoObj.put("expiryDate", WordUtil.padString(sampleInfo.getExpiryDate(), 12));
 
         String modelName = "animalImaging.ftl";
-        if (LocalWord.exportWord(modelName, dataMap, fileName)) {
-            return;
-        }
         fileInfoService.uploadFileWithFileName(modelName, fileName, sampleInfo.getId(), sampleInfo.getStatus(), dataMap);
     }
 

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

@@ -1,4 +1,4 @@
-package com.github.jfcloud.gene.sample.service.impl;
+package com.github.jfcloud.gene.sample.service.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DatePattern;

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

@@ -1,4 +1,4 @@
-package com.github.jfcloud.gene.sample.service.impl;
+package com.github.jfcloud.gene.sample.service.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -70,12 +70,26 @@ public class SamplePathologicalServiceImpl extends ServiceImpl<SamplePathologica
         SamplePathological samplePathological = BeanUtil.copyProperties(pathological, SamplePathological.class);
         samplePathological.setId(CustomIdGenerator.nextId());
         samplePathological.setSampleId(sampleId);
+        //清空预实验相关的参数
+        if (!pathological.getPreExperiment()) {
+            samplePathological.setPreDate("")
+                    .setPrePeople("")
+                    .setPreSubjectName("")
+                    .setPreApplicantId(null)
+                    .setPreApplicantName("")
+                    .setPreApplicantLeaderId(null)
+                    .setPreApplicantLeaderName("")
+                    .setPreContent("")
+                    .setPreConclusion("");
+        }
         samplePathological.insert();
 
         //保存预实验列表
-        List<PathologicalPreExperiment> preExperiments = BeanUtil.copyToList(pathological.getExperiments(), PathologicalPreExperiment.class);
-        preExperiments.forEach(item -> item.setPathologicalId(samplePathological.getId()));
-        preExperimentService.saveBatch(preExperiments);
+        if (pathological.getPreExperiment()) {
+            List<PathologicalPreExperiment> preExperiments = BeanUtil.copyToList(pathological.getExperiments(), PathologicalPreExperiment.class);
+            preExperiments.forEach(item -> item.setPathologicalId(samplePathological.getId()));
+            preExperimentService.saveBatch(preExperiments);
+        }
 
         //保存附件列表
         List<FileInfo> fileInfos = new ArrayList<>();

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

@@ -27,6 +27,9 @@ import com.github.jfcloud.gene.sample.enums.SampleTypeEnum;
 import com.github.jfcloud.gene.sample.mapper.SampleInfoMapper;
 import com.github.jfcloud.gene.sample.service.SampleEditService;
 import com.github.jfcloud.gene.sample.service.SampleInfoService;
+import com.github.jfcloud.gene.sample.service.biz.SampleAnimalImagingServiceImpl;
+import com.github.jfcloud.gene.sample.service.biz.SampleAnimalServiceImpl;
+import com.github.jfcloud.gene.sample.service.biz.SamplePathologicalServiceImpl;
 import com.github.jfcloud.gene.sample.vo.SampleAuditVo;
 import com.github.jfcloud.gene.sample.vo.SamplePageVo;
 import com.github.jfcloud.gene.sample.vo.SampleSubmitVo;

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/vo/SamplePathologicalVo.java

@@ -158,6 +158,12 @@ public class SamplePathologicalVo {
     @Schema(description = "预实验申请人姓名")
     private String preApplicantName;
 
+    @Schema(description = "预实验申请人负责人id")
+    private Long preApplicantLeaderId;
+
+    @Schema(description = "预实验申请人负责人姓名")
+    private String preApplicantLeaderName;
+
     @Schema(description = "预实验的内容")
     @Size(max = 255, message = "预实验的内容不能超过255个字符")
     private String preContent;

jfcloud-gene-biz/src/main/resources/sql/sample_init.sql

@@ -205,6 +205,8 @@ CREATE TABLE IF NOT EXISTS sample_pathological
     pre_subject_name     VARCHAR(255) COMMENT '预实验课题名称',
     pre_applicant_id     BIGINT COMMENT '预实验申请人id',
     pre_applicant_name   VARCHAR(100) COMMENT '预实验申请人姓名',
+    pre_applicant_leader_id     BIGINT COMMENT '预实验申请人负责人id',
+    pre_applicant_leader_name   VARCHAR(100) COMMENT '预实验申请人负责人姓名',
     pre_content          VARCHAR(255) COMMENT '预实验的内容',
     pre_conclusion       TEXT COMMENT '预实验的结论',
     pre_date             VARCHAR(30) COMMENT '预实验的实验日期',