From e7f9e7ed396c55d64c57a1f40fb2005f997be98b Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Wed, 19 Oct 2016 20:43:17 +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

---
 .../lyms/platform/query/LisCrisisItemQuery.java    | 12 ++++++++++++
 .../web/controller/LisCrisisItemController.java    | 22 ++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
index fd8bcfc..1346240 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
@@ -33,6 +33,15 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue
     private Integer serviceStatus;
     private Integer startWeek;
     private Integer endWeek;
+    private Integer age;
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
 
     public String getPatientName() {
         return patientName;
@@ -233,6 +242,9 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue
         if(null!=endWeek){
             condition=condition.and("week",endWeek,MongoOper.LTE);
         }
+        if(null!=age){
+            condition=condition.and("age",age,MongoOper.IS);
+        }
 
         return condition.toMongoQuery();
     }
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 fbbf94e..6ebbad0 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
@@ -37,13 +37,23 @@ public class LisCrisisItemController {
     public void getEmergenceTreatments(HttpServletResponse response,
                                        @RequestParam("page") int page,
                                        @RequestParam("limit") int limit,
-                                       @RequestParam(value = "id",required = false) String id
+                                       @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
     ){
         LisCrisisItemQuery query = new LisCrisisItemQuery();
         query.setSort("publishTime desc");
         query.setPage(page);
         query.setLimit(limit);
         query.setId(id);
+        query.setCardNo(cardNo);
+        query.setPhone(phone);
+        query.setAge(age);
+        query.setStartWeek(startWeek);
+        query.setEndWeek(endWeek);
         List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
 
         List<Map> list = new ArrayList<>();
@@ -55,7 +65,6 @@ public class LisCrisisItemController {
                 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());
@@ -69,6 +78,15 @@ public class LisCrisisItemController {
                 map.put("publishTime", DateUtil.getSecond(data.getPublishTime()));
                 map.put("status",data.getStatus());
                 map.put("statusName",data.getStatusName());
+
+                map.put("patientName",data.getStatusName());
+                map.put("cardNo",data.getStatusName());
+                map.put("phone",data.getStatusName());
+                map.put("serviceType",data.getStatusName());
+                map.put("serviceStatus",data.getStatusName());
+                map.put("lastMenses",DateUtil.getSecond(data.getLastMenses()));
+                map.put("week",data.getWeek());
+
                 list.add(map);
             }
             ResultUtils.buildSuccessResultAndWrite(response, list);
-- 
1.8.3.1