From cf9a262192c318409e82c65e4928996770324818 Mon Sep 17 00:00:00 2001 From: HyungJu Date: Fri, 17 May 2024 22:23:09 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20lot,=20=EB=B0=B1=EC=8B=A0=EB=AA=85,=20?= =?UTF-8?q?=EC=A0=9C=EC=A1=B0=EC=82=AC=EB=AA=85=20=EA=B3=B5=EB=B0=B1=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/inoculation/application/InoculationService.kt | 6 +++--- .../application/dto/response/InoculationDetailResponse.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/vacgom/backend/inoculation/application/InoculationService.kt b/src/main/kotlin/com/vacgom/backend/inoculation/application/InoculationService.kt index 60d5568..673c396 100644 --- a/src/main/kotlin/com/vacgom/backend/inoculation/application/InoculationService.kt +++ b/src/main/kotlin/com/vacgom/backend/inoculation/application/InoculationService.kt @@ -106,9 +106,9 @@ class InoculationService( it.vaccination.vaccineName, it.inoculationOrderString, it.agency, - it.lotNumber ?: "로트번호 정보 없음", - it.vaccineName ?: "백신명 정보 없음", - it.vaccineBrandName ?: "제조사 정보 없음", + if (it.lotNumber.isNullOrEmpty()) "로트번호 정보 없음" else it.lotNumber, + if (it.vaccineName.isNullOrEmpty()) "백신명 정보 없음" else it.vaccineName, + if (it.vaccineBrandName.isNullOrEmpty()) "백신 제조사 정보 없음" else it.vaccineBrandName, it.date, ) }.toList() diff --git a/src/main/kotlin/com/vacgom/backend/inoculation/application/dto/response/InoculationDetailResponse.kt b/src/main/kotlin/com/vacgom/backend/inoculation/application/dto/response/InoculationDetailResponse.kt index b7ae687..55716e0 100644 --- a/src/main/kotlin/com/vacgom/backend/inoculation/application/dto/response/InoculationDetailResponse.kt +++ b/src/main/kotlin/com/vacgom/backend/inoculation/application/dto/response/InoculationDetailResponse.kt @@ -7,8 +7,8 @@ data class InoculationDetailResponse( val vaccineName: String, val order: String, val agency: String, - val lotNumber: String?, - val vaccineProductName: String?, - val vaccineBrandName: String?, + val lotNumber: String, + val vaccineProductName: String, + val vaccineBrandName: String, val date: LocalDate, )