shiyang / regional-platform

Download as
Browse Code »

Commit 5665df7966dff01aaca4e8f0df06d92bc7077fc5

Authored by landong2015
1 parent 8c5c14b89d
Exists in master and in 1 other branch nobuildprocess

提交代码

Showing 1 changed file with 8 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmergenceController.java View file @ 5665df7
... ... @@ -55,15 +55,13 @@
55 55 * @param request
56 56 */
57 57 @RequestMapping(value = "/emergenceTreatments", method = RequestMethod.POST)
58   -// @TokenRequired
  58 + @TokenRequired
59 59 public void addDepartments(HttpServletRequest request,
60 60 HttpServletResponse response,
61 61 @RequestParam("id") String emergenceId,
62 62 @RequestParam("content") String content,
63 63 @RequestParam(value = "status",required = false) Integer status,
64   - @RequestParam(value = "statusName",required = false) String statusName,
65 64 @RequestParam(value = "message", required = false) String message) {
66   - Map<String, Object> map = new HashMap<>();
67 65 //判断emergenceId是否存在
68 66 LisCrisisItemQuery query = new LisCrisisItemQuery();
69 67 query.setId(emergenceId);
... ... @@ -74,8 +72,8 @@
74 72 }
75 73  
76 74 //拿到登录用户的ID
77   - LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
78   -/* Users users = usersService.getUsers(loginState.getId());
  75 +/* LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  76 + Users users = usersService.getUsers(loginState.getId());
79 77 if (users==null || users.getYn()==YnEnums.NO.getId()){
80 78 map.put("errorcode",ErrorCodeConstants.PARAMETER_ERROR);
81 79 map.put("errormsg","用户不存在");
82 80  
83 81  
... ... @@ -101,14 +99,13 @@
101 99 lisCrisisItem.setStatus(status);
102 100 model.setStatus(status);
103 101 }
104   - if (StringUtils.isNotEmpty(statusName)) {
105   - lisCrisisItem.setStatusName(PatientStatusEnum.getTitle(status));
106   - model.setStatusName(PatientStatusEnum.getTitle(status));
107   - }
108 102  
  103 + lisCrisisItem.setStatusName(PatientStatusEnum.getTitle(status));
  104 + model.setStatusName(PatientStatusEnum.getTitle(status));
  105 +
109 106 emergenceTreatmentService.addEmergenceTreatmentModel(model);
110 107  
111   - if (status!=null || StringUtils.isNotEmpty(statusName)){
  108 + if (status!=null){
112 109 lisCrisisItemService.updateLisCrisisItem(lisCrisisItem,lisCrisisItem.getId());
113 110 }
114 111  
... ... @@ -127,7 +124,7 @@
127 124 *
128 125 */
129 126 @RequestMapping(value = "/emergenceTreatments", method = RequestMethod.GET)
130   -// @TokenRequired
  127 + @TokenRequired
131 128 public void getEmergenceTreatments(HttpServletResponse response,
132 129 @Valid EmergenceTreatmentRequest emergenceTreatmentRequest) {
133 130 String emergenceId = null;