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 351884f..e51187e 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 @@ -72,13 +72,14 @@ public class EmergenceController extends BaseController{ // } //拿到登录用户的ID -/* LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Users users = usersService.getUsers(loginState.getId()); if (users==null || users.getYn()==YnEnums.NO.getId()){ + Map map = new HashMap<>(); map.put("errorcode",ErrorCodeConstants.PARAMETER_ERROR); map.put("errormsg","用户不存在"); return; - }*/ + } //提交处理意见 EmergenceTreatmentModel model = new EmergenceTreatmentModel(); @@ -87,8 +88,8 @@ public class EmergenceController extends BaseController{ model.setCreated(new Date()); model.setModified(new Date()); -// model.setDoctorName(users.getName()); - model.setDoctorName("王大伟"); + model.setDoctorName(users.getName()); +// model.setDoctorName("王大伟"); model.setContent(content); //修改危急信息的状态和处理信息的状态 @@ -141,9 +142,9 @@ public class EmergenceController extends BaseController{ // return; // } // } - System.out.println("id....................... : " + emergenceTreatmentRequest.getId() ); - System.out.println("page....................... : " + emergenceTreatmentRequest.getPage() ); - System.out.println("limit....................... : " + emergenceTreatmentRequest.getLimit() ); +// System.out.println("id....................... : " + emergenceTreatmentRequest.getId() ); +// System.out.println("page....................... : " + emergenceTreatmentRequest.getPage() ); +// System.out.println("limit....................... : " + emergenceTreatmentRequest.getLimit() ); //查询满足条件的数据 EmergenceTreatmentQuery query = new EmergenceTreatmentQuery(); query.setEmergenceId(emergenceTreatmentRequest.getId()); @@ -164,7 +165,7 @@ public class EmergenceController extends BaseController{ emergence.put("statusName", data.getStatusName()); emergence.put("lisCrisisItemId", data.getEmergenceId()); emergence.put("doctorName", data.getDoctorName()); - emergence.put("created", DateUtil.getSecond(data.getCreated())); + emergence.put("created", data.getCreated().getTime()); list.add(emergence); } }