From 9b3275437d890c61d1fa561a906bbb693f794a0d Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 29 Apr 2021 23:54:26 +0800
Subject: [PATCH] =?UTF-8?q?20210429=E4=B8=AD=E5=8C=BB=E8=8D=AF=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=95=E5=85=A5=E4=BA=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/tcm/bean/vo/BiologicalSamplesVo.java  |  4 ++++
 .../java/com/ccsens/tcm/bean/vo/PatientVo.java   |  4 ++++
 .../com/ccsens/tcm/service/PatientService.java   |  1 +
 tcm/src/main/resources/application.yml           |  4 ++--
 tcm/src/main/resources/mapper_dao/PatientDao.xml | 16 +++++++++++++---
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java
index 9ccd2d46..e24152d4 100644
--- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java
+++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java
@@ -27,6 +27,10 @@ public class BiologicalSamplesVo {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty("时间")
         private Date updateAt;
+        @ApiModelProperty("录入人id")
+        private Long userId;
+        @ApiModelProperty("录入人名称")
+        private String doctorName;
     }
     @Data
     @ApiModel("统计医院生物样本数量")
diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java
index a95c11ac..b736ab13 100644
--- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java
+++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java
@@ -38,6 +38,10 @@ public class PatientVo {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty("时间")
         private Date updateAt;
+        @ApiModelProperty("录入人id")
+        private Long userId;
+        @ApiModelProperty("录入人名称")
+        private String doctorName;
     }
     @Data
     @ApiModel("经过搜索条件查询的患者集合")
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 27288ca9..d723651a 100644
--- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
+++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
@@ -94,6 +94,7 @@ public class PatientService implements IPatientService {
         BeanUtils.copyProperties(param,patientInformation);
         patientInformation.setId(snowflake.nextId());
         patientInformation.setHospitalId(hospital.getId());
+        patientInformation.setUserId(userId);
         // 生成编号
         long incr = redisUtil.incr(StrUtil.format(Constant.Redis.HOSPITAL_NUM, hospital.getCode(), inpatient.getCode()) , 1);
         DecimalFormat df=new DecimalFormat("000");
diff --git a/tcm/src/main/resources/application.yml b/tcm/src/main/resources/application.yml
index 4ecd13fd..33b76558 100644
--- a/tcm/src/main/resources/application.yml
+++ b/tcm/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: green
+    include: common, util-green
 
diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml
index b07f35b4..e68380b8 100644
--- a/tcm/src/main/resources/mapper_dao/PatientDao.xml
+++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml
@@ -48,10 +48,13 @@
             th.name as hosName,
             ti.name,
             ti.collection_num as collectionNum,
-            tpi.update_at as updateAt
+            tpi.update_at as updateAt,
+            tpi.user_id as userId,
+            d.`name` as doctorName
         FROM
             t_patient_information tpi left join t_inpatient ti on ti.rec_status=0 and ti.id=tpi.inpatient_id
             left join t_hospital th on th.rec_status=0 and th.id=tpi.hospital_id
+        LEFT JOIN t_doctor d on tpi.user_id = d.user_id and d.rec_status = 0
         WHERE
             tpi.rec_status = 0
             <if test="hospitalId!=null and hospitalId !=0 ">
@@ -154,9 +157,12 @@
         tpi.input_status AS inputStatus,
         tpi.hospital_id AS hospitalId,
         ti.name,
-        ti.collection_num as collectionNum
+        ti.collection_num as collectionNum,
+        tpi.user_id as userId,
+        d.`name` as doctorName
         FROM
         t_patient_information tpi left join t_inpatient ti on ti.rec_status=0 and ti.id=tpi.inpatient_id
+        LEFT JOIN t_doctor d on d.user_id = tpi.user_id and d.rec_status = 0
         WHERE
         tpi.rec_status =0
         <if test="id != null and id!=0">
@@ -393,10 +399,14 @@
         t.user_id
     </select>
     <select id="selBiologicalSamples" resultType="com.ccsens.tcm.bean.vo.BiologicalSamplesVo$selBiolog">
-        select th.name,tbs.sample_type as sampleType, tpi.hospitalization, tpi.code as patientCode, tbs.code, tbs.collect_time as collectTime,tbs.update_at as updateAt
+        select th.name,tbs.sample_type as sampleType, tpi.hospitalization, tpi.code as patientCode, tbs.code, tbs.collect_time as collectTime,
+        tbs.update_at as updateAt,
+        tbs.user_id as userId,
+        d.`name` as doctorName
         from t_biological_samples tbs
         left join t_patient_information tpi on tpi.id=tbs.patient_information_id and tpi.rec_status=0
         left join t_hospital th on th.id=tpi.hospital_id and th.rec_status=0
+        LEFT JOIN t_doctor d on d.user_id = tbs.user_id and d.rec_status = 0
         where tbs.rec_status=0
         <if test="hospitalId!=null">
             and th.id=#{hospitalId}