diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index 3b7956e..b0595a9 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -44,7 +44,7 @@ @@ -467,7 +467,7 @@ C1, DID, jzh - from archive_other_ext + from archive_other_ext with(nolock) C1 != '一般病程记录' and sysFlag != 5 @@ -486,7 +486,7 @@ '手麻系统病历' as C1, DID, jzh - from archive_other_ext + from archive_other_ext with(nolock) and sysFlag = 5 /*and (C1 = '术前访视' or C1 = '术后访视' or C1 = '麻醉记录' or C1 = '麻醉小结')*/ @@ -505,7 +505,7 @@ C1, DID, jzh - from archive_other_ext + from archive_other_ext with(nolock) C1 = '一般病程记录' @@ -526,7 +526,7 @@ @@ -549,9 +549,9 @@ sysFlag = 1 THEN ( SELECT - MAX( eTime ) eTime + MIN( eTime ) eTime FROM - archive_other_ext + archive_other_ext with(nolock) WHERE sysFlag = 1 AND jzh = #{patientId} @@ -562,7 +562,7 @@ END eTime, ID,sysFlag FROM - archive_other_ext + archive_other_ext with(nolock) WHERE ID IN (${ids})) archive_other_ext @@ -594,7 +594,7 @@ SELECT MAX( eTime ) eTime FROM - archive_other_ext + archive_other_ext with(nolock) WHERE sysFlag = 1 AND archive_other_ext.jzh = #{patientId} @@ -605,12 +605,13 @@ END eTime, ID,sysFlag,C1 FROM - archive_other_ext + archive_other_ext with(nolock) WHERE archive_other_ext.jzh = #{patientId}) archive_other_ext INNER JOIN archive_other_ext_submitTime ON archive_other_ext.ID = archive_other_ext_submitTime.other_ext_id WHERE + sysFlag in (1,2,3,4,5,6,7,8,9,10,11) and eTime <= case when sysFlag = 1 @@ -625,7 +626,7 @@ SELECT MID FROM - archive_other_ext + archive_other_ext with(nolock) WHERE sysFlag IN ( 3, 4, 6 ) AND ISNULL( DID, '' )= '' @@ -635,11 +636,11 @@ - select jzh,C1,C2,convert(varchar(19),sysUpdateTime,120) sysUpdateTime from archive_other_ext + select jzh,C1,C2,convert(varchar(19),sysUpdateTime,120) sysUpdateTime from archive_other_ext with(nolock) jzh = #{jzh} @@ -835,7 +836,7 @@ C10, SycObj FROM - archive_other_ext + archive_other_ext with(nolock) WHERE sysFlag = - 300 AND MID = #{masterId} diff --git a/src/main/resources/mapper/ArchiveOtherMapper.xml b/src/main/resources/mapper/ArchiveOtherMapper.xml index 837f222..29d5219 100644 --- a/src/main/resources/mapper/ArchiveOtherMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherMapper.xml @@ -30,7 +30,7 @@ @@ -266,10 +266,10 @@