病案预览默认100%尺寸

src/main/java/com/emr/util/Jpg2PdfUtil.java

@@ -102,7 +102,7 @@ public class Jpg2PdfUtil {
                     reader.close();
                 }
             }catch (Exception e){
-                e.printStackTrace();
+                //e.printStackTrace();
             }finally {
                 if(null != copy){
                     copy.close();
@@ -111,7 +111,7 @@ public class Jpg2PdfUtil {
                     bos.flush();
                     bos.close();
                 }catch (Exception e){
-                    e.printStackTrace();
+                    //e.printStackTrace();
                 }
                 if(null != document){
                     document.close();

src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp

@@ -237,6 +237,14 @@
                             <option value="1">已审核</option>
                         </select>
                     </div>
+                    <div class="form-group divCss">
+                        <label>是否完整:</label>
+                        <select class="input-sm form-control" id="isSuccessSearch">
+                            <option value="">全部</option>
+                            <option value="1">是</option>
+                            <option value="0">否</option>
+                        </select>
+                    </div>
                     <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
                     <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
                     <button type="button" class="btn btn-primary btn-sm divCss" id="approvesBtn">批量审核</button>
@@ -708,7 +716,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/beHospList/beHospList.js?time=2020-08-21"></script>
+<script src="${path}/static/js/beHospList/beHospList.js?time=2020-08-26"></script>
 <script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-08-21"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
 </html>

src/main/webapp/static/js/beHospList/beHospList.js

@@ -66,7 +66,8 @@ function initTable() {
                     doctorInCharge:$("#doctorInCharge").val(),
                     isSearch:$("#isSearch").val(),
                     status:$("#currentRoleIds").val(),
-                    role:$("#currentRole").val()
+                    role:$("#currentRole").val(),
+                    isSuccess:$("#isSuccessSearch").val()
                 };
                 return temp;
             },

src/main/webapp/static/pdfjs/web/viewer.html

@@ -33,7 +33,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/
 
   <!-- This snippet is used in production (included from viewer.html) -->
   <link rel="resource" type="application/l10n" href="locale/locale.properties"/>
-  <link rel="shortcut icon" href="/emr_medical_record/favicon.ico">
+  <link rel="shortcut icon" href="../../favicon.ico">
   <script type="text/javascript" src="../../js/jquery-3.3.1.js"></script>
   <script type="text/javascript" src="../../bootstrap-3.3.7/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
   <script src="l10n.js"></script>
@@ -42,7 +42,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/
 
 
   <script src="debugger.js"></script>
-  <script src="viewer.js"></script>
+  <script src="viewer.js?time=2020-08-27"></script>
 
   <style>
     .loading {
@@ -233,14 +233,14 @@ http://sourceforge.net/adobe/cmap/wiki/License/
               </div>
               <span id="scaleSelectContainer" class="dropdownToolbarButton">
                      <select id="scaleSelect" title="Zoom" tabindex="23" data-l10n-id="zoom">
-                      <option id="pageAutoOption" title="" value="auto" selected="selected" data-l10n-id="page_scale_auto">Automatic Zoom</option>
+                      <option id="pageAutoOption" title="" value="auto"  data-l10n-id="page_scale_auto">Automatic Zoom</option>
                       <option id="pageActualOption" title="" value="page-actual" data-l10n-id="page_scale_actual">Actual Size</option>
                       <option id="pageFitOption" title="" value="page-fit" data-l10n-id="page_scale_fit">Fit Page</option>
                       <option id="pageWidthOption" title="" value="page-width" data-l10n-id="page_scale_width">Full Width</option>
                       <option id="customScaleOption" title="" value="custom"></option>
                       <option title="" value="0.5" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 50 }'>50%</option>
                       <option title="" value="0.75" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 75 }'>75%</option>
-                      <option title="" value="1" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 100 }'>100%</option>
+                      <option title="" value="1" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 100 }' selected="selected">100%</option>
                       <option title="" value="1.25" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 125 }'>125%</option>
                       <option title="" value="1.5" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 150 }'>150%</option>
                       <option title="" value="2" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 200 }'>200%</option>

src/main/webapp/static/pdfjs/web/viewer.js

@@ -46,7 +46,7 @@ var mozL10n = document.mozL10n || document.webL10n;
 
 
 var CSS_UNITS = 96.0 / 72.0;
-var DEFAULT_SCALE = 'auto';
+var DEFAULT_SCALE = '1';
 var UNKNOWN_SCALE = 0;
 var MAX_AUTO_SCALE = 1.25;
 var SCROLLBAR_PADDING = 40;