From ca73988623340830cae9c9d3ace86b4228fd766c Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Fri, 18 Mar 2022 16:44:03 +0800
Subject: [PATCH] =?UTF-8?q?his=E6=82=A3=E8=80=85=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8C=BB=E9=99=A2=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java    | 6 ++++++
 .../main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java   | 2 ++
 talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml       | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java
index 4c898c6..950fbdd 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java
@@ -85,6 +85,12 @@ public class LymsHisInfo implements Serializable {
     @TableField(value = "doctor")
     @NotNull(message = "doctor不能为空")
     private String doctor;
+    /**
+     * 医生姓名
+     */
+    @TableField(value = "hospitalId")
+    @NotNull(message = "hospitalId不能为空")
+    private String hospitalId;
 
     /**
      * 上传问诊平台状态。0：未上传 1：已上传
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java
index 5f0a0c8..1bb0a5d 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java
@@ -84,6 +84,7 @@ public class GetPatientInfoTask {
                                 QueryWrapper qurey = new QueryWrapper();
                                 qurey.eq("idCard", hisInfoMap.getIdcard());
                                 qurey.eq("diagnose", hisInfoMap.getDiagnose());
+                                qurey.eq("hospitalId", hisInfoMap.getHospitalId());
                                 Calendar calendar = Calendar.getInstance();
                                 calendar.setTime(new Date());
                                 calendar.set(Calendar.HOUR_OF_DAY, 00);//时
@@ -156,6 +157,7 @@ public class GetPatientInfoTask {
                     QueryWrapper qurey = new QueryWrapper();
                     qurey.eq("idCard", hisInfoMap.getIdcard());
                     qurey.eq("diagnose", hisInfoMap.getDiagnose());
+                    qurey.eq("hospitalId", hisInfoMap.getHospitalId());
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTime(new Date());
                     calendar.set(Calendar.HOUR_OF_DAY, 00);//时
diff --git a/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml
index b4dcdf0..e99c856 100644
--- a/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml
+++ b/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml
@@ -13,6 +13,7 @@
             <result property="phone" column="phone" jdbcType="VARCHAR"/>
             <result property="idcard" column="idCard" jdbcType="VARCHAR"/>
             <result property="dept" column="dept" jdbcType="VARCHAR"/>
+            <result property="hospitalId" column="hospitalId" jdbcType="VARCHAR"/>
             <result property="diagnose" column="diagnose" jdbcType="VARCHAR"/>
             <result property="doctor" column="doctor" jdbcType="VARCHAR"/>
             <result property="upType" column="up_type" jdbcType="INTEGER"/>
@@ -23,7 +24,7 @@
     <sql id="Base_Column_List">
         id,vcCardNo,name,
         sex,birthday,phone,
-        idCard,dept,diagnose,
+        idCard,dept,hospitalId,diagnose,
         doctor,up_type,up_time,
         createdtime
     </sql>
-- 
1.8.3.1