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 24d2de1..e632042 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
@@ -6,9 +6,7 @@ import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.result.CommonResult;
-import com.lyms.platform.common.utils.DateUtil;
-import com.lyms.platform.common.utils.ResultUtils;
-import com.lyms.platform.common.utils.StringUtils;
+import com.lyms.platform.common.utils.*;
 import com.lyms.platform.pojo.LisCrisisItem;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.query.LisCrisisItemQuery;
@@ -16,11 +14,13 @@ import com.lyms.platform.query.PatientsQuery;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestHeader;
 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.text.MessageFormat;
 import java.util.*;
 
 /**
@@ -45,7 +45,7 @@ public class LisCrisisItemController extends BaseController {
     public void getEmergenceTreatments(HttpServletResponse response,
                                        @RequestParam("page") int page,
                                        @RequestParam("limit") int limit,
-                                       @RequestParam(value = "queryNo",required = false) String queryNo,
+                                       @RequestParam(value = "queryNo", required = false) String queryNo,
                                        @RequestParam(value = "id", required = false) String id,
                                        @RequestParam(value = "cardNo", required = false) String cardNo,
                                        @RequestParam(value = "phone", required = false) String phone,
@@ -82,7 +82,7 @@ public class LisCrisisItemController extends BaseController {
 
         if (CollectionUtils.isNotEmpty(patientses)) {
             List<String> parentIds = new LinkedList<>();
-            for(Patients pa:patientses){
+            for (Patients pa : patientses) {
                 parentIds.add(pa.getId());
             }
             query.setParentIds(parentIds);
@@ -118,7 +118,7 @@ public class LisCrisisItemController extends BaseController {
                 map.put("phone", data.getPhone());
                 map.put("serviceType", data.getServiceType());
                 map.put("serviceStatus", data.getServiceStatus());
-                map.put("lastMenses", data.getLastMenses() ==null ?0:data.getLastMenses().getTime());
+                map.put("lastMenses", data.getLastMenses() == null ? 0 : data.getLastMenses().getTime());
 
                 if (data.getWeek() >= 42) {
                     map.put("week", "已分娩");
@@ -136,26 +136,63 @@ public class LisCrisisItemController extends BaseController {
         result.setList(list);
         result.setPageInfo(query.getPageInfo());
         ResultUtils.buildSuccessResultAndWrite(response, result);
-        //        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);
+    }
 
+    /**
+     * 获取该医院的危机数据
+     *
+     * @param response
+     * @param page
+     * @param limit
+     * @param lasttime
+     * @param token
+     */
+    public void fuckUm(HttpServletResponse response,
+                       @RequestParam(value = "page", defaultValue = "1") Integer page,
+                       @RequestParam(value = "limit", defaultValue = "15") Integer limit,
+                       @RequestParam(value = "lasttime") Long lasttime,
+                       @RequestHeader("Authorization") String token) {
+
+        if (!"3d19960bf3e81e7d816c4f26051c49ba".equals(token)) {
+            ExceptionUtils.catchException("The request token is " + token);
+            writeString(response, "Token is error");
+            return;
+        }
 
-    }
+        LisCrisisItemQuery query = new LisCrisisItemQuery();
+        query.setPage(page);
+        query.setLimit(limit);
+        query.setNeed("y");
+        query.setSort("id asc");
+        if (null != lasttime) {
+            query.setGteCreated(new Date(lasttime));
+            query.setGteModified(new Date(lasttime));
+        }
+
+        List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
+        List<Map> list = new ArrayList<>();
 
+        if (CollectionUtils.isNotEmpty(lisCrisisItemList)) {
+            for (LisCrisisItem data : lisCrisisItemList) {
+                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> content = new HashMap<>();
+                map.put("emergenceId", data.getId());
+                map.put("hospitalId", data.getHospitalId());
+                content.put("type", data.getItemName());
+                content.put("ref", data.getRef() + " " + data.getUnit());
+                content.put("real", data.getResult() + " " + data.getUnit());
+                map.put("content", JsonUtil.obj2JsonString(content));
+                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("patientId", data.getPatientId());
+                list.add(map);
+            }
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", list);
+        ResultUtils.buildSuccessResultAndWrite(response, map);
+    }
 }