From 1357556c8675e9888889af33bd20725d10c7a0a2 Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Thu, 12 Oct 2023 15:07:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mappeer=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/Archive_DetailMapper.xml | 5 ++---
 src/main/resources/mapper/Archive_MasterMapper.xml | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml
index b41299f2..a50cdd00 100644
--- a/src/main/resources/mapper/Archive_DetailMapper.xml
+++ b/src/main/resources/mapper/Archive_DetailMapper.xml
@@ -255,8 +255,7 @@
 
   <select id="detailWithChildByClo" resultMap="BaseResultMap2" parameterType="com.emr.entity.Archive_Detail_Vo">
       select
-      t.id,t.Source,CONVERT(varchar(100),t.UpLoadDateTime, 120)
-      UpLoadDateTime,t.Title,t.flag
+      t.id,t.Source,t.UpLoadDateTime,t.Title,t.flag
       from archive_detail t
       <where>1=1
           <if test="source != null and source != '' and source!='-1'">
@@ -280,7 +279,7 @@
   <select id="sourceByClo" resultMap="BaseResultMap2" parameterType="com.emr.entity.Archive_Detail_Vo">
       select DISTINCT d.Source
       from zd_assort z left join(
-      select t.MasterID,t.AssortId,t.id,t.PDF_PATH,t.Source,CONVERT(varchar(100),t.UpLoadDateTime, 120) UpLoadDateTime,t.SubAssort,t.Title,t.flag,t.page_number from archive_detail t left join archive_master f on t.MasterID=f.id
+      select t.MasterID,t.AssortId,t.id,t.PDF_PATH,t.Source,t.UpLoadDateTime,t.SubAssort,t.Title,t.flag,t.page_number from archive_detail t left join archive_master f on t.MasterID=f.id
       where 1=1
       <if test="patientId != null">
           and f.id=#{patientId,jdbcType=VARCHAR}
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 98e60c5b..9767786c 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -985,8 +985,7 @@
     </select>
     <select id="bbSel2" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
         select id,inp_no,visit_id,U.name,dept_name,E.name doctor_name,DOCTOR_IN_CHARGE,ArchiveState,ISNULL(e.name, u.dept_name) doctorName,
-        CONVERT(varchar(100),admission_date_time, 120) admission_date_time,CONVERT(varchar(100),U.discharge_date_time, 120) discharge_date_time
-        ,bed_number,GETDATE() nowt,
+       admission_date_time,U.discharge_date_time,bed_number,GETDATE() nowt,
         <if test="remark!= null and remark!= ''">
             CEILING(DATEDIFF(hour,U.discharge_date_time,GETDATE())/24.00)-#{remark,jdbcType=NCHAR} nurse_name
         </if>