From 45e7cb67b79e96c06788ad6672d38fd79873b1e7 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Tue, 23 Nov 2021 09:28:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B11=E6=9C=88=E9=9C=80?= =?UTF-8?q?=E6=B1=82-=E5=84=BF=E7=AB=A5=E5=81=A5=E5=BA=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86---=E5=BF=83=E7=90=86=E4=B8=93=E7=A7=91=E3=80=81?= =?UTF-8?q?=E8=90=A5=E5=85=BB=E4=B8=93=E7=A7=91----=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=9A=E5=88=97=E8=A1=A8=E5=8A=A0=E5=85=A5=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E5=8C=BB=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/BabyNutritionSpecialtyFacade.java | 6 ++++++ .../lyms/platform/operate/web/facade/BabyPsychologistFacade.java | 6 ++++++ .../platform/operate/web/result/BabyNutritionSpecialtyResult.java | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java index 68ff30e..469eaf1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java @@ -437,6 +437,12 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { babyNutritionSpecialtyResult.setCaseClosed("否"); } + if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getCheckDoctor())) { + Users users = usersService.getUsers(NumberUtils.toInt(babyNutritionSpecialtyModel.getCheckDoctor())); + if (users != null && StringUtils.isNotEmpty(users.getName())) { + babyNutritionSpecialtyResult.setCheckDoctor(users.getName()); + } + } babyNutritionSpecialtyResults.add(babyNutritionSpecialtyResult); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java index 8ca7761..d777f77 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java @@ -403,6 +403,12 @@ public class BabyPsychologistFacade extends BaseServiceImpl { if (babyPsychologistModel != null) { babyPsychologistResult.convertToResult(babyPsychologistModel); babyPsychologistResult.setHospitalId(CommonsHelper.getHospitalName(babyPsychologistModel.getHospitalId(), organizationService)); + if (StringUtils.isNotEmpty(babyPsychologistModel.getCheckDoctor())) { + Users users = usersService.getUsers(NumberUtils.toInt(babyPsychologistModel.getCheckDoctor())); + if (users != null && StringUtils.isNotEmpty(users.getName())) { + babyPsychologistResult.setCheckDoctor(users.getName()); + } + } babyPsychologistResultList.add(babyPsychologistResult); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java index 930ebfa..b5b9d12 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java @@ -698,7 +698,7 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert