From c48e8a76635f1ea04da0067be759d938a9eb9fb3 Mon Sep 17 00:00:00 2001 From: materro Date: Wed, 27 Dec 2023 18:53:37 +0100 Subject: [PATCH] Book: getAllDoctors: Use clinicId.optionalId --- server/src/main/scala/com/lbs/server/conversation/Book.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/main/scala/com/lbs/server/conversation/Book.scala b/server/src/main/scala/com/lbs/server/conversation/Book.scala index 4cf85f5..439a05d 100644 --- a/server/src/main/scala/com/lbs/server/conversation/Book.scala +++ b/server/src/main/scala/com/lbs/server/conversation/Book.scala @@ -81,7 +81,10 @@ class Book( staticOptions = apiService .getAllDoctors(userId.accountId, bd.cityId.id, bd.serviceId.id) .map( - _.filter(doc => bd.clinicId == null || bd.clinicId.id == -1 || doc.facilityGroupIds.exists(_ == bd.clinicId.id)) + _.filter(doc => { + val clinicId = bd.clinicId.optionalId + clinicId.isEmpty || doc.facilityGroupIds.exists(_.contains(clinicId.get)) + }) .map(_.toIdName) ), applyId = id => bd.copy(doctorId = id.toIdName)