From 1f1cef0fea9c33acbee07ab802457e17bce432ac Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Tue, 28 May 2019 11:12:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/BabyNutritionController.java | 2 +- .../operate/web/facade/BabyCheckFacade.java | 8 +- .../operate/web/facade/BabyNutritionFacade.java | 141 +++++++++++---------- 3 files changed, 75 insertions(+), 76 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java index 02618b1..e35ba5f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java @@ -142,7 +142,7 @@ public class BabyNutritionController extends BaseController { @ResponseBody @TokenRequired public BaseResponse unSettleList(@Valid @RequestBody BabyNutritionSettleRequest request, - HttpServletRequest httpServletRequest) { + HttpServletRequest httpServletRequest) { return babyNutritionFacade.unSettleList(request, getUserId(httpServletRequest)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index c6e1358..610ff09 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -140,9 +140,9 @@ public class BabyCheckFacade { bm.setModified(new Date()); if (request.getHighRisk() == null) { bm.setLastHighRisk(0); + bm.setHighRiskInfo(request.getHighRiskInfo()); } else { bm.setLastHighRisk(request.getHighRisk()); - bm.setHighRiskInfo(request.getHighRiskInfo()); } } @@ -416,10 +416,8 @@ public class BabyCheckFacade { value = request.getEyeGuideSuggestions(); value = StringUtils.isNotEmpty(value) ? value : ""; model.setEyeGuideSuggestions(value); - - //新加字段 - + return model; } @@ -1507,7 +1505,7 @@ public class BabyCheckFacade { model.setEyeDioptroscopy(checkModel.getEyeDioptroscopy()); String eyeAdvice = checkModel.getEyeAdvice(); String eyeAdviceName = ""; - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(eyeAdvice)){ + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(eyeAdvice)) { eyeAdviceName = EyeExaminationEnums.getNameById(Integer.parseInt(eyeAdvice)); } model.setEyeAdvice(eyeAdvice); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index 77a8326..ff867f2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -195,7 +195,6 @@ public class BabyNutritionFacade { } /** - * * @param page * @param limit * @param queryNo @@ -204,11 +203,11 @@ public class BabyNutritionFacade { * @param userId * @param recordTime * @param interpretDoctorId 报告解读人 - * @param settleStatus 结算状态 + * @param settleStatus 结算状态 * @return */ public BaseResponse queryBabyNutritionList(Integer page, Integer limit, String queryNo, String vcCardNo, - String babyName,Integer userId,String recordTime, String interpretDoctorId, String settleStatus) { + String babyName, Integer userId, String recordTime, String interpretDoctorId, String settleStatus) { String hospitalId = autoMatchFacade.getHospitalId(userId); List list = new ArrayList<>(); List babyIds = new ArrayList<>(); @@ -255,21 +254,23 @@ public class BabyNutritionFacade { if (CollectionUtils.isNotEmpty(models)) { for (BabyNutritionModel model : models) { - Map map = new HashMap(); - - map.put("id", model.getId()); - map.put("babyId", model.getBabyId()); - - BabyModel baby = babyBookbuildingService.queryBabyBuildById(model.getBabyId()); - map.put("babyName", baby.getName()); - map.put("babySex", SexEnum.getTextById(baby.getSex())); - map.put("monthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), new Date()))); - map.put("motherName", baby.getMname()); - map.put("phone", baby.getMphone()); - map.put("vcCardNo", baby.getVcCardNo()); - - String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(baby.getHighRiskInfo()); - map.put("highRiskInfos", highRiskInfos); + Integer currentSettleStatus = getSettleStatus(model); + if (settleStatus != null) { + if (currentSettleStatus != null && (currentSettleStatus == Integer.parseInt(settleStatus))) { + Map map = new HashMap(); + map.put("id", model.getId()); + map.put("babyId", model.getBabyId()); + + BabyModel baby = babyBookbuildingService.queryBabyBuildById(model.getBabyId()); + map.put("babyName", baby.getName()); + map.put("babySex", SexEnum.getTextById(baby.getSex())); + map.put("monthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), new Date()))); + map.put("motherName", baby.getMname()); + map.put("phone", baby.getMphone()); + map.put("vcCardNo", baby.getVcCardNo()); + + String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(baby.getHighRiskInfo()); + map.put("highRiskInfos", highRiskInfos); String diagnose = ""; if (StringUtils.isNotEmpty(baby.getPid())) { @@ -293,9 +294,9 @@ public class BabyNutritionFacade { // 新增报表解读人和结算状态 String currInterpretDoctorId = model.getInterpretDoctorId(); String interpretDoctorName = ""; - if (StringUtils.isNotEmpty(currInterpretDoctorId)){ + if (StringUtils.isNotEmpty(currInterpretDoctorId)) { Users users = usersService.getUsers(Integer.parseInt(currInterpretDoctorId)); - if (users != null){ + if (users != null) { interpretDoctorName = users.getName(); } } @@ -317,7 +318,6 @@ public class BabyNutritionFacade { return objectResponse; } - public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId) { /** * 获取结算状态 * @@ -328,14 +328,14 @@ public class BabyNutritionFacade { HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); healthChargeQuery.setBabyForeignId(model.getId()); List healthChargeModelList = healthChargeService.queryHealthChargeList(healthChargeQuery); - if (CollectionUtils.isNotEmpty(healthChargeModelList)){ + if (CollectionUtils.isNotEmpty(healthChargeModelList)) { HealthChargeModel healthChargeModel = healthChargeModelList.get(0); return healthChargeModel.getStatus(); } return null; } - public BaseObjectResponse queryBabyNutritionReport(String id,Integer userId) { + public BaseObjectResponse queryBabyNutritionReport(String id, Integer userId) { Map data = new HashMap(); @@ -893,42 +893,6 @@ public class BabyNutritionFacade { return kaupEvaluate; } - public BaseObjectResponse queryBabyDietReport(String id, Integer userId) { - Map data = new HashMap(); - - BabyNutritionQuery babyQuery = new BabyNutritionQuery(); - String hospitalId = autoMatchFacade.getHospitalId(userId); - babyQuery.setHospitalId(hospitalId); - babyQuery.setId(id); - - List models = babyNutritionService.queryBabyNutritions(babyQuery); - if (CollectionUtils.isNotEmpty(models)) { - BabyNutritionModel model = models.get(0); - BabyModel baby = babyBookbuildingService.queryBabyBuildById(model.getBabyId()); - - Map map = new HashMap(); - map.put("id", model.getId()); - map.put("babyId", model.getBabyId()); - map.put("babyName", baby.getName()); - map.put("babySex", SexEnum.getTextById(baby.getSex())); - map.put("monthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), new Date()))); - map.put("motherName", baby.getMname()); - map.put("phone", baby.getMphone()); - map.put("vcCardNo", baby.getVcCardNo()); - map.put("weight", model.getWeight()); - map.put("height", model.getHeight()); - Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId)); - map.put("hospitalName", org.getName()); - map.put("reportMonthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), model.getNutritiTime()))); - data.put("userInfo", map); - } - - BaseObjectResponse objectResponse = new BaseObjectResponse(); - objectResponse.setData(data); - objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - objectResponse.setErrormsg("成功"); - return objectResponse; - } /** * 未结算列表 @@ -938,7 +902,7 @@ public class BabyNutritionFacade { * @return */ public BaseResponse unSettleList(BabyNutritionSettleRequest request, Integer userId) { - HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); + HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); healthChargeQuery.setPage(request.getPage()); healthChargeQuery.setLimit(request.getLimit()); healthChargeQuery.setNeed("true"); @@ -950,7 +914,7 @@ public class BabyNutritionFacade { Date startDate = areaCountFacade.getStartDate(); healthChargeQuery.setCreatedStart(startDate); healthChargeQuery.setCreatedEnd(new Date()); - if (request.getStartTime() != null){ + if (request.getStartTime() != null) { healthChargeQuery.setCreatedStart(request.getStartTime()); healthChargeQuery.setCreatedEnd(request.getEndTime()); } @@ -959,36 +923,36 @@ public class BabyNutritionFacade { List list = healthChargeService.queryHealthChargeList(healthChargeQuery); List resultList = new LinkedList<>(); - if (CollectionUtils.isNotEmpty(list)){ - for (HealthChargeModel model: list){ + if (CollectionUtils.isNotEmpty(list)) { + for (HealthChargeModel model : list) { String babyForeignId = model.getBabyForeignId(); - if (StringUtils.isNotEmpty(findNo) && StringUtils.isNotEmpty(keyword)){ + if (StringUtils.isNotEmpty(findNo) && StringUtils.isNotEmpty(keyword)) { List babyModels = getBabyModels(findNo, babyForeignId); - if (CollectionUtils.isNotEmpty(babyModels)){ + if (CollectionUtils.isNotEmpty(babyModels)) { BabyModel babyModel = babyModels.get(0); String name = babyModel.getName(); - if (name.contains(keyword)){ + if (name.contains(keyword)) { resultList.add(model); } } } - if (StringUtils.isNotEmpty(findNo)){ + if (StringUtils.isNotEmpty(findNo)) { List babyModels = getBabyModels(findNo, babyForeignId); - if (CollectionUtils.isNotEmpty(babyModels)){ + if (CollectionUtils.isNotEmpty(babyModels)) { resultList.add(model); } } - if (StringUtils.isNotEmpty(keyword)){ + if (StringUtils.isNotEmpty(keyword)) { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setId(babyForeignId); babyQuery.setQueryNo(findNo); babyQuery.setYn(YnEnums.YES.getId()); } - if (StringUtils.isEmpty(findNo) && StringUtils.isEmpty(keyword)){ + if (StringUtils.isEmpty(findNo) && StringUtils.isEmpty(keyword)) { resultList.add(model); } } @@ -1015,4 +979,41 @@ public class BabyNutritionFacade { babyQuery.setYn(YnEnums.YES.getId()); return babyBookbuildingService.queryBabyBuildByCond(babyQuery); } + + public BaseObjectResponse queryBabyDietReport(String id, Integer userId) { + Map data = new HashMap(); + + BabyNutritionQuery babyQuery = new BabyNutritionQuery(); + String hospitalId = autoMatchFacade.getHospitalId(userId); + babyQuery.setHospitalId(hospitalId); + babyQuery.setId(id); + + List models = babyNutritionService.queryBabyNutritions(babyQuery); + if (CollectionUtils.isNotEmpty(models)) { + BabyNutritionModel model = models.get(0); + BabyModel baby = babyBookbuildingService.queryBabyBuildById(model.getBabyId()); + + Map map = new HashMap(); + map.put("id", model.getId()); + map.put("babyId", model.getBabyId()); + map.put("babyName", baby.getName()); + map.put("babySex", SexEnum.getTextById(baby.getSex())); + map.put("monthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), new Date()))); + map.put("motherName", baby.getMname()); + map.put("phone", baby.getMphone()); + map.put("vcCardNo", baby.getVcCardNo()); + map.put("weight", model.getWeight()); + map.put("height", model.getHeight()); + Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId)); + map.put("hospitalName", org.getName()); + map.put("reportMonthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), model.getNutritiTime()))); + data.put("userInfo", map); + } + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(data); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } \ No newline at end of file -- 1.8.3.1