From 2c719948b0ce70daf39c49a4e51e3f7955c6527c Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 8 Dec 2016 17:37:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/LisCrisisItemController.java | 84 +++++++++++----------- 1 file changed, 44 insertions(+), 40 deletions(-) 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 index 8d3aed2..b4a0d00 100644 --- 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 @@ -26,9 +26,8 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; /** - * - * 危急管理列表 - * + * 危急管理列表 + *

* Created by Administrator on 2016/10/19 0019. */ @Controller @@ -46,17 +45,17 @@ public class LisCrisisItemController extends BaseController { public void getEmergenceTreatments(HttpServletResponse response, @RequestParam("page") int page, @RequestParam("limit") int limit, - @RequestParam(value = "id",required = false) String id, - @RequestParam(value = "cardNo",required = false) String cardNo, - @RequestParam(value = "phone",required = false) String phone, - @RequestParam(value = "age",required = false) Integer age, - @RequestParam(value = "startWeek",required = false) Integer startWeek, - @RequestParam(value = "endWeek",required = false) Integer endWeek, - @RequestParam(value = "name",required = false) String name, - @RequestParam(value = "status",required = false) Integer status, - @RequestParam(value = "refer",required = false) String refer, - @RequestParam(value = "doctor",required = false) String doctor - ){ + @RequestParam(value = "id", required = false) String id, + @RequestParam(value = "cardNo", required = false) String cardNo, + @RequestParam(value = "phone", required = false) String phone, + @RequestParam(value = "age", required = false) Integer age, + @RequestParam(value = "startWeek", required = false) Integer startWeek, + @RequestParam(value = "endWeek", required = false) Integer endWeek, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "status", required = false) Integer status, + @RequestParam(value = "refer", required = false) String refer, + @RequestParam(value = "doctor", required = false) String doctor + ) { LisCrisisItemQuery query = new LisCrisisItemQuery(); query.setPage(page); query.setLimit(limit); @@ -75,34 +74,39 @@ public class LisCrisisItemController extends BaseController { 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("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()); + 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("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.getyyyy_MM_dd(data.getPublishTime())); - map.put("status",data.getStatus()); - map.put("statusName",data.getStatusName()); + map.put("status", data.getStatus()); + map.put("statusName", data.getStatusName()); - map.put("patientName",data.getPatientName()); - map.put("cardNo",data.getCardNo()); - map.put("phone",data.getPhone()); - map.put("serviceType",data.getServiceType()); - map.put("serviceStatus",data.getServiceStatus()); - map.put("lastMenses",data.getLastMenses().getTime()); - map.put("week",data.getWeek()); + map.put("patientName", data.getPatientName()); + map.put("cardNo", data.getCardNo()); + map.put("phone", data.getPhone()); + map.put("serviceType", data.getServiceType()); + map.put("serviceStatus", data.getServiceStatus()); + map.put("lastMenses", data.getLastMenses().getTime()); + + if (data.getWeek() > 42) { + map.put("week", "已分娩"); + } else { + map.put("week", data.getWeek() + "周"); + } map.put("pId", data.getPid()); map.put("patientId", data.getPatientId()); -- 1.8.3.1