power2.0
/
powerbz
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增病案回收

Browse Source
master
linjj 2 years ago
parent 77bd1cd5a8
commit c8d6529a41
6 changed files with 129 additions and 118 deletions
Show Stats Download Patch File Download Diff File

21
power-admin/src/main/java/com/manage/controller/PageController.java
Unescape Escape View File

@ -46,6 +46,9 @@ public class PageController {
@Value("${EMRFILES_URLHEAD}") @Value("${EMRFILES_URLHEAD}")
private String EMRFILES_URLHEAD; private String EMRFILES_URLHEAD;
@Value("${EMR_RECOVERY}")
private String EMR_RECOVERY;
@Value("${WEBSOCKET_URLHEAD}") @Value("${WEBSOCKET_URLHEAD}")
private String WEBSOCKET_URLHEAD; private String WEBSOCKET_URLHEAD;
@Value("${STR_SPLIT}") @Value("${STR_SPLIT}")
@ -109,6 +112,8 @@ public class PageController {
model.addAttribute("EMRAPPLYCOPY_URLHEAD",EMRAPPLYCOPY_URLHEAD); model.addAttribute("EMRAPPLYCOPY_URLHEAD",EMRAPPLYCOPY_URLHEAD);
model.addAttribute("EMRFILES_URLHEAD",EMRFILES_URLHEAD); model.addAttribute("EMRFILES_URLHEAD",EMRFILES_URLHEAD);
model.addAttribute("EMR_RECOVERY", EMR_RECOVERY);
model.addAttribute("WEBSOCKET_URLHEAD",WEBSOCKET_URLHEAD); model.addAttribute("WEBSOCKET_URLHEAD",WEBSOCKET_URLHEAD);
model.addAttribute("STR_SPLIT",STR_SPLIT); model.addAttribute("STR_SPLIT",STR_SPLIT);
@ -144,11 +149,13 @@ public class PageController {
int power = 0; int power = 0;
int emr_medical_record = 0; int emr_medical_record = 0;
int emr_record = 0; int emr_record = 0;
int emr_recovery = 0;
int emr_apply_copy = 0; int emr_apply_copy = 0;
int emr_files = 0; int emr_files = 0;
int power1 = 0; int power1 = 0;
int emr_medical_record1 = 0; int emr_medical_record1 = 0;
int emr_record1 = 0; int emr_record1 = 0;
int emr_recovery1 = 0;
int emr_apply_copy1 = 0; int emr_apply_copy1 = 0;
int emr_files1 = 0; int emr_files1 = 0;
if(null != sysList && !sysList.isEmpty()){ if(null != sysList && !sysList.isEmpty()){
@ -178,6 +185,10 @@ public class PageController {
emr_files1 = 1; emr_files1 = 1;
continue; continue;
} }
if ("emr_recovery".equals(sysFlag)) {
emr_recovery1 = 1;
continue;
}
} }
} }
} }
@ -204,6 +215,10 @@ public class PageController {
emr_files = 1; emr_files = 1;
continue; continue;
} }
if ("emr_recovery".equals(sysFlag)) {
emr_recovery = 1;
continue;
}
} }
} }
} }
@ -232,7 +247,13 @@ public class PageController {
}else{ }else{
emr_files = 0; emr_files = 0;
} }
if(emr_recovery == 1 && emr_recovery1 == 1){
emr_recovery = 1;
}else{
emr_recovery = 0;
}
model.addAttribute("power",power); model.addAttribute("power",power);
model.addAttribute("emr_recovery",emr_recovery);
model.addAttribute("emr_medical_record",emr_medical_record); model.addAttribute("emr_medical_record",emr_medical_record);
model.addAttribute("emr_record",emr_record); model.addAttribute("emr_record",emr_record);
model.addAttribute("emr_apply_copy",emr_apply_copy); model.addAttribute("emr_apply_copy",emr_apply_copy);

1
power-admin/src/main/java/com/manage/controller/Power_Sys_DictController.java
Unescape Escape View File

