更新版本20210113

master
zengwh 5 years ago
parent 4fe3f48627
commit 82dda9c0c9

@ -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);

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

@ -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);
}
})

Loading…
Cancel
Save