Merge pull request #52 from susom/dev

Change TIDE to support 10-digit MRNs (new version 3.0.36-SNAPSHOT)
susom · Jun 3, 2024 · c4bc547 · c4bc547
2 parents e4173b7 + bb5e73f
commit c4bc547
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -5,9 +5,9 @@ steps:
     env:
       - 'REPO_API_TOKEN=$_REPO_TOKEN'
 
-  # Docker Build
+  # Docker Build 
   - name: "gcr.io/cloud-builders/docker:20.10.14"
-    args: ["build", "-t", "${_ARTIFACT_REGISTRY_REPO}/tide:3.0.35${_SUFFIX}", "."]
+    args: ["build", "-t", "${_ARTIFACT_REGISTRY_REPO}/tide:3.0.36${_SUFFIX}", "."]
 
   # Docker push to Google Artifact Registry
   - name: "gcr.io/cloud-builders/docker:20.10.14"

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <name>Starr Core DeId Pipeline</name>
   <groupId>com.github.susom</groupId>
   <artifactId>deid</artifactId>
-  <version>3.0.35-SNAPSHOT</version>
+  <version>3.0.36-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -16,7 +16,7 @@
 
     <main.class>com.github.susom.starr.deid.Main</main.class>
 
-    <beam.version>2.55.1</beam.version>
+    <beam.version>2.56.0</beam.version>
     <jackson.version>2.10.4</jackson.version>
     <junit-jupiter.version>5.1.0</junit-jupiter.version>
     <version.jopt.simple>5.0.4</version.jopt.simple>

diff --git a/src/main/java/com/github/susom/starr/deid/anonymizers/MrnAnonymizer.java b/src/main/java/com/github/susom/starr/deid/anonymizers/MrnAnonymizer.java
@@ -98,6 +98,12 @@ public class MrnAnonymizer implements AnonymizerProcessor {
     // MRN Number: nnn-nn-nn
     { Pattern.compile("(" + LABEL + NUMBER + COLON + "\\s*" + ")" + DIGITS + FOLLOWING),
       TEST ? "$1<span style=\"color:red\">&lt;$2&gt;</span>" : "$1" + REPLACE_WORD
+    },
+
+    // 10-digit MRN
+    // nnnnnnnnnn
+    { Pattern.compile(PRECEDING + "\\d{10}" + FOLLOWING),
+      TEST ? "<span style=\"color:red\">&lt;$0&gt;</span>" : REPLACE_WORD
     }
   };