lib/health-data-standards/models/encounter.rb in health-data-standards-3.6.1 vs lib/health-data-standards/models/encounter.rb in health-data-standards-3.7.0

@@ -1,10 +1,13 @@
 class Encounter < Entry
   field :admitType, as: :admit_type, type: Hash
   field :dischargeDisposition, as: :discharge_disposition, type: Hash
   field :admitTime, as: :admit_time, type: Integer
   field :dischargeTime, as: :discharge_time, type: Integer
+
+  embeds_one :principalDiagnosis, class_name: "EncounterPrincipalDiagnosis"
+  embeds_one :diagnosis, class_name: "EncounterPrincipalDiagnosis"
   
   embeds_one :transferTo, class_name: "Transfer"
   embeds_one :transferFrom, class_name: "Transfer"
 
   embeds_one :facility
@@ -14,16 +17,26 @@
 
   alias :transfer_to :transferTo
   alias :transfer_to= :transferTo=
   alias :transfer_from :transferFrom
   alias :transfer_from= :transferFrom=
+  alias :principal_diagnosis :principalDiagnosis
+  alias :principal_diagnosis= :principalDiagnosis=
 
   def shift_dates(date_diff)
     super
     if self.facility
       self.facility.shift_dates(date_diff)
     end
-    
+
+    if self.transferTo
+      self.transferTo.shift_dates(date_diff)
+    end
+
+    if self.transferFrom
+      self.transferFrom.shift_dates(date_diff)
+    end
+
     self.admitTime = (self.admitTime.nil?) ? nil : self.admitTime + date_diff
     self.dischargeTime = (self.dischargeTime.nil?) ? nil : self.dischargeTime + date_diff
   end
 
 end
\ No newline at end of file