jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 45e7cb67b79e96c06788ad6672d38fd79873b1e7

Authored by shiyang
1 parent d709d2622c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

秦皇岛11月需求-儿童健康管理---心理专科、营养专科----列表：列表加入检查医生

Showing 3 changed files with 14 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java View file @ 45e7cb6
... ... @@ -437,6 +437,12 @@
437 437 babyNutritionSpecialtyResult.setCaseClosed("否");
438 438 }
439 439  
  440 + if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getCheckDoctor())) {
  441 + Users users = usersService.getUsers(NumberUtils.toInt(babyNutritionSpecialtyModel.getCheckDoctor()));
  442 + if (users != null && StringUtils.isNotEmpty(users.getName())) {
  443 + babyNutritionSpecialtyResult.setCheckDoctor(users.getName());
  444 + }
  445 + }
440 446 babyNutritionSpecialtyResults.add(babyNutritionSpecialtyResult);
441 447 }
442 448 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java View file @ 45e7cb6
... ... @@ -403,6 +403,12 @@
403 403 if (babyPsychologistModel != null) {
404 404 babyPsychologistResult.convertToResult(babyPsychologistModel);
405 405 babyPsychologistResult.setHospitalId(CommonsHelper.getHospitalName(babyPsychologistModel.getHospitalId(), organizationService));
  406 + if (StringUtils.isNotEmpty(babyPsychologistModel.getCheckDoctor())) {
  407 + Users users = usersService.getUsers(NumberUtils.toInt(babyPsychologistModel.getCheckDoctor()));
  408 + if (users != null && StringUtils.isNotEmpty(users.getName())) {
  409 + babyPsychologistResult.setCheckDoctor(users.getName());
  410 + }
  411 + }
406 412 babyPsychologistResultList.add(babyPsychologistResult);
407 413 }
408 414 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java View file @ 45e7cb6
... ... @@ -698,7 +698,7 @@
698 698 setYyProject(destModel.getYyProject());
699 699 setCheckDate(DateUtil.getYyyyMmDd(destModel.getCheckDate()));
700 700 setCheckMonth(destModel.getCheckMonth());
701   - //checkDoctor
  701 +// setCheckDoctor(destModel.getCheckDoctor());
702 702 setNextDate(DateUtil.getYyyyMmDd(destModel.getNextDate()));
703 703 setCaseClosed(destModel.getCaseClosed());
704 704 if("2".equals(destModel.getCaseClosed())){
... ... @@ -782,7 +782,7 @@
782 782 }
783 783 setCheckDate(DateUtil.getYyyyMmDd(destModel.getCheckDate()));
784 784 setCheckMonth(destModel.getCheckMonth());
785   - //checkDoctor
  785 +// setCheckDoctor(destModel.getCheckDoctor());
786 786 setNextDate(DateUtil.getYyyyMmDd(destModel.getNextDate()));
787 787 setCaseClosed(destModel.getCaseClosed());
788 788 if("2".equals(destModel.getCaseClosed())){