Index: /ccr2ccd-xslt/trunk/make/Nancy-ccr_qrda-M1.xsl
===================================================================
--- /ccr2ccd-xslt/trunk/make/Nancy-ccr_qrda-M1.xsl	(revision 992)
+++ /ccr2ccd-xslt/trunk/make/Nancy-ccr_qrda-M1.xsl	(revision 993)
@@ -775,197 +775,4 @@
                         </component>
                     </xsl:if>
-<component>
-<section>
-<!--We are including only a coverage activity for Medicare here. There is also policy activity and and authorization activity that I don't think we need to report for QRDA, at least not for most reports-->
-<templateId root="2.16.840.1.113883.10.20.1.9"/>
-<!-- 48768-6 is payment sources and is fixed CQ-188,189,190-->
-<code code="48768-6" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Payment Sources"/>
-<!--CQ-191,192-->
-<title>Payers</title>
-<!--medicare-->
-<entry typeCode="DRIV">
-<!--WVP moodCode is DEF is definition to describe the characteristics of who must be involved in an act CQ-194,195-->
-<act classCode="ACT" moodCode="DEF">
-<!--WVP coverage activity template is the 10.20.1.20 CQ-193-->
-<templateId root="2.16.840.1.113883.10.20.1.20"/>
-<!--Coverage Shall Include and Act ID CQ-196-->
-<!--looks like a UUID to me-->
-<id root="1751b180-8a54-11df-a4ee-0800200c9c66"/><!--FIX!!!???-->
-<!--CQ-197-198 It appears that statusCode="completed" need to follow the code code ... here and below-->
-
-<!--CQ199,200-->
-<code code="48768-6" codeSystem="2.16.840.1.113883.6.1" displayName="Payment sources"/>
-<statusCode code="completed"/>
-
-<!--A coverage activity shall contain on or more act/entryRelationship. The value for  act/entryRelationship/@typeCode shall be COMP which SHALL be  the CMS QRDA Policy Activity CQ-201, 203-->
-<!--It MAY contain an entryRelationship/sequenceNumber CQ-202-->
-<entryRelationship typeCode="COMP">
-<!--  for the act is event with moodCode EVN  CQ-205,206,207-->
-<act classCode="ACT" moodCode="EVN">
-<!--Policy activity is the 10.20.1.26 template CQ-205-->
-<templateId root="2.16.840.1.113883.10.20.1.26"/>
-
-<!-- act/id which is the group or contract number related to the insurance policy or program CQ-208-->
-<id root="dbbb6311-8a4d-11df-a4ee-0800200c9c66"/><!--!!!FIX-->
-<!--Act statusCode must be completed CQ-210-->
-<!--This SHOULD be present and comes from the downloadable resource S display name is in quotes AUTOPOL - "automobile" policy;EHCPOL additional insurance in addition to Medicare in this case
-HSAPOL "Health Spending Account";PUBLICPOL "public healthcare" which is NOT Medicare - maybe a state program for example
-WBCPOL is "workers compensation" CQ-211,212-->
-<!--<code code="PUBLICPOL" codeSystem="2.16.840.1.113883.5.4" displayName="Public Healthcare"/>-->
-<code code="PUBLICPOL" codeSystem="2.16.840.1.113883.5.4" displayName="Public Healthcare"/>
-<!--WVP performer type codes are numerous but PRF is performer representing the Payer CQ-213-->
-<statusCode code="completed"/>
-<performer typeCode="PRF">
-
-<!--performer/assignedEntity id is the payer identification and the extension comes from the downloadable resource section I insurance plan TYPE CQ-214-->
-<assignedEntity>
-<id root="2.16.840.1.113883.12.86" extension="MC"/>
-<!--<representedOrganization>
-<name>CMS</name>
-</representedOrganization>-->
-</assignedEntity>
-</performer>
-<!-- Act/participant @typeCode this represents the covered party CQ-215-->
-<participant typeCode="COV">
-<participantRole>
-<!--A covered party in a policy activity SHOULD contain one or more participant/participantRole/id to represent the patien's member of subscriber identifier with respect to the payer
-For participant/paricipantRole/id either the Social Security Number or HIC Number SHALL be submitted for Medicare patients. for SSN the ID @root SHALL be 2.16.840.1.113883.4.1 where
-the HIC id/@root shall be 2.16.840.1.113883.3.249.13 CQ-216"RoleCode" in the downloadable resource-->
-<!-- in this case theextension is the patients SSN for a medicare patient so it is the same each time for one patient-->
-<id root="2.16.840.1.113883.4.1" extension="@@SSN@@"/>
-<!--The covered party in tha policy activity SHOULD contain exactly one particpant/participantRole/code for self, family etc from the valuse set PolicyOrPrograCoverageRoleType 2.16.840.1.113883.1.11.19809 CQ-217,218-->
-<code code="SELF" codeSystem="2.16.840.1.113883.5.111" displayName="Self"/>
-</participantRole>
-</participant>
-</act>
-</entryRelationship>
-</act>
-</entry>
-</section>
-</component>
-                    <xsl:if test="a:ContinuityOfCareRecord/a:Body/a:Results/a:Result">
-                        <component>
-                            <section>
-                                <templateId root="2.16.840.1.113883.10.20.1.14"/>
-                                <code code="30954-2" codeSystem="2.16.840.1.113883.6.1"/>
-                                <title>Results</title>
-                                <text>
-                                    <table>
-                                        <tbody>
-                                            <tr>
-                                                <th>Test</th>
-                                                <th>Date</th>
-                                                <th>Result</th>
-                                                <th>Source</th>
-                                            </tr>
-                                            <xsl:for-each select="/a:ContinuityOfCareRecord/a:Body/a:Results/a:Result">
-                                                <tr>
-                                                    <xsl:attribute name="id">
-                                                        <xsl:value-of select="a:CCRDataObjectID"/>
-                                                    </xsl:attribute>
-                                                    <td>
-                                                        <xsl:value-of select="a:Description/a:Text"/>
-                                                    </td>
-                                                    <td>
-                                                        <xsl:call-template name="date:format-date">
-                                                            <xsl:with-param name="date-time" select="a:DateTime/a:ExactDateTime"/>
-                                                        </xsl:call-template>
-                                                    </td>
-                                                    <td>
-                                                        <xsl:for-each select="a:Test[a:TestResult/a:Value!='']">
-                                                            <div>
-                                                                <xsl:attribute name="id">
-                                                                    <xsl:value-of select="a:CCRDataObjectID"/>
-                                                                </xsl:attribute>
-
-                                                                <xsl:value-of select="a:Description/a:Text"/>
-                                                                <xsl:text xml:space="preserve"> </xsl:text>
-                                                                <xsl:value-of select="a:TestResult/a:Value"/>
-                                                                <xsl:text xml:space="preserve"> </xsl:text>
-                                                                <xsl:value-of select="a:TestResult/a:Units/a:Unit"/>
-                                                                <xsl:text xml:space="preserve"> </xsl:text>
-                                                                <xsl:value-of select="a:Flag/a:Text"/>
-                                                                <br/>
-                                                            </div>
-                                                        </xsl:for-each>
-                                                        <xsl:for-each select="a:Test[a:TestResult/a:Description/a:Text!='']">
-                                                            <div>
-                                                                <xsl:attribute name="id">
-                                                                    <xsl:value-of select="a:CCRDataObjectID"/>
-                                                                </xsl:attribute>
-
-                                                                <xsl:value-of select="a:Description/a:Text"/>
-                                                                <xsl:text xml:space="preserve"> </xsl:text>
-                                                                <xsl:value-of select="a:TestResult/a:Description/a:Text" disable-output-escaping="yes"/>
-                                                                <xsl:text xml:space="preserve"> </xsl:text>
-                                                                <xsl:value-of select="a:Flag/a:Text"/>
-                                                                <br/>
-                                                            </div>
-                                                        </xsl:for-each>
-                                                    </td>
-                                                    <td>
-                                                        <xsl:call-template name="actorName">
-                                                            <xsl:with-param name="objID" select="a:Source/a:Actor/a:ActorID"/>
-                                                        </xsl:call-template>
-                                                    </td>
-                                                </tr>
-                                            </xsl:for-each>
-                                        </tbody>
-                                    </table>
-                                </text>
-                                <xsl:for-each select="/a:ContinuityOfCareRecord/a:Body/a:Results/a:Result">
-                                    <entry typeCode="DRIV">
-                                        <xsl:variable name="testDate" select="a:DateTime"/>
-
-                                        <xsl:choose>
-                                            <xsl:when test="count(a:Test)>1">
-                                                <organizer classCode="BATTERY" moodCode="EVN">
-                                                    <templateId root="2.16.840.1.113883.10.20.1.32"/>
-                                                    <!--Result organizer template -->
-
-                                                    <!-- <id> -->
-                                                    <xsl:call-template name="ccdID">
-                                                        <xsl:with-param name="ccrObjectID" select="a:CCRDataObjectID"/>
-                                                    </xsl:call-template>
-
-                                                    <!-- <code> -->
-                                                    <xsl:call-template name="ccdCodedValue">
-                                                        <xsl:with-param name="ccrCodedDescription" select="a:Description"/>
-                                                        <xsl:with-param name="nodeName" select="'code'"/>
-                                                    </xsl:call-template>
-
-                                                    <statusCode code="completed"/>
-
-                                                    <!-- <effectiveTime> -->
-                                                    <xsl:call-template name="ccdDateTime">
-                                                        <xsl:with-param name="dt" select="$testDate"/>
-                                                    </xsl:call-template>
-
-                                                    <xsl:call-template name="ccdPerformer">
-                                                        <xsl:with-param name="ccrActorReference" select="a:Source/a:Actor"/>
-                                                    </xsl:call-template>
-
-                                                    <xsl:for-each select="a:Test">
-                                                        <xsl:call-template name="ccdObservation">
-                                                            <xsl:with-param name="ccrTestNode" select="."/>
-                                                            <xsl:with-param name="testDate" select="$testDate"/>
-                                                        </xsl:call-template>
-                                                    </xsl:for-each>
-
-                                                </organizer>
-
-                                            </xsl:when>
-                                            <xsl:otherwise>
-                                                <xsl:call-template name="ccdObservation">
-                                                    <xsl:with-param name="ccrTestNode" select="a:Test[1]"/>
-                                                    <xsl:with-param name="testDate" select="$testDate"/>
-                                                </xsl:call-template>
-                                            </xsl:otherwise>
-                                        </xsl:choose>
-                                    </entry>
-                                </xsl:for-each>
-                            </section>
-                        </component>
-                    </xsl:if>
 </section>
 </component>