@ -300,6 +300,7 @@ public class Power_Sys_DictController {
sysTypes.add("档案管理系统"); sysTypes.add("档案管理系统");
sysTypes.add("档案归档系统"); sysTypes.add("档案归档系统");
sysTypes.add("复印预约系统"); sysTypes.add("复印预约系统");
sysTypes.add("病案回收系统");
sysTypes.add("科研系统"); sysTypes.add("科研系统");
sysTypes.add("其它"); sysTypes.add("其它");
model.addAttribute("sysTypes",sysTypes); model.addAttribute("sysTypes",sysTypes);

2
power-admin/src/main/resources/config/config.properties
Unescape Escape View File

@ -57,6 +57,8 @@ EMRFILES__SYSFLAG = emr_files
#emr_files病案签收的服务器地址头 #emr_files病案签收的服务器地址头
EMRFILES_URLHEAD = http://${EMRFILES_IP}:${EMRFILES_PORT}/${EMRFILES__SYSFLAG} EMRFILES_URLHEAD = http://${EMRFILES_IP}:${EMRFILES_PORT}/${EMRFILES__SYSFLAG}
#####################################################其他############################################## #####################################################其他##############################################
#病案回收地址系统
EMR_RECOVERY=https://192.168.16.85:9012/recycle
#webSocket服务器地址 #webSocket服务器地址
WEBSOCKET_URLHEAD = ${POWER_IP}:8088 WEBSOCKET_URLHEAD = ${POWER_IP}:8088
#通知字符串间隔符 #通知字符串间隔符

109
power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
Unescape Escape View File

@ -16,6 +16,7 @@
.navbar-custom-menu { .navbar-custom-menu {
padding-right: 17px; padding-right: 17px;
} }
/** /**
*右侧 *右侧
*/ */
@ -23,6 +24,7 @@
width: 100%; width: 100%;
height: 83%; height: 83%;
} }
/** /**
*右侧上部分 *右侧上部分
*/ */
@ -31,12 +33,14 @@
height: 40%; height: 40%;
min-height: 190px; min-height: 190px;
} }
.rightTopSpanDiv { .rightTopSpanDiv {
padding-top: 10%; padding-top: 10%;
width: 100%; width: 100%;
height: 50px; height: 50px;
text-align: center; text-align: center;
} }
.rightTopSpanDiv span { .rightTopSpanDiv span {
font-size: 36px; font-size: 36px;
font-weight: bold; font-weight: bold;
@ -48,15 +52,19 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.home-sidebar-menu > li { .home-sidebar-menu > li {
padding: 18px 0; padding: 18px 0;
} }
.skin-blue .sidebar-menu > li:hover, .skin-blue .sidebar-menu > li.active { .skin-blue .sidebar-menu > li:hover, .skin-blue .sidebar-menu > li.active {
background: #1e282c; background: #1e282c;
} }
.skin-blue .sidebar-menu > li:hover > .aClass, .skin-blue .sidebar-menu > li.active > .aClass { .skin-blue .sidebar-menu > li:hover > .aClass, .skin-blue .sidebar-menu > li.active > .aClass {
color: white; color: white;
} }
.aClass { .aClass {
display: grid; display: grid;
justify-content: center; justify-content: center;
@ -67,26 +75,38 @@
color: #b8c7ce; color: #b8c7ce;
cursor: pointer; cursor: pointer;
} }
.aClass i { .aClass i {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin: 0 auto; margin: 0 auto;
font-size: 54px; font-size: 54px;
} }
.aClass span { .aClass span {
margin-top: 5px; margin-top: 5px;
} }
.sidebar-mini.sidebar-collapse .aClass { .sidebar-mini.sidebar-collapse .aClass {
font-size: 12px; font-size: 12px;
} }
.sidebar-mini.sidebar-collapse .aClass > i { .sidebar-mini.sidebar-collapse .aClass > i {
font-size: 25px; font-size: 25px;
} }
.home-menu:hover .dropdown-menu {display: block;}
.home-menu:hover .dropdown-menu {
display: block;
}
.sidebar-mini.sidebar-collapse .img { .sidebar-mini.sidebar-collapse .img {
width: 25px; width: 25px;
} }
.home-menu:hover .dropdown-menu {display: block;}
.home-menu:hover .dropdown-menu {
display: block;
}
.sidebar-mini.sidebar-collapse .titleDiv { .sidebar-mini.sidebar-collapse .titleDiv {
font-size: 12px; font-size: 12px;
} }
@ -112,32 +132,40 @@
<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">
<a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown" onclick="noticeManage()"> <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown"
onclick="noticeManage()">
<span class="label label-warning" id="noticeCount">0</span> <span class="label label-warning" id="noticeCount">0</span>
<i class="fa fa-envelope-o" style="font-size: 21px;"></i> <i class="fa fa-envelope-o" style="font-size: 21px;"></i>
</a> </a>
</li> </li>
<li class="user user-menu"> <li class="user user-menu">
<a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown"> <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">
<img src="${path}/static/bootstrap-3.3.7/dist/img/user2-160x160.jpg" class="user-image" alt="User Image"> <img src="${path}/static/bootstrap-3.3.7/dist/img/user2-160x160.jpg" class="user-image"
alt="User Image">
<c:choose> <c:choose>
<c:when test="${CURRENT_USER.powerDepts == '' || CURRENT_USER.powerDepts == null || CURRENT_USER.powerDepts == 'null'}"> <c:when test="${CURRENT_USER.powerDepts == '' || CURRENT_USER.powerDepts == null || CURRENT_USER.powerDepts == 'null'}">
<c:choose> <c:choose>
<c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}"> <c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}">
<div class="hidden-xs" title="${CURRENT_USER.name}">${CURRENT_USER.name}</div> <div class="hidden-xs"
title="${CURRENT_USER.name}">${CURRENT_USER.name}</div>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<div class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</div> <div class="hidden-xs"
title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</div>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:choose> <c:choose>
<c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}"> <c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}">
<div class="hidden-xs" title="${CURRENT_USER.name}(${CURRENT_USER.powerDepts})">${CURRENT_USER.name}(${CURRENT_USER.powerDepts})</div> <div class="hidden-xs"
title="${CURRENT_USER.name}(${CURRENT_USER.powerDepts})">${CURRENT_USER.name}(${CURRENT_USER.powerDepts})
</div>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<div class="hidden-xs" title="${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})">${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})</div> <div class="hidden-xs"
title="${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})">${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})
</div>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:otherwise> </c:otherwise>
@ -145,7 +173,8 @@
</a> </a>
</li> </li>
<li class="home-menu"> <li class="home-menu">
<a href="${path}/gatewayPage" title="点击返回首页"><i class="fa fa-home" style="font-size: 21px"></i></a> <a href="${path}/gatewayPage" title="点击返回首页"><i class="fa fa-home"
style="font-size: 21px"></i></a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="${path}/logout?token=${token}">退出登录</a></li> <li><a href="${path}/logout?token=${token}">退出登录</a></li>
</ul> </ul>
@ -222,7 +251,7 @@
<c:if test="${emr_medical_record == 1}"> <c:if test="${emr_medical_record == 1}">
<div class="iconContext left"> <div class="iconContext left">
<a href="${EMRMEDICALRECORD_URLHEAD}/login?token=${token}&userName=${CURRENT_USER.userName}"> <a href="${EMRMEDICALRECORD_URLHEAD}/login?token=${token}&userName=${CURRENT_USER.userName}">
<div class="backgroupImgDiv green rightDefaultImg_bg"> <div class="backgroupImgDiv red rightDefaultImg_bg">
<div class="rightImgDiv"> <div class="rightImgDiv">
<img class="rightImg" src="${path}/static/images/门户页面/u136.png"/> <img class="rightImg" src="${path}/static/images/门户页面/u136.png"/>
</div> </div>
@ -251,66 +280,22 @@
</a> </a>
</div> </div>
</c:if> </c:if>
<%--<c:if test="${emr_apply_copy == 1}"> <c:if test="${emr_recovery == 1}">
<div class="iconContext left"> <div class="iconContext left">
<a href="${EMRAPPLYCOPY_URLHEAD}/auth/login?token=${token}&userName=${CURRENT_USER.userName}"> <a href="${EMR_RECOVERY}" target="_blank">
<!-- Unnamed (矩形) --> <div class="backgroupImgDiv red rightDefaultImg_bg">
<div id="u146" class="ax_default sticky_3"> <div class="rightImgDiv">
<div id="u146_div" class=""></div> <img class="rightImg" src="${path}/static/images/门户页面/u138.png"/>
<!-- Unnamed () -->
<div id="u147" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div>
<!-- Unnamed (形状) -->
<div id="u148" class="ax_default icon">
<img id="u148_img" class="img " src="${path}/static/images/门户页面/u149.png"/>
<!-- Unnamed () -->
<div id="u149" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div> </div>
<div class="rightTitleDiv">
<div class="rightTitle">
<span>病案回收系统</span>
</div> </div>
<!-- Unnamed (矩形) -->
<div id="u150" class="ax_default _二级标题">
<div id="u150_div" class=""></div>
<!-- Unnamed () -->
<div id="u151" class="text" style="visibility: visible;text-align: center">
<p><span>病案复印预约</span></p>
</div> </div>
</div> </div>
</a> </a>
</div> </div>
</c:if> </c:if>
<c:if test="${emr_files == 1}">
<div class="iconContext left">
<a href="${EMRFILES_URLHEAD}/login?token=${token}&userName=${CURRENT_USER.userName}">
<!-- Unnamed (矩形) -->
<div id="u1461" class="ax_default sticky_3">
<div id="u1461_div" class=""></div>
<!-- Unnamed () -->
<div id="u1471" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div>
<!-- Unnamed (形状) -->
<div id="u1481" class="ax_default icon">
<img id="u1481_img" class="img " src="${path}/static/images/门户页面/u148.png"/>
<!-- Unnamed () -->
<div id="u1491" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div>
<!-- Unnamed (矩形) -->
<div id="u1501" class="ax_default _二级标题">
<div id="u1501_div" class=""></div>
<!-- Unnamed () -->
<div id="u1511" class="text" style="visibility: visible;text-align: center">
<p><span>病案签收</span></p>
</div>
</div>
</a>
</div>
</c:if>--%>
</div> </div>
</section> </section>
</div> </div>

