Browse Source

动物样本检测附件调整:去掉重复的申请人字段

陈长荣 1 week ago
parent
commit
2ef7bfca47

+ 6 - 0
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/entity/SampleInfo.java

@@ -42,6 +42,12 @@ public class SampleInfo extends BaseEntity {
     @Schema(description = "申请人邮箱")
     private String applicantEmail;
 
+    @Schema(description = "接收人id")
+    private Long receiveUserId;
+
+    @Schema(description = "接收人姓名")
+    private String receiveUserName;
+
     @Schema(description = "申请时间")
     private LocalDateTime applyTime;
 

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

@@ -190,7 +190,8 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
         SampleAnimalVo sampleAnimal = getDetail(sampleId);
 
         //血清样本送检
-        if (sampleAnimal.getScientificSampleType().contains(ScientificSampleTypeEnum.serum.getDescription())) {
+        if (StrUtil.isNotBlank(sampleAnimal.getScientificSampleType()) &&
+                sampleAnimal.getScientificSampleType().contains(ScientificSampleTypeEnum.serum.getDescription())) {
             //获取检测指标
             String sql = "select id, name from dbo.HT_DICT_ITEM where status=1 and type=0";
             List<Entity> entities = lisDb.query(sql);

+ 6 - 0
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/vo/SampleSubmitVo.java

@@ -41,6 +41,12 @@ public class SampleSubmitVo {
     @Size(max = 100, message = "申请人邮箱长度不能超过100个字符")
     private String applicantEmail;
 
+    @Schema(description = "接收人id")
+    private Long receiveUserId;
+
+    @Schema(description = "接收人姓名")
+    private String receiveUserName;
+
     @Schema(description = "申请时间", example = "2022-01-01")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate applyTime;

File diff suppressed because it is too large
+ 318 - 501
jfcloud-gene-biz/src/main/resources/ftlTemplate/animalSampleTesting.ftl


+ 4 - 0
jfcloud-gene-biz/src/main/resources/sql/ddl-20250613.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `jfcloud_gene`.`sample_info`
+    ADD COLUMN `receive_user_id` bigint DEFAULT NULL COMMENT '接收人id' AFTER `applicant_email`;
+ALTER TABLE `jfcloud_gene`.`sample_info`
+    ADD COLUMN `receive_user_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '接收人姓名' AFTER `receive_user_id`;

Some files were not shown because too many files changed in this diff