From ca31018decd1299a4ea29600dcff342038768e00 Mon Sep 17 00:00:00 2001 From: fangcheng Date: Tue, 9 May 2017 11:23:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/base/common/dao/conf/DiagnoseConfMapper.xml | 3 ++- .../com/lyms/base/common/entity/conf/DiagnoseConf.java | 16 ++++++++++++++++ .../java/com/lyms/cm/controller/LoginController.java | 6 ------ .../webapp/WEB-INF/views/conf/diagnose/conf_edit.html | 6 ++++++ .../webapp/WEB-INF/views/conf/diagnose/conf_list.html | 3 +++ .../hospital.web/src/main/resources/dev/conf.properties | 2 +- 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseConfMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseConfMapper.xml index f9e6b2a..9ca6146 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseConfMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseConfMapper.xml @@ -8,6 +8,7 @@ + @@ -16,6 +17,6 @@ - ID AS id, SOURCE_ID AS sourceId, VERSION_ID AS versionId, NAME AS name, GROUPNAME AS groupname, GROUPORDER AS grouporder, ITEMORDER AS itemorder, ENABLE AS enable + ID AS id, SOURCE_ID AS sourceId, VERSION_ID AS versionId, NAME AS name, SIMPLE_CODE as simpleCode,GROUPNAME AS groupname, GROUPORDER AS grouporder, ITEMORDER AS itemorder, ENABLE AS enable diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java index 306cbfc..0739dd4 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java @@ -38,6 +38,14 @@ public class DiagnoseConf implements Serializable { */ @TableField(value="NAME") private String name; + + + /** + * 自定义高危显示名 + */ + @TableField(value="SIMPLE_CODE") + private String simpleCode; + /** * 自定义高危颜色编码 */ @@ -124,4 +132,12 @@ public class DiagnoseConf implements Serializable { this.enable = enable; } + public String getSimpleCode() { + return simpleCode; + } + + public void setSimpleCode(String simpleCode) { + this.simpleCode = simpleCode; + } + } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java index 45acc41..8443398 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java @@ -20,13 +20,10 @@ import com.lyms.base.common.entity.role.TreeNode; import com.lyms.base.common.entity.user.Users; import com.lyms.base.common.enums.PermissionEnum; import com.lyms.base.common.service.role.PermissionsService; -import com.lyms.base.common.service.user.UsersService; -import com.lyms.cm.controller.sys.SysUsersController; import com.lyms.constants.Constants; import com.lyms.shiro.ShiroWebUtils; import com.lyms.util.StrUtils; import com.lyms.web.controller.BaseController; -import com.qiniu.util.Json; @Controller public class LoginController extends BaseController { @@ -35,8 +32,6 @@ public class LoginController extends BaseController { @Autowired private PermissionsService sysPermissionsService; - @Autowired - private UsersService usersService; @RequestMapping("/") public String index(Model model) { @@ -84,7 +79,6 @@ public class LoginController extends BaseController { public String login(String username, String password, @RequestParam(value = "rememberMe", defaultValue = "0") int rememberMe, Model model) { String view = VIEW_LOGIN; - System.out.println(1243); if (StrUtils.isEmpty(username) || StrUtils.isEmpty(password)) { model.addAttribute(Constants.CAPTCHA_TOKEN, StrUtils.uuid()); return view; diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_edit.html index 6af887a..37c21d8 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_edit.html @@ -27,6 +27,12 @@
+ +
+ +
+
+
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_list.html index 25fc10a..dcb8238 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/conf/diagnose/conf_list.html @@ -80,6 +80,9 @@ var default_dataColumns = [{ field: 'name', title: '自定义诊断项名称' },{ + field: 'simpleCode', + title: '搜索简码' + },{ field: 'groupname', title: '诊断组名称' },{ diff --git a/parent/hospital.web/src/main/resources/dev/conf.properties b/parent/hospital.web/src/main/resources/dev/conf.properties index 0897aa1..3346a36 100644 --- a/parent/hospital.web/src/main/resources/dev/conf.properties +++ b/parent/hospital.web/src/main/resources/dev/conf.properties @@ -1,4 +1,4 @@ -token.prefix=token.user: +token.prefix=token.user.hospital: #\u4E2D\u5FC3\u64CD\u4F5C\u63A8\u9001\u5230\u8282\u70B9 -- 1.8.3.1