Changeset 225 for ccr/trunk

Timestamp:

Oct 25, 2008, 8:20:47 PM (16 years ago)

Author:

George Lilly

Message:

fix for meds

File:

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

ccr/trunk/p/CCRMEDS2.m

@@ -49 +49 @@
  N RXIEN S RXIEN=0
  N MEDCOUNT S MEDCOUNT=0
+ N MEDFIRST S MEDFIRST=1 ; FLAG FOR FIRST MED IN THIS SECTION FOR MERGING
  S MEDMAP=$NA(^TMP("GPLCCR",$J,"MEDMAP")) ; THIS IS THE VARIABLE MAP
  S MEDCOUNT=@MEDMAP@(0) ; ACCOUNT FOR MEDS ALREADY IN ARRAY
@@ -205 +206 @@
  . . . 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
+ . 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