fangcheng / regional-platform

Download as
Browse Code »

Commit 2c719948b0ce70daf39c49a4e51e3f7955c6527c

Authored by jiangjiazhi
1 parent 96f6eb04c1
Exists in master and in 1 other branch nobuildprocess

修改产检删除

Showing 1 changed file with 44 additions and 40 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java View file @ 2c71994
... ... @@ -26,9 +26,8 @@
26 26 import java.util.*;
27 27  
28 28 /**
29   - *
30   - * 危急管理列表
31   - *
  29 + * 危急管理列表
  30 + * <p/>
32 31 * Created by Administrator on 2016/10/19 0019.
33 32 */
34 33 @Controller
... ... @@ -46,17 +45,17 @@
46 45 public void getEmergenceTreatments(HttpServletResponse response,
47 46 @RequestParam("page") int page,
48 47 @RequestParam("limit") int limit,
49   - @RequestParam(value = "id",required = false) String id,
50   - @RequestParam(value = "cardNo",required = false) String cardNo,
51   - @RequestParam(value = "phone",required = false) String phone,
52   - @RequestParam(value = "age",required = false) Integer age,
53   - @RequestParam(value = "startWeek",required = false) Integer startWeek,
54   - @RequestParam(value = "endWeek",required = false) Integer endWeek,
55   - @RequestParam(value = "name",required = false) String name,
56   - @RequestParam(value = "status",required = false) Integer status,
57   - @RequestParam(value = "refer",required = false) String refer,
58   - @RequestParam(value = "doctor",required = false) String doctor
59   - ){
  48 + @RequestParam(value = "id", required = false) String id,
  49 + @RequestParam(value = "cardNo", required = false) String cardNo,
  50 + @RequestParam(value = "phone", required = false) String phone,
  51 + @RequestParam(value = "age", required = false) Integer age,
  52 + @RequestParam(value = "startWeek", required = false) Integer startWeek,
  53 + @RequestParam(value = "endWeek", required = false) Integer endWeek,
  54 + @RequestParam(value = "name", required = false) String name,
  55 + @RequestParam(value = "status", required = false) Integer status,
  56 + @RequestParam(value = "refer", required = false) String refer,
  57 + @RequestParam(value = "doctor", required = false) String doctor
  58 + ) {
60 59 LisCrisisItemQuery query = new LisCrisisItemQuery();
61 60 query.setPage(page);
62 61 query.setLimit(limit);
63 62  
64 63  
... ... @@ -75,34 +74,39 @@
75 74  
76 75 List<Map> list = new ArrayList<>();
77 76  
78   - if (CollectionUtils.isNotEmpty(lisCrisisItemList)){
79   - for (LisCrisisItem data : lisCrisisItemList){
80   - Map<String,Object> map = new HashMap<>();
81   - map.put("id",data.getId());
82   - map.put("hospitalId",data.getHospitalId());
83   - map.put("name",data.getName());
84   - map.put("age",data.getAge());
85   - map.put("itemCode",data.getItemCode());
86   - map.put("itemName",data.getItemName());
87   - map.put("classify",data.getClassify());
88   - map.put("classifyName",data.getClassifyName());
89   - map.put("flag",data.getFlag());
90   - map.put("ref",data.getRef());
91   - map.put("result",data.getResult());
92   - map.put("unit",data.getUnit());
93   - map.put("applyDoctorCode",data.getApplyDoctorCode());
94   - map.put("applyDoctorName",data.getApplyDoctorName());
  77 + if (CollectionUtils.isNotEmpty(lisCrisisItemList)) {
  78 + for (LisCrisisItem data : lisCrisisItemList) {
  79 + Map<String, Object> map = new HashMap<>();
  80 + map.put("id", data.getId());
  81 + map.put("hospitalId", data.getHospitalId());
  82 + map.put("name", data.getName());
  83 + map.put("age", data.getAge());
  84 + map.put("itemCode", data.getItemCode());
  85 + map.put("itemName", data.getItemName());
  86 + map.put("classify", data.getClassify());
  87 + map.put("classifyName", data.getClassifyName());
  88 + map.put("flag", data.getFlag());
  89 + map.put("ref", data.getRef());
  90 + map.put("result", data.getResult());
  91 + map.put("unit", data.getUnit());
  92 + map.put("applyDoctorCode", data.getApplyDoctorCode());
  93 + map.put("applyDoctorName", data.getApplyDoctorName());
95 94 map.put("publishTime", DateUtil.getyyyy_MM_dd(data.getPublishTime()));
96   - map.put("status",data.getStatus());
97   - map.put("statusName",data.getStatusName());
  95 + map.put("status", data.getStatus());
  96 + map.put("statusName", data.getStatusName());
98 97  
99   - map.put("patientName",data.getPatientName());
100   - map.put("cardNo",data.getCardNo());
101   - map.put("phone",data.getPhone());
102   - map.put("serviceType",data.getServiceType());
103   - map.put("serviceStatus",data.getServiceStatus());
104   - map.put("lastMenses",data.getLastMenses().getTime());
105   - map.put("week",data.getWeek());
  98 + map.put("patientName", data.getPatientName());
  99 + map.put("cardNo", data.getCardNo());
  100 + map.put("phone", data.getPhone());
  101 + map.put("serviceType", data.getServiceType());
  102 + map.put("serviceStatus", data.getServiceStatus());
  103 + map.put("lastMenses", data.getLastMenses().getTime());
  104 +
  105 + if (data.getWeek() > 42) {
  106 + map.put("week", "已分娩");
  107 + } else {
  108 + map.put("week", data.getWeek() + "周");
  109 + }
106 110 map.put("pId", data.getPid());
107 111 map.put("patientId", data.getPatientId());
108 112