From dca0001f888669ca0f46b9d4b69165e9060059a0 Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 16 May 2011 11:39:02 +0000 Subject: [PATCH] Changes to BSDX01 to prevent Scheduled,dc'ed,completed radiology appointments from being cancelled. Updated files to T2. --- m/BSDX01.m | 32 +++++++++++++++++++++++++++----- m/BSDX02.m | 4 ++-- m/BSDX03.m | 2 +- m/BSDX04.m | 2 +- m/BSDX05.m | 2 +- m/BSDX06.m | 2 +- m/BSDX07.m | 2 +- m/BSDX08.m | 2 +- m/BSDX09.m | 2 +- m/BSDX11.m | 2 +- m/BSDX12.m | 2 +- m/BSDX13.m | 2 +- m/BSDX14.m | 2 +- m/BSDX15.m | 2 +- m/BSDX16.m | 2 +- m/BSDX17.m | 2 +- m/BSDX18.m | 2 +- m/BSDX19.m | 2 +- m/BSDX20.m | 2 +- m/BSDX21.m | 2 +- m/BSDX22.m | 2 +- m/BSDX23.m | 2 +- m/BSDX24.m | 2 +- m/BSDX25.m | 2 +- m/BSDX26.m | 2 +- m/BSDX27.m | 2 +- m/BSDX28.m | 2 +- m/BSDX29.m | 2 +- m/BSDX2E.m | 2 +- m/BSDX30.m | 2 +- m/BSDX31.m | 2 +- m/BSDX32.m | 2 +- m/BSDX33.m | 2 +- m/BSDX34.m | 2 +- m/BSDX35.m | 2 +- m/BSDXAPI.m | 2 +- m/BSDXGPRV.m | 2 +- 37 files changed, 64 insertions(+), 42 deletions(-) diff --git a/m/BSDX01.m b/m/BSDX01.m index 1a8d24d..ee201e1 100644 --- a/m/BSDX01.m +++ b/m/BSDX01.m @@ -1,5 +1,5 @@ -BSDX01 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:14am - ;;1.6T1;BSDX;;May 11, 2011 +BSDX01 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 5/16/11 2:46pm + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; SUINFOD(BSDXY,BSDXDUZ) ;EP Debugging entry point @@ -376,14 +376,36 @@ SCHRAEX(BSDXY,RADFN,RAOIFN,RAOSCH) ; Schedule a Radiology Exam; RPC EP; UJO/SMH QUIT ; HOLDRAEX(BSDXY,RADFN,RAOIFN) ; Hold a Radiology Exam; RPC EP; UJO/SMH new in v 1.6 - ; RPC: BSDX HOLD RAD EXAM; Return: Single Vale + ; RPC: BSDX HOLD RAD EXAM; Return: Single Value ; ; Input: ; - RADFN -> DFN ; - RAOIFN -> Radiology Order IEN in file 75.1 - ; Output: Always "1" + ; Output: 1 OR 0 for success or failure. + ; Can we hold? + N CANHOLD + D CANHOLD(.CANHOLD,RAOIFN) + I 'CANHOLD S BSDXY=0 QUIT + ; N RAOSTS S RAOSTS=3 ; Status of Hold - N RAOREA S RAOREA=20 ; Reason: Exam Cancelled + N RAOREA ; Reason, stored in file 75.2 + I $D(^RA(75.2,100)) S RAOREA=100 ; Custom site Reason + E I $D(^RA(75.2,20)) S RAOREA=20 ; Reason: Exam Cancelled + E ; Else is empty. I won't set RAOREA at all. D ^RAORDU S BSDXY=1 ; Success QUIT + ; +CANHOLD(BSDXY,RAOIFN) ; Can we hold this Exam? RPC EP; UJO/SMH new in 1.6 + ; RPC: BSDX CAN HOLD RAD EXAM; Return: Single Value + ; + ; Input: + ; - RAOIFN -> Radiology Order IEN in file 75.1 + ; Output: 0 or 1 for false or true + ; + N STATUS S STATUS=$$GET1^DIQ(75.1,RAOIFN,"REQUEST STATUS","I") + ; 1 = discontinued; 2 = Complete; 6 = Active + ; if any one of these, cannot hold exam; otherwise, we can + I 126[STATUS S BSDXY=0 QUIT + ELSE S BSDXY=1 QUIT + QUIT diff --git a/m/BSDX02.m b/m/BSDX02.m index fb33f2f..4f75008 100644 --- a/m/BSDX02.m +++ b/m/BSDX02.m @@ -1,5 +1,5 @@ -BSDX02 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 5/11/11 11:33am - ;;1.6T1;BSDX;;May 11, 2011 +BSDX02 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 5/16/11 2:47pm + ;;1.6T2;BSDX;;May 16, 2011 ;Licensed under LGPL ; Change Log ; July 15 2010: UJO/SMH - Pass FM dates in instead of US dates for i18n diff --git a/m/BSDX03.m b/m/BSDX03.m index 5568f86..b75c7c6 100644 --- a/m/BSDX03.m +++ b/m/BSDX03.m @@ -1,5 +1,5 @@ BSDX03 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:14am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ;Licensed under LGPL ; ; diff --git a/m/BSDX04.m b/m/BSDX04.m index 558f0ba..6a9b83a 100644 --- a/m/BSDX04.m +++ b/m/BSDX04.m @@ -1,5 +1,5 @@ BSDX04 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; ; 4/28/11 10:15am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; Change Log: ; July 11 2010: Pass BSDXSTART and END as FM dates rather than US formatted dates diff --git a/m/BSDX05.m b/m/BSDX05.m index 0aff8ea..050ff22 100644 --- a/m/BSDX05.m +++ b/m/BSDX05.m @@ -1,5 +1,5 @@ BSDX05 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:16am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; Change Log: diff --git a/m/BSDX06.m b/m/BSDX06.m index d14f33f..2bcd6de 100644 --- a/m/BSDX06.m +++ b/m/BSDX06.m @@ -1,5 +1,5 @@ BSDX06 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:16am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; Change Log: ; UJO/SMH: July 15 2010: Change in BSDXSTART and BSDXEND: get diff --git a/m/BSDX07.m b/m/BSDX07.m index 35d220d..baa5595 100644 --- a/m/BSDX07.m +++ b/m/BSDX07.m @@ -1,5 +1,5 @@ BSDX07 ; VW/UJO/SMH - WINDOWS SCHEDULING RPCS ; 4/28/11 10:17am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; Change Log: diff --git a/m/BSDX08.m b/m/BSDX08.m index 232f3df..3c7316b 100644 --- a/m/BSDX08.m +++ b/m/BSDX08.m @@ -1,5 +1,5 @@ BSDX08 ; VW/UJO/SMH - WINDOWS SCHEDULING RPCS ; 4/28/11 10:17am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; ; Original by HMW. New Written by Sam Habiel. Licensed under LGPL. ; diff --git a/m/BSDX09.m b/m/BSDX09.m index eeb93eb..92054db 100644 --- a/m/BSDX09.m +++ b/m/BSDX09.m @@ -1,5 +1,5 @@ BSDX09 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; ; 4/28/11 10:18am - ;;1.6T1;BSDX;;May 11, 2011;Build 7 + ;;1.6T2;BSDX;;May 16, 2011;Build 7 ; Licensed under LGPL ; ; Change Log: diff --git a/m/BSDX11.m b/m/BSDX11.m index 20ed03f..b8c2a98 100644 --- a/m/BSDX11.m +++ b/m/BSDX11.m @@ -1,5 +1,5 @@ BSDX11 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:18am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ENV0100 ;EP Version 1.0 Environment check diff --git a/m/BSDX12.m b/m/BSDX12.m index 144f155..90ba0a2 100644 --- a/m/BSDX12.m +++ b/m/BSDX12.m @@ -1,5 +1,5 @@ BSDX12 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:18am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; Change Log: diff --git a/m/BSDX13.m b/m/BSDX13.m index dd02eca..d4ca04d 100644 --- a/m/BSDX13.m +++ b/m/BSDX13.m @@ -1,5 +1,5 @@ BSDX13 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:19am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; Change Log: diff --git a/m/BSDX14.m b/m/BSDX14.m index e5c5e7a..765c041 100644 --- a/m/BSDX14.m +++ b/m/BSDX14.m @@ -1,5 +1,5 @@ BSDX14 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:19am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX15.m b/m/BSDX15.m index 62fc895..cd24834 100644 --- a/m/BSDX15.m +++ b/m/BSDX15.m @@ -1,5 +1,5 @@ BSDX15 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:19am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX16.m b/m/BSDX16.m index 4180625..b29fd3e 100644 --- a/m/BSDX16.m +++ b/m/BSDX16.m @@ -1,5 +1,5 @@ BSDX16 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; ; 4/28/11 10:20am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX17.m b/m/BSDX17.m index ad63762..b6571fa 100644 --- a/m/BSDX17.m +++ b/m/BSDX17.m @@ -1,5 +1,5 @@ BSDX17 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:20am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX18.m b/m/BSDX18.m index ae47e4a..28740c9 100644 --- a/m/BSDX18.m +++ b/m/BSDX18.m @@ -1,5 +1,5 @@ BSDX18 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:20am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX19.m b/m/BSDX19.m index c139000..7326509 100644 --- a/m/BSDX19.m +++ b/m/BSDX19.m @@ -1,5 +1,5 @@ BSDX19 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:21am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX20.m b/m/BSDX20.m index dee867f..2a1451d 100644 --- a/m/BSDX20.m +++ b/m/BSDX20.m @@ -1,5 +1,5 @@ BSDX20 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:21am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX21.m b/m/BSDX21.m index d79f3d7..1fb994e 100644 --- a/m/BSDX21.m +++ b/m/BSDX21.m @@ -1,5 +1,5 @@ BSDX21 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:22am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX22.m b/m/BSDX22.m index 2ca9df8..f17c3a7 100644 --- a/m/BSDX22.m +++ b/m/BSDX22.m @@ -1,5 +1,5 @@ BSDX22 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:22am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX23.m b/m/BSDX23.m index 7114aef..c5badf9 100644 --- a/m/BSDX23.m +++ b/m/BSDX23.m @@ -1,5 +1,5 @@ BSDX23 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:22am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX24.m b/m/BSDX24.m index 5b87872..ed6338d 100644 --- a/m/BSDX24.m +++ b/m/BSDX24.m @@ -1,5 +1,5 @@ BSDX24 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:22am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX25.m b/m/BSDX25.m index eb067e5..3c89125 100644 --- a/m/BSDX25.m +++ b/m/BSDX25.m @@ -1,5 +1,5 @@ BSDX25 ; VW/UJO/SMH - WINDOWS SCHEDULING RPCS ; 4/28/11 10:24am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; Change Log: diff --git a/m/BSDX26.m b/m/BSDX26.m index 581e105..13bc296 100644 --- a/m/BSDX26.m +++ b/m/BSDX26.m @@ -1,5 +1,5 @@ BSDX26 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:24am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; Change History: ; 3101023 - UJO/SMH - Addition of restartable transaction; relocation of tx. diff --git a/m/BSDX27.m b/m/BSDX27.m index 367692b..c725661 100644 --- a/m/BSDX27.m +++ b/m/BSDX27.m @@ -1,5 +1,5 @@ BSDX27 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:24am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; Change Log: July 15, 2010 diff --git a/m/BSDX28.m b/m/BSDX28.m index c59ca82..5bd20e7 100644 --- a/m/BSDX28.m +++ b/m/BSDX28.m @@ -1,5 +1,5 @@ BSDX28 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:25am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; Change Log: ; HMW 3050721 Added test for inactivated record diff --git a/m/BSDX29.m b/m/BSDX29.m index ee589b3..c2a0090 100644 --- a/m/BSDX29.m +++ b/m/BSDX29.m @@ -1,5 +1,5 @@ BSDX29 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:25am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; Change Log: diff --git a/m/BSDX2E.m b/m/BSDX2E.m index b0fc796..a9870c3 100644 --- a/m/BSDX2E.m +++ b/m/BSDX2E.m @@ -1,5 +1,5 @@ BSDX2E ;IHS/OIT/MJL - ENVIRONMENT CHECK FOR WINDOWS SCHEDULING [4/28/11 10:28am] - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; S LINE="",$P(LINE,"*",81)="" diff --git a/m/BSDX30.m b/m/BSDX30.m index 4ff335c..187b3be 100644 --- a/m/BSDX30.m +++ b/m/BSDX30.m @@ -1,5 +1,5 @@ BSDX30 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; [4/28/11 10:28am] - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDX31.m b/m/BSDX31.m index 206445f..4f47180 100644 --- a/m/BSDX31.m +++ b/m/BSDX31.m @@ -1,5 +1,5 @@ BSDX31 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:28am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; Change Log: ; v1.42 Oct 23 2010 WV/SMH diff --git a/m/BSDX32.m b/m/BSDX32.m index 47a1ffe..38f9718 100644 --- a/m/BSDX32.m +++ b/m/BSDX32.m @@ -1,5 +1,5 @@ BSDX32 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 5/11/11 10:39am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; Change Log: diff --git a/m/BSDX33.m b/m/BSDX33.m index 0b69b40..93d7567 100644 --- a/m/BSDX33.m +++ b/m/BSDX33.m @@ -1,5 +1,5 @@ BSDX33 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:29am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; Mods by WV/STAR ; diff --git a/m/BSDX34.m b/m/BSDX34.m index a168b17..26c44ec 100644 --- a/m/BSDX34.m +++ b/m/BSDX34.m @@ -1,5 +1,5 @@ BSDX34 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:29am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; Change Log: diff --git a/m/BSDX35.m b/m/BSDX35.m index e18c85e..f2eb9cb 100644 --- a/m/BSDX35.m +++ b/m/BSDX35.m @@ -1,5 +1,5 @@ BSDX35 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/28/11 10:29am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ; diff --git a/m/BSDXAPI.m b/m/BSDXAPI.m index 4aa5d41..bec1540 100644 --- a/m/BSDXAPI.m +++ b/m/BSDXAPI.m @@ -1,5 +1,5 @@ BSDXAPI ; IHS/ANMC/LJF & VW/SMH - SCHEDULING APIs ; 4/28/11 10:30am - ;;1.6T1;BSDX;;May 11, 2011;Build 7 + ;;1.6T2;BSDX;;May 16, 2011;Build 7 ; Licensed under LGPL ; ;Orignal routine is BSDAPI by IHS/LJF, HMW, and MAW diff --git a/m/BSDXGPRV.m b/m/BSDXGPRV.m index 450ff40..89447c6 100644 --- a/m/BSDXGPRV.m +++ b/m/BSDXGPRV.m @@ -1,5 +1,5 @@ BSDXGPRV ; WV/SMH - WINDOWS SCHEDULING RPCS ; 4/28/11 10:31am - ;;1.6T1;BSDX;;May 11, 2011 + ;;1.6T2;BSDX;;May 16, 2011 ; Licensed under LGPL ; ;