Index: ccr/trunk/p/C0CRNF.m
===================================================================
--- ccr/trunk/p/C0CRNF.m	(revision 342)
+++ ccr/trunk/p/C0CRNF.m	(revision 343)
@@ -51,5 +51,5 @@
  S C0CREF=GIEN_"," ; OPEN ROOT REFERENCE INTO FILE
  D CLEAN^DILF ; MAKE SURE WE ARE CLEANED UP
- D GETS^DIQ(GFILE,C0CREF,"**","","C0CTMP")
+ D GETS^DIQ(GFILE,C0CREF,"**","I","C0CTMP")
  D FIELDS(GRTN,GFILE) ;GET ALL THE FIELD NAMES FOR THE FILE
  S @GRTN@(0)=GFILE_"^RNF1^"_GIEN_"^"_DT_"^"_$J ; STRUCTURE SIGNATURE
@@ -105,5 +105,5 @@
  D CLEAN^DILF ; MAKE SURE WE ARE CLEANED UP
  K C0CTMP
- D GETS^DIQ(GFILE,C0CREF,"**","","C0CTMP")
+ D GETS^DIQ(GFILE,C0CREF,"**","IE","C0CTMP")
  D FIELDS(GRTN,GFILE) ;GET ALL THE FIELD NAMES FOR THE FILE
  S @GRTN@(0)=GFILE_"^RNF1^"_GIEN_"^"_DT_"^"_$J_"^"_DUZ ; STRUCTURE SIGNATURE
@@ -114,5 +114,5 @@
  . . ;W C0CJ," ",C0CI,!
  . . S C0CNAME=$P(^DD(C0CJ,C0CI,0),"^",1) ;PULL THE FIELD NAME
