1 files changed, 3 insertions, 8 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm.scala
index b605566..5827f62 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm.scala
@@ -92,18 +92,13 @@ object eligibilityarm {
 
         val diseases = fields
           .get("diseases")
-          .map(_.convertTo[Seq[CancerType]])
-          .getOrElse(orig.eligibilityArmDiseases.map(_.disease))
+          .map(_.convertTo[Seq[CancerType]].map(x => EligibilityArmDisease(orig.eligibilityArm.id, x)))
+          .getOrElse(orig.eligibilityArmDiseases)
 
         orig.copy(
           eligibilityArm = orig.eligibilityArm
             .copy(name = name),
-          eligibilityArmDiseases = orig.eligibilityArmDiseases
-            .zip(diseases)
-            .map {
-              case (eligibilityArmDisease, disease) =>
-                eligibilityArmDisease.copy(disease = disease)
-            }
+          eligibilityArmDiseases = diseases
         )
 
       case _ => deserializationErrorEntityMessage(json)