diff --git a/README.md b/README.md
index 6f8058d8..f9afdd89 100644
--- a/README.md
+++ b/README.md
@@ -196,6 +196,15 @@ Then administrator should make the following one time configurations using the a
6. Add global property `orderentryowa.labOrderAutoExpireTimeInDays` with a value of `30` days or any other number
7. Add global propery Lab Orderables Concept Set `orderentryowa.labOrderablesConceptSet`, whose value is the UUID of a concept set of Class LabSet and whose Set Members are other LabSet concept sets or concept of Class Test.
+### Additional features
+
+As of version 1.3.0, the module supports a collecting an "order reason" for Lab Orders. Order reasons are specified at
+individual test or panel level via global property `orderentryowa.orderReasonsMap` that supports a pipe-delimited
+lists of panel or panel uuids mapping tests to concept sets that provides the reason for ordering. A single set of
+tests/panels can also be mapped to the same concept set. For example:
+
+uuid-of-test-a=uuid-of-concept-set-that-contains-potential-reasons-for-test-a|uuid-of-test-b,uuid-of-panel-a=uuid-of-concept-set-that contains potential-reasons-for-test-b-and-panel-a
+
**NB:** Not having any of the above configurations will result into an error notice. Please check more information [here](https://wiki.openmrs.org/display/projects/Order+Entry+UI+Administrator+Guide)
diff --git a/app/js/actions/actionTypes.js b/app/js/actions/actionTypes.js
index ea19e850..032f047a 100644
--- a/app/js/actions/actionTypes.js
+++ b/app/js/actions/actionTypes.js
@@ -78,3 +78,10 @@ export const DISCONTINUE_ACTIVE_DRUG_ORDER = 'DISCONTINUE_ACTIVE_DRUG_ORDER';
export const DISCONTINUE_ORDER = 'DISCONTINUE_ORDER';
export const DISCONTINUE_ORDER_SUCCEDED = 'DISCONTINUE_ORDER_SUCCEDED';
export const SET_REDIRECT_TO_ADD_RESULTS = "SET_REDIRECT_TO_ADD_RESULTS";
+export const FETCH_ORDER_REASONS_GLOBAL_PROPERTY_FAILURE = 'FETCH_ORDER_REASONS_GLOBAL_PROPERTY_FAILURE';
+export const FETCH_ORDER_REASONS_GLOBAL_PROPERTY_SUCCESS = 'FETCH_ORDER_REASONS_GLOBAL_PROPERTY_SUCCESS';
+export const FETCH_ORDER_REASONS_GLOBAL_PROPERTY_LOADING = 'FETCH_ORDER_REASONS_GLOBAL_PROPERTY_LOADING';
+export const FETCH_ORDER_REASONS_FAILURE = 'FETCH_ORDER_REASONS_FAILURE';
+export const FETCH_ORDER_REASONS_SUCCESS = 'FETCH_ORDER_REASONS_SUCCESS';
+export const FETCH_ORDER_REASONS_LOADING = 'FETCH_ORDER_REASONS_LOADING';
+export const SET_LAB_ORDER_REASON = 'SET_LAB_ORDER_REASON';
diff --git a/app/js/actions/draftActions.js b/app/js/actions/draftActions.js
index c25d6f7d..d2e1766e 100644
--- a/app/js/actions/draftActions.js
+++ b/app/js/actions/draftActions.js
@@ -1,4 +1,4 @@
-import { DELETE_DRAFT_DRUG_ORDER_SUCCESS, TOGGLE_DRAFT_LAB_ORDER_URGENCY } from './actionTypes';
+import { DELETE_DRAFT_DRUG_ORDER_SUCCESS, SET_LAB_ORDER_REASON, TOGGLE_DRAFT_LAB_ORDER_URGENCY } from './actionTypes';
import { DRUG_ORDER } from '../components/orderEntry/orderTypes';
import { selectDrugSuccess } from './drug';
import { setSelectedOrder } from './orderAction';
@@ -6,7 +6,7 @@ import {
removeTestFromDraft,
removeTestPanelFromDraft,
deleteDraftLabOrder,
-} from '../actions/draftLabOrderAction';
+} from './draftLabOrderAction';
import { deleteAllDrugDraftOrders } from './draftTableAction';
import constants from '../utils/constants';
@@ -54,3 +54,9 @@ export const discardTestsInDraft = (test = {}) => (dispatch) => {
dispatch(deleteDraftLabOrder());
return dispatch(deleteAllDrugDraftOrders());
};
+
+export const setLabOrderReason = ({ order, orderReason }) => ({
+ type: SET_LAB_ORDER_REASON,
+ order,
+ orderReason,
+});
\ No newline at end of file
diff --git a/app/js/actions/fetchOrderReasons.js b/app/js/actions/fetchOrderReasons.js
new file mode 100644
index 00000000..71dc033b
--- /dev/null
+++ b/app/js/actions/fetchOrderReasons.js
@@ -0,0 +1,9 @@
+import axiosInstance from '../config';
+
+const fetchOrderReasons = conceptUUID => ({
+ type: 'FETCH_ORDER_REASONS',
+ payload: axiosInstance.get(`/concept/${conceptUUID}`),
+
+});
+
+export default fetchOrderReasons;
diff --git a/app/js/actions/fetchOrderReasonsGlobalProperty.js b/app/js/actions/fetchOrderReasonsGlobalProperty.js
new file mode 100644
index 00000000..79567ce7
--- /dev/null
+++ b/app/js/actions/fetchOrderReasonsGlobalProperty.js
@@ -0,0 +1,59 @@
+import axiosInstance from '../config';
+import loading from "./loading";
+import networkError from "./networkError";
+import {
+ FETCH_ORDER_REASONS_GLOBAL_PROPERTY_FAILURE,
+ FETCH_ORDER_REASONS_GLOBAL_PROPERTY_SUCCESS,
+} from "./actionTypes";
+import fetchOrderReasons from "./fetchOrderReasons";
+
+
+export const fetchOrderReasonsGlobalPropertySuccess = value => ({
+ type: FETCH_ORDER_REASONS_GLOBAL_PROPERTY_SUCCESS,
+ payload: value,
+});
+
+export const fetchOrderReasonsGlobalPropertyFailure = error => ({
+ type: FETCH_ORDER_REASONS_GLOBAL_PROPERTY_FAILURE,
+ payload: error,
+});
+
+
+export const fetchOrderReasonsGlobalProperty = () => (dispatch) => {
+ dispatch(loading('FETCH_ORDER_REASONS_GLOBAL_PROPERTY', true));
+ return axiosInstance.get(`systemsetting?v=custom:(value)&q=orderentryowa.orderReasonsMap`)
+ .then((response) => {
+ const orderReasonsMap = {};
+ const reasonSetUuids = [];
+
+ if (response.data.results.length > 0) {
+ response.data.results[0].value.split('|').forEach((element) => {
+ const orderables = element.split('=')[0];
+ const reasonSetUuid = element.split('=')[1];
+ orderables.split(',').forEach((orderable) => {
+ orderReasonsMap[orderable] = {
+ setUuid: reasonSetUuid,
+ members: [],
+ };
+ });
+ if (!reasonSetUuids.includes(reasonSetUuid)) {
+ reasonSetUuids.push(reasonSetUuid);
+ }
+ });
+
+ dispatch(fetchOrderReasonsGlobalPropertySuccess(orderReasonsMap));
+
+ reasonSetUuids.forEach((uuid) => {
+ dispatch(fetchOrderReasons(uuid));
+ });
+ dispatch(loading('FETCH_ORDER_REASON_GLOBAL_PROPERTY', false));
+ }
+ }).catch((error) => {
+ if (!error.response) dispatch(networkError('Network error occurred'));
+ else dispatch(fetchOrderReasonsGlobalPropertyFailure(error));
+ dispatch(loading('FETCH_ORDER_REASONS_GLOBAL_PROPERTY', false));
+ });
+};
+
+
+export default fetchOrderReasonsGlobalProperty;
\ No newline at end of file
diff --git a/app/js/components/Draft.jsx b/app/js/components/Draft.jsx
index 1ef76d0e..aba86f21 100644
--- a/app/js/components/Draft.jsx
+++ b/app/js/components/Draft.jsx
@@ -6,14 +6,32 @@ import { injectIntl, FormattedMessage } from 'react-intl';
import constants from '../utils/constants';
import IconButton from './button/IconButton';
import { getConceptShortName } from '../utils/helpers';
+import fetchOrderReasonsGlobalProperty from "../actions/fetchOrderReasonsGlobalProperty";
export class Draft extends PureComponent {
+ componentDidMount() {
+ this.props.dispatch(fetchOrderReasonsGlobalProperty());
+ }
+
renderDraftList = () => {
let draftType;
- const { draftOrders, handleDraftDiscard, locale } = this.props;
+ const {
+ draftOrders,
+ handleDraftDiscard,
+ locale,
+ orderReasonsMap,
+ } = this.props;
return draftOrders.map((order) => {
const isPanel = !!order.set;
const isOtherOrderType = !!order.type;
+ const orderReasons =
+ orderReasonsMap && orderReasonsMap[order.uuid] ? orderReasonsMap[order.uuid] : null;
+
+ // set default order reason if not set
+ if (orderReasons && orderReasons.members && orderReasons.members.length > 0
+ && order.orderReason === undefined) {
+ this.props.setLabOrderReason({ orderReason: orderReasons.members[0].uuid, order });
+ }
if (isPanel) {
draftType = 'panel';
@@ -34,40 +52,64 @@ export class Draft extends PureComponent {
);
return (
-
- {!order.action ? 'NEW' : order.action}
- { orderName }
-
-
- { order.type !== 'drugorder' ?
+
+
+ {!order.action ? 'NEW' : order.action}
+ { orderName }
+
+
+ { order.type !== 'drugorder' ?
+
+
+
:
+
+ }
+
+
:
-
- }
-
-
-
-
-