UHM-9105 - Support removing orders from reception list (#20)

mseaton · web-flow · commit 0d48055b83c1 · 2026-02-24T07:47:43.000-05:00
diff --git a/api/src/main/java/org/openmrs/module/pihapps/PihAppsService.java b/api/src/main/java/org/openmrs/module/pihapps/PihAppsService.java
@@ -13,7 +13,9 @@
  */
 package org.openmrs.module.pihapps;
 
+import org.openmrs.Concept;
 import org.openmrs.Location;
+import org.openmrs.Order;
 import org.openmrs.api.OpenmrsService;
 import org.openmrs.module.pihapps.orders.EncounterFulfillingOrders;
 import org.openmrs.module.pihapps.orders.OrderSearchCriteria;
@@ -33,4 +35,6 @@ public interface PihAppsService extends OpenmrsService {
 	EncounterFulfillingOrders saveEncounterFulfillingOrders(EncounterFulfillingOrders encounterFulfillingOrders);
 
 	EncounterFulfillingOrders getEncounterFulfillingOrders(String encounterUuid);
+
+	void markOrdersAsNotFulfilled(List<Order> orders, Concept reason);
 }
diff --git a/api/src/main/java/org/openmrs/module/pihapps/PihAppsServiceImpl.java b/api/src/main/java/org/openmrs/module/pihapps/PihAppsServiceImpl.java
@@ -31,6 +31,7 @@
 import org.openmrs.annotation.Authorized;
 import org.openmrs.api.EncounterService;
 import org.openmrs.api.LocationService;
+import org.openmrs.api.ObsService;
 import org.openmrs.api.OrderService;
 import org.openmrs.api.db.hibernate.DbSessionFactory;
 import org.openmrs.api.impl.BaseOpenmrsService;
@@ -79,6 +80,9 @@ public class PihAppsServiceImpl extends BaseOpenmrsService implements PihAppsSer
 	@Setter
 	private OrderService orderService;
 
+	@Setter
+	private ObsService obsService;
+
 	@Setter
 	private DbSessionFactory sessionFactory;
 
@@ -319,4 +323,27 @@ public EncounterFulfillingOrders getEncounterFulfillingOrders(String encounterUu
 		encounterFulfillingOrders.setOrders(orders);
 		return encounterFulfillingOrders;
 	}
+
+	@Override
+	@Transactional
+	@Authorized(PrivilegeConstants.EDIT_ORDERS)
+	public void markOrdersAsNotFulfilled(List<Order> orders, Concept reason) {
+		for (Order order : orders) {
+			orderService.updateOrderFulfillerStatus(order, Order.FulfillerStatus.EXCEPTION, null);
+			if (reason != null) {
+				if (labOrderConfig.getReasonTestNotPerformedQuestion() == null) {
+					throw new IllegalArgumentException("Reason test not performed question is not configured");
+				}
+				Obs obs = new Obs();
+				obs.setPerson(order.getPatient());
+				obs.setObsDatetime(new Date());
+				obs.setConcept(labOrderConfig.getReasonTestNotPerformedQuestion());
+				obs.setOrder(order);
+				obs.setValueCoded(reason);
+				obs.setAccessionNumber(order.getAccessionNumber());
+				obs.setComment("result-entry-form^did-not-perform-dropdown"); // This is here for backwards-compatibility with the labworkflow owa
+				obsService.saveObs(obs, "");
+			}
+		}
+	}
 }
diff --git a/api/src/main/java/org/openmrs/module/pihapps/orders/LabOrderConfig.java b/api/src/main/java/org/openmrs/module/pihapps/orders/LabOrderConfig.java
@@ -394,6 +394,18 @@ public Concept getSpecimenReceivedDateQuestion() {
         return conceptService.getConceptByReference(getSpecimenReceivedDateQuestionReference());
     }
 
