From 82dda9c0c995a76e381ff67bdfece1e7adceea7f Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Mon, 25 Jan 2021 15:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC20210113?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/emr/controller/FontController.java     | 3 +--
 src/main/webapp/WEB-INF/views/font/showRecordByOpId.jsp  | 6 +++---
 src/main/webapp/static/js/showRecord/showRecordIframe.js | 3 +++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java
index 3af9722..9875819 100644
--- a/src/main/java/com/emr/controller/FontController.java
+++ b/src/main/java/com/emr/controller/FontController.java
@@ -1,7 +1,6 @@
 package com.emr.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.emr.dao.ArchiveOtherExtMapper;
 import com.emr.dao.Emr_DictionaryMapper;
 import com.emr.entity.*;
 import com.emr.service.Archive_DetailService;
@@ -507,7 +506,7 @@ public class FontController {
                             }
                         }
                         //初始化时或有记录时添加日期节点
-                        if (isSearch == 0 || flag) {
+                        if (flag) {
                             //格式化日期
                             String returnDate = fmt.format(fmt1.parse(date));
                             tree1.setName(returnDate);
diff --git a/src/main/webapp/WEB-INF/views/font/showRecordByOpId.jsp b/src/main/webapp/WEB-INF/views/font/showRecordByOpId.jsp
index e782dbe..9bf315f 100644
--- a/src/main/webapp/WEB-INF/views/font/showRecordByOpId.jsp
+++ b/src/main/webapp/WEB-INF/views/font/showRecordByOpId.jsp
@@ -55,12 +55,12 @@
         }
         .searchDiv{
             width:100%;
-            height:18%;
+            height:120px;
             background-color: #FFF;
         }
         .contentDiv{
             width:100%;
-            height: calc(100vh - 18% - 43px - 1vh);
+            height: calc(100vh - 120px - 43px - 1vh);
             margin-top:1vh;
             background-color: #FFF;
         }
@@ -210,7 +210,7 @@
     <iframe width="100%"  src=""  id="iframe" frameborder="0" scrolling="no"></iframe>
 </div>
 </div>
-<script type="text/javascript" src="${path}/static/js/showRecord/showRecordByOpId.js"></script>
+<script type="text/javascript" src="${path}/static/js/showRecord/showRecordByOpId.js?time=2021-01-15"></script>
 <script type="text/javascript" src="${path}/static/js/showRecord/showRecordIframeCommom.js"></script>
 </body>
 </html>
diff --git a/src/main/webapp/static/js/showRecord/showRecordIframe.js b/src/main/webapp/static/js/showRecord/showRecordIframe.js
index 0d49ff1..70ff152 100644
--- a/src/main/webapp/static/js/showRecord/showRecordIframe.js
+++ b/src/main/webapp/static/js/showRecord/showRecordIframe.js
@@ -58,6 +58,9 @@ var menu = {
 				if(detailIds.substring(detailIds.length-1,detailIds.length) == ","){
 					detailIds = detailIds.substring(0,detailIds.length-1);
 				}
+				if(detailIds == ''){
+					toastr.warning('该患者该时间段未上传报告!');
+				}
 				$("#detailIds").val(detailIds);
 			}
 		})