From 292ccb17d184d7ed5fa2225abf62ab048d570cab Mon Sep 17 00:00:00 2001
From: wang1007152140 <1007152140@qq.com>
Date: Fri, 19 Feb 2021 18:26:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/tcm/bean/dto/BiologicalSamplesDto.java   | 13 ++++++++-----
 .../java/com/ccsens/tcm/service/PatientService.java |  8 ++++++++
 util/src/main/java/com/ccsens/util/CodeEnum.java    |  1 +
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/BiologicalSamplesDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/BiologicalSamplesDto.java
index 0280e481..fcec9c54 100644
--- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/BiologicalSamplesDto.java
+++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/BiologicalSamplesDto.java
@@ -7,22 +7,25 @@ import lombok.Data;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 @Data
 public class BiologicalSamplesDto {
     @Data
-    @ApiModel("添加生物样本")
+    @ApiModel("添加生物样本-1007")
     public static class AddBiolog {
-        @ApiModelProperty("样本类型 0：抗血凝10ml 1：促凝血5ml 2：晨尿10ml 3:24小时尿10ml")
+        @ApiModelProperty("王-样本类型 0：抗血凝10ml 1：促凝血5ml 2：晨尿10ml 3:24小时尿10ml")
         private Byte sampleType;
-        @ApiModelProperty("患者id")
-        private Long patientInformationId;
+        @NotBlank
+        @ApiModelProperty("住院号")
+        private String hospitalization;
         @ApiModelProperty("采集时间")
         private Integer collectTime;
     }
     @Data
-    @ApiModel("查询生物样本")
+    @ApiModel("查询生物样本-1007")
     public static class SelBiolog {
         @ApiModelProperty("医院id")
         private Long hospitalId;
diff --git a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
index abba80cb..35334918 100644
--- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
+++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
@@ -301,9 +301,17 @@ public class PatientService implements IPatientService {
 
     @Override
     public void addBiologicalSamples(BiologicalSamplesDto.AddBiolog param, Long userId) {
+
+        PatientInformationExample patientInformationExample=new PatientInformationExample();
+        patientInformationExample.createCriteria().andHospitalizationEqualTo(param.getHospitalization()).andRecStatusEqualTo((byte)0);
+        List<PatientInformation> patientInformations = patientInformationMapper.selectByExample(patientInformationExample);
+        if(patientInformations.size()!=1){
+            throw  new BaseException(CodeEnum.QUANTITYERROR);
+        }
         BiologicalSamples biologicalSamples=new BiologicalSamples();
         biologicalSamples.setUserId(userId);
         biologicalSamples.setId(snowflake.nextId());
+        biologicalSamples.setPatientInformationId(patientInformations.get(0).getId());
         BeanUtils.copyProperties(param,biologicalSamples);
         biologicalSamplesMapper.insertSelective(biologicalSamples);
     }
diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java
index 4d83127e..31c45274 100644
--- a/util/src/main/java/com/ccsens/util/CodeEnum.java
+++ b/util/src/main/java/com/ccsens/util/CodeEnum.java
@@ -181,6 +181,7 @@ public enum CodeEnum {
     ALREADY_UPLOAD_VIDEO(150,"您已经上传了视频，请勿重复提交",true),
     ALREADY_UPLOAD_FORM(151,"请勿重复提交信息",true),
     MESSAGEISNULL(152,"数据为空",true),
+    QUANTITYERROR(153,"住院号和患者id不对应",true),
     ;