From 240a0209c5b0ad395749dd82b06e769d4949f77e Mon Sep 17 00:00:00 2001
From: wangxh <java888888ly@163.com>
Date: Sat, 11 Apr 2020 17:42:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=90=8E=EF=BC=8C=E7=AE=A1=E7=90=86=E5=91=98=E7=99=BB?=
 =?UTF-8?q?=E5=85=A5=E6=9F=A5=E7=9C=8B=E4=B8=8D=E5=88=B0=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/config/logback.xml                         | 1 +
 src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml | 4 ++--
 src/main/webapp/index.jsp                                     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/config/logback.xml b/src/main/resources/config/logback.xml
index 2165a83..a5fe209 100644
--- a/src/main/resources/config/logback.xml
+++ b/src/main/resources/config/logback.xml
@@ -70,4 +70,5 @@
         <appender-ref ref="fileInfoLog"/>
         <appender-ref ref="fileErrorLog"/>
     </root>
+
 </configuration>
\ No newline at end of file
diff --git a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
index ac9e179..30ef4cf 100644
--- a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
+++ b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
@@ -328,7 +328,7 @@
     ON
         a.patient_id = c.patient_id
     LEFT JOIN
-        (select code,Name from emr_dictionary where parent_id = (select id from emr_dictionary where typeCode = 'apply_type')) emr_dictionary
+        (select code,Name from emr_dictionary where parent_id = 'apply_type') emr_dictionary
     ON
         a.apply_type = emr_dictionary.code
     LEFT JOIN
@@ -408,7 +408,7 @@
     ON
         a.patient_id = c.patient_id
     LEFT JOIN
-        (select code,Name from emr_dictionary where parent_id = (select id from emr_dictionary where typeCode = 'apply_type')) emr_dictionary
+        (select code,Name from emr_dictionary where parent_id = 'apply_type') emr_dictionary
     ON
         a.apply_type = emr_dictionary.code
     LEFT JOIN
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index 0c93b55..e613d32 100644
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
@@ -210,7 +210,7 @@
             <div class="page-content-wrapper">
                 <div class="page-content">
                     <div class="container-fluid">
-                        <iframe class="row-fluid" style="width:100%;height:100%;" src="${path}/commom/commomList" id="iFrame1" name="iFrame1" scrolling="no" frameborder="0"></iframe>
+                        <iframe class="row-fluid" style="width:100%;height:100%;" src="${path}/commom/commomList" id="iFrame1" name="iFrame1" scrolling="yes" frameborder="0"></iframe>
                     </div>
                 </div>
             </div>