Changeset 588 for ccr/trunk

Timestamp:

Oct 30, 2009, 8:51:43 AM (15 years ago)

Author:

Christopher Edwards

Message:

Fix test if a MRN exists for the patient actor

File:

• ccr/trunk/p/C0CACTOR.m (modified) (8 diffs)

ccr/trunk/p/C0CACTOR.m

@@ -1 @@
-C0CACTOR         ; CCDCCR/GPL - CCR/CCD PROCESSING FOR ACTORS ; 7/3/08
+C0CACTOR  ; CCDCCR/GPL - CCR/CCD PROCESSING FOR ACTORS ; 7/3/08
  ;;1.0;C0C;;May 19, 2009;
  ;Copyright 2008,2009 George Lilly, University of Minnesota.
@@ -27 +27 @@
  ; 0.4 Patient data rouine refactored; adjustments here--SMH
  ;
-EXTRACT(IPXML,ALST,AXML)        ; EXTRACT ACTOR FROM ALST INTO PROVIDED XML TEMPLATE
+EXTRACT(IPXML,ALST,AXML) ; EXTRACT ACTOR FROM ALST INTO PROVIDED XML TEMPLATE
  ; IPXML is the Input Actor Template into which we  substitute values
  ; This is straight XML. Values to be substituted are in @@VAL@@ format.
@@ -83 +83 @@
  Q
  ;
-PATIENT(INXML,AIEN,AOID,OUTXML) ; PROCESS A PATIENT ACTOR
+PATIENT(INXML,AIEN,AOID,OUTXML) ; PROCESS A PATIENT ACTOR
  I DEBUG W "PROCESSING ACTOR PATIENT ",AIEN,!
  ;GPL SEPARATED EXTRACT FROM MAP FOR PROCESSING PATIENTS - TO MAKE
@@ -109 +109 @@
  X ^%ZOSF("TEST") ; TEST TO SEE IF THE ROUTINE EXISTS
  I $T S MRN=$$^MSCDPTID(DFN) ;TEST FOR MRN ON OPENVISTA ;GPL
- I $D(MRN) D  ; IF MRN IS PRESENT
+ I MRN'="" D  ; IF MRN IS PRESENT
  . S @AMAP@("ACTORSSN")=MRN
  . S @AMAP@("ACTORSSNTEXT")="MRN"
@@ -154 +154 @@
  Q
  ;
-SYSTEM(INXML,AIEN,AOID,OUTXML)  ; PROCESS A SYSTEM ACTOR
+SYSTEM(INXML,AIEN,AOID,OUTXML) ; PROCESS A SYSTEM ACTOR
      ;
      ; N AMAP
@@ -166 +166 @@
      Q
      ;
-NOK(INXML,AIEN,AOID,OUTXML)     ; PROCESS A NEXT OF KIN TYPE ACTOR
+NOK(INXML,AIEN,AOID,OUTXML) ; PROCESS A NEXT OF KIN TYPE ACTOR
      ;
      ; N AMAP
@@ -179 +179 @@
      Q
      ;
-ORG(INXML,AIEN,AOID,OUTXML)     ; PROCESS AN ORGANIZATION TYPE ACTOR
+ORG(INXML,AIEN,AOID,OUTXML) ; PROCESS AN ORGANIZATION TYPE ACTOR
      ;
      ; N AMAP
@@ -190 +190 @@
      Q
      ;
-PROVIDER(INXML,AIEN,AOID,OUTXML)        ; PROCESS A PROVIDER TYPE ACTOR
+PROVIDER(INXML,AIEN,AOID,OUTXML) ; PROCESS A PROVIDER TYPE ACTOR
      ;
      ; N AMAP