Commit fd69105d6570a8513a598bf7c24ade70f8e1610d
1 parent
1d1af3056b
Exists in
master
and in
8 other branches
提交代码
Showing 1 changed file with 9 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmergenceController.java
View file @
fd69105
... | ... | @@ -72,13 +72,14 @@ |
72 | 72 | // } |
73 | 73 | |
74 | 74 | //拿到登录用户的ID |
75 | -/* LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
75 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
76 | 76 | Users users = usersService.getUsers(loginState.getId()); |
77 | 77 | if (users==null || users.getYn()==YnEnums.NO.getId()){ |
78 | + Map<String,Object> map = new HashMap<>(); | |
78 | 79 | map.put("errorcode",ErrorCodeConstants.PARAMETER_ERROR); |
79 | 80 | map.put("errormsg","用户不存在"); |
80 | 81 | return; |
81 | - }*/ | |
82 | + } | |
82 | 83 | |
83 | 84 | //提交处理意见 |
84 | 85 | EmergenceTreatmentModel model = new EmergenceTreatmentModel(); |
... | ... | @@ -87,8 +88,8 @@ |
87 | 88 | model.setCreated(new Date()); |
88 | 89 | model.setModified(new Date()); |
89 | 90 | |
90 | -// model.setDoctorName(users.getName()); | |
91 | - model.setDoctorName("王大伟"); | |
91 | + model.setDoctorName(users.getName()); | |
92 | +// model.setDoctorName("王大伟"); | |
92 | 93 | |
93 | 94 | model.setContent(content); |
94 | 95 | //修改危急信息的状态和处理信息的状态 |
... | ... | @@ -141,9 +142,9 @@ |
141 | 142 | // return; |
142 | 143 | // } |
143 | 144 | // } |
144 | - System.out.println("id....................... : " + emergenceTreatmentRequest.getId() ); | |
145 | - System.out.println("page....................... : " + emergenceTreatmentRequest.getPage() ); | |
146 | - System.out.println("limit....................... : " + emergenceTreatmentRequest.getLimit() ); | |
145 | +// System.out.println("id....................... : " + emergenceTreatmentRequest.getId() ); | |
146 | +// System.out.println("page....................... : " + emergenceTreatmentRequest.getPage() ); | |
147 | +// System.out.println("limit....................... : " + emergenceTreatmentRequest.getLimit() ); | |
147 | 148 | //查询满足条件的数据 |
148 | 149 | EmergenceTreatmentQuery query = new EmergenceTreatmentQuery(); |
149 | 150 | query.setEmergenceId(emergenceTreatmentRequest.getId()); |
... | ... | @@ -164,7 +165,7 @@ |
164 | 165 | emergence.put("statusName", data.getStatusName()); |
165 | 166 | emergence.put("lisCrisisItemId", data.getEmergenceId()); |
166 | 167 | emergence.put("doctorName", data.getDoctorName()); |
167 | - emergence.put("created", DateUtil.getSecond(data.getCreated())); | |
168 | + emergence.put("created", data.getCreated().getTime()); | |
168 | 169 | list.add(emergence); |
169 | 170 | } |
170 | 171 | } |