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 @@
-
+