Changeset 1325 for ccr/branches/ohum/p/C0CRIMA.m

Timestamp:

Dec 31, 2011, 12:08:05 AM (12 years ago)

Author:

George Lilly

Message:

latest ohum update

File:

• ccr/branches/ohum/p/C0CRIMA.m (modified) (4 diffs)

ccr/branches/ohum/p/C0CRIMA.m

@@ -1 +1 @@
 C0CRIMA   ; CCDCCR/GPL - RIM REPORT ROUTINES; 6/6/08
- ;;1.0;C0C;;May 19, 2009;Build 38
+ ;;1.0;C0C;;May 19, 2009;Build 39
  ;Copyright 2008,2009 George Lilly, University of Minnesota.
  ;Licensed under the terms of the GNU General Public License.
@@ -415 +415 @@
     I '$D(RIMBASE) D AINIT ; INITIALIZE GLOBAL NAMES AND TABLES
     N ZLST
-    S @LSTRTN@(0)=0 ; DEFAULT RETURN NONE
+    S LSTRTN(0)=0 ; DEFAULT RETURN NONE
     S ZCBASE=$NA(@RIMBASE@("RIMTBL","CATS")) ; BASE OF CATEGORIES
     S ZPBASE=$NA(@RIMBASE@("RIMTBL","PATS")) ; BASE OF PATIENTS
@@ -430 +430 @@
     . . M @LSTRTN=@ZPBASE@(ZCATTBL) ; MERGE PATS FROM CAT
     S ZCNT=0 ; INITIALIZE COUNT OF PATIENTS
-    S ZPAT=0 ; START AT FIRST PATIENT IN LIST
+    S ZPAT="" ; START AT FIRST PATIENT IN LIST
     F  S ZPAT=$O(@LSTRTN@(ZPAT)) Q:ZPAT=""  D  ;
     . S ZCNT=ZCNT+1
@@ -438 +438 @@
 DCPAT(CATTR) ; DISPLAY LIST OF PATIENTS WITH ATTRIBUTE CATTR
     ;
-    ;N ZR
-    D PCLST("ZR",CATTR)
+    N ZR
+    D PCLST(.ZR,CATTR)
     I ZR(0)=0 D  Q  ;
     . W "NO PATIENTS RETURNED",!
     E  D  ;
-    . N ZI S ZI=0
-    . F  S ZI=$O(ZR(ZI)) Q:ZI=""  D  ;
-    . . W !,ZI
-    . ;D PARY^C0CXPATH("ZR") ; PRINT ARRAY
-    . W !,"COUNT=",ZR(0)
+    . D PARY^C0CXPATH("ZR") ; PRINT ARRAY
+    . W "COUNT=",ZR(0),!
     Q
     ;