Index: ccr/trunk/p/CCRMEDS3.m
===================================================================
--- ccr/trunk/p/CCRMEDS3.m	(revision 240)
+++ ccr/trunk/p/CCRMEDS3.m	(revision 241)
@@ -153,6 +153,10 @@
  . ;
  . ; S @MAP@("MEDPTINSTRUCTIONS","F")="52.41^105"
- . S @MAP@("MEDPTINSTRUCTIONS")=MED(10,1) ; WP Field
- . S @MAP@("MEDFULLFILLMENTINSTRUCTIONS")=MED(14,1) ; WP Field
+ . I $D(MED(10,1)) D  ;
+ . . S @MAP@("MEDPTINSTRUCTIONS")=MED(10,1) ; WP Field
+ . E  S @MAP@("MEDPTINSTRUCTIONS")=""
+ . I $D(MED(14,1)) D  ;
+ . . S @MAP@("MEDFULLFILLMENTINSTRUCTIONS")=MED(14,1) ; WP Field
+ . E  S @MAP@("MEDFULLFILLMENTINSTRUCTIONS")=""
  . S @MAP@("MEDRFNO")=""
  . N RESULT S RESULT=$NA(^TMP("GPLCCR",$J,"MAPPED"))
@@ -171,7 +175,8 @@
  . . . D MAP^GPLXPATH(DIRXML1,MDZNA,DIRXML2)
  . . . D INSERT^GPLXPATH(RESULT,DIRXML2,"//Medications/Medication")
- . D:MEDCOUNT=1 CP^GPLXPATH(RESULT,OUTXML) ; First one is a copy
- . D:MEDCOUNT>1 INSINNER^GPLXPATH(OUTXML,RESULT) ; AFTER THE FIRST, INSERT INNER XML
- D PARY^GPLXPAT(OUTXML) ;LETS LOOK AT IT
+ . I MEDFIRST D  ;
+ . . S MEDFIRST=0 ; RESET FIRST FLAG
+ . . D CP^GPLXPATH(RESULT,OUTXML) ; First one is a copy
+ . D:'MEDFIRST INSINNER^GPLXPATH(OUTXML,RESULT) ; AFTER FIRST, INSERT INNER XML
  N MEDTMP,MEDI
  D MISSING^GPLXPATH(OUTXML,"MEDTMP") ; SEARCH XML FOR MISSING VARS