- . . S C0CVALUE=C0CTMP(C0CJ,C0CREF,C0CI) ;
+ . . S C0CVALUE=C0CTMP(C0CJ,C0CREF,C0CI,"E") ;
  . . I C0CVALUE["C0CTMP" D  ; WP FIELD
  . . . N ZT,ZWP S ZWP=0 ;ITERATOR
@@ -124,4 +124,5 @@
  . . . . S C0CVALUE=C0CVALUE_ZT ;
  . . S $P(@GRTN@(C0CNAME),"^",3)=C0CVALUE ;RETURN VALUE IN P3
+ . . S $P(@GRTN@(C0CNAME,"I"),"^",3)=$G(C0CTMP(C0CJ,C0CREF,C0CI,"I"))
  I C0CNN D  ; IF ONLY NON-NULL VALUES ARE TO BE RETURNED
  . S C0CI=""
@@ -280,2 +281,8 @@
  Q $P(@ZTAB@(ZFN),"^",3)
  ;
+ZVALUEI(ZFN,ZTAB) ;EXTRINSIC TO RETURN VALUE FOR FIELD NAME PASSED
+ ; BY VALUE IN ZFN. FILE NUMBER IS PIECE 3 OF @ZTAB@(ZFN)
+ ; IF ZTAB IS NULL, IT DEFAULTS TO C0CA
+ I '$D(ZTAB) S ZTAB="C0CA"
+ Q $P(@ZTAB@(ZFN,"I"),"^",3)
+ ;
Index: ccr/trunk/p/GPLALERT.m
===================================================================
--- ccr/trunk/p/GPLALERT.m	(revision 342)
+++ ccr/trunk/p/GPLALERT.m	(revision 343)
@@ -51,4 +51,6 @@
  . S ADT=ADT_" reaction to "_$P(@ALTG@(ALTTMP),U,2)_"."
  . S @ALTVMAP@("ALERTDESCRIPTIONTEXT")=ADT
+ . N ADTY S ADTY=$S(A2="P":"Adverse Reaction",A2="A":"Allergy",1:"") ;
+ . S @ALTVMAP@("ALERTTYPE")=ADTY ; type of allergy
  . N ALTCDE ; SNOMED CODE THE THE ALERT
  . S ALTCDE=$S(A2="P":"282100009",A2="A":"418634005",1:"") ; IF NOT ADVERSE, IT IS ALLERGIC
@@ -99,4 +101,9 @@
  . . S @ALTVMAP@("ALERTREACTIONCODESYSTEM")=""
  . S ALTARYTMP=$NA(@ALTTARYTMP@(ALTCNT))
+ . ; NOW GO TO THE GLOBAL TO GET THE DATE/TIME AND BETTER DESCRIPTION
+ . N C0CG1,C0CT ; ARRAY FOR VALUES FROM GLOBAL
+ . D GETN1^C0CRNF("C0CG1",120.8,DFN,"B") ;GET VALUES BY NAME
+ . S C0CT=$$ZVALUEI^C0CRNF("ORIGINATION DATE/TIME","C0CG1")
+ . S @ALTVMAP@("ALERTDATETIME")=$$FMDTOUTC^CCRUTIL(C0CT)
  . K @ALTARYTMP
  . D MAP^GPLXPATH(ALTXML,ALTVMAP,ALTARYTMP)
Index: ccr/trunk/p/GPLCCR0.m
===================================================================
--- ccr/trunk/p/GPLCCR0.m	(revision 342)
+++ ccr/trunk/p/GPLCCR0.m	(revision 343)
@@ -105,4 +105,7 @@
  ;;<Text>Problem</Text>
  ;;</Type>
+ ;;<Status>
+ ;;<Text>@@PROBLEMSTATUS@@</Text>
+ ;;</Status>
  ;;<Description>
  ;;<Text>@@PROBLEMDESCRIPTION@@</Text>
@@ -113,4 +116,7 @@
  ;;</Code>
  ;;</Description>
+ ;;<DateTime>
+ ;;<ExactDateTime>@@PROBLEMDATEMOD@@</ExactDateTime>
+ ;;</DateTime>
  ;;<Source>
  ;;<Actor>
@@ -220,4 +226,7 @@
  ;;<Alert>
  ;;<CCRDataObjectID>@@ALERTOBJECTID@@</CCRDataObjectID>
+ ;;<Type>
+ ;;<Text>@@ALERTTYPE@@</Text>
+ ;;</Type>
  ;;<Description>
  ;;<Text>@@ALERTDESCRIPTIONTEXT@@</Text>
@@ -230,4 +239,7 @@
  ;;<Text>@@ALERTSTATUSTEXT@@</Text>
  ;;</Status>
+ ;;<DateTime>
+ ;;<ExactDateTime>@@ALERTDATETIME@@</ExactDateTime>
+ ;;</DateTime>
  ;;<Source>
  ;;<Actor>
Index: ccr/trunk/p/GPLPROBS.m
===================================================================
--- ccr/trunk/p/GPLPROBS.m	(revision 342)
+++ ccr/trunk/p/GPLPROBS.m	(revision 343)
@@ -17,6 +17,6 @@
  ;with this program; if not, write to the Free Software Foundation, Inc.,
  ;51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- ; 
- ; 
+ ;
+ ;
  ; PROCESS THE PROBLEMS SECTION OF THE CCR
  ;
@@ -49,10 +49,10 @@
  . S @VMAP@("PROBLEMOBJECTID")="PROBLEM"_J ; UNIQUE OBJID FOR PROBLEM
  . S @VMAP@("PROBLEMIEN")=$P(PTMP,U,1)
- . S @VMAP@("PROBLEMSTATUS")=$P(PTMP,U,2)
+ . S @VMAP@("PROBLEMSTATUS")=$S($P(PTMP,U,2)="A":"Active",1:"")
  . S @VMAP@("PROBLEMDESCRIPTION")=$P(PTMP,U,3)
  . S @VMAP@("PROBLEMCODINGVERSION")=""
  . S @VMAP@("PROBLEMCODEVALUE")=$P(PTMP,U,4)
- . S @VMAP@("PROBLEMDATEOFONSET")=$P(PTMP,U,5)
- . S @VMAP@("PROBLEMDATEMOD")=$P(PTMP,U,6)
+ . S @VMAP@("PROBLEMDATEOFONSET")=$$FMDTOUTC^CCRUTIL($P(PTMP,U,5),"DT")
+ . S @VMAP@("PROBLEMDATEMOD")=$$FMDTOUTC^CCRUTIL($P(PTMP,U,6),"DT")
  . S @VMAP@("PROBLEMSC")=$P(PTMP,U,7)
  . S @VMAP@("PROBLEMSE")=$P(PTMP,U,8)
@@ -65,6 +65,6 @@
  . S @VMAP@("PROBLEMSERVICE")=$P(PTMP,U,13)
  . S @VMAP@("PROBLEMHASCMT")=$P(PTMP,U,14)
- . S @VMAP@("PROBLEMDTREC")=$P(PTMP,U,15)
- . S @VMAP@("PROBLEMINACT")=$P(PTMP,U,16)
+ . S @VMAP@("PROBLEMDTREC")=$$FMDTOUTC^CCRUTIL($P(PTMP,U,15),"DT")
+ . S @VMAP@("PROBLEMINACT")=$$FMDTOUTC^CCRUTIL($P(PTMP,U,16),"DT")
  . S ARYTMP=$NA(@TARYTMP@(J))
  . ; W "ARYTMP= ",ARYTMP,!