diff --git a/p/CCRMEDS.m b/p/CCRMEDS1.M similarity index 100% rename from p/CCRMEDS.m rename to p/CCRMEDS1.M diff --git a/p/GPLMEDS.m b/p/GPLMEDS.m index fa350b4..22d3423 100644 --- a/p/GPLMEDS.m +++ b/p/GPLMEDS.m @@ -71,7 +71,7 @@ EXTRACT(MEDXML,DFN,MEDOUTXML) ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE . I DEBUG W "VMAP= ",MEDVMAP,! . S ZJ=$P(ZA(ZI),U,1) ; INDEX OF FIRST LINE OF MED IN MEDRSLT . S MEDPTMP=MEDRSLT(ZJ) ; PULL OUT FIRST LINE OF MED - . I $P(MEDPTMP,U,1)?1"~OP"&$P(MEDPTMP,"^",10)="ACTIVE" Q ; SKIP OP ACTIVE + . I $P(MEDPTMP,U,1)?1"~OP" Q ; SKIP OP ACTIVE AND PENDING . S @MEDVMAP@("MEDOBJECTID")="MED"_(ZI+MEDCNT) ; UNIQUE OBJID FOR MEDS . I $P(MEDPTMP,"^",11)="" S @MEDVMAP@("MEDISSUEDATETXT")="" . E S @MEDVMAP@("MEDISSUEDATETXT")=$$FMDTOUTC^CCRUTIL($P(MEDPTMP,"^",11),"DT") ; GETS LAST FILL DATE