Merge pull request #228 from MeasureAuthoringTool/MAT-7155_shiftTestC…

…aesDates

MAT-7155 wrong type for EncounterPerformed:diagnoses

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>gov.cms.madie</groupId>
   <artifactId>madie-java-models</artifactId>
-  <version>0.6.48-SNAPSHOT</version>
+  <version>0.6.49-SNAPSHOT</version>
   <name>madie-java-models</name>
   <description>Java based models for MADiE microservices</description>
   <properties>

src/main/java/gov/cms/madie/models/cqm/datacriteria/DiagnosisComponent.java

@@ -0,0 +1,23 @@
+package gov.cms.madie.models.cqm.datacriteria;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import gov.cms.madie.models.cqm.datacriteria.basetypes.Code;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DiagnosisComponent {
+  private String qdmVersion = "5.6";
+  private String _type = "QDM::DiagnosisComponent";
+  private String _id;
+  private Code code;
+  private Code presentOnAdmissionIndicator;
+  private Integer rank;
+}

src/main/java/gov/cms/madie/models/cqm/datacriteria/EncounterPerformed.java

@@ -40,7 +40,7 @@ public class EncounterPerformed extends DataElement {
   private Interval relevantPeriod;
   private Code dischargeDisposition;
   private List<Code> facilityLocations;
-  private List<Code> diagnoses;
+  private List<DiagnosisComponent> diagnoses;
   private Quantity lengthOfStay;
   private Code priority;
   private List<Entity> participant;

src/main/java/gov/cms/madie/models/cqm/datacriteria/basetypes/Code.java

@@ -1,5 +1,7 @@
 package gov.cms.madie.models.cqm.datacriteria.basetypes;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -9,6 +11,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Code {
   private String code;
   private String display;