Index: ccr/trunk/p/GPLACTORS.m
===================================================================
--- ccr/trunk/p/GPLACTORS.m	(revision 70)
+++ ccr/trunk/p/GPLACTORS.m	(revision 71)
@@ -133,5 +133,5 @@
      S AMAP=$NA(^TMP($J,"AMAP"))
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
-     S @AMAP@("ORGANIZATIONNAME")="WORLDVISTA EHR CLINIC"
+     S @AMAP@("ORGANIZATIONNAME")=$P($$SITE^VASITE,U,2)
      S @AMAP@("ACTORSOURCEID")="ACTORSYSTEM_1"
      D MAP^GPLXPATH(INXML,AMAP,OUTXML) ; MAP THE VARIABLE
@@ -146,8 +146,8 @@
      S @AMAP@("ACTORMIDDLENAME")=$$MIDDLE^CCRVA200(AIEN)
      S @AMAP@("ACTORFAMILYNAME")=$$FAMILY^CCRVA200(AIEN)
-	 S @AMAP@("ACTORTITLE")=$$TITLE^CCRVA200(AIEN)
-	 S @AMAP@("IDTYPE")=$P($$NPI^CCRVA200(AIEN),U,1)
-	 S @AMAP@("ID")=$P($$NPI^CCRVA200(AIEN),U,2)
-	 S @AMAP@("IDDESC")=$P($$NPI^CCRVA200(AIEN),U,3)
+         S @AMAP@("ACTORTITLE")=$$TITLE^CCRVA200(AIEN)
+         S @AMAP@("IDTYPE")=$P($$NPI^CCRVA200(AIEN),U,1)
+         S @AMAP@("ID")=$P($$NPI^CCRVA200(AIEN),U,2)
+         S @AMAP@("IDDESC")=$P($$NPI^CCRVA200(AIEN),U,3)
      S @AMAP@("ACTORSPECIALITY")=$$SPEC^CCRVA200(AIEN)
      S @AMAP@("ACTORADDRESSTYPE")=$$ADDTYPE^CCRVA200(AIEN)
Index: ccr/trunk/p/GPLCCR0.m
===================================================================
--- ccr/trunk/p/GPLCCR0.m	(revision 70)
+++ ccr/trunk/p/GPLCCR0.m	(revision 71)
@@ -144,112 +144,14 @@
  ;;</Type>
  ;;<Description>
