Merge pull request #779 from synthetichealth/procedure-fix

Fix procedures with delays to ensure the record entry is only added once

src/main/java/org/mitre/synthea/engine/State.java

@@ -438,9 +438,24 @@ public abstract static class Delayable extends State {
 
     public abstract long endOfDelay(long time, Person person);
 
+    /**
+     * Process any aspect of this state which should only happen once.
+     * Because of the nature of Delay states, this state may get called
+     * multiple times: once per timestep while delaying. To ensure
+     * any actions which are supposed to happen only happen once,
+     * this function should be overriden in subclasses.
+     *
+     * @param person the person being simulated
+     * @param time the date within the simulated world
+     */
+    public void processOnce(Person person, long time) {
+      // do nothing. allow subclasses to override
+    }
+
     @Override
     public boolean process(Person person, long time) {
       if (this.next == null) {
+        this.processOnce(person, time);
         this.next = this.endOfDelay(time, person);
       }
 
@@ -1366,7 +1381,7 @@ public long endOfDelay(long time, Person person) {
     }
 
     @Override
-    public boolean process(Person person, long time) {
+    public void processOnce(Person person, long time) {
       String primaryCode = codes.get(0).code;
       HealthRecord.Procedure procedure = person.record.procedure(time, primaryCode);
       entry = procedure;
@@ -1406,8 +1421,6 @@ public boolean process(Person person, long time) {
       if (assignToAttribute != null) {
         person.attributes.put(assignToAttribute, procedure);
       }
-
-      return super.process(person, time);
     }
   }
 

src/test/java/org/mitre/synthea/engine/StateTest.java

@@ -617,7 +617,10 @@ public void procedure_during_encounter() throws Exception {
     long nextStep = time + Utilities.convertTime("days", 7);
     assertTrue(appendectomy.process(person, nextStep));
 
-    HealthRecord.Procedure proc = person.record.encounters.get(0).procedures.get(0);
+    List<HealthRecord.Procedure> procedures = person.record.encounters.get(0).procedures;
+    assertEquals(1, procedures.size());
+
+    HealthRecord.Procedure proc = procedures.get(0);
     Code code = proc.codes.get(0);
 
     assertEquals("6025007", code.code);