shiyang / regional-platform

Download as
Browse Code »

Commit b58dab0028255af64fd9b464eaa1ffac59b7ea1a

Authored by jiangjiazhi
1 parent 63482a618b
Exists in master and in 1 other branch nobuildprocess

修改产检删除

Showing 2 changed files with 25 additions and 5 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/EmergenceTreatmentService.java View file @ b58dab0
... ... @@ -30,7 +30,7 @@
30 30 }
31 31  
32 32 public void updateEmergenceTreatmentModel(EmergenceTreatmentModel obj,String id){
33   - emergenceTreatmentDao.updateEmergenceTreatmentModel(obj,id);
  33 + emergenceTreatmentDao.updateEmergenceTreatmentModel(obj, id);
34 34 }
35 35  
36 36 public void deleteEmergenceTreatmentModel(String id){
... ... @@ -45,6 +45,13 @@
45 45 }
46 46 return emergenceTreatmentDao.queryEmergenceTreatmentModel(mongoQuery.addOrder(Sort.Direction.DESC, "id"));
47 47 }
48   -
  48 + public List<EmergenceTreatmentModel> queryEmergenceTreatmentModel(EmergenceTreatmentQuery query,String field){
  49 + MongoQuery mongoQuery =query.convertToQuery();
  50 + if (StringUtils.isNotEmpty(query.getNeed())){
  51 + query.mysqlBuild(emergenceTreatmentDao.queryEmergenceTreatmentModelCount(query.convertToQuery()));
  52 + mongoQuery.start(query.getOffset()).end(query.getLimit());
  53 + }
  54 + return emergenceTreatmentDao.queryEmergenceTreatmentModel(mongoQuery.addOrder(Sort.Direction.DESC, field));
  55 + }
49 56 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java View file @ b58dab0
1 1 package com.lyms.platform.operate.web.controller;
2 2  
3 3 import com.lyms.platform.biz.dal.LisCrisisItemDao;
  4 +import com.lyms.platform.biz.service.EmergenceTreatmentService;
4 5 import com.lyms.platform.biz.service.LisCrisisItemService;
5 6 import com.lyms.platform.common.annotation.TokenRequired;
6 7 import com.lyms.platform.common.base.BaseController;
7 8  
... ... @@ -9,7 +10,9 @@
9 10 import com.lyms.platform.common.utils.DateUtil;
10 11 import com.lyms.platform.common.utils.JsonUtil;
11 12 import com.lyms.platform.common.utils.ResultUtils;
  13 +import com.lyms.platform.pojo.EmergenceTreatmentModel;
12 14 import com.lyms.platform.pojo.LisCrisisItem;
  15 +import com.lyms.platform.query.EmergenceTreatmentQuery;
13 16 import com.lyms.platform.query.LisCrisisItemQuery;
14 17 import org.apache.commons.collections.CollectionUtils;
15 18 import org.springframework.beans.factory.annotation.Autowired;
16 19  
... ... @@ -32,8 +35,9 @@
32 35  
33 36 @Autowired
34 37 private LisCrisisItemService lisCrisisItemService;
  38 +
35 39 @Autowired
36   - private LisCrisisItemDao lisCrisisItemDao;
  40 + private EmergenceTreatmentService emergenceTreatmentService;
37 41  
38 42  
39 43 @RequestMapping(value = "/lisCrisisItems", method = RequestMethod.GET)
... ... @@ -98,8 +102,17 @@
98 102 map.put("serviceStatus",data.getServiceStatus());
99 103 map.put("lastMenses",data.getLastMenses().getTime());
100 104 map.put("week",data.getWeek());
101   - map.put("pId",data.getPid());
102   - map.put("patientId",data.getPatientId());
  105 + map.put("pId", data.getPid());
  106 + map.put("patientId", data.getPatientId());
  107 + EmergenceTreatmentQuery emergenceTreatmentQuery=new EmergenceTreatmentQuery();
  108 + emergenceTreatmentQuery.setEmergenceId(data.getId());
  109 + List<EmergenceTreatmentModel> models= emergenceTreatmentService.queryEmergenceTreatmentModel(emergenceTreatmentQuery,"created");
  110 + Long lastTime=null;
  111 + if(CollectionUtils.isNotEmpty(models)){
  112 + lastTime= models.get(0).getCreated().getTime();
  113 + }
  114 +
  115 + map.put("lastTime", lastTime);
103 116 list.add(map);
104 117 }
105 118 }