- ;;<Text>Heart Disease</Text>
- ;;<Code>
- ;;<Value>C0018799</Value>
- ;;<CodingSystem>UMLS Concept</CodingSystem>
- ;;<Version>2006</Version>
- ;;</Code>
- ;;<Code>
- ;;<Value>429.9</Value>
- ;;<CodingSystem>ICD9CM</CodingSystem>
- ;;<Version>2006</Version>
- ;;</Code>
- ;;<Code>
- ;;<Value>56265001</Value>
- ;;<CodingSystem>SNOMEDCT</CodingSystem>
- ;;<Version>2006</Version>
- ;;</Code>
- ;;</Description>
- ;;<Source>
- ;;<Actor>
- ;;<ActorID>AA0001</ActorID>
- ;;</Actor>
- ;;</Source>
- ;;</Problem>
- ;;</FamilyProblemHistory>
- ;;<FamilyProblemHistory>
- ;;<CCRDataObjectID>BB0003</CCRDataObjectID>
- ;;<Source>
- ;;<Actor>
- ;;<ActorID>AA0001</ActorID>
- ;;</Actor>
- ;;</Source>
- ;;<FamilyMember>
- ;;<ActorID>AA0004</ActorID>
- ;;<ActorRole>
- ;;<Text>Grandparents</Text>
- ;;</ActorRole>
- ;;<Source>
- ;;<Actor>
- ;;<ActorID>AA0001</ActorID>
- ;;</Actor>
- ;;</Source>
- ;;</FamilyMember>
- ;;<Problem>
- ;;<Type>
- ;;<Text>Problem</Text>
- ;;</Type>
- ;;<Description>
- ;;<Text>Arthritis</Text>
- ;;<Code>
- ;;<Value>C0003873</Value>
- ;;<CodingSystem>UMLS Concept</CodingSystem>
- ;;<Version>2006</Version>
- ;;</Code>
- ;;<Code>
- ;;<Value>714.0</Value>
- ;;<CodingSystem>ICD9CM</CodingSystem>
- ;;<Version>2006</Version>
- ;;</Code>
- ;;<Code>
- ;;<Value>69896004</Value>
- ;;<CodingSystem>SNOMEDCT</CodingSystem>
- ;;<Version>2006</Version>
- ;;</Code>
- ;;</Description>
- ;;<Source>
- ;;<Actor>
- ;;<ActorID>AA0001</ActorID>
- ;;</Actor>
- ;;</Source>
- ;;</Problem>
- ;;<Problem>
- ;;<Type>
- ;;<Text>Problem</Text>
- ;;</Type>
- ;;<Description>
- ;;<Text>Diabetes Mellitus</Text>
- ;;<Code>
- ;;<Value>C0375113</Value>
- ;;<CodingSystem>UMLS Concept</CodingSystem>
- ;;<Version>2006</Version>
- ;;</Code>
- ;;<Code>
- ;;<Value>250.00</Value>
- ;;<CodingSystem>ICD9CM</CodingSystem>
- ;;<Version>2006</Version>
- ;;</Code>
- ;;</Description>
- ;;<Source>
- ;;<Actor>
- ;;<ActorID>AA0001</ActorID>
- ;;</Actor>
- ;;</Source>
- ;;</Problem>
- ;;<Problem>
- ;;<Type>
- ;;<Text>Problem</Text>
- ;;</Type>
- ;;<Description>
- ;;<Text>Parkinson's disease NOS</Text>
- ;;<Code>
- ;;<Value>332.0</Value>
- ;;<CodingSystem>ICD9CM</CodingSystem>
- ;;<Version>2007</Version>
- ;;</Code>
- ;;</Description>
- ;;<Source>
- ;;<Actor>
- ;;<ActorID>AA0001</ActorID>
+ ;;<Text>@@FAMILYMEMBERPROBLEMDESCRIPTION@@</Text>
+ ;;<Code>
+ ;;<Value>@@FAMILYMEMBERPROBLEMCODE@@</Value>
+ ;;<CodingSystem>@@FAMILYMEMBERCODESYSTEM@@</CodingSystem>
+ ;;<Version>@@FAMILYMEMBERCODEVERSION@@</Version>
+ ;;</Code>
+ ;;</Description>
+ ;;<Source>
+ ;;<Actor>
+ ;;<ActorID>@@FAMILYMEMBERPROBLEMSOURCEID@@</ActorID>
  ;;</Actor>
  ;;</Source>
@@ -453,5 +355,5 @@
  ;;</Actor>
  ;;</Source>
- ;;<Test>
+ ;;<Test_1>
  ;;<CCRDataObjectID>107c2dc0-67a5-11db-bd13-0800200c9a66</CCRDataObjectID>
  ;;<DateTime>
@@ -494,6 +396,6 @@
  ;;</Normal>
  ;;</NormalResult>
- ;;</Test>
- ;;<Test>
+ ;;</Test_1>
+ ;;<Test_2>
  ;;<CCRDataObjectID>8b3fa370-67a5-11db-bd13-0800200c9a66</CCRDataObjectID>
  ;;<DateTime>
@@ -553,6 +455,6 @@
  ;;</Normal>
  ;;</NormalResult>
- ;;</Test>
- ;;<Test>
+ ;;</Test_2>
+ ;;<Test_3>
  ;;<CCRDataObjectID>80a6c740-67a5-11db-bd13-0800200c9a66</CCRDataObjectID>
  ;;<DateTime>
@@ -615,5 +517,5 @@
  ;;<Text>LOW</Text>
  ;;</Flag>
- ;;</Test>
+ ;;</Test_3>
  ;;</Result>
  ;;<Result>