shiyang / regional-platform

Download as
Browse Code »

Commit f142348c891387c743107633e6488d36114b036d

Authored by baohanddd
2 parents 947dc83c74 5665df7966
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmergenceController.java View file @ f142348
... ... @@ -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;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java View file @ f142348
1 1 package com.lyms.platform.operate.web.controller;
2 2  
3 3 import com.lyms.platform.biz.dal.LisCrisisItemDao;
4   -import com.lyms.platform.biz.dal.impl.LisCrisisItemDaoImpl;
5 4 import com.lyms.platform.biz.service.LisCrisisItemService;
6   -import com.lyms.platform.common.result.IdTextModel;
  5 +import com.lyms.platform.common.annotation.TokenRequired;
7 6 import com.lyms.platform.common.utils.DateUtil;
8 7 import com.lyms.platform.common.utils.ResultUtils;
9 8 import com.lyms.platform.pojo.LisCrisisItem;
10 9  
11 10  
... ... @@ -34,14 +33,17 @@
34 33  
35 34  
36 35 @RequestMapping(value = "/lisCrisisItems", method = RequestMethod.GET)
37   -// @TokenRequired
  36 + @TokenRequired
38 37 public void getEmergenceTreatments(HttpServletResponse response,
39 38 @RequestParam("page") int page,
40   - @RequestParam("limit") int limit){
  39 + @RequestParam("limit") int limit,
  40 + @RequestParam(value = "id",required = false) String id
  41 + ){
41 42 LisCrisisItemQuery query = new LisCrisisItemQuery();
42 43 query.setSort("publishTime desc");
43 44 query.setPage(page);
44 45 query.setLimit(limit);
  46 + query.setId(id);
45 47 List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
46 48  
47 49 List<Map> list = new ArrayList<>();