Changeset 144 for ccr/trunk

Timestamp:

Sep 8, 2008, 3:47:51 PM (16 years ago)

Author:

George Lilly

Message:

fixed naming bug

File:

• ccr/trunk/p/GPLRIMA.m (modified) (2 diffs)

ccr/trunk/p/GPLRIMA.m

@@ -59 +59 @@
     . ;
     . I $D(^TMP("GPLCCR",$J,"PROBVALS",1)) D  ; PROBLEM VARS EXISTS
-    . . M @RIMBASE@("VARS",RIMDFN,"PROBLEMS")=TMP("GPLCCR",$J,"PROBVALS")
+    . . M @RIMBASE@("VARS",RIMDFN,"PROBLEMS")=^TMP("GPLCCR",$J,"PROBVALS")
     . I $D(^TMP("GPLCCR",$J,"VITALS",1)) D  ; VITALS VARS EXISTS
-    . . M @RIMBASE@("VARS",RIMDFN,"VITALS")=TMP("GPLCCR",$J,"VITALS")
+    . . M @RIMBASE@("VARS",RIMDFN,"VITALS")=^TMP("GPLCCR",$J,"VITALS")
     . I $D(^TMP("GPLCCR",$J,"MEDICATIONS",1)) D  ; MEDS VARS EXISTS
-    . . M @RIMBASE@("VARS",RIMDFN,"MEDS")=TMP("GPLCCR",$J,"MEDICATIONS")
+    . . M @RIMBASE@("VARS",RIMDFN,"MEDS")=^TMP("GPLCCR",$J,"MEDICATIONS")
     . K ^TMP("GPLCCR",$J) ; KILL WORK AREA FOR CCR BUILDING
     . ;
@@ -223 +223 @@
     ;
     N ATTR S ATTR=""
-    I $D(^TMP("GPLRIM","ATTR",DFN)) S ATTR=^TMP("GPLRIM","ATTR",DFN)
+    I '$D(^TMP("GPLRIM","ATTR",DFN)) D  ; RIM VARS NOT PRESENT
+    . D ANALYZE(DFN,1) ; EXTRACT THE RIM VARIABLE FOR THIS PATIENT
+    S ATTR=^TMP("GPLRIM","ATTR",DFN)
     I ATTR="" W "THIS PATIENT NOT ANALYZED.",! Q  ;NO ATTRIBUTES FOUND
     I $D(^TMP("GPLRIM","RIMTBL","CATS",ATTR)) D  ; FOUND A CAT