Changeset 1679 for cprs/trunk/CPRS-Chart/Orders/fODReleaseEvent.pas

Timestamp:

May 7, 2015, 12:34:29 PM (10 years ago)

Author:

healthsevak

Message:

Updating the working copy to CPRS version 28

File:

• cprs/trunk/CPRS-Chart/Orders/fODReleaseEvent.pas (modified) (2 diffs)

cprs/trunk/CPRS-Chart/Orders/fODReleaseEvent.pas

@@ -118 +118 @@
       SendReleaseOrders(OrdersLst);
       LastCheckedPtEvt := '';
+
+      //CQ #15813 Modired code to look for error string mentioned in CQ and change strings to conts - JCS
       with OrdersLst do if Count > 0 then for i := 0 to Count - 1 do
       begin
@@ -123 +125 @@
         begin
           OrderText := FindOrderText(Piece(OrdersLst[i], U, 1));
-          if Piece(OrdersLst[i],U,4) = 'Invalid Pharmacy order number' then
+          if Piece(OrdersLst[i],U,4) = TX_SAVERR_PHARM_ORD_NUM_SEARCH_STRING then
           InfoBox(TX_SAVERR1 + Piece(OrdersLst[i], U, 4) + TX_SAVERR2 + OrderText + CRLF + CRLF +
-                  'The changes to this order have not been saved.  You must contact Pharmacy to complete any action on this order.',
-                  TC_SAVERR, MB_OK)
+                  TX_SAVERR_PHARM_ORD_NUM, TC_SAVERR, MB_OK)
+          else if Piece(OrdersLst[i],U,4) = TX_SAVERR_IMAGING_PROC_SEARCH_STRING then
+          InfoBox(TX_SAVERR1 + Piece(OrdersLst[i], U, 4) + TX_SAVERR2 + OrderText + CRLF + CRLF +
+                  TX_SAVERR_IMAGING_PROC, TC_SAVERR, MB_OK)
           else
           InfoBox(TX_SAVERR1 + Piece(OrdersLst[i], U, 4) + TX_SAVERR2 + OrderText,