Index: WorldVistAEHR/trunk/r/CLINICAL_REMINDERS-PXRM/PXRMDNVA.m
===================================================================
--- WorldVistAEHR/trunk/r/CLINICAL_REMINDERS-PXRM/PXRMDNVA.m	(revision 613)
+++ WorldVistAEHR/trunk/r/CLINICAL_REMINDERS-PXRM/PXRMDNVA.m	(revision 623)
@@ -1,49 +1,48 @@
-PXRMDNVA	; SLC/PKR - Handle non-VA med findings. ;03/14/2007
-	;;2.0;CLINICAL REMINDERS;**4,6**;Feb 04, 2005;Build 123
-	;
-	;===============================================
-GETDATA(DAS,FIEVT)	;Return data for an non-VA med finding.
-	;DBIA #3793
-	D NVA^PSOPXRM1(DAS,.FIEVT)
-	S FIEVT("VALUE")=FIEVT("STATUS")
-	I $G(FIEVT("START DATE"))="" S FIEVT("START DATE")=FIEVT("DOCUMENTED DATE")
-	S FIEVT("DURATION")=$$DURATION^PXRMDATE(FIEVT("START DATE"),FIEVT("DISCONTINUED DATE"))
-	Q
-	;
-	;===============================================
-EVALTERM(DFN,FINDPA,ENODE,TERMARR,TFIEVAL)	;Evaluate terms.
-	D EVALTERM^PXRMINDX(DFN,.FINDPA,ENODE,.TERMARR,.TFIEVAL)
-	Q
-	;
-	;====================================================
-MHVOUT(INDENT,IFIEVAL,NLINES,TEXT)	;Produce the MHV output.
-	N DATE,JND,NOUT,TEMP,TEXTOUT
-	S TEMP="Non-VA med: "_IFIEVAL("ORDERABLE ITEM")_" = "
-	S TEMP=TEMP_"("_$$EDATE^PXRMDATE(IFIEVAL("START DATE"))
-	S DATE=IFIEVAL("DISCONTINUED DATE")
-	S DATE=$S(DATE="":"NONE",1:$$EDATE^PXRMDATE(DATE))
-	D FORMATS^PXRMTEXT(INDENT+2,PXRMRM,TEMP,.NOUT,.TEXTOUT)
-	F JND=1:1:NOUT S NLINES=NLINES+1,TEXT(NLINES)=TEXTOUT(JND)
-	Q
-	;
-	;===============================================
-OUTPUT(INDENT,IFIEVAL,NLINES,TEXT)	;Produce the clinical
-	;maintenance output.
-	N DATE,JND,NOUT,TEMP,TEXTOUT
-	S NLINES=NLINES+1
-	S TEXT(NLINES)=$$INSCHR^PXRMEXLC(INDENT," ")_"Non-VA med: "_IFIEVAL("ORDERABLE ITEM")
-	S DATE=IFIEVAL("START DATE")
-	S TEMP="Start Date: "_$$EDATE^PXRMDATE(DATE)
-	S DATE=IFIEVAL("DISCONTINUED DATE")
-	S DATE=$S(DATE="":"NONE",1:$$EDATE^PXRMDATE(DATE))
-	S TEMP=TEMP_" Discontinued Date: "_DATE
-	I $D(IFIEVAL("DURATION")) S TEMP=TEMP_"  Duration: "_IFIEVAL("DURATION")_" D"
-	S TEMP=TEMP_" Status: "_IFIEVAL("STATUS")_"\\"
-	S TEMP=TEMP_"Dosage Form: "_IFIEVAL("DOSAGE FORM")
-	S TEMP=TEMP_" Dosage: "_IFIEVAL("DOSAGE")
-	S TEMP=TEMP_" Medication Route: "_IFIEVAL("MEDICATION ROUTE")
-	D FORMATS^PXRMTEXT(INDENT+1,PXRMRM,TEMP,.NOUT,.TEXTOUT)
-	F JND=1:1:NOUT S NLINES=NLINES+1,TEXT(NLINES)=TEXTOUT(JND)
-	S NLINES=NLINES+1,TEXT(NLINES)=""
-	Q
-	;
+PXRMDNVA ; SLC/PKR - Handle non-VA med findings. ;05/24/2006
+ ;;2.0;CLINICAL REMINDERS;**4**;Feb 04, 2005;Build 21
+ ;
+ ;===============================================
+GETDATA(DAS,FIEVT) ;Return data for an non-VA med finding.
+ ;DBIA #3793
+ D NVA^PSOPXRM1(DAS,.FIEVT)
+ S FIEVT("VALUE")=FIEVT("STATUS")
+ I $G(FIEVT("START DATE"))="" S FIEVT("START DATE")=FIEVT("DOCUMENTED DATE")
+ S FIEVT("DURATION")=$$DURATION^PXRMDATE(FIEVT("START DATE"),FIEVT("DISCONTINUED DATE"))
+ Q
+ ;
+ ;===============================================
+EVALTERM(DFN,FINDPA,ENODE,TERMARR,TFIEVAL) ;Evaluate terms.
+ D EVALTERM^PXRMINDX(DFN,.FINDPA,ENODE,.TERMARR,.TFIEVAL)
+ Q
+ ;
+ ;====================================================
+MHVOUT(INDENT,IFIEVAL,NLINES,TEXT) ;Produce the MHV output.
+ N JND,NOUT,TEMP,TEXTOUT
+ S TEMP="Non-VA med: "_IFIEVAL("ORDERABLE ITEM")_" = "
+ S TEMP=TEMP_"("_$$EDATE^PXRMDATE(IFIEVAL("START DATE"))
+ S TEMP=TEMP_" - "_$$EDATE^PXRMDATE(IFIEVAL("STOP DATE"))_")"
+ D FORMATS^PXRMTEXT(INDENT+2,PXRMRM,TEMP,.NOUT,.TEXTOUT)
+ F JND=1:1:NOUT S NLINES=NLINES+1,TEXT(NLINES)=TEXTOUT(JND)
+ Q
+ ;
+ ;===============================================
+OUTPUT(INDENT,IFIEVAL,NLINES,TEXT) ;Produce the clinical
+ ;maintenance output.
+ N DATE,JND,NOUT,TEMP,TEXTOUT
+ S NLINES=NLINES+1
+ S TEXT(NLINES)=$$INSCHR^PXRMEXLC(INDENT," ")_"Non-VA med: "_IFIEVAL("ORDERABLE ITEM")
+ S DATE=IFIEVAL("START DATE")
+ S TEMP="Start Date: "_$$EDATE^PXRMDATE(DATE)
+ S DATE=IFIEVAL("DISCONTINUED DATE")
+ S DATE=$S(DATE="":"NONE",1:$$EDATE^PXRMDATE(DATE))
+ S TEMP=TEMP_" Discontinued Date: "_DATE
+ I $D(IFIEVAL("DURATION")) S TEMP=TEMP_"  Duration: "_IFIEVAL("DURATION")_" D"
+ S TEMP=TEMP_" Status: "_IFIEVAL("STATUS")_"\\"
+ S TEMP=TEMP_"Dosage Form: "_IFIEVAL("DOSAGE FORM")
+ S TEMP=TEMP_" Dosage: "_IFIEVAL("DOSAGE")
+ S TEMP=TEMP_" Medication Route: "_IFIEVAL("MEDICATION ROUTE")
+ D FORMATS^PXRMTEXT(INDENT+1,PXRMRM,TEMP,.NOUT,.TEXTOUT)
+ F JND=1:1:NOUT S NLINES=NLINES+1,TEXT(NLINES)=TEXTOUT(JND)
+ S NLINES=NLINES+1,TEXT(NLINES)=""
+ Q
+ ;
