diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/EmergenceTreatmentService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/EmergenceTreatmentService.java index 171ac95..0974596 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/EmergenceTreatmentService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/EmergenceTreatmentService.java @@ -30,7 +30,7 @@ public class EmergenceTreatmentService { } public void updateEmergenceTreatmentModel(EmergenceTreatmentModel obj,String id){ - emergenceTreatmentDao.updateEmergenceTreatmentModel(obj,id); + emergenceTreatmentDao.updateEmergenceTreatmentModel(obj, id); } public void deleteEmergenceTreatmentModel(String id){ @@ -45,5 +45,12 @@ public class EmergenceTreatmentService { } return emergenceTreatmentDao.queryEmergenceTreatmentModel(mongoQuery.addOrder(Sort.Direction.DESC, "id")); } - + public List queryEmergenceTreatmentModel(EmergenceTreatmentQuery query,String field){ + MongoQuery mongoQuery =query.convertToQuery(); + if (StringUtils.isNotEmpty(query.getNeed())){ + query.mysqlBuild(emergenceTreatmentDao.queryEmergenceTreatmentModelCount(query.convertToQuery())); + mongoQuery.start(query.getOffset()).end(query.getLimit()); + } + return emergenceTreatmentDao.queryEmergenceTreatmentModel(mongoQuery.addOrder(Sort.Direction.DESC, field)); + } } 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 e07d968..e641d1c 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 @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.biz.dal.LisCrisisItemDao; +import com.lyms.platform.biz.service.EmergenceTreatmentService; import com.lyms.platform.biz.service.LisCrisisItemService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; @@ -9,7 +10,9 @@ import com.lyms.platform.common.result.CommonResult; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.ResultUtils; +import com.lyms.platform.pojo.EmergenceTreatmentModel; import com.lyms.platform.pojo.LisCrisisItem; +import com.lyms.platform.query.EmergenceTreatmentQuery; import com.lyms.platform.query.LisCrisisItemQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -32,8 +35,9 @@ public class LisCrisisItemController extends BaseController { @Autowired private LisCrisisItemService lisCrisisItemService; + @Autowired - private LisCrisisItemDao lisCrisisItemDao; + private EmergenceTreatmentService emergenceTreatmentService; @RequestMapping(value = "/lisCrisisItems", method = RequestMethod.GET) @@ -98,8 +102,17 @@ public class LisCrisisItemController extends BaseController { map.put("serviceStatus",data.getServiceStatus()); map.put("lastMenses",data.getLastMenses().getTime()); map.put("week",data.getWeek()); - map.put("pId",data.getPid()); - map.put("patientId",data.getPatientId()); + map.put("pId", data.getPid()); + map.put("patientId", data.getPatientId()); + EmergenceTreatmentQuery emergenceTreatmentQuery=new EmergenceTreatmentQuery(); + emergenceTreatmentQuery.setEmergenceId(data.getId()); + List models= emergenceTreatmentService.queryEmergenceTreatmentModel(emergenceTreatmentQuery,"created"); + Long lastTime=null; + if(CollectionUtils.isNotEmpty(models)){ + lastTime= models.get(0).getCreated().getTime(); + } + + map.put("lastTime", lastTime); list.add(map); } }