be better at software

CDCgov · Oct 25, 2023 · 7c2feb5 · 7c2feb5
1 parent 7729d0b
commit 7c2feb5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/service/PatientBulkUploadServiceAsync.java b/backend/src/main/java/gov/cdc/usds/simplereport/service/PatientBulkUploadServiceAsync.java
@@ -132,8 +132,10 @@ public CompletableFuture<Set<Person>> savePatients(byte[] content, UUID facility
                 .ethnicity(convertEthnicityToDatabaseValue(extractedData.getEthnicity().getValue()))
                 .gender(convertSexToDatabaseValue(extractedData.getBiologicalSex().getValue()))
                 .genderIdentity(
-                    convertGenderIdentityToDatabaseValue(
-                        extractedData.getGenderIdentity().getValue()))
+                    extractedData.getGenderIdentity().getValue() == null
+                        ? null
+                        : convertGenderIdentityToDatabaseValue(
+                            extractedData.getGenderIdentity().getValue()))
                 .residentCongregateSetting(
                     parseYesNoUnk(extractedData.getResidentCongregateSetting().getValue()))
                 .employedInHealthcare(

diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/validators/CsvValidatorUtils.java b/backend/src/main/java/gov/cdc/usds/simplereport/validators/CsvValidatorUtils.java
@@ -473,7 +473,10 @@ public static MappingIterator<Map<String, String>> getIteratorForCsv(InputStream
 
   /* Values need to be lower case to play nice with frontend */
   public static String convertGenderIdentityToDatabaseValue(String genderIdentity) {
-    return genderIdentity.toLowerCase();
+    if (genderIdentity != null) {
+      return genderIdentity.toLowerCase();
+    }
+    return "";
   }
 
   /* The acceptable values for race and ethnicity don't map to the values expected in our database. */