From c6e0d69af08d4ca0fab5a5c63a8c199de316394f Mon Sep 17 00:00:00 2001 From: landong2015 Date: Wed, 19 Oct 2016 20:01:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/common/enums/PatientStatusEnum.java | 56 ++++++++++++++++++++++ .../web/controller/EmergenceController.java | 14 +++--- 2 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/PatientStatusEnum.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientStatusEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientStatusEnum.java new file mode 100644 index 0000000..6fdf8ea --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientStatusEnum.java @@ -0,0 +1,56 @@ +package com.lyms.platform.common.enums; + +/** + * Created by Administrator on 2016/10/19 0019. + */ +public enum PatientStatusEnum { + + daichuli(1,"待处理"), + chulizhong(2,"处理中"), + qita(3, "其它"), + yihuifu(4, "已恢复"), + yizhuanyuan(5, "已转院") + ; + + private PatientStatusEnum(Integer id, String title) { + this.id = id; + this.title = title; + } + + public static String getTitle(Integer id) { + for (PatientStatusEnum e:values()) { + if (e.getId() == id) { + return e.getTitle(); + } + } + return ""; + } + + public static PatientStatusEnum getEnum(Integer id) { + for (PatientStatusEnum e:values()) { + if (e.getId() == id) { + return e; + } + } + return null; + } + + private Integer id; + private String title; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmergenceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmergenceController.java index a262093..d8a270a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmergenceController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmergenceController.java @@ -6,6 +6,7 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.PatientStatusEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; @@ -74,12 +75,12 @@ public class EmergenceController extends BaseController{ //拿到登录用户的ID LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Users users = usersService.getUsers(loginState.getId()); +/* Users users = usersService.getUsers(loginState.getId()); if (users==null || users.getYn()==YnEnums.NO.getId()){ map.put("errorcode",ErrorCodeConstants.PARAMETER_ERROR); map.put("errormsg","用户不存在"); return; - } + }*/ //提交处理意见 EmergenceTreatmentModel model = new EmergenceTreatmentModel(); @@ -88,20 +89,21 @@ public class EmergenceController extends BaseController{ model.setCreated(new Date()); model.setModified(new Date()); - model.setDoctorName(users.getName()); +// model.setDoctorName(users.getName()); + model.setDoctorName("王大伟"); model.setContent(content); //修改危急信息的状态和处理信息的状态 LisCrisisItem lisCrisisItem = new LisCrisisItem(); lisCrisisItem.setId(emergenceId); - //当状态code和状态名称,危急信息的Messages不为null时,修改危急信息数据 + if (status!=null){ lisCrisisItem.setStatus(status); model.setStatus(status); } if (StringUtils.isNotEmpty(statusName)) { - lisCrisisItem.setStatusName(statusName); - model.setStatusName(statusName); + lisCrisisItem.setStatusName(PatientStatusEnum.getTitle(status)); + model.setStatusName(PatientStatusEnum.getTitle(status)); } emergenceTreatmentService.addEmergenceTreatmentModel(model); -- 1.8.3.1