Index: ccr/trunk/p/GPLMEDS.m
===================================================================
--- ccr/trunk/p/GPLMEDS.m	(revision 177)
+++ ccr/trunk/p/GPLMEDS.m	(revision 178)
@@ -34,4 +34,9 @@
    . S MEDCNT=@MEDOUTXML@(0) ; SAVE COUNT TO KNOW HOW TO ADD TO MAP
    . W "HAS ACTIVE OP MEDS",!
+   D EXTRACT^CCRMEDS2(MEDXML,DFN,MEDOUTXML) ; FIRST EXTRACT OUTPATIENT MEDS
+   I @MEDOUTXML@(0)>0 D  ; CCRMEDS FOUND ACTIVE OP MEDS
+   . S HASOP=1 ; SET FLAG TO KNOW HOW TO ADD XML
+   . S MEDCNT=@MEDOUTXML@(0) ; SAVE COUNT TO KNOW HOW TO ADD TO MAP
+   . W "HAS OP MEDS",!
    N MEDRSLT,I,J,K,MEDPTMP,X,MEDVMAP,TBUF
    D ACTIVE^ORWPS(.MEDRSLT,DFN)
Index: ccr/trunk/p/GPLXPATH.m
===================================================================
--- ccr/trunk/p/GPLXPATH.m	(revision 177)
+++ ccr/trunk/p/GPLXPATH.m	(revision 178)
@@ -369,9 +369,15 @@
  . . . S TVAL="@@"_$P(@IXML@(I),"@@",J)_"@@" ; DEFAULT UNCHANGED
  . . . I $D(@INARY@(TNAM))  D  ; IS THE VARIABLE IN THE MAP?
- . . . . S TVAL=@INARY@(TNAM) ; PULL OUT MAPPED VALUE
+ . . . . I '$D(@INARY@(TNAM,"F")) D  ; NOT A SPECIAL FIELD
+ . . . . . S TVAL=@INARY@(TNAM) ; PULL OUT MAPPED VALUE
+ . . . . E  D DOFLD ; PROCESS A FIELD
  . . . S TSTR=TSTR_TVAL_$P(@IXML@(I),"@@",J+1) ; ADD VAR AND PART AFTER
  . . S @OXML@(I)=TSTR ; COPY LINE WITH MAPPED VALUES
  . . I DEBUG W TSTR
  I DEBUG W "MAPPED",!
+ Q
+ ;
+DOFLD ; PROCESS A FILEMAN FIELD REFERENCED BY A VARIABLE
+ ;
  Q
  ;