From cf861572e62df17218e10ce0208bd1003d2a4c30 Mon Sep 17 00:00:00 2001
From: 51976 <519763495@qq.com>
Date: Thu, 4 Aug 2022 16:57:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BD=92=E6=A1=A3=E7=97=85=E5=8E=86=E5=8F=AC?=
 =?UTF-8?q?=E5=9B=9E=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=BC=B9=E6=A1=86=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=EF=BC=88=E2=80=9C=E6=8F=90=E9=86=92=E6=82=A3=E6=96=B9?=
 =?UTF-8?q?=E5=8F=8A=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B7=B2=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=BF=87=E7=97=85=E5=8E=86=E2=80=9D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/Emr_Fault_DetailMapper.xml            | 2 +-
 .../webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

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
     <if test="archiveDetailId != null">
       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("未使用");
         }
     }