Index: ccr2ccd-xslt/trunk/ccr_ccd.xsl
===================================================================
--- ccr2ccd-xslt/trunk/ccr_ccd.xsl	(revision 787)
+++ ccr2ccd-xslt/trunk/ccr_ccd.xsl	(revision 798)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Conversion of CCR to Level 3 CCD
@@ -42,5 +42,5 @@
     <xsl:output method="xml" encoding="utf-8" version="1.0" indent="yes"/>
     <xsl:template match="/">
-        <ClinicalDocument xmlns="urn:hl7-org:v3" xsi:schemaLocation="urn:hl7-org:v3 http://xreg2.nist.gov:8080/hitspValidation/schema/cdar2c32/infrastructure/cda/C32_CDA.xsd" classCode="DOCCLIN" moodCode="EVN">
+        <ClinicalDocument xmlns="urn:hl7-org:v3" xmlns:voc="urn:hl7-org:v3/voc" xmlns:sdtc="urn:hl7-org:sdtc"  xsi:schemaLocation="urn:hl7-org:v3 http://xreg2.nist.gov:8080/hitspValidation/schema/cdar2c32/infrastructure/cda/C32_CDA.xsd" classCode="DOCCLIN" moodCode="EVN">
             <realmCode code="US"/>
             <typeId root="2.16.840.1.113883.1.3" extension="POCD_HD000040"/>
@@ -56,5 +56,7 @@
             </id>
             <code code="34133-9" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Summarization of episode note"/>
-            <title>Continuity of Care Document</title>
+             <xsl:variable name="fromID" select="/a:ContinuityOfCareRecord/a:From/a:ActorLink[1]/a:ActorID"/>
+              <xsl:variable name="ccrFromActorObjectID" select="/a:ContinuityOfCareRecord/a:Actors/a:Actor[a:ActorObjectID=$fromID]/a:InternalCCRLink[a:LinkRelationship='representedOrganization']/a:LinkID"/>
+            <title>Continuity of Care Document from <xsl:value-of select="/a:ContinuityOfCareRecord/a:Actors/a:Actor[a:ActorObjectID=$ccrFromActorObjectID]/a:Organization/a:Name"/></title>
             <effectiveTime>
                 <xsl:attribute name="value">
@@ -68,5 +70,5 @@
             <languageCode code="en-US"/>
 
-            <recordTarget>
+            <recordTarget typeCode="RCT" contextControlCode="OP">
                 <xsl:call-template name="ccdPatientRole">
                     <xsl:with-param name="ccrActorObjectID" select="/a:ContinuityOfCareRecord/a:Patient[1]/a:ActorID"/>
@@ -74,5 +76,4 @@
             </recordTarget>
 
-            <xsl:variable name="fromID" select="/a:ContinuityOfCareRecord/a:From/a:ActorLink[1]/a:ActorID"/>
 
             <author>
@@ -99,5 +100,5 @@
                     </assignedCustodian>
                 </custodian>
-            </xsl:if>
+            </xsl:if> 
 
             <documentationOf>
@@ -400,21 +401,15 @@
                                             <xsl:for-each select="/a:ContinuityOfCareRecord/a:Body/a:Problems/a:Problem">
                                                 <tr>
-                                                    <xsl:attribute name="id">
-                                                        <xsl:value-of select="a:CCRDataObjectID"/>
-                                                    </xsl:attribute>
                                                     <td>
                                                         <xsl:value-of select="a:Type/a:Text"/>
                                                     </td>
-                                                    <td>
-                                                        <table>
-                                                            <tbody>
-                                                                <xsl:apply-templates select="a:DateTime"/>
-                                                            </tbody>
-                                                        </table>
-                                                    </td>
+                                                   <xsl:apply-templates select="a:DateTime"/>                                                        
                                                     <td>
                                                         <xsl:apply-templates select="a:Description/a:Code"/>
                                                     </td>
                                                     <td>
+														<xsl:attribute name="ID">
+															<xsl:value-of select="a:CCRDataObjectID"></xsl:value-of>
+														</xsl:attribute>
                                                         <xsl:value-of select="a:Description/a:Text"/>
                                                     </td>
@@ -457,5 +452,5 @@
                                                     <xsl:call-template name="ccdID">
                                                         <xsl:with-param name="ccrObjectID" select="a:CCRDataObjectID"/>
-                                                        <xsl:with-param name="suffix">.1</xsl:with-param>
+                                                        <xsl:with-param name="suffix"></xsl:with-param>
                                                     </xsl:call-template>
 
@@ -2099,11 +2094,13 @@
                     </xsl:attribute>
                     <xsl:attribute name="root">
-                        <xsl:text>CCR Actor Object ID</xsl:text>
+                        <xsl:text>CCRActorID</xsl:text>
                     </xsl:attribute>
                 </xsl:otherwise>
             </xsl:choose>
         </id>
-    </xsl:template>
-
+         <xsl:if test="$CCRActor/a:Organization">
+            <name><xsl:value-of select="$CCRActor/a:Organization/a:Name"></xsl:value-of></name>
+        </xsl:if>
+    </xsl:template>		
     <xsl:template name="ccdAddress">
         <xsl:param name="CCRActorAddress"/>
@@ -2126,7 +2123,7 @@
                         <xsl:value-of select="$CCRActorAddress/a:State"/>
                     </state>
-                    <postalcode>
+                    <postalCode>
                         <xsl:value-of select="$CCRActorAddress/a:PostalCode"/>
-                    </postalcode>
+                    </postalCode>
                 </xsl:when>
                 <xsl:otherwise>
@@ -2136,10 +2133,10 @@
         </addr>
     </xsl:template>
-
+    
     <xsl:template name="ccdTelecom">
         <xsl:param name="CCRActor"/>
-        <telecom>
-            <xsl:if test="$CCRActor/a:Telephone">
-                <xsl:attribute name="use">
+			<xsl:if test="$CCRActor/a:Telephone">
+			<telecom>
+                    <xsl:attribute name="use">
                     <xsl:call-template name="CDAVocabularyLookup">
                         <xsl:with-param name="domain" select="'telecommunicationsAddressUse'"/>
@@ -2151,7 +2148,7 @@
                     <xsl:value-of select="$CCRActor/a:Telephone[1]/a:Value"/>
                 </xsl:attribute>
+			</telecom>            
             </xsl:if>
-        </telecom>
-
+		
         <xsl:if test="$CCRActor/a:Email">
             <telecom>
@@ -2185,5 +2182,5 @@
                 <xsl:value-of select="$suffix"></xsl:value-of>
             </xsl:attribute>
-            <xsl:attribute name="root">CCR Object ID</xsl:attribute>
+            <xsl:attribute name="extension">CCRObjectID</xsl:attribute>
         </id>
     </xsl:template>