3
power-admin/src/main/webapp/static/css/gatewayPageStyles.css
Unescape Escape View File

@ -78,6 +78,9 @@
.green{ .green{
background-color: rgba(0, 128, 0, 1); background-color: rgba(0, 128, 0, 1);
} }
.red{
background-color: rgb(248, 5, 5);
}
.orange{ .orange{
background-color: rgba(255, 102, 0, 1); background-color: rgba(255, 102, 0, 1);
} }

1
power-dao/src/main/resources/mapper/PowerMapper.xml
Unescape Escape View File

@ -86,7 +86,6 @@
<if test="key != null and key != ''"> <if test="key != null and key != ''">
and (power_user.name LIKE '%${key}%' OR power_user.user_name LIKE '%${key}%') and (power_user.name LIKE '%${key}%' OR power_user.user_name LIKE '%${key}%')
</if> </if>
group by self_id
</select> </select>
<select id="getRoleTree" resultMap="BaseResultMap"> <select id="getRoleTree" resultMap="BaseResultMap">
select 1 as level,0 as parent_id,power_sys_dict.hospital_name name,power_sys_dict.hospital_name new_name,null as select 1 as level,0 as parent_id,power_sys_dict.hospital_name name,power_sys_dict.hospital_name new_name,null as

Write Preview
Loading…
Cancel
Save