From da97d1289ee3cfa2469bab5349ba53bf795d392b Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 17 Sep 2020 15:11:10 +0800 Subject: [PATCH] update --- .../operate/web/controller/BreastController.java | 13 +++++- .../platform/operate/web/facade/BreastFacade.java | 47 ++++++++++++++++++++-- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java index 362ff54..52de322 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.BreastFacade; import com.lyms.platform.operate.web.request.BreastRequest; import com.lyms.platform.query.BreastModelQuery; +import com.lyms.platform.query.FamilyPlanningModelQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -89,7 +90,17 @@ public class BreastController extends BaseController { return breastFacade.queryByIdEdit(id); } - + /** + * 查询单人所有记录 + * buildId + * @param + */ + @RequestMapping(value = "/queryOne", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryOne(BreastModelQuery breastModelQuery, HttpServletRequest request) { + return breastFacade.queryOne(breastModelQuery,getUserId(request)); + } /** * 管理列表 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java index 3ff3b00..59de519 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java @@ -15,19 +15,18 @@ import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.BreastRequest; import com.lyms.platform.operate.web.result.BabyHighRiskBabyResult; import com.lyms.platform.operate.web.result.BreastResult; +import com.lyms.platform.operate.web.result.FamilyPlanningResult; import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.BabyHighRiskBabyModel; -import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.pojo.BreastModel; -import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.BabyHighRiskBabyModelQuery; import com.lyms.platform.query.BasicConfigQuery; import com.lyms.platform.query.BreastModelQuery; +import com.lyms.platform.query.FamilyPlanningModelQuery; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -210,6 +209,46 @@ public class BreastFacade extends BaseServiceImpl { } return br; } + /** + * + 查询单人所有记录 + * @Author: 武涛涛 + * @Date: 2020/9/17 11:13 + */ + public BaseObjectResponse queryOne(BreastModelQuery babyQuery, Integer userId) { + + BaseObjectResponse br = new BaseObjectResponse(); + String hospitalId = autoMatchFacade.getHospitalId(userId); + List breastResultList = new ArrayList <>(); + + //单人多条专病记录 + List breastModelList = new ArrayList <>(); + + if (StringUtils.isNotEmpty(babyQuery.getParentId())) { + babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setHospitalId(hospitalId); + babyQuery.setSort("checkDate"); + breastModelList = breastService.queryOne(babyQuery); + + } + for (int i = 0; i < breastModelList.size(); i++) { + BreastModel breastModel = breastModelList.get(i); + BreastResult breastResult = new BreastResult(); + if (breastModel != null) { + breastResult.convertToResult(breastModel); + if (StringUtils.isNotEmpty(breastModel.getHospitalId())) { + breastResult.setHospitalName(CommonsHelper.getHospitalName(breastModel.getHospitalId(), organizationService)); + } + breastResultList.add(breastResult); + } + } + br.setData(breastResultList); + br.setPageInfo(babyQuery.getPageInfo()); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + return br; + + } /** -- 1.8.3.1