linjj
/
emr_record_czry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.xinjihn.cn/cs_2.0/EMR_Record

Browse Source
master
hcy 2 years ago
parent baf2f4e5dd 6d03aa3a67
commit 62490fcd4b
4 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File

4
src/main/resources/mapper/CommomMapper.xml
Unescape Escape View File

@ -1406,8 +1406,8 @@
c.file_path filePath, c.file_path filePath,
c.patient_id patientId c.patient_id patientId
from commomtable c from commomtable c
where c.inpatient_no= #{inpatientNo} where c.inpatient_no = #{inpatientNo}
AND c.dis_date like #{disDate} + '%' AND CONVERT(varchar(30),c.dis_date,23) = #{disDate}
</select> </select>
<select id="queryTableConfig" parameterType="string" resultType="map"> <select id="queryTableConfig" parameterType="string" resultType="map">

2
src/main/webapp/WEB-INF/views/otherManage/recordLogList.jsp
Unescape Escape View File

@ -73,7 +73,7 @@
<div class="headDiv"> <div class="headDiv">
<div class="headSpanDiv"> <div class="headSpanDiv">
<span class="headspan"> <span class="headspan">
日志管理 病案浏览日志管理
</span> </span>
</div> </div>
</div> </div>

53
src/main/webapp/index.jsp
Unescape Escape View File

@ -48,20 +48,32 @@
#indexTreeMenu::-webkit-scrollbar{ #indexTreeMenu::-webkit-scrollbar{
display: none; display: none;
} }
.seal-result { .seal-result {
transform: rotate(-14deg); transform: rotate(-36deg);
/* border: solid 2px #ddd; */ /* border: solid 2px #ddd; */
border-radius: 100%; border-radius: 100%;
text-align: center; text-align: center;
color: #37485061; color: #ed1a001a;
font-size: 1vw; font-size: 2vw;
font-weight: bold; font-weight: bold;
line-height: 60px; line-height: 60px;
left: 6%; left: 35vw;
top: 64%; top: 24vw;
position: absolute; position: absolute;
/* background-color: rgba(255, 255, 255, 0.8); */ /* background-color: rgba(255, 255, 255, 0.8); */
z-index: 1000; z-index: 1000;
display: none;
letter-spacing: 2vw;
}
.newlogoContent{
width: 90%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
line-height: normal;
} }
</style> </style>
<% <%
@ -89,6 +101,8 @@
<body class="hold-transition skin-blue sidebar-mini" onkeydown="disabledPrint()"> <body class="hold-transition skin-blue sidebar-mini" onkeydown="disabledPrint()">
<input type="hidden" id="token" value="<%=token%>"/> <input type="hidden" id="token" value="<%=token%>"/>
<input type="hidden" id="roleId" value="${CURRENT_USER.roleId}"/> <input type="hidden" id="roleId" value="${CURRENT_USER.roleId}"/>
<input type="hidden" id="hospitalName" value="<%=hospitalName%>">
<!--webSocket所需--> <!--webSocket所需-->
<input type="hidden" id="userId" value="${CURRENT_USER.userId}"/> <input type="hidden" id="userId" value="${CURRENT_USER.userId}"/>
<input type="hidden" id="userName" value="${CURRENT_USER.userName}"/> <input type="hidden" id="userName" value="${CURRENT_USER.userName}"/>
@ -103,21 +117,26 @@
<div class="wrapper"> <div class="wrapper">
<header class="main-header"> <header class="main-header">
<!--logo--> <!--logo-->
<div class=" logo"> <%-- <div class=" logo">--%>
<%--<div class="pull-left image" style="align-content: baseline;"> <%-- &lt;%&ndash;<div class="pull-left image" style="align-content: baseline;">--%>
<img src="${path}/static/bootstrap-3.3.7/dist/img/credit/paypal.png" <%-- <img src="${path}/static/bootstrap-3.3.7/dist/img/credit/paypal.png"--%>
style="height:70%;width: 70%;margin-top:0.25rem;" <%-- style="height:70%;width: 70%;margin-top:0.25rem;"--%>
class="user-image" alt="User Image"> <%-- class="user-image" alt="User Image">--%>
</div>--%> <%-- </div>&ndash;%&gt;--%>
<div class="pull-left info" style="width: 100%"> <%-- <div class="pull-left info" style="width: 100%;">--%>
<p>病案数码影像信息管理系统</p> <%-- <p>病案数码影像信息管理系统</p>--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="logo">
<div class="newlogoContent">
<p id="logoTitleName">病案数码影像信息管理系统</p>
</div> </div>
</div> </div>
<nav class="navbar navbar-static-top"> <nav class="navbar navbar-static-top">
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button"> <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
</a> </a>
<%-- <div class="seal-result"><%= hospitalName %></div>--%> <%-- <div class="seal-result" id="hospitalNameWater"></div>--%>
<div class="navbar-custom-menu"> <div class="navbar-custom-menu">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="user user-menu"> <li class="user user-menu">
@ -284,6 +303,12 @@
const windowHeight = $(window).height(); const windowHeight = $(window).height();
$("#iFrame1").css("height", windowHeight - headerHeight - footerHeight - 37); $("#iFrame1").css("height", windowHeight - headerHeight - footerHeight - 37);
$("#indexTreeMenu").css("height",windowHeight - headerHeight); $("#indexTreeMenu").css("height",windowHeight - headerHeight);
const hospitalName = $("#hospitalName").val();
if(hospitalName != '' && hospitalName != null && hospitalName != undefined){
$("#hospitalNameWater").css('display','block')
$("#hospitalNameWater").html(hospitalName)
}
}) })
</script> </script>
</body> </body>

3
src/main/webapp/static/js/recordManage/bloodPurification/documentList.js
Unescape Escape View File

@ -345,7 +345,8 @@ $(function () {
search(); search();
$('#yearMonth').datepicker({ $('#yearMonth').datepicker({
language: "zh-CN", language: "zh-CN",
format: "yyyy-mm-dd", format: "yyyy-mm",
minViewMode: 1,
autoclose: true//选中之后自动隐藏日期选择框 autoclose: true//选中之后自动隐藏日期选择框
}) })
}) })

Write Preview
Loading…
Cancel
Save