Index: Scheduling/trunk/m/BSDX09.m
===================================================================
--- Scheduling/trunk/m/BSDX09.m	(revision 864)
+++ Scheduling/trunk/m/BSDX09.m	(revision 865)
@@ -18,15 +18,36 @@
 	S BSDXRET="^BSDXTMP("_$J_")"
 	;
-	S ^BSDXTMP($J,0)="T00030IEN^T00030STREET^T00030CITY^T00030STATE^T00030ZIP^T00030NAME^D00030DOB^T00030SSN^T00030HRN"
-	S ^BSDXTMP($J,0)=^BSDXTMP($J,0)_"^T00030HOMEPHONE^T00030OFCPHONE^T00030MSGPHONE"
-	S ^BSDXTMP($J,0)=^BSDXTMP($J,0)_"^T00030NOK NAME^T00030RELATIONSHIP^T00030PHONE^T00030STREET^T00030CITY^T00030STATE^T00030ZIP"
-	S ^BSDXTMP($J,0)=^BSDXTMP($J,0)_"^D00030DATAREVIEWED"
-	; S ^BSDXTMP($J,0)=^BSDXTMP($J,0)_"^T00030Medicare#^T00030Suffix"
-	S ^BSDXTMP($J,0)=^BSDXTMP($J,0)_"^T00030RegistrationComments"
-	S ^BSDXTMP($J,0)=^BSDXTMP($J,0)_$C(30)
+	N OUT S OUT=$NA(^BSDXTMP($J,0))
+	S $P(@OUT,U,1)="T00030IEN"
+	S $P(@OUT,U,2)="T00030STREET"
+	S $P(@OUT,U,3)="T00030CITY"
+	S $P(@OUT,U,4)="T00030STATE"
+	S $P(@OUT,U,5)="T00030ZIP"
+	S $P(@OUT,U,6)="T00030NAME"
+	S $P(@OUT,U,7)="D00030DOB"
+	S $P(@OUT,U,8)="T00030SSN"
+	S $P(@OUT,U,9)="T00030HRN"
+	S $P(@OUT,U,10)="T00030HOMEPHONE"
+	S $P(@OUT,U,11)="T00030OFCPHONE"
+	S $P(@OUT,U,12)="T00030MSGPHONE"
+	S $P(@OUT,U,13)="T00030NOK NAME"
+	S $P(@OUT,U,14)="T00030RELATIONSHIP"
+	S $P(@OUT,U,15)="T00030PHONE"
+	S $P(@OUT,U,16)="T00030STREET"
+	S $P(@OUT,U,17)="T00030CITY"
+	S $P(@OUT,U,18)="T00030STATE"
+	S $P(@OUT,U,19)="T00030ZIP"
+	S $P(@OUT,U,20)="D00030DATAREVIEWED"
+	S $P(@OUT,U,21)="T00030RegistrationComments"
+	S $P(@OUT,U,22)="T00050EMAIL ADDRESS"
+	S $P(@OUT,U,23)="T00020PHONE NUMBER [CELLULAR]"
+	S $P(@OUT,U,24)="T00030COUNTRY"
+	S $E(@OUT,$L(@OUT)+1)=$C(30)
+	;
 	;
 	N BSDXNOD,BSDXNAM,Y,U
 	S U="^"
 	S BSDXY="ERROR"
+	K NAME
 	I '+BSDXPAT S ^BSDXTMP($J,1)=$C(31) Q
 	I '$D(^DPT(+BSDXPAT,0)) S ^BSDXTMP($J,1)=$C(31) Q
@@ -48,4 +69,7 @@
 	;/smh D MEDICARE
 	D REGCMT
+	S $P(BSDXY,"^",22)=$$GET1^DIQ(2,BSDXPAT,"EMAIL ADDRESS")
+	S $P(BSDXY,"^",23)=$$GET1^DIQ(2,BSDXPAT,"PHONE NUMBER [CELLULAR]")
+	S $P(BSDXY,"^",24)=$$GET1^DIQ(2,BSDXPAT,"COUNTRY:DESCRIPTION")
 	N BSDXBEG,BSDXEND,BSDXLEN,BSDXI
 	S BSDXLEN=$L(BSDXY)