From ce400b14b6d77d905226a335839bf160a520eb46 Mon Sep 17 00:00:00 2001 From: xm Date: Fri, 25 Mar 2022 14:25:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=91=E4=B8=BB=E4=BB=BB=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BB=A5=E6=9C=80=E6=96=B0=E6=97=B6?= =?UTF-8?q?=E9=97=B4Archive=5FMaster=5FFollowing.following=5Ftype=3D9?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8Amaster=5Fid=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E6=97=A0=E8=AE=B0=E5=BD=95=E4=B9=9F=E8=AE=BE=E5=AE=9A=E4=B8=BA?= =?UTF-8?q?9=EF=BC=8C=E8=BF=99=E4=B8=A4=E4=B8=AA=E6=98=AF=E7=A7=91?= =?UTF-8?q?=E4=B8=BB=E4=BB=BB=E6=9C=AA=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E9=83=BD=E6=98=AF=E5=B7=B2=E7=BB=8F=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/Archive_MasterMapper.xml | 9 +++++++-- .../WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 345f558c..43859880 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -671,10 +671,15 @@ ,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,ISNULL(d.name,m.dept_admission_to) 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.is_scanning, - m.bed_number,ISNULL(s.numb, 0) numb,ISNULL(amf.num, 0) checkFlag + m.bed_number,ISNULL(s.numb, 0) numb,ISNULL(amf.num, 9) checkFlag ,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(printTable.num, 0) printNum from archive_master m - LEFT JOIN(select master_id,count(*) num from Archive_Master_Following where following_type=5 GROUP BY master_id ) amf + LEFT JOIN(SELECT amfa.id ,amfa.master_id, amfa.following_type num FROM Archive_Master_Following amfa left join + (SELECT amfb.master_id ida,max(handle_time) t FROM Archive_Master_Following amfb GROUP BY master_id) amfc + on amfa.master_id = amfc.ida + AND amfa.handle_time = amfc.t + WHERE ida is not NULL + AND t is not null) amf on m.id=amf.master_id LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('1','5') GROUP BY archive_detail_id) sDoctor on m.id=sDoctor.archive_detail_id diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index 908442ab..2990d8b3 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -3382,7 +3382,7 @@ align: 'center', formatter: function (value, row, index) { var a = ""; - if (value == 0) { + if (value == 9) { a = '未审核'; } else { a = '已审核'; From 2bdb32c80a47649c53e018dcb877cd62edc0f7d4 Mon Sep 17 00:00:00 2001 From: xm Date: Fri, 25 Mar 2022 23:37:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=90=E5=AE=9A5=E4=B8=8E9=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=97=A0=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E4=B8=89=E7=A7=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/Archive_MasterMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 43859880..bd065c81 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -679,7 +679,8 @@ on amfa.master_id = amfc.ida AND amfa.handle_time = amfc.t WHERE ida is not NULL - AND t is not null) amf + AND t is not null + AND following_type in (5,9)) amf on m.id=amf.master_id LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('1','5') GROUP BY archive_detail_id) sDoctor on m.id=sDoctor.archive_detail_id