Merge branch 'dev' of https://github.com/LTHTR-DST/hdruk_avoidable_ad…

…missions into dev
LTHTR-DST · Mar 8, 2023 · c6edcd3 · c6edcd3
2 parents 311340b + d1642a7
commit c6edcd3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/avoidable_admissions/data/validate.py b/avoidable_admissions/data/validate.py
@@ -119,17 +119,19 @@ class Config:
 AdmittedCareEpisodeSchema: pa.DataFrameSchema = (
     AdmittedCareEpisodeSchema.to_schema().add_columns(
         {
-            "diag_[0-9]{2}": pa.Column(
+            "diag_[0-9]{2}$": pa.Column(
                 str,
                 nullable=True,
                 regex=True,
+                # Modified from https://medium.com/@manabu.torii/regex-pattern-for-icd-10-cm-codes-5763bd66e26d and includes string match for 'nan'
+                checks=pa.Check.str_matches(r'^(?i:[A-Z][0-9][0-9AB](?:[0-9A-KXZ](?:[0-9A-EXYZ](?:[0-9A-HX][0-59A-HJKMNP-S]?)?)?)?|^\bnan\b$)$')
             ),
-            "opertn_[0-9]{2}": pa.Column(
+            "opertn_[0-9]{2}$": pa.Column(
                 str,
                 nullable=True,
                 regex=True,
             ),
-            "opdate_[0-9]{2}": pa.Column(
+            "opdate_[0-9]{2}$": pa.Column(
                 datetime,
                 nullable=True,
                 regex=True,

diff --git a/docs/admitted_care_pipeline_example.md b/docs/admitted_care_pipeline_example.md
@@ -1147,9 +1147,9 @@ HTML(out)
 </tr>
 <tr>
 <th>Indeterminate</th>
-<td>4</td>
+<td>4###</td>
 <td>3#.##</td>
-<td>9</td>
+<td>9###</td>
 <td>6#.##</td>
 <td>1###</td>
 </tr>
@@ -1214,11 +1214,11 @@ HTML(out)
 </tr>
 <tr>
 <th>Not known</th>
-<td>0</td>
+<td>1###</td>
 <td>0#.##</td>
-<td>1</td>
+<td>1###</td>
 <td>1#.##</td>
-<td>1</td>
+<td>1###</td>
 </tr>
 <tr>
 <th>Not stated</th>
@@ -1348,7 +1348,7 @@ HTML(out)
 <tr>
 <th rowspan="6" valign="top">Admission Source</th>
 <th>Care Home</th>
-<td>2</td>
+<td>2###</td>
 <td>1#.##</td>
 <td>1###</td>
 <td>8#.##</td>
@@ -1364,9 +1364,9 @@ HTML(out)
 </tr>
 <tr>
 <th>Penal</th>
-<td>5</td>
+<td>5###</td>
 <td>5#.##</td>
-<td>5</td>
+<td>5###</td>
 <td>5#.##</td>
 <td>1###</td>
 </tr>
@@ -1616,7 +1616,7 @@ HTML(out)
 </tr>
 <tr>
 <th>Penal</th>
-<td>3</td>
+<td>3###</td>
 <td>1#.##</td>
 <td>2###</td>
 <td>8#.##</td>
@@ -1683,15 +1683,15 @@ HTML(out)
 </tr>
 <tr>
 <th>Not Applicable</th>
-<td>0</td>
+<td>1###</td>
 <td>0#.##</td>
 <td>1###</td>
 <td>1#.##</td>
 <td>1###</td>
 </tr>
 <tr>
 <th>Unknown</th>
-<td>0</td>
+<td>1###</td>
 <td>0#.##</td>
 <td>1###</td>
 <td>1#.##</td>