From 40f3387fd099107a7ea45477eb62b3a0d21a7b7f Mon Sep 17 00:00:00 2001 From: landong2015 Date: Wed, 19 Oct 2016 19:48:51 +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 --- .../web/controller/EmergenceController.java | 65 ++++++++------ .../web/controller/LisCrisisItemController.java | 99 ++++++++++++++++++++++ 2 files changed, 140 insertions(+), 24 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java 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 273ed51..a262093 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 @@ -17,8 +17,10 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.EmergenceTreatmentModel; import com.lyms.platform.pojo.LisCrisisItem; import com.lyms.platform.query.EmergenceTreatmentQuery; +import com.lyms.platform.query.LisCrisisItemQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,15 +56,21 @@ public class EmergenceController extends BaseController{ @RequestMapping(value = "/emergenceTreatments", method = RequestMethod.POST) // @TokenRequired public void addDepartments(HttpServletRequest request, + HttpServletResponse response, @RequestParam("id") String emergenceId, @RequestParam("content") String content, - @RequestParam("status") String status, + @RequestParam(value = "status",required = false) Integer status, + @RequestParam(value = "statusName",required = false) String statusName, @RequestParam(value = "message", required = false) String message) { Map map = new HashMap<>(); //判断emergenceId是否存在 - LisCrisisItem crisisItem = new LisCrisisItem(); - crisisItem.setId(emergenceId); - + LisCrisisItemQuery query = new LisCrisisItemQuery(); + query.setId(emergenceId); + List lisCrisisItemList = lisCrisisItemService.query(query); + if (lisCrisisItemList.size()==0){ + ResultUtils.buildParameterErrorResultAndWrite(response,"危急ID不存在"); + return; + } //拿到登录用户的ID LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); @@ -73,7 +81,7 @@ public class EmergenceController extends BaseController{ return; } - // + //提交处理意见 EmergenceTreatmentModel model = new EmergenceTreatmentModel(); model.setEmergenceId(emergenceId); model.setYn(YnEnums.YES.getId()); @@ -82,16 +90,32 @@ public class EmergenceController extends BaseController{ model.setDoctorName(users.getName()); + model.setContent(content); //修改危急信息的状态和处理信息的状态 - + LisCrisisItem lisCrisisItem = new LisCrisisItem(); + lisCrisisItem.setId(emergenceId); //当状态code和状态名称,危急信息的Messages不为null时,修改危急信息数据 + if (status!=null){ + lisCrisisItem.setStatus(status); + model.setStatus(status); + } + if (StringUtils.isNotEmpty(statusName)) { + lisCrisisItem.setStatusName(statusName); + model.setStatusName(statusName); + } + emergenceTreatmentService.addEmergenceTreatmentModel(model); - //找到患者,拿到她的手机号,发送短信 + if (status!=null || StringUtils.isNotEmpty(statusName)){ + lisCrisisItemService.updateLisCrisisItem(lisCrisisItem,lisCrisisItem.getId()); + } + //找到患者,拿到她的手机号,发送短信 //找到患者对应的用户,发送推送 + ResultUtils.buildSuccessResultAndWrite(response); + } @@ -104,31 +128,24 @@ public class EmergenceController extends BaseController{ // @TokenRequired public void getEmergenceTreatments(HttpServletResponse response, @Valid EmergenceTreatmentRequest emergenceTreatmentRequest) { - -// EmergenceTreatmentModel model = new EmergenceTreatmentModel(); -// model.setYn(YnEnums.YES.getId()); -// model.setCreated(new Date()); -// model.setModified(new Date()); -// model.setEmergenceId("12345678"); -// model.setContent("快来检查"); -// model.setStatus(1); -// model.setStatusName("待处理"); -// model.setDoctorName("王医生"); -// emergenceTreatmentService.addEmergenceTreatmentModel(model); - - System.out.println("emergenceTreatmentService :" + emergenceTreatmentService); - - String emergenceId = null; if (StringUtils.isNotEmpty(emergenceTreatmentRequest.getId())){ //判断emergenceId是否存在 - emergenceId = emergenceTreatmentRequest.getId(); + LisCrisisItemQuery query = new LisCrisisItemQuery(); + query.setId(emergenceId); + List lisCrisisItemList = lisCrisisItemService.query(query); + if (lisCrisisItemList.size()==1){ + emergenceId = lisCrisisItemList.get(0).getId(); + }else { + ResultUtils.buildParameterErrorResultAndWrite(response,"危急ID不存在"); + return; + } } //查询满足条件的数据 EmergenceTreatmentQuery query = new EmergenceTreatmentQuery(); - query.setEmergenceId(emergenceTreatmentRequest.getId()); + query.setEmergenceId(emergenceId); query.setPage(emergenceTreatmentRequest.getPage()); query.setLimit(emergenceTreatmentRequest.getLimit()); query.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java new file mode 100644 index 0000000..68bf6d4 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java @@ -0,0 +1,99 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.biz.dal.LisCrisisItemDao; +import com.lyms.platform.biz.dal.impl.LisCrisisItemDaoImpl; +import com.lyms.platform.biz.service.LisCrisisItemService; +import com.lyms.platform.common.result.IdTextModel; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.ResultUtils; +import com.lyms.platform.pojo.LisCrisisItem; +import com.lyms.platform.query.LisCrisisItemQuery; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import javax.servlet.http.HttpServletResponse; +import java.util.*; + +/** + * + * 危急管理列表 + * + * Created by Administrator on 2016/10/19 0019. + */ +@Controller +public class LisCrisisItemController { + + @Autowired + private LisCrisisItemService lisCrisisItemService; + @Autowired + private LisCrisisItemDao lisCrisisItemDao; + + + @RequestMapping(value = "/lisCrisisItems", method = RequestMethod.GET) +// @TokenRequired + public void getEmergenceTreatments(HttpServletResponse response, + @RequestParam("page") int page, + @RequestParam("limit") int limit){ + LisCrisisItemQuery query = new LisCrisisItemQuery(); + query.setSort("publishTime desc"); + query.setPage(page); + query.setLimit(limit); + List lisCrisisItemList = lisCrisisItemService.query(query); + + List list = new ArrayList<>(); + + if (CollectionUtils.isNotEmpty(lisCrisisItemList)){ + for (LisCrisisItem data : lisCrisisItemList){ + Map map = new HashMap<>(); + map.put("id",data.getId()); + map.put("hospitalId",data.getHospitalId()); + map.put("name",data.getName()); + map.put("age",data.getAge()); + map.put("weeks",data.getWeeks()); + map.put("itemCode",data.getItemCode()); + map.put("itemName",data.getItemName()); + map.put("classify",data.getClassify()); + map.put("classifyName",data.getClassifyName()); + map.put("flag",data.getFlag()); + map.put("ref",data.getRef()); + map.put("result",data.getResult()); + map.put("unit",data.getUnit()); + map.put("applyDoctorCode",data.getApplyDoctorCode()); + map.put("applyDoctorName",data.getApplyDoctorName()); + map.put("publishTime", DateUtil.getSecond(data.getPublishTime())); + map.put("status",data.getStatus()); + map.put("statusName",data.getStatusName()); + list.add(map); + } + ResultUtils.buildSuccessResultAndWrite(response, list); + }else { + ResultUtils.buildParameterErrorResultAndWrite(response,"没有查询到数据"); + } + + // LisCrisisItem data = new LisCrisisItem(); +// data.setName("黄小希"); +// data.setAge(30); +// data.setWeeks("17+3"); +// data.setItemCode("123456789dfdsafsdafsdaf"); +// data.setItemName("血红蛋白"); +// data.setClassify("8"); +// data.setClassifyName("血常规"); +// data.setFlag("1"); +// data.setRef("120~200"); +// data.setResult("500"); +// data.setUnit("g/L"); +// data.setApplyDoctorCode("fsdfsdfsdaf4544fsdaf"); +// data.setApplyDoctorName("王大伟"); +// data.setPublishTime(new Date()); +// data.setStatus(1); +// data.setStatusName("待处理"); +// lisCrisisItemDao.addLisCrisisItem(data); + + + } + +} -- 1.8.3.1