From 5665df7966dff01aaca4e8f0df06d92bc7077fc5 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Wed, 19 Oct 2016 20:23:16 +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

---
 .../operate/web/controller/EmergenceController.java   | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

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 d8a270a..729465e 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
@@ -55,15 +55,13 @@ public class EmergenceController extends BaseController{
      * @param request
      */
     @RequestMapping(value = "/emergenceTreatments", method = RequestMethod.POST)
-//    @TokenRequired
+    @TokenRequired
     public void addDepartments(HttpServletRequest request,
                                HttpServletResponse response,
                                @RequestParam("id") String emergenceId,
                                @RequestParam("content") String content,
                                @RequestParam(value = "status",required = false) Integer status,
-                               @RequestParam(value = "statusName",required = false) String statusName,
                                @RequestParam(value = "message", required = false) String message) {
-        Map<String, Object> map = new HashMap<>();
         //判断emergenceId是否存在
         LisCrisisItemQuery query = new LisCrisisItemQuery();
         query.setId(emergenceId);
@@ -74,8 +72,8 @@ public class EmergenceController extends BaseController{
         }
 
         //拿到登录用户的ID
-        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-/*        Users users = usersService.getUsers(loginState.getId());
+/*        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        Users users = usersService.getUsers(loginState.getId());
         if (users==null || users.getYn()==YnEnums.NO.getId()){
             map.put("errorcode",ErrorCodeConstants.PARAMETER_ERROR);
             map.put("errormsg","用户不存在");
@@ -101,14 +99,13 @@ public class EmergenceController extends BaseController{
             lisCrisisItem.setStatus(status);
             model.setStatus(status);
         }
-        if (StringUtils.isNotEmpty(statusName)) {
-            lisCrisisItem.setStatusName(PatientStatusEnum.getTitle(status));
-            model.setStatusName(PatientStatusEnum.getTitle(status));
-        }
+
+        lisCrisisItem.setStatusName(PatientStatusEnum.getTitle(status));
+        model.setStatusName(PatientStatusEnum.getTitle(status));
 
         emergenceTreatmentService.addEmergenceTreatmentModel(model);
 
-        if (status!=null || StringUtils.isNotEmpty(statusName)){
+        if (status!=null){
             lisCrisisItemService.updateLisCrisisItem(lisCrisisItem,lisCrisisItem.getId());
         }
 
@@ -127,7 +124,7 @@ public class EmergenceController extends BaseController{
      *
      */
     @RequestMapping(value = "/emergenceTreatments", method = RequestMethod.GET)
-//    @TokenRequired
+    @TokenRequired
     public void getEmergenceTreatments(HttpServletResponse response,
                                        @Valid EmergenceTreatmentRequest emergenceTreatmentRequest) {
         String emergenceId = null;
-- 
1.8.3.1