Index: ccr/trunk/p/C0CVITAL.m
===================================================================
--- ccr/trunk/p/C0CVITAL.m	(revision 563)
+++ ccr/trunk/p/C0CVITAL.m	(revision 564)
@@ -238,5 +238,5 @@
  . . . S @VITVMAP@("VITALSIGNSDESCCODINGSYSTEM")="SNOMED"
  . . . S @VITVMAP@("VITALSIGNSCODEVERSION")=""
- . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^AUPNVMSR($P(VITPTMP,U,1),12),U,4)
+ . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P($G(^AUPNVMSR($P(VITPTMP,U,1),12)),U,4)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P($P(VITPTMP,U,5)," ",1)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")="in"
@@ -252,5 +252,5 @@
  . . . S @VITVMAP@("VITALSIGNSDESCCODINGSYSTEM")="SNOMED"
  . . . S @VITVMAP@("VITALSIGNSCODEVERSION")=""
- . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^AUPNVMSR($P(VITPTMP,U,1),12),U,4)
+ . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P($G(^AUPNVMSR($P(VITPTMP,U,1),12)),U,4)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P($P(VITPTMP,U,5)," ",1)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")="lbs"
@@ -266,5 +266,5 @@
  . . . S @VITVMAP@("VITALSIGNSDESCCODINGSYSTEM")="SNOMED"
  . . . S @VITVMAP@("VITALSIGNSCODEVERSION")=""
- . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^AUPNVMSR($P(VITPTMP,U,1),12),U,4)
+ . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P($G(^AUPNVMSR($P(VITPTMP,U,1),12)),U,4)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P($P(VITPTMP,U,5)," ",1)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")=""
@@ -280,5 +280,5 @@
  . . . S @VITVMAP@("VITALSIGNSDESCCODINGSYSTEM")="SNOMED"
  . . . S @VITVMAP@("VITALSIGNSCODEVERSION")=""
- . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^AUPNVMSR($P(VITPTMP,U,1),12),U,4)
+ . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P($G(^AUPNVMSR($P(VITPTMP,U,1),12)),U,4)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P($P(VITPTMP,U,5)," ",1)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")="F"
@@ -294,5 +294,5 @@
  . . . S @VITVMAP@("VITALSIGNSDESCCODINGSYSTEM")="SNOMED"
  . . . S @VITVMAP@("VITALSIGNSCODEVERSION")=""
- . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^AUPNVMSR($P(VITPTMP,U,1),12),U,4)
+ . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P($G(^AUPNVMSR($P(VITPTMP,U,1),12)),U,4)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P($P(VITPTMP,U,5)," ",1)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")=""
@@ -308,5 +308,5 @@
  . . . S @VITVMAP@("VITALSIGNSDESCCODINGSYSTEM")="SNOMED"
  . . . S @VITVMAP@("VITALSIGNSCODEVERSION")=""
- . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^AUPNVMSR($P(VITPTMP,U,1),12),U,4)
+ . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P($G(^AUPNVMSR($P(VITPTMP,U,1),12)),U,4)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P($P(VITPTMP,U,5)," ",1)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")=""
@@ -322,5 +322,5 @@
  . . . S @VITVMAP@("VITALSIGNSDESCCODINGSYSTEM")="SNOMED"
  . . . S @VITVMAP@("VITALSIGNSCODEVERSION")=""
- . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^AUPNVMSR($P(VITPTMP,U,1),12),U,4)
+ . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P($G(^AUPNVMSR($P(VITPTMP,U,1),12)),U,4)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P($P(VITPTMP,U,5)," ",1)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")=""
@@ -334,8 +334,8 @@
  . . . S @VITVMAP@("VITALSIGNSTESTTYPETEXT")="OBSERVED"
  . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONTEXT")=$P(VITPTMP,U,2)
- . . . ;S @VITVMAP@("VITALSIGNSDESCCODEVALUE")=""
- . . . ;S @VITVMAP@("VITALSIGNSDESCCODINGSYSTEM")=""
- . . . ;S @VITVMAP@("VITALSIGNSCODEVERSION")=""
- . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^AUPNVMSR($P(VITPTMP,U,1),12),U,4)
+ . . . S @VITVMAP@("VITALSIGNSDESCCODEVALUE")=""
+ . . . S @VITVMAP@("VITALSIGNSDESCCODINGSYSTEM")=""
+ . . . S @VITVMAP@("VITALSIGNSCODEVERSION")=""
+ . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P($G(^AUPNVMSR($P(VITPTMP,U,1),12)),U,4)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P($P(VITPTMP,U,5)," ",1)
  . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")=$P($P(VITPTMP,U,5)," ",2)
@@ -359,11 +359,4 @@
  Q
  ;
- ;VITDATES(VDT)	; VDT IS PASSED BY REFERENCE AND WILL CONTAIN THE ARRAY
- ; OF DATES IN THE VITALS RESULTS
- ;N VDTI,VDTJ,VTDCNT
- ;S VTDCNT=0 ; COUNT TO BUILD ARRAY
- ;S VDTJ="" ; USED TO VISIT THE RESULTS
- ;I $$SYSNAME^C0CSYS()="RPMS" D VITDRPMS E  D VITDVISTA
- ;
 VITDRPMS(VDT)	; RUN DATE SORTING ALGORITHM FOR RPMS
  ; VDT IS PASSED BY REFERENCE AND WILL CONTAIN THE ARRAY