+    public String getReasonTestNotPerformedQuestionReference() {
+        String configVal = ConfigUtil.getGlobalProperty("pihapps.labs.didNotPerformReason");
+        if (StringUtils.isBlank(configVal)) {
+            configVal = ConfigUtil.getGlobalProperty("labworkflowowa.didNotPerformReason");
+        }
+        return configVal;
+    }
+
+    public Concept getReasonTestNotPerformedQuestion() {
+        return conceptService.getConceptByReference(getReasonTestNotPerformedQuestionReference());
+    }
+
     private Map<String, String> map(String... keysAndValues) {
         Map<String, String> ret = new LinkedHashMap<>();
         for (int i = 0; i < keysAndValues.length; i += 2) {
diff --git a/api/src/main/resources/messages.properties b/api/src/main/resources/messages.properties
@@ -76,6 +76,8 @@ pihapps.labTestLocation=Laboratory Performing Test
 pihapps.specimenCollectionDateCannotBeFuture=Specimen Collection Date cannot be in the future
 pihapps.specimenReceivedDateCannotBeFuture=Date Specimen Received at Laboratory cannot be in the future
 pihapps.specimenReceivedCannotBeBeforeCollected=Date Specimen Received at Laboratory cannot be before Specimen Collection Date
+pihapps.reason=Reason
+pihapps.reasonRequired=Reason is required
 
 # Login and Visit Location Configuration and Selection Pages
 pihapps.login.chooseLocation.title=Choose login location
diff --git a/api/src/main/resources/messages_es.properties b/api/src/main/resources/messages_es.properties
@@ -76,6 +76,8 @@ pihapps.labTestLocation=Laboratorio que realiza la prueba
 pihapps.specimenCollectionDateCannotBeFuture=La fecha de recolección de la muestra no puede ser una fecha futura.
 pihapps.specimenReceivedDateCannotBeFuture=La fecha en que se recibió la muestra en el laboratorio no puede ser una fecha futura.
 pihapps.specimenReceivedCannotBeBeforeCollected=La fecha de recepción de la muestra en el laboratorio no puede ser anterior a la fecha de recolección de la muestra.
+pihapps.reason=Razón
+pihapps.reasonRequired=Se requiere razón
 
 # Login and Visit Location Configuration and Selection Pages
 pihapps.login.chooseLocation.title=Elija la ubicación de inicio de sesión
diff --git a/api/src/main/resources/messages_fr.properties b/api/src/main/resources/messages_fr.properties
@@ -76,6 +76,8 @@ pihapps.labTestLocation=Laboratoire effectuant les tests
 pihapps.specimenCollectionDateCannotBeFuture=La date de prélèvement de l'échantillon ne peut pas être une date future.
 pihapps.specimenReceivedDateCannotBeFuture=La date de réception de l'échantillon au laboratoire ne peut pas être une date future.
 pihapps.specimenReceivedCannotBeBeforeCollected=La date de réception de l'échantillon au laboratoire ne peut pas être antérieure à la date de prélèvement de l'échantillon.
+pihapps.reason=Raison
+pihapps.reasonRequired=Une raison est requise
 
 # Login and Visit Location Configuration and Selection Pages
 pihapps.login.chooseLocation.title=Choisissez votre lieu
diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml
@@ -19,6 +19,7 @@
 				<property name="locationService" ref="locationService"/>
 				<property name="orderService" ref="orderService"/>
 				<property name="encounterService" ref="encounterService"/>
+				<property name="obsService" ref="obsService"/>
 				<property name="sessionFactory" ref="dbSessionFactory"/>
 			</bean>
 		</property>
diff --git a/omod/src/main/java/org/openmrs/module/pihapps/rest/LabOrderRestController.java b/omod/src/main/java/org/openmrs/module/pihapps/rest/LabOrderRestController.java
@@ -7,6 +7,7 @@
 import org.openmrs.Order;
 import org.openmrs.OrderType;
 import org.openmrs.Patient;
+import org.openmrs.api.ConceptService;
 import org.openmrs.api.OrderService;
 import org.openmrs.module.pihapps.PihAppsService;
 import org.openmrs.module.pihapps.SortCriteria;
@@ -16,6 +17,7 @@
 import org.openmrs.module.pihapps.orders.OrderSearchResult;
 import org.openmrs.module.pihapps.orders.PatientWithOrders;
 import org.openmrs.module.pihapps.orders.PatientWithOrdersSearchResult;
+import org.openmrs.module.webservices.rest.SimpleObject;
 import org.openmrs.module.webservices.rest.web.ConversionUtil;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestUtil;
@@ -24,7 +26,10 @@
 import org.openmrs.module.webservices.rest.web.resource.impl.AlreadyPaged;
 import org.openmrs.module.webservices.rest.web.response.ResponseException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -52,11 +57,14 @@ public class LabOrderRestController {
 
     private final OrderService orderService;
 
+    private final ConceptService conceptService;
+
     @Autowired
-    public LabOrderRestController(PihAppsService pihAppsService, LabOrderConfig labOrderConfig, OrderService orderService) {
+    public LabOrderRestController(PihAppsService pihAppsService, LabOrderConfig labOrderConfig, OrderService orderService, ConceptService conceptService) {
         this.pihAppsService = pihAppsService;
         this.labOrderConfig = labOrderConfig;
         this.orderService = orderService;
+        this.conceptService = conceptService;
     }
 
     @RequestMapping(value = "/rest/v1/pihapps/labOrder", method = RequestMethod.GET)
@@ -189,6 +197,37 @@ public Object getLabOrderPatients(HttpServletRequest request, HttpServletRespons
         return alreadyPaged.toSimpleObject(patientConverter);
     }
 
+    @RequestMapping(value = "/rest/v1/pihapps/markOrdersAsNotPerformed", method = RequestMethod.POST)
+    public Object markOrdersAsNotPerformed(HttpServletRequest request, HttpServletResponse response, @RequestBody SimpleObject post) throws ResponseException {
+        try {
+            List<String> orderUuids = post.get("orders");
+            if (orderUuids == null || orderUuids.isEmpty()) {
+                throw new RuntimeException("You must specify at least one order");
+            }
+            List<Order> orders = new ArrayList<>();
+            for (String orderUuid : orderUuids) {
+                Order order = orderService.getOrderByUuid(orderUuid);
+                if (order == null) {
+                    throw new Exception("No order found with uuid " + orderUuid);
+                }
+                orders.add(order);
+            }
+            Concept reason = null;
+            if (StringUtils.isNotBlank(post.get("reason"))) {
+                reason = conceptService.getConceptByReference(post.get("reason"));
+                if (reason == null) {
+                    throw new Exception("Invalid reason.  No concept found with uuid " + post.get("reason"));
+                }
+            }
+            pihAppsService.markOrdersAsNotFulfilled(orders, reason);
+            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        }
+        catch (Exception e) {
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+            return RestUtil.wrapErrorResponse(e, e.getLocalizedMessage());
+        }
+    }
+
     /**
      * There is no OrderType Property Editor registered with core, so convert from String uuids to OrderTypes
      */
diff --git a/omod/src/main/webapp/pages/labs/labPatientReception.gsp b/omod/src/main/webapp/pages/labs/labPatientReception.gsp
