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, )