diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index a7f0e0a3..ce61d960 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -170,7 +170,7 @@ LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable on m.id=printTable.MasterID where 1=1 - and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%' + and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%' and m.Is_Valid!=1 and (m.dept_admission_to in @@ -293,7 +293,7 @@ LEFT JOIN (select zyh,jzh,COUNT(*) num from archive_other_ext where T2!='1801-02-03 00:00:00.000' group by zyh,jzh) extNurse on m.inp_no=extNurse.zyh and m.visit_id=extNurse.jzh - where 1=1 and ArchiveState in('归档中','提交','主任退回') + where 1=1 and ArchiveState in('归档中','提交','主任退回') and m.Is_Valid!=1 and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%' @@ -427,7 +427,7 @@ and ao.sysFlag='1' LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable on m.id=printTable.MasterID - where 1=1 and ArchiveState in('初审') + where 1=1 and ArchiveState in('初审') and m.Is_Valid!=1 and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%' and m.id @@ -569,7 +569,7 @@ LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag is not null GROUP BY archive_detail_id) s on m.id=s.archive_detail_id where 1=1 - and m.ArchiveState not in('作废','已封存') and inp_no not like 'LG%' + and m.ArchiveState not in('作废','已封存') and m.Is_Valid!=1 and inp_no not like 'LG%' and m.id = #{id,jdbcType=NVARCHAR} @@ -702,7 +702,7 @@ on m.id=printTable.MasterID where 1=1 and patindex('%B%',m.inp_no) in (0,1) - and m.ArchiveState not in('作废','已封存') and inp_no not like 'LG%' + and m.ArchiveState not in('作废','已封存') and m.Is_Valid!=1 and inp_no not like 'LG%' and m.id @@ -842,7 +842,7 @@ LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable on m.id=printTable.MasterID where 1=1 and ArchiveState in('提交','主任退回','归档中','复审退回') - and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%' + and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%' and m.Is_Valid!=1 and m.id diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index a78ae1f6..460623c6 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -156,6 +156,8 @@ + + diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index ef69e754..3d2887b5 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -478,7 +478,6 @@ -
diff --git a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp index b5eaa023..ff02be62 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp @@ -124,14 +124,16 @@
diff --git a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp index 9e8ebf64..65b841f4 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp @@ -76,15 +76,17 @@
diff --git a/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp b/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp index 037613ab..bc5b4e6f 100644 --- a/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp +++ b/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp @@ -306,7 +306,7 @@