From b7b4392ac5b1e3baeb226157f1156c7ea46d9149 Mon Sep 17 00:00:00 2001 From: wzqgit <568275241@qq.com> Date: Tue, 19 Oct 2021 15:26:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=AE=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E5=87=BA=E5=A4=9A=E6=9D=A1=E5=90=8C=E6=82=A3?= =?UTF-8?q?=E8=80=85=E6=95=B0=E6=8D=AEbug=2010/19=20wzq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/Archive_MasterMapper.xml | 2 +- .../webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 14feabdb..24a36527 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -393,7 +393,7 @@ dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to ,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned, m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance, - m.is_scanning,m.bed_number,amf.following_type,ISNULL(s.numb, 0) numb,ao.C5 is_sign,ao.C1 signer + m.is_scanning,m.bed_number,amf.following_type,ISNULL(s.numb, 0) numb,ao.C5 is_sign ,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(printTable.num, 0) printNum from archive_master m LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index b5e62286..7f047a66 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -3555,12 +3555,12 @@ return a; } }, - { + /*{ title: '签收人', field: 'signer', align: 'left', visible: false, - /* formatter: function (value, row, index) { + formatter: function (value, row, index) { var redFlag = row.numb; var a = ""; if (value != null && value != "") { @@ -3577,8 +3577,8 @@ a = '' + value + ''; } return a; - }*/ - }, + } + },*/ { title: '签收日期', field: 'signTime',