diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java index 4e96d92..2adb13b 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java @@ -56,6 +56,15 @@ public class BabyCheckService { return babyCheckDao.queryBabyCheckRecord(query.addOrder(Sort.Direction.DESC,"created")); } + public List queryBabyCheckListRecord(BabyCheckModelQuery babyQuery) { + MongoQuery query = babyQuery.convertToQuery(); + if (StringUtils.isNotEmpty(babyQuery.getNeed())) { + babyQuery.mysqlBuild(babyCheckDao.queryBabyCheckCount(babyQuery.convertToQuery())); + query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); + } + return babyCheckDao.queryBabyCheckRecord(query.addOrder(Sort.Direction.ASC,"created")); + } + public List queryBabyCheckRecord(BabyCheckModelQuery query,String sortkey,Sort.Direction sort) { return babyCheckDao.queryBabyCheckRecord(query.convertToQuery().addOrder(sort, sortkey)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 29dc460..8e1845b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -925,9 +925,13 @@ public class ViewController extends BaseController { } - /*** - * 检查报告 - * */ + /** + * 检查报表 + * + * @param antex + * @param request + * @return + */ @RequestMapping(value = "/checkReport", method = RequestMethod.GET) @ResponseBody @TokenRequired @@ -938,5 +942,17 @@ public class ViewController extends BaseController { } + /** + * 儿童检查列表详情 + * + * @param id + * @return + */ + @RequestMapping(value = "/getBabyCheckList/{id}", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse getBabyCheckList(@PathVariable("id") String id) { + return viewFacade.getCheckList(id); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 9954de7..b4276c3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -4227,7 +4227,6 @@ public class ViewFacade { if (checkModels != null && checkModels.size() > 0) { BabyCheckModel checkModel = checkModels.get(0); - BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setId(checkModel.getBuildId()); babyQuery.setYn(YnEnums.YES.getId()); @@ -6214,4 +6213,44 @@ public class ViewFacade { } return new BaseObjectResponse().setData(data).setErrorcode(0).setErrormsg("成功"); } + + + public BaseObjectResponse getCheckList(String id) { + BaseObjectResponse br = new BaseObjectResponse(); + BabyCheckModelQuery babyCheckModel = new BabyCheckModelQuery(); + babyCheckModel.setBuildId(id); + babyCheckModel.setYn(YnEnums.YES.getId()); + babyCheckModel.setSort("created asc"); + List checkListResults = new ArrayList<>(); + List babyCheckList = babyCheckService.queryBabyCheckListRecord(babyCheckModel); + if (CollectionUtils.isNotEmpty(babyCheckList)) { + for (BabyCheckModel babyCheck : babyCheckList) { + checkListResults.add(getBabyCheckListResult(babyCheck)); + } + } + br.setData(checkListResults); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + return br; + } + + private BabyCheckListResult getBabyCheckListResult(BabyCheckModel checkModel) { + BabyCheckListResult result = new BabyCheckListResult(); + if (null != checkModel) { + result.setCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); + result.setMonthAge(DateUtil.getBabyMonthAge(checkModel.getBirth(), checkModel.getCheckDate())); + result.setWeight(StringUtils.isNotEmpty(checkModel.getWeight()) ? checkModel.getWeight() + "kg,评价：" + checkModel.getWeightEvaluate() : ""); + result.setHeight(StringUtils.isNotEmpty(checkModel.getHeight()) ? checkModel.getHeight() + "cm,评价：" + checkModel.getHeightEvaluate() : ""); + result.setWeightOrHeight(checkModel.getHeightWeight()); + result.setPhysiqueInfo(checkModel.getWeightEvaluate()); + result.setHeadCircumference(checkModel.getHead()); + result.setXhdb(checkModel.getHemoglobin()); + result.setOtherCheck(JsonUtil.obj2JsonString(checkModel.getFaceColor())); + result.setCheckHospital(StringUtils.isNotEmpty(checkModel.getHospitalId()) ? organizationService.getOrganization(Integer.valueOf(checkModel.getHospitalId())).getName() : ""); + result.setCheckDoctor(StringUtils.isNotEmpty(checkModel.getCheckDoctor()) ? usersService.getUsers(Integer.valueOf(checkModel.getCheckDoctor())).getName() : ""); + result.setNextCheckTime(DateUtil.getyyyy_MM_dd(checkModel.getNextDate())); + } + return result; + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckListResult.java new file mode 100644 index 0000000..01f7f08 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckListResult.java @@ -0,0 +1,156 @@ +package com.lyms.platform.operate.web.result; + +/** + * Created by Administrator on 2019/9/6. + */ +public class BabyCheckListResult { + private Integer id; + //检查日期 + private String checkDate; + //月龄 + private String monthAge; + //体重 + private String weight; + //身高 + private String height; + //体重或身长 平台页面的身长体重 + private String weightOrHeight; + //体格发育评价 + private String physiqueInfo; + //头围 + private String headCircumference; + //血红蛋白 + private String xhdb; + //其他检查 + private String otherCheck; + //检查医院 + private String checkHospital; + //检查医生 + private String checkDoctor; + //下次检查日期 + private String nextCheckTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getCheckDate() { + return checkDate; + } + + public void setCheckDate(String checkDate) { + this.checkDate = checkDate; + } + + public String getMonthAge() { + return monthAge; + } + + public void setMonthAge(String monthAge) { + this.monthAge = monthAge; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + + public String getWeightOrHeight() { + return weightOrHeight; + } + + public void setWeightOrHeight(String weightOrHeight) { + this.weightOrHeight = weightOrHeight; + } + + public String getPhysiqueInfo() { + return physiqueInfo; + } + + public void setPhysiqueInfo(String physiqueInfo) { + this.physiqueInfo = physiqueInfo; + } + + public String getHeadCircumference() { + return headCircumference; + } + + public void setHeadCircumference(String headCircumference) { + this.headCircumference = headCircumference; + } + + public String getXhdb() { + return xhdb; + } + + public void setXhdb(String xhdb) { + this.xhdb = xhdb; + } + + public String getOtherCheck() { + return otherCheck; + } + + public void setOtherCheck(String otherCheck) { + this.otherCheck = otherCheck; + } + + public String getCheckHospital() { + return checkHospital; + } + + public void setCheckHospital(String checkHospital) { + this.checkHospital = checkHospital; + } + + public String getCheckDoctor() { + return checkDoctor; + } + + public void setCheckDoctor(String checkDoctor) { + this.checkDoctor = checkDoctor; + } + + public String getNextCheckTime() { + return nextCheckTime; + } + + public void setNextCheckTime(String nextCheckTime) { + this.nextCheckTime = nextCheckTime; + } + + + @Override + public String toString() { + return "BabyCheckListResult{" + + "id=" + id + + ", checkDate='" + checkDate + '\'' + + ", monthAge='" + monthAge + '\'' + + ", weight='" + weight + '\'' + + ", height='" + height + '\'' + + ", weightOrHeight='" + weightOrHeight + '\'' + + ", physiqueInfo='" + physiqueInfo + '\'' + + ", headCircumference='" + headCircumference + '\'' + + ", xhdb='" + xhdb + '\'' + + ", otherCheck='" + otherCheck + '\'' + + ", checkHospital='" + checkHospital + '\'' + + ", checkDoctor='" + checkDoctor + '\'' + + ", nextCheckTime='" + nextCheckTime + '\'' + + '}'; + } +}