Commit c6e0d69af08d4ca0fab5a5c63a8c199de316394f
1 parent
40f3387fd0
Exists in
master
and in
8 other branches
提交代码
Showing 2 changed files with 64 additions and 6 deletions
platform-common/src/main/java/com/lyms/platform/common/enums/PatientStatusEnum.java
View file @
c6e0d69
| 1 | +package com.lyms.platform.common.enums; | |
| 2 | + | |
| 3 | +/** | |
| 4 | + * Created by Administrator on 2016/10/19 0019. | |
| 5 | + */ | |
| 6 | +public enum PatientStatusEnum { | |
| 7 | + | |
| 8 | + daichuli(1,"待处理"), | |
| 9 | + chulizhong(2,"处理中"), | |
| 10 | + qita(3, "其它"), | |
| 11 | + yihuifu(4, "已恢复"), | |
| 12 | + yizhuanyuan(5, "已转院") | |
| 13 | + ; | |
| 14 | + | |
| 15 | + private PatientStatusEnum(Integer id, String title) { | |
| 16 | + this.id = id; | |
| 17 | + this.title = title; | |
| 18 | + } | |
| 19 | + | |
| 20 | + public static String getTitle(Integer id) { | |
| 21 | + for (PatientStatusEnum e:values()) { | |
| 22 | + if (e.getId() == id) { | |
| 23 | + return e.getTitle(); | |
| 24 | + } | |
| 25 | + } | |
| 26 | + return ""; | |
| 27 | + } | |
| 28 | + | |
| 29 | + public static PatientStatusEnum getEnum(Integer id) { | |
| 30 | + for (PatientStatusEnum e:values()) { | |
| 31 | + if (e.getId() == id) { | |
| 32 | + return e; | |
| 33 | + } | |
| 34 | + } | |
| 35 | + return null; | |
| 36 | + } | |
| 37 | + | |
| 38 | + private Integer id; | |
| 39 | + private String title; | |
| 40 | + | |
| 41 | + public Integer getId() { | |
| 42 | + return id; | |
| 43 | + } | |
| 44 | + | |
| 45 | + public void setId(Integer id) { | |
| 46 | + this.id = id; | |
| 47 | + } | |
| 48 | + | |
| 49 | + public String getTitle() { | |
| 50 | + return title; | |
| 51 | + } | |
| 52 | + | |
| 53 | + public void setTitle(String title) { | |
| 54 | + this.title = title; | |
| 55 | + } | |
| 56 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmergenceController.java
View file @
c6e0d69
| ... | ... | @@ -6,6 +6,7 @@ |
| 6 | 6 | import com.lyms.platform.common.base.BaseController; |
| 7 | 7 | import com.lyms.platform.common.base.LoginContext; |
| 8 | 8 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 9 | +import com.lyms.platform.common.enums.PatientStatusEnum; | |
| 9 | 10 | import com.lyms.platform.common.enums.YnEnums; |
| 10 | 11 | import com.lyms.platform.common.utils.DateUtil; |
| 11 | 12 | import com.lyms.platform.common.utils.JsonUtil; |
| 12 | 13 | |
| ... | ... | @@ -74,12 +75,12 @@ |
| 74 | 75 | |
| 75 | 76 | //拿到登录用户的ID |
| 76 | 77 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 77 | - Users users = usersService.getUsers(loginState.getId()); | |
| 78 | +/* Users users = usersService.getUsers(loginState.getId()); | |
| 78 | 79 | if (users==null || users.getYn()==YnEnums.NO.getId()){ |
| 79 | 80 | map.put("errorcode",ErrorCodeConstants.PARAMETER_ERROR); |
| 80 | 81 | map.put("errormsg","用户不存在"); |
| 81 | 82 | return; |
| 82 | - } | |
| 83 | + }*/ | |
| 83 | 84 | |
| 84 | 85 | //提交处理意见 |
| 85 | 86 | EmergenceTreatmentModel model = new EmergenceTreatmentModel(); |
| 86 | 87 | |
| 87 | 88 | |
| ... | ... | @@ -88,20 +89,21 @@ |
| 88 | 89 | model.setCreated(new Date()); |
| 89 | 90 | model.setModified(new Date()); |
| 90 | 91 | |
| 91 | - model.setDoctorName(users.getName()); | |
| 92 | +// model.setDoctorName(users.getName()); | |
| 93 | + model.setDoctorName("王大伟"); | |
| 92 | 94 | |
| 93 | 95 | model.setContent(content); |
| 94 | 96 | //修改危急信息的状态和处理信息的状态 |
| 95 | 97 | LisCrisisItem lisCrisisItem = new LisCrisisItem(); |
| 96 | 98 | lisCrisisItem.setId(emergenceId); |
| 97 | - //当状态code和状态名称,危急信息的Messages不为null时,修改危急信息数据 | |
| 99 | + | |
| 98 | 100 | if (status!=null){ |
| 99 | 101 | lisCrisisItem.setStatus(status); |
| 100 | 102 | model.setStatus(status); |
| 101 | 103 | } |
| 102 | 104 | if (StringUtils.isNotEmpty(statusName)) { |
| 103 | - lisCrisisItem.setStatusName(statusName); | |
| 104 | - model.setStatusName(statusName); | |
| 105 | + lisCrisisItem.setStatusName(PatientStatusEnum.getTitle(status)); | |
| 106 | + model.setStatusName(PatientStatusEnum.getTitle(status)); | |
| 105 | 107 | } |
| 106 | 108 | |
| 107 | 109 | emergenceTreatmentService.addEmergenceTreatmentModel(model); |