Commit 5451e4f0b57589672252f4fa6c8bbc8b58f93517
1 parent
3464e02990
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 54 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
View file @
5451e4f
... | ... | @@ -882,5 +882,14 @@ |
882 | 882 | |
883 | 883 | return babyBookbuildingFacade.addBabyRecord(request, loginState.getId()); |
884 | 884 | } |
885 | + | |
886 | + @RequestMapping(method = RequestMethod.GET, value = "/queryBabyRecord") | |
887 | + @ResponseBody | |
888 | + @TokenRequired | |
889 | + public BaseResponse queryBabyRecord(@RequestParam(required = true) String babyId,HttpServletRequest httpServletRequest) { | |
890 | + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); | |
891 | + | |
892 | + return babyBookbuildingFacade.queryBabyRecord(babyId, loginState.getId()); | |
893 | + } | |
885 | 894 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
5451e4f
... | ... | @@ -5331,7 +5331,7 @@ |
5331 | 5331 | request.setGuideSuggest(stringBuilder.toString()); |
5332 | 5332 | |
5333 | 5333 | |
5334 | - babyCheckFacade.addBabyCheck(request,Integer.parseInt(babyModelDb.getBuildDoctor())); | |
5334 | + babyCheckFacade.addBabyCheck(request, Integer.parseInt(babyModelDb.getBuildDoctor())); | |
5335 | 5335 | |
5336 | 5336 | } |
5337 | 5337 | |
... | ... | @@ -5362,6 +5362,50 @@ |
5362 | 5362 | babyModelDb.setNextCheckTime(model.getNextCheckTime()); |
5363 | 5363 | babyService.updateOneBaby(babyModelDb, babyModelDb.getId()); |
5364 | 5364 | return new BaseResponse(); |
5365 | + } | |
5366 | + | |
5367 | + public BaseResponse queryBabyRecord(String babyId, Integer userId) { | |
5368 | + Map data = new HashMap(); | |
5369 | + BabyModel babyModelDb = babyService.getOneBabyById(babyId); | |
5370 | + String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(babyModelDb.getHighRiskInfo()); | |
5371 | + data.put("highRiskInfos", highRiskInfos); | |
5372 | + data.put("numCode", ""); | |
5373 | + data.put("buildDate", DateUtil.getyyyy_MM_dd(babyModelDb.getBuildDate())); | |
5374 | + data.put("babyName", babyModelDb.getName()); | |
5375 | + data.put("birth", DateUtil.getyyyy_MM_dd(babyModelDb.getBirth())); | |
5376 | + data.put("motherName", babyModelDb.getMname()); | |
5377 | + data.put("sex", SexEnum.getTextById(babyModelDb.getSex())); | |
5378 | + data.put("phone", babyModelDb.getMphone()); | |
5379 | + | |
5380 | + String homeAddress = CommonsHelper.getResidence(babyModelDb.getProvinceId(), babyModelDb.getCityId(), | |
5381 | + babyModelDb.getAreaId(), babyModelDb.getStreetId(), babyModelDb.getAddress(), basicConfigService); | |
5382 | + data.put("address", homeAddress); | |
5383 | + data.put("riskType", ""); | |
5384 | + | |
5385 | + | |
5386 | + //String hospitalId = autoMatchFacade.getHospitalId(userId); | |
5387 | + | |
5388 | + Query query = new Query(); | |
5389 | + query.addCriteria(Criteria.where("babyId").is(babyId)); | |
5390 | + | |
5391 | + List<Map> records = new ArrayList<>(); | |
5392 | + List<BabyRecordModel> models = mongoTemplate.find(query, BabyRecordModel.class); | |
5393 | + if (CollectionUtils.isNotEmpty(models)) | |
5394 | + { | |
5395 | + for (BabyRecordModel model : models) | |
5396 | + { | |
5397 | + | |
5398 | + Map map = new HashMap(); | |
5399 | + map.put("id",model.getId()); | |
5400 | + map.put("doctorName",usersService.getUsers(Integer.parseInt(model.getDoctorId())).getName()); | |
5401 | + map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(model.getNextCheckTime())); | |
5402 | + map.put("recordTime",DateUtil.getyyyy_MM_dd(model.getRecordTime())); | |
5403 | + map.put("content",model.getContent()); | |
5404 | + records.add(map); | |
5405 | + } | |
5406 | + } | |
5407 | + data.put("records", records); | |
5408 | + return new BaseObjectResponse().setData(data); | |
5365 | 5409 | } |
5366 | 5410 | } |