diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml index 1e124b36..f6481755 100644 --- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml +++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml @@ -320,7 +320,7 @@ left join(select * from emr_fault_detail t where id = (select top 1 id from emr_fault_detail where archive_detail_id = t.archive_detail_id order by create_time desc ) and state in('已召回','未召回')) f ON f.archive_detail_id=m.id - left join v_printinfo p ON m.id=p.masterID + left join archive_printinfo p ON m.id=p.MasterID where 1=1 and m.Is_Valid!=1 and f.archive_detail_id = #{archiveDetailId,jdbcType=NVARCHAR} diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp index ef978300..3bf009e4 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp @@ -762,8 +762,6 @@ //提醒是否使用 if (vprintinfoId != null && vprintinfoId != "" && vprintinfoId != "null"){ alert("已使用"); - }else { - alert("未使用"); } }