From bb253903ea6993158c0513b802f6a257086efbac Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 20 Sep 2010 12:16:53 +0000 Subject: [PATCH] Change version to 1.4 on all routines BSDX08 has fix for drag and drop because it referenced a non existent cancellation reason --- m/BSDX01.m | 11 ++++++++--- m/BSDX02.m | 2 +- m/BSDX03.m | 2 +- m/BSDX04.m | 2 +- m/BSDX05.m | 2 +- m/BSDX06.m | 2 +- m/BSDX07.m | 2 +- m/BSDX08.m | 6 +++--- m/BSDX09.m | 4 ++-- 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 | 4 ++-- 37 files changed, 48 insertions(+), 43 deletions(-) diff --git a/m/BSDX01.m b/m/BSDX01.m index b898b97..31445c7 100644 --- a/m/BSDX01.m +++ b/m/BSDX01.m @@ -1,5 +1,5 @@ -BSDX01 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/18/10 2:04pm - ;;1.3T1;BSDX;;Jul 18, 2010 +BSDX01 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 9/15/10 9:09pm + ;;1.4;BSDX;;Sep 07, 2010 ; ; SUINFOD(BSDXY,BSDXDUZ) ;EP Debugging entry point @@ -119,7 +119,12 @@ RESUSR(BSDXY,BSDXDUZ) ;EP S BSDXRES=0 F S BSDXRES=$O(^BSDXRES(BSDXRES)) Q:'+BSDXRES D . Q:'$D(^BSDXRES(BSDXRES,0)) . S BSDXRNOD=^BSDXRES(BSDXRES,0) - . ;Q:$P(BSDXRNOD,U,2)=1 ;Inactive resources not filtered + . N BSDXSC S BSDXSC=$P(BSDXRNOD,U,4) ; Hospital Location + . ; super line... if tied to hospital location, + . ; Hosp location exists, AND 4th piece isn't the same as + . ; DUZ(2), quit. Filters based on Divisions. + . ; . I +BSDXSC,$D(^SC(BSDXSC,0)),$P(^SC(BSDXSC,0),U,4)'=DUZ(2) QUIT + . ;Q:$P(BSDXRNOD,U,2)=1 ;Inactive resources not filtered . ;S BSDXRDAT=$P(BSDXRNOD,U,1,4) . K BSDXRDAT . F BSDX=1:1:4 S $P(BSDXRDAT,U,BSDX)=$P(BSDXRNOD,U,BSDX) diff --git a/m/BSDX02.m b/m/BSDX02.m index 1f47e3a..81bab5e 100644 --- a/m/BSDX02.m +++ b/m/BSDX02.m @@ -1,5 +1,5 @@ BSDX02 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 12:25pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; 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 b82f0c1..80fb5ee 100644 --- a/m/BSDX03.m +++ b/m/BSDX03.m @@ -1,5 +1,5 @@ BSDX03 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Q diff --git a/m/BSDX04.m b/m/BSDX04.m index 8970e84..74820d9 100644 --- a/m/BSDX04.m +++ b/m/BSDX04.m @@ -1,5 +1,5 @@ BSDX04 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; ; 7/15/10 12:44pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; Change Log: ; July 11 2010: Pass BSDXSTART and END as FM dates rather than US formatted dates ; for i18n diff --git a/m/BSDX05.m b/m/BSDX05.m index bed556c..6d17b31 100644 --- a/m/BSDX05.m +++ b/m/BSDX05.m @@ -1,5 +1,5 @@ BSDX05 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 12:51pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Change Log: ; UJO/SMH - July 11 2010: pass FM Dates for Start and End rather than US Dates diff --git a/m/BSDX06.m b/m/BSDX06.m index 5667f2c..f7274fa 100644 --- a/m/BSDX06.m +++ b/m/BSDX06.m @@ -1,5 +1,5 @@ BSDX06 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 4:51pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; Change Log: ; UJO/SMH: July 15 2010: Change in BSDXSTART and BSDXEND: get ; dates in FM format for i18n diff --git a/m/BSDX07.m b/m/BSDX07.m index d306ba2..496ce04 100644 --- a/m/BSDX07.m +++ b/m/BSDX07.m @@ -1,5 +1,5 @@ BSDX07 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; ; 7/18/10 2:11pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Change Log: ; UJO/SMH diff --git a/m/BSDX08.m b/m/BSDX08.m index a0e4848..4f1a94c 100644 --- a/m/BSDX08.m +++ b/m/BSDX08.m @@ -1,5 +1,5 @@ -BSDX08 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 +BSDX08 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 9/15/10 8:21pm + ;;1.4;BSDX;;Sep 07, 2010 ; ; APPDELD(BSDXY,BSDXAPTID,BSDXTYP,BSDXCR,BSDXNOT) ;EP @@ -100,7 +100,7 @@ APCAN(BSDXZ,BSDXLOC,BSDXDFN,BSDXSD) ; S %H=$H D YMD^%DTC S BSDXC("CDT")=X+% S BSDXC("NOT")=BSDXNOT - S:'+$G(BSDXCR) BSDXCR=14 ;UNKNOWN REASON + S:'+$G(BSDXCR) BSDXCR=11 ;Other S BSDXC("CR")=BSDXCR S BSDXC("USR")=DUZ ; diff --git a/m/BSDX09.m b/m/BSDX09.m index 2fffb80..2e22da9 100644 --- a/m/BSDX09.m +++ b/m/BSDX09.m @@ -1,5 +1,5 @@ BSDX09 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; ; 8/16/10 4:28pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Change Log: ; UJO/TH - v 1.3 on 3100714 - Extra Demographics: @@ -12,7 +12,7 @@ BSDX09 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; ; 8/16/10 4:28pm ; GETREGA(BSDXRET,BSDXPAT) ;EP ; - ; See below for the returned fields + ; See below for the returned fields ; ;For patient with ien BSDXPAT ;K ^BSDXTMP($J) diff --git a/m/BSDX11.m b/m/BSDX11.m index 0f26183..cff7a7c 100644 --- a/m/BSDX11.m +++ b/m/BSDX11.m @@ -1,5 +1,5 @@ BSDX11 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ENV0100 ;EP Version 1.0 Environment check I '$G(IOM) D HOME^%ZIS diff --git a/m/BSDX12.m b/m/BSDX12.m index 84c51bb..71f85ff 100644 --- a/m/BSDX12.m +++ b/m/BSDX12.m @@ -1,5 +1,5 @@ BSDX12 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/18/10 2:14pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Change Log: ; v 1.3 - i18n support - 3100718 diff --git a/m/BSDX13.m b/m/BSDX13.m index 60d878f..b86e49d 100644 --- a/m/BSDX13.m +++ b/m/BSDX13.m @@ -1,5 +1,5 @@ BSDX13 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/18/10 2:17pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Change Log: ; V 1.3 - i18n support - Dates passed to Routine as FM Date - WV/SMH diff --git a/m/BSDX14.m b/m/BSDX14.m index 23c0ac3..65f8dd9 100644 --- a/m/BSDX14.m +++ b/m/BSDX14.m @@ -1,5 +1,5 @@ BSDX14 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; ACCTYPD(BSDXY,BSDXVAL) ;EP diff --git a/m/BSDX15.m b/m/BSDX15.m index 1c1aec3..5bc3660 100644 --- a/m/BSDX15.m +++ b/m/BSDX15.m @@ -1,5 +1,5 @@ BSDX15 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; GRPTYP(BSDXY) ;EP diff --git a/m/BSDX16.m b/m/BSDX16.m index 624af3f..b602da7 100644 --- a/m/BSDX16.m +++ b/m/BSDX16.m @@ -1,5 +1,5 @@ BSDX16 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; RSRCD(BSDXY,BSDXVAL) ;EP diff --git a/m/BSDX17.m b/m/BSDX17.m index caabbb9..0919880 100644 --- a/m/BSDX17.m +++ b/m/BSDX17.m @@ -1,5 +1,5 @@ BSDX17 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; SCHUSRD(BSDXY) ;EP diff --git a/m/BSDX18.m b/m/BSDX18.m index 8427942..ef2f66b 100644 --- a/m/BSDX18.m +++ b/m/BSDX18.m @@ -1,5 +1,5 @@ BSDX18 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; DELRUD(BSDXY,BSDXIEN) ;EP diff --git a/m/BSDX19.m b/m/BSDX19.m index e3c940d..a9aebfa 100644 --- a/m/BSDX19.m +++ b/m/BSDX19.m @@ -1,5 +1,5 @@ BSDX19 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; ADDRGD(BSDXY,BSDXVAL) ;EP diff --git a/m/BSDX20.m b/m/BSDX20.m index 95e986a..e511bb9 100644 --- a/m/BSDX20.m +++ b/m/BSDX20.m @@ -1,5 +1,5 @@ BSDX20 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; DELRGID(BSDXY,BSDXIEN) ;EP diff --git a/m/BSDX21.m b/m/BSDX21.m index 5de5d4c..eab5db4 100644 --- a/m/BSDX21.m +++ b/m/BSDX21.m @@ -1,5 +1,5 @@ BSDX21 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 5/21/10 9:42pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; ADDAGD(BSDXY,BSDXVAL) ;EP diff --git a/m/BSDX22.m b/m/BSDX22.m index 689b283..ae781b6 100644 --- a/m/BSDX22.m +++ b/m/BSDX22.m @@ -1,5 +1,5 @@ BSDX22 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; DELAGID(BSDXY,BSDXIEN,BSDXIEN1) ;EP diff --git a/m/BSDX23.m b/m/BSDX23.m index 8fd8b50..9b1f042 100644 --- a/m/BSDX23.m +++ b/m/BSDX23.m @@ -1,5 +1,5 @@ BSDX23 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; EVENT(BSDXEVENT,BSDXPARAM,BSDXSIP,BSDXSPT) ;EP diff --git a/m/BSDX24.m b/m/BSDX24.m index ee4dc19..8dd76d1 100644 --- a/m/BSDX24.m +++ b/m/BSDX24.m @@ -1,5 +1,5 @@ BSDX24 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Q diff --git a/m/BSDX25.m b/m/BSDX25.m index dcd3d50..68c8c40 100644 --- a/m/BSDX25.m +++ b/m/BSDX25.m @@ -1,5 +1,5 @@ BSDX25 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; CHECKIND(BSDXY,BSDXAPTID,BSDXCDT,BSDXCC,BSDXPRV,BSDXROU,BSDXVCL,BSDXVFM,BSDXOG) ;EP diff --git a/m/BSDX26.m b/m/BSDX26.m index 3651793..6ab442b 100644 --- a/m/BSDX26.m +++ b/m/BSDX26.m @@ -1,5 +1,5 @@ BSDX26 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; EDITAPTD(BSDXY,BSDXAPTID,BSDXNOTE) ;EP diff --git a/m/BSDX27.m b/m/BSDX27.m index 5694fcb..b62fcbf 100644 --- a/m/BSDX27.m +++ b/m/BSDX27.m @@ -1,5 +1,5 @@ BSDX27 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 12:22pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Change Log: July 15, 2010 ; UJO/SMH - i18n: FM Dates passed into routine for Clinic Letters - CLDISP tag diff --git a/m/BSDX28.m b/m/BSDX28.m index 435a39c..4a6063d 100644 --- a/m/BSDX28.m +++ b/m/BSDX28.m @@ -1,5 +1,5 @@ BSDX28 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/18/10 2:30pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Change Log: ; HMW 3050721 Added test for inactivated record diff --git a/m/BSDX29.m b/m/BSDX29.m index 01081bc..33dfa1e 100644 --- a/m/BSDX29.m +++ b/m/BSDX29.m @@ -1,5 +1,5 @@ BSDX29 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/18/10 2:03pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Change Log: ; v1.3 by WV/SMH on 3100713 diff --git a/m/BSDX2E.m b/m/BSDX2E.m index 0f6fcee..7c0e066 100644 --- a/m/BSDX2E.m +++ b/m/BSDX2E.m @@ -1,5 +1,5 @@ BSDX2E ;IHS/OIT/MJL - ENVIRONMENT CHECK FOR WINDOWS SCHEDULING [7/18/10 4:30pm] - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; S LINE="",$P(LINE,"*",81)="" S XPDNOQUE="NO QUE" ;NO QUEUING ALLOWED diff --git a/m/BSDX30.m b/m/BSDX30.m index c46233e..96bc0aa 100644 --- a/m/BSDX30.m +++ b/m/BSDX30.m @@ -1,5 +1,5 @@ BSDX30 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; [ 09/12/2007 1:54 PM ] - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; SPACED(BSDXY,BSDXDIC,BSDXVAL) ;EP diff --git a/m/BSDX31.m b/m/BSDX31.m index 89c14fe..2170f4f 100644 --- a/m/BSDX31.m +++ b/m/BSDX31.m @@ -1,5 +1,5 @@ BSDX31 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; NOSHOWD(BSDXY,BSDXAPTID,BSDXNS) ;EP diff --git a/m/BSDX32.m b/m/BSDX32.m index c80b47b..1fa7401 100644 --- a/m/BSDX32.m +++ b/m/BSDX32.m @@ -1,5 +1,5 @@ BSDX32 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; ERROR ; diff --git a/m/BSDX33.m b/m/BSDX33.m index 1b5112b..8218b92 100644 --- a/m/BSDX33.m +++ b/m/BSDX33.m @@ -1,5 +1,5 @@ BSDX33 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 12:33pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; Mods by WV/STAR ; ; Change Log: diff --git a/m/BSDX34.m b/m/BSDX34.m index 7eae549..8f52fc7 100644 --- a/m/BSDX34.m +++ b/m/BSDX34.m @@ -1,5 +1,5 @@ BSDX34 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 12:37pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Change Log: ; July 10 2010: diff --git a/m/BSDX35.m b/m/BSDX35.m index 16e5f14..09540bb 100644 --- a/m/BSDX35.m +++ b/m/BSDX35.m @@ -1,5 +1,5 @@ BSDX35 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ; ; Q diff --git a/m/BSDXAPI.m b/m/BSDXAPI.m index c842d1f..398520b 100644 --- a/m/BSDXAPI.m +++ b/m/BSDXAPI.m @@ -1,5 +1,5 @@ BSDXAPI ; IHS/ANMC/LJF - SCHEDULING APIs ; 4/29/10 9:42pm - ;;1.3T1;BSDX;;Jul 18, 2010 + ;;1.4;BSDX;;Sep 07, 2010 ;Orignal routine is BSDAPI by IHS/LJF, HMW, and MAW ;local mods (many) by WV/SMH ;Move to BSDX namespace as BSDXAPI from BSDAPI by WV/SMH diff --git a/m/BSDXGPRV.m b/m/BSDXGPRV.m index 7c870ba..071979a 100644 --- a/m/BSDXGPRV.m +++ b/m/BSDXGPRV.m @@ -1,5 +1,5 @@ -BSDXGPRV ; WV/SMH - WINDOWS SCHEDULING RPCS ; 6/10/10 9:01pm - ;;1.3T1;BSDX;;Jul 18, 2010 +BSDXGPRV ; WV/SMH - WINDOWS SCHEDULING RPCS ; 9/7/10 7:59am + ;;1.4;BSDX;;Sep 07, 2010 ; ; ERROR ;