Index: /ccr/trunk/p/CCRUTIL.m
===================================================================
--- /ccr/trunk/p/CCRUTIL.m	(revision 50)
+++ /ccr/trunk/p/CCRUTIL.m	(revision 51)
@@ -21,6 +21,5 @@
           ; In this case, set H, MM and S to "00"
           S:('$L(H)&'$L(MM)&'$L(S)) (H,MM,S)="00"
-          I S="" S UTC=Y_"-"_M_"-"_D_"T"_H_":"_MM_OFF
-          E  S UTC=Y_"-"_M_"-"_D_"T"_H_":"_MM_":"_S_OFF
+          S UTC=Y_"-"_M_"-"_D_"T"_H_":"_MM_$S(S="":"",1:":"_S)_OFF ; Skip's code to fix hanging colon if no seconds
           I $L($G(FORMAT)),FORMAT="DT" Q UTC ; Date with time.
           E  Q $P(UTC,"T") 
Index: /ccr/trunk/p/GPLCCR.m
===================================================================
--- /ccr/trunk/p/GPLCCR.m	(revision 50)
+++ /ccr/trunk/p/GPLCCR.m	(revision 51)
@@ -13,6 +13,6 @@
        S OARY=$NA(^TMP("GPLCCR",$J,DFN,"CCR",1))
        S ONAM="PAT_"_DFN_"_CCR_V1.xml"
-       S ODIR="/home/glilly/CCROUT"
-       ;S ODIR="/home/cedwards/"
+       ;S ODIR="/home/glilly/CCROUT"
+       S ODIR="/home/cedwards/"
            ;S ODIR="/opt/wv/p/"
        D OUTPUT^GPLXPATH(OARY,ONAM,ODIR)
@@ -83,5 +83,5 @@
     N VMAP S VMAP=$NA(^TMP("GPLCCR",$J,DFN,"HEADER"))
     ; K @VMAP
-    S @VMAP@("DATETIME")=$$FMDTOUTC^CCRUTIL($$FMTHL7^XLFDT($$NOW^XLFDT),"DT")
+    S @VMAP@("DATETIME")=$$FMDTOUTC^CCRUTIL($$NOW^XLFDT,"DT")
     I IHDR="" D  ; HEADER ARRAY IS NOT PROVIDED, USE DEFAULTS
     . S @VMAP@("ACTORPATIENT")="ACTORPATIENT_"_DFN
Index: /ccr/trunk/p/GPLVITALS.m
===================================================================
--- /ccr/trunk/p/GPLVITALS.m	(revision 50)
+++ /ccr/trunk/p/GPLVITALS.m	(revision 51)
@@ -22,7 +22,6 @@
           . . . S @VITVMAP@("VITALSIGNSDATETIMETYPETEXT")="OBSERVED"
           . . . S @VITVMAP@("VITALSIGNSEXACTDATETIME")=$$FMDTOUTC^CCRUTIL($P(VITPTMP,U,4),"DT")
-          . . . W "CONVERTED DATE TIME: ",@VITVMAP@("VITALSIGNSEXACTDATETIME"),!
           . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONTEXT")="HEIGHT"
-          . . . ;S @VITVMAP@("VITALSIGNSSOURCEACTORID")=""
+          . . . S @VITVMAP@("VITALSIGNSSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
           . . . S @VITVMAP@("VITALSIGNSTESTOBJECTID")="VITALTEST"_J
           . . . S @VITVMAP@("VITALSIGNSTESTTYPETEXT")="OBSERVED"
@@ -31,5 +30,5 @@
           . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODINGSYSTEM")=""
           . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVERSION")=""
-          . . . ;S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")=""
+          . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
           . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P(VITPTMP,U,3)
           . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")="in"
@@ -39,5 +38,5 @@
           . . . S @VITVMAP@("VITALSIGNSEXACTDATETIME")=$$FMDTOUTC^CCRUTIL($P(VITPTMP,U,4),"DT")
           . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONTEXT")="WEIGHT"
-          . . . ;S @VITVMAP@("VITALSIGNSSOURCEACTORID")=""
+          . . . S @VITVMAP@("VITALSIGNSSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
           . . . S @VITVMAP@("VITALSIGNSTESTOBJECTID")="VITALTEST"_J
           . . . S @VITVMAP@("VITALSIGNSTESTTYPETEXT")="OBSERVED"
@@ -46,5 +45,5 @@
           . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODINGSYSTEM")=""
           . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVERSION")=""
-          . . . ;S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")=""
+          . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
           . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P(VITPTMP,U,3)
           . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")="lbs"
@@ -54,12 +53,12 @@
           . . . S @VITVMAP@("VITALSIGNSEXACTDATETIME")=$$FMDTOUTC^CCRUTIL($P(VITPTMP,U,4),"DT")
           . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONTEXT")="OTHER VITAL"
-          . . . S @VITVMAP@("VITALSIGNSSOURCEACTORID")=""
+          . . . S @VITVMAP@("VITALSIGNSSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
           . . . S @VITVMAP@("VITALSIGNSTESTOBJECTID")="VITALTEST"_J
           . . . S @VITVMAP@("VITALSIGNSTESTTYPETEXT")="OBSERVED"
           . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONTEXT")="OTHER"
-          . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVALUE")=""
-          . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONCODINGSYSTEM")=""
-          . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVERSION")=""
-          . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")=""
+          . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVALUE")=""
+          . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODINGSYSTEM")=""
+          . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVERSION")=""
+          . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
           . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P(VITPTMP,U,3)
           . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")="UNKNOWN"