From c8d6529a41e883180d3609e24cff99be33cd2625 Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Sat, 7 Oct 2023 15:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=97=85=E6=A1=88=E5=9B=9E?=
=?UTF-8?q?=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/manage/controller/PageController.java | 21 ++
.../controller/Power_Sys_DictController.java | 1 +
.../main/resources/config/config.properties | 2 +
.../WEB-INF/views/gatewayDir/gatewayIndex.jsp | 219 ++++++++----------
.../webapp/static/css/gatewayPageStyles.css | 3 +
.../src/main/resources/mapper/PowerMapper.xml | 1 -
6 files changed, 129 insertions(+), 118 deletions(-)
diff --git a/power-admin/src/main/java/com/manage/controller/PageController.java b/power-admin/src/main/java/com/manage/controller/PageController.java
index a62a2bc..5656f98 100644
--- a/power-admin/src/main/java/com/manage/controller/PageController.java
+++ b/power-admin/src/main/java/com/manage/controller/PageController.java
@@ -46,6 +46,9 @@ public class PageController {
@Value("${EMRFILES_URLHEAD}")
private String EMRFILES_URLHEAD;
+ @Value("${EMR_RECOVERY}")
+ private String EMR_RECOVERY;
+
@Value("${WEBSOCKET_URLHEAD}")
private String WEBSOCKET_URLHEAD;
@Value("${STR_SPLIT}")
@@ -109,6 +112,8 @@ public class PageController {
model.addAttribute("EMRAPPLYCOPY_URLHEAD",EMRAPPLYCOPY_URLHEAD);
model.addAttribute("EMRFILES_URLHEAD",EMRFILES_URLHEAD);
+ model.addAttribute("EMR_RECOVERY", EMR_RECOVERY);
+
model.addAttribute("WEBSOCKET_URLHEAD",WEBSOCKET_URLHEAD);
model.addAttribute("STR_SPLIT",STR_SPLIT);
@@ -144,11 +149,13 @@ public class PageController {
int power = 0;
int emr_medical_record = 0;
int emr_record = 0;
+ int emr_recovery = 0;
int emr_apply_copy = 0;
int emr_files = 0;
int power1 = 0;
int emr_medical_record1 = 0;
int emr_record1 = 0;
+ int emr_recovery1 = 0;
int emr_apply_copy1 = 0;
int emr_files1 = 0;
if(null != sysList && !sysList.isEmpty()){
@@ -178,6 +185,10 @@ public class PageController {
emr_files1 = 1;
continue;
}
+ if ("emr_recovery".equals(sysFlag)) {
+ emr_recovery1 = 1;
+ continue;
+ }
}
}
}
@@ -204,6 +215,10 @@ public class PageController {
emr_files = 1;
continue;
}
+ if ("emr_recovery".equals(sysFlag)) {
+ emr_recovery = 1;
+ continue;
+ }
}
}
}
@@ -232,7 +247,13 @@ public class PageController {
}else{
emr_files = 0;
}
+ if(emr_recovery == 1 && emr_recovery1 == 1){
+ emr_recovery = 1;
+ }else{
+ emr_recovery = 0;
+ }
model.addAttribute("power",power);
+ model.addAttribute("emr_recovery",emr_recovery);
model.addAttribute("emr_medical_record",emr_medical_record);
model.addAttribute("emr_record",emr_record);
model.addAttribute("emr_apply_copy",emr_apply_copy);
diff --git a/power-admin/src/main/java/com/manage/controller/Power_Sys_DictController.java b/power-admin/src/main/java/com/manage/controller/Power_Sys_DictController.java
index 15f635b..6ba3095 100644
--- a/power-admin/src/main/java/com/manage/controller/Power_Sys_DictController.java
+++ b/power-admin/src/main/java/com/manage/controller/Power_Sys_DictController.java
@@ -300,6 +300,7 @@ public class Power_Sys_DictController {
sysTypes.add("档案管理系统");
sysTypes.add("档案归档系统");
sysTypes.add("复印预约系统");
+ sysTypes.add("病案回收系统");
sysTypes.add("科研系统");
sysTypes.add("其它");
model.addAttribute("sysTypes",sysTypes);
diff --git a/power-admin/src/main/resources/config/config.properties b/power-admin/src/main/resources/config/config.properties
index f2b7e59..dd4eb07 100644
--- a/power-admin/src/main/resources/config/config.properties
+++ b/power-admin/src/main/resources/config/config.properties
@@ -57,6 +57,8 @@ EMRFILES__SYSFLAG = emr_files
#emr_files病案签收的服务器地址头
EMRFILES_URLHEAD = http://${EMRFILES_IP}:${EMRFILES_PORT}/${EMRFILES__SYSFLAG}
#####################################################其他##############################################
+#病案回收地址系统
+EMR_RECOVERY=https://192.168.16.85:9012/recycle
#webSocket服务器地址
WEBSOCKET_URLHEAD = ${POWER_IP}:8088
#通知字符串间隔符
diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
index 0784387..d157181 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
@@ -13,51 +13,59 @@
var path = "${path}";
@@ -112,32 +132,40 @@
+