refactor: shift code instructions

jy95 · Jan 9, 2025 · 48823d7 · 48823d7
1 parent f01d793
commit 48823d7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/r4/src/main/java/jy95/fhir/r4/translators/BoundsRangeR4.java b/r4/src/main/java/jy95/fhir/r4/translators/BoundsRangeR4.java
@@ -21,11 +21,6 @@ protected boolean hasTiming(Dosage dosage) {
         return dosage.hasTiming();
     }
 
-    @Override
-    protected boolean hasRequiredElements(Dosage dosage) {
-        return dosage.getTiming().hasRepeat() && dosage.getTiming().getRepeat().hasBoundsRange();
-    }
-
     @Override
     public CompletableFuture<String> convert(Dosage dosage) {
         var boundsRange = dosage.getTiming().getRepeat().getBoundsRange();
@@ -35,4 +30,9 @@ public CompletableFuture<String> convert(Dosage dosage) {
                 .convert(bundle, this.getConfig(), boundsRange)
                 .thenApplyAsync(v -> boundsRangeMsg.format(new Object[]{v}));
     }
+
+    @Override
+    protected boolean hasRequiredElements(Dosage dosage) {
+        return dosage.getTiming().hasRepeat() && dosage.getTiming().getRepeat().hasBoundsRange();
+    }
 }
diff --git a/r4/src/main/java/jy95/fhir/r4/translators/FrequencyFrequencyMaxR4.java b/r4/src/main/java/jy95/fhir/r4/translators/FrequencyFrequencyMaxR4.java
@@ -15,11 +15,6 @@ protected boolean hasTiming(Dosage dosage) {
         return dosage.hasTiming();
     }
 
-    @Override
-    protected boolean hasRequiredElements(Dosage dosage) {
-        return dosage.getTiming().hasRepeat() && (hasFrequency(dosage) || hasFrequencyMax(dosage));
-    }
-
     @Override
     protected boolean hasFrequency(Dosage dosage) {
         return dosage.getTiming().getRepeat().hasFrequency();
@@ -30,6 +25,11 @@ protected boolean hasFrequencyMax(Dosage dosage) {
         return dosage.getTiming().getRepeat().hasFrequencyMax();
     }
 
+    @Override
+    protected boolean hasRequiredElements(Dosage dosage) {
+        return dosage.getTiming().hasRepeat() && (hasFrequency(dosage) || hasFrequencyMax(dosage));
+    }
+
     @Override
     protected String turnFrequencyAndFrequencyMaxToString(Dosage dosage) {
         var repeat = dosage.getTiming().getRepeat();

diff --git a/r4/src/main/java/jy95/fhir/r4/translators/TimingCodeR4.java b/r4/src/main/java/jy95/fhir/r4/translators/TimingCodeR4.java
@@ -17,11 +17,6 @@ protected boolean hasTiming(Dosage dosage) {
         return dosage.hasTiming();
     }
 
-    @Override
-    protected boolean hasRequiredElements(Dosage dosage) {
-        return dosage.getTiming().hasCode();
-    }
-
     @Override
     public CompletableFuture<String> convert(Dosage dosage) {
         return this
@@ -31,4 +26,9 @@ public CompletableFuture<String> convert(Dosage dosage) {
                         dosage.getTiming().getCode()
                 );
     }
+
+    @Override
+    protected boolean hasRequiredElements(Dosage dosage) {
+        return dosage.getTiming().hasCode();
+    }
 }