Enable export of single barcodes even if not WorkflowStatus Specialis…

…t Reviewd
BernhardWebstudio · Nov 26, 2023 · 033d7ed · 033d7ed
1 parent 03d2548
commit 033d7ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/jobs/NahimaExportJob.java b/src/main/java/edu/harvard/mcz/imagecapture/jobs/NahimaExportJob.java
@@ -52,10 +52,11 @@ public void start() {
         SpecimenLifeCycle sls = new SpecimenLifeCycle();
         if (specimenToExport == null) {
             Map<String, Object> queryParams = new HashMap<>();
-            queryParams.put("workFlowStatus", WorkFlowStatus.STAGE_CLEAN);
             queryParams.put("nahimaExported", false);
             if (this.oneSpecimenBarcode != null && !this.oneSpecimenBarcode.equals("")) {
                 queryParams.put("barcode", this.oneSpecimenBarcode);
+            } else {
+                queryParams.put("workFlowStatus", WorkFlowStatus.STAGE_CLEAN);
             }
             specimenToExport = sls.findBy(queryParams);
         }

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/lifecycle/GenericLifeCycle.java b/src/main/java/edu/harvard/mcz/imagecapture/lifecycle/GenericLifeCycle.java
@@ -101,7 +101,7 @@ public List<T> findBy(Map<String, Object> propertyValueMap, int maxResults, int
                         p = cb.like(propertyToMatch, (String) entry.getValue());
                     } else {
                         Object value = entry.getValue();
-                        if (value instanceof String || value instanceof Date || value instanceof java.lang.Number) {
+                        if (value instanceof Boolean || value instanceof String || value instanceof Date || value instanceof java.lang.Number) {
                             p = cb.equal(propertyToMatch, entry.getValue());
                         } else {
                             log.warn("Will not handle property: " + entry.getKey() + " with value type " + " " + value.getClass().toGenericString());