Changeset 21515 in main


Ignore:
Timestamp:
09/11/20 10:37:14 (9 days ago)
Author:
TongZheng_UT
Message:

fix and cleaning

Location:
adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed
Files:
33 edited

Legend:

Unmodified
Added
Removed
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/EDCntyED.xml

    r20562 r21515  
    110110<MAP_NAME>GeoCBSA</MAP_NAME>
    111111 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    112           <SECTION_NAMES>
    113             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    114           </SECTION_NAMES>
     112          <!--SECTION_NAMES>
     113            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     114          </SECTION_NAMES-->
    115115        </EXCLUDE>
    116116      </CRITERIA>
     
    196196 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    197197          <SECTION_NAMES>
    198             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     198            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    199199            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    200200          </SECTION_NAMES>
     
    274274          <SECTION_NAMES>
    275275            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    276             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     276            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    277277            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    278278          </SECTION_NAMES>
     
    339339            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    340340          </MAP_NAMES>
    341           <SECTION_NAMES>
    342             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    343           </SECTION_NAMES>
     341          <!--SECTION_NAMES>
     342            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     343          </SECTION_NAMES-->
    344344        </EXCLUDE>
    345345      </CRITERIA>
     
    424424<MAP_NAME>GeoCBSA</MAP_NAME>
    425425 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    426           <SECTION_NAMES>
    427             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    428           </SECTION_NAMES>
     426          <!--SECTION_NAMES>
     427            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     428          </SECTION_NAMES-->
    429429        </EXCLUDE>
    430430      </CRITERIA>
     
    497497<MAP_NAME>GeoCBSA</MAP_NAME>
    498498 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    499           <SECTION_NAMES>
    500             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    501           </SECTION_NAMES>
     499          <!--SECTION_NAMES>
     500            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     501          </SECTION_NAMES-->
    502502        </EXCLUDE>
    503503      </CRITERIA>
     
    543543
    544544      <ibis:include href="section/Procedure.xml"/>
    545       <ibis:include href="section/AgeGrp14.xml"/>
    546545      <ibis:include href="section/AgeGrp13.xml"/>
     546      <!--ibis:include href="section/AgeGrp13.xml"/-->
    547547      <ibis:include href="section/Sex.xml"/>
    548548      <ibis:include href="section/PriPayer.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/EDCntyEDICD10.xml

    r20562 r21515  
    110110<MAP_NAME>GeoCBSA</MAP_NAME>
    111111 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    112           <SECTION_NAMES>
    113             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    114           </SECTION_NAMES>
     112          <!--SECTION_NAMES>
     113            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     114          </SECTION_NAMES-->
    115115        </EXCLUDE>
    116116      </CRITERIA>
     
    195195 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    196196          <SECTION_NAMES>
    197             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     197            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    198198            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    199199          </SECTION_NAMES>
     
    272272          <SECTION_NAMES>
    273273            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    274             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     274            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    275275            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    276276          </SECTION_NAMES>
     
    336336            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    337337          </MAP_NAMES>
    338           <SECTION_NAMES>
    339             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    340           </SECTION_NAMES>
     338          <!--SECTION_NAMES>
     339            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     340          </SECTION_NAMES-->
    341341        </EXCLUDE>
    342342      </CRITERIA>
     
    420420<MAP_NAME>GeoCBSA</MAP_NAME>
    421421 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    422           <SECTION_NAMES>
    423             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    424           </SECTION_NAMES>
     422          <!--SECTION_NAMES>
     423            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     424          </SECTION_NAMES-->
    425425        </EXCLUDE>
    426426      </CRITERIA>
     
    492492<MAP_NAME>GeoCBSA</MAP_NAME>
    493493 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    494           <SECTION_NAMES>
    495             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    496           </SECTION_NAMES>
     494          <!--SECTION_NAMES>
     495            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     496          </SECTION_NAMES-->
    497497        </EXCLUDE>
    498498      </CRITERIA>
     
    538538
    539539      <ibis:include href="section/Procedure.xml"/>
    540       <ibis:include href="section/AgeGrp14.xml"/>
    541540      <ibis:include href="section/AgeGrp13.xml"/>
     541      <!--ibis:include href="section/AgeGrp13.xml"/-->
    542542      <ibis:include href="section/Sex.xml"/>
    543543      <ibis:include href="section/PriPayer.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/EDCntyHosp.xml

    r20562 r21515  
    110110<MAP_NAME>GeoCBSA</MAP_NAME>
    111111 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    112           <SECTION_NAMES>
    113             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    114           </SECTION_NAMES>
     112          <!--SECTION_NAMES>
     113            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     114          </SECTION_NAMES-->
    115115        </EXCLUDE>
    116116      </CRITERIA>
     
    182182 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    183183          <SECTION_NAMES>
    184             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     184            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    185185            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    186186          </SECTION_NAMES>
     
    259259          <SECTION_NAMES>
    260260            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    261             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     261            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    262262            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    263263          </SECTION_NAMES>
     
    310310            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    311311          </MAP_NAMES>
    312           <SECTION_NAMES>
    313             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    314           </SECTION_NAMES>
     312          <!--SECTION_NAMES>
     313            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     314          </SECTION_NAMES-->
    315315        </EXCLUDE>
    316316      </CRITERIA>
     
    382382<MAP_NAME>GeoCBSA</MAP_NAME>
    383383 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    384           <SECTION_NAMES>
    385             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    386           </SECTION_NAMES>
     384          <!--SECTION_NAMES>
     385            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     386          </SECTION_NAMES-->
    387387        </EXCLUDE>
    388388      </CRITERIA>
     
    442442<MAP_NAME>GeoCBSA</MAP_NAME>
    443443 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    444           <SECTION_NAMES>
    445             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    446           </SECTION_NAMES>
     444          <!--SECTION_NAMES>
     445            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     446          </SECTION_NAMES-->
    447447        </EXCLUDE>
    448448      </CRITERIA>
     
    490490<MAP_NAME>GeoCBSA</MAP_NAME>
    491491 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    492           <SECTION_NAMES>
    493             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    494           </SECTION_NAMES>
     492          <!--SECTION_NAMES>
     493            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     494          </SECTION_NAMES-->
    495495        </EXCLUDE>
    496496      </CRITERIA>
     
    560560<MAP_NAME>GeoCBSA</MAP_NAME>
    561561 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    562           <SECTION_NAMES>
    563             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    564           </SECTION_NAMES>
     562          <!--SECTION_NAMES>
     563            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     564          </SECTION_NAMES-->
    565565        </EXCLUDE>
    566566      </CRITERIA>
     
    619619<MAP_NAME>GeoCBSA</MAP_NAME>
    620620 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    621           <SECTION_NAMES>
    622             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    623           </SECTION_NAMES>
     621          <!--SECTION_NAMES>
     622            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     623          </SECTION_NAMES-->
    624624        </EXCLUDE>
    625625      </CRITERIA>
     
    652652
    653653      <ibis:include href="section/Procedure.xml"/>
    654       <ibis:include href="section/AgeGrp14.xml"/>
    655654      <ibis:include href="section/AgeGrp13.xml"/>
     655      <!--ibis:include href="section/AgeGrp13.xml"/-->
    656656      <ibis:include href="section/Sex.xml"/>
    657657      <ibis:include href="section/PriPayer.xml"/>
     
    696696    <ibis:include href="dimension/AgeGrp11.xml"/>
    697697    <ibis:include href="dimension/AgeGrp13.xml"/>
    698     <ibis:include href="dimension/AgeGrp14.xml"/>
     698    <ibis:include href="dimension/AgeGrp13.xml"/>
    699699    <ibis:include href="dimension/AgeGrpNCDM.xml"/>
    700700    <ibis:include href="dimension/Sex.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/EDCntyHospED.xml

    r20562 r21515  
    106106<MAP_NAME>GeoCBSA</MAP_NAME>
    107107 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    108           <SECTION_NAMES>
    109             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    110           </SECTION_NAMES>
     108          <!--SECTION_NAMES>
     109            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     110          </SECTION_NAMES-->
    111111        </EXCLUDE>
    112112      </CRITERIA>
     
    178178 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    179179          <SECTION_NAMES>
    180             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     180            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    181181            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    182182          </SECTION_NAMES>
     
    255255          <SECTION_NAMES>
    256256            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    257             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     257            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    258258            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    259259          </SECTION_NAMES>
     
    310310            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    311311          </MAP_NAMES>
    312           <SECTION_NAMES>
    313             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    314           </SECTION_NAMES>
     312          <!--SECTION_NAMES>
     313            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     314          </SECTION_NAMES-->
    315315        </EXCLUDE>
    316316      </CRITERIA>
     
    382382            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    383383          </MAP_NAMES>
    384           <SECTION_NAMES>
    385             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    386           </SECTION_NAMES>
     384          <!--SECTION_NAMES>
     385            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     386          </SECTION_NAMES-->
    387387        </EXCLUDE>
    388388      </CRITERIA>
     
    442442            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    443443          </MAP_NAMES>
    444           <SECTION_NAMES>
    445             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    446           </SECTION_NAMES>
     444          <!--SECTION_NAMES>
     445            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     446          </SECTION_NAMES-->
    447447        </EXCLUDE>
    448448      </CRITERIA>
     
    475475
    476476      <ibis:include href="section/Procedure.xml"/>
    477       <ibis:include href="section/AgeGrp14.xml"/>
    478477      <ibis:include href="section/AgeGrp13.xml"/>
     478      <!--ibis:include href="section/AgeGrp13.xml"/-->
    479479      <ibis:include href="section/Sex.xml"/>
    480480      <ibis:include href="section/PriPayer.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/EDCntyHospEDICD10.xml

    r20562 r21515  
    106106<MAP_NAME>GeoCBSA</MAP_NAME>
    107107 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    108           <SECTION_NAMES>
    109             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    110           </SECTION_NAMES>
     108          <!--SECTION_NAMES>
     109            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     110          </SECTION_NAMES-->
    111111        </EXCLUDE>
    112112      </CRITERIA>
     
    177177 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    178178          <SECTION_NAMES>
    179             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     179            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    180180            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    181181          </SECTION_NAMES>
     
    253253          <SECTION_NAMES>
    254254            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    255             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     255            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    256256            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    257257          </SECTION_NAMES>
     
    307307            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    308308          </MAP_NAMES>
    309           <SECTION_NAMES>
    310             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    311           </SECTION_NAMES>
     309          <!--SECTION_NAMES>
     310            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     311          </SECTION_NAMES-->
    312312        </EXCLUDE>
    313313      </CRITERIA>
     
    378378            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    379379          </MAP_NAMES>
    380           <SECTION_NAMES>
    381             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    382           </SECTION_NAMES>
     380          <!--SECTION_NAMES>
     381            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     382          </SECTION_NAMES-->
    383383        </EXCLUDE>
    384384      </CRITERIA>
     
    437437            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    438438          </MAP_NAMES>
    439           <SECTION_NAMES>
    440             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    441           </SECTION_NAMES>
     439          <!--SECTION_NAMES>
     440            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     441          </SECTION_NAMES-->
    442442        </EXCLUDE>
    443443      </CRITERIA>
     
    470470
    471471      <ibis:include href="section/Procedure.xml"/>
    472       <ibis:include href="section/AgeGrp14.xml"/>
    473472      <ibis:include href="section/AgeGrp13.xml"/>
     473      <!--ibis:include href="section/AgeGrp13.xml"/-->
    474474      <ibis:include href="section/Sex.xml"/>
    475475      <ibis:include href="section/PriPayer.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/EDCntyHospICD10.xml

    r20562 r21515  
    114114<MAP_NAME>GeoCBSA</MAP_NAME>
    115115 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    116           <SECTION_NAMES>
    117             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    118           </SECTION_NAMES>
     116          <!--SECTION_NAMES>
     117            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     118          </SECTION_NAMES-->
    119119        </EXCLUDE>
    120120      </CRITERIA>
     
    185185 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    186186          <SECTION_NAMES>
    187             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     187            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    188188            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    189189          </SECTION_NAMES>
     
    261261          <SECTION_NAMES>
    262262            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    263             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     263            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    264264            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    265265          </SECTION_NAMES>
     
    311311            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    312312          </MAP_NAMES>
    313           <SECTION_NAMES>
    314             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    315           </SECTION_NAMES>
     313          <!--SECTION_NAMES>
     314            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     315          </SECTION_NAMES-->
    316316        </EXCLUDE>
    317317      </CRITERIA>
     
    382382<MAP_NAME>GeoCBSA</MAP_NAME>
    383383 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    384           <SECTION_NAMES>
    385             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    386           </SECTION_NAMES>
     384          <!--SECTION_NAMES>
     385            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     386          </SECTION_NAMES-->
    387387        </EXCLUDE>
    388388      </CRITERIA>
     
    441441<MAP_NAME>GeoCBSA</MAP_NAME>
    442442 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    443           <SECTION_NAMES>
    444             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    445           </SECTION_NAMES>
     443          <!--SECTION_NAMES>
     444            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     445          </SECTION_NAMES-->
    446446        </EXCLUDE>
    447447      </CRITERIA>
     
    488488<MAP_NAME>GeoCBSA</MAP_NAME>
    489489 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    490           <SECTION_NAMES>
    491             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    492           </SECTION_NAMES>
     490          <!--SECTION_NAMES>
     491            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     492          </SECTION_NAMES-->
    493493        </EXCLUDE>
    494494      </CRITERIA>
     
    557557<MAP_NAME>GeoCBSA</MAP_NAME>
    558558 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    559           <SECTION_NAMES>
    560             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    561           </SECTION_NAMES>
     559          <!--SECTION_NAMES>
     560            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     561          </SECTION_NAMES-->
    562562        </EXCLUDE>
    563563      </CRITERIA>
     
    615615<MAP_NAME>GeoCBSA</MAP_NAME>
    616616 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    617           <SECTION_NAMES>
    618             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    619           </SECTION_NAMES>
     617          <!--SECTION_NAMES>
     618            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     619          </SECTION_NAMES-->
    620620        </EXCLUDE>
    621621      </CRITERIA>
     
    648648
    649649      <ibis:include href="section/Procedure.xml"/>
    650       <ibis:include href="section/AgeGrp14.xml"/>
    651650      <ibis:include href="section/AgeGrp13.xml"/>
     651      <!--ibis:include href="section/AgeGrp13.xml"/-->
    652652      <ibis:include href="section/Sex.xml"/>
    653653      <ibis:include href="section/PriPayer.xml"/>
     
    692692    <ibis:include href="dimension/AgeGrp11.xml"/>
    693693    <ibis:include href="dimension/AgeGrp13.xml"/>
    694     <ibis:include href="dimension/AgeGrp14.xml"/>
     694    <ibis:include href="dimension/AgeGrp13.xml"/>
    695695    <ibis:include href="dimension/AgeGrpNCDM.xml"/>
    696696    <ibis:include href="dimension/Sex.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/EPHTEDCntyHospED.xml

    r20562 r21515  
    125125            <SELECTION>
    126126              <NAME>AgeGrpProxy</NAME>
    127               <VALUE>AgeGrp14</VALUE>
     127              <VALUE>AgeGrp13</VALUE>
    128128            </SELECTION>
    129129            <SELECTION>
     
    215215            <SELECTION>
    216216              <NAME>AgeGrpProxy</NAME>
    217               <VALUE>AgeGrp14</VALUE>
     217              <VALUE>AgeGrp13</VALUE>
    218218            </SELECTION>
    219219            <SELECTION>
     
    302302            <SELECTION>
    303303              <NAME>AgeGrpProxy</NAME>
    304               <VALUE>AgeGrp14</VALUE>
     304              <VALUE>AgeGrp13</VALUE>
    305305            </SELECTION>
    306306            <SELECTION>
     
    393393            <SELECTION>
    394394              <NAME>AgeGrpProxy</NAME>
    395               <VALUE>AgeGrp14</VALUE>
     395              <VALUE>AgeGrp13</VALUE>
    396396            </SELECTION>
    397397            <SELECTION>
     
    506506            <SELECTION>
    507507              <NAME>AgeGrpProxy</NAME>
    508               <VALUE>AgeGrp14</VALUE>
     508              <VALUE>AgeGrp13</VALUE>
    509509            </SELECTION>
    510510            <SELECTION>
     
    621621            <SELECTION>
    622622              <NAME>AgeGrpProxy</NAME>
    623               <VALUE>AgeGrp14</VALUE>
     623              <VALUE>AgeGrp13</VALUE>
    624624            </SELECTION>
    625625            <SELECTION>
     
    732732            <SELECTION>
    733733              <NAME>AgeGrpProxy</NAME>
    734               <VALUE>AgeGrp14</VALUE>
     734              <VALUE>AgeGrp13</VALUE>
    735735            </SELECTION>
    736736            <SELECTION>
     
    930930 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    931931          <SECTION_NAMES>
    932             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     932            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    933933            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    934934            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
     
    11651165 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    11661166          <SECTION_NAMES>
    1167             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     1167            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    11681168            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    11691169            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
     
    13481348      <!--ibis:include href="section/Diag.xml"/>
    13491349                        <ibis:include href="section/Procedure.xml"/-->
    1350       <!--ibis:include href="section/AgeGrp14.xml"/>
     1350      <!--ibis:include href="section/AgeGrp13.xml"/>
    13511351      <ibis:include href="section/AgeGrp13.xml"/-->
    13521352      <ibis:include href="section/AgeGrp_NCDM.xml" />
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/EPHTEDCntyHospED_COPD.xml

    r20562 r21515  
    129129            <SELECTION>
    130130              <NAME>AgeGrpProxy</NAME>
    131               <VALUE>AgeGrp14</VALUE>
     131              <VALUE>AgeGrp13</VALUE>
    132132            </SELECTION>
    133133            <SELECTION>
     
    239239            <SELECTION>
    240240              <NAME>AgeGrpProxy</NAME>
    241               <VALUE>AgeGrp14</VALUE>
     241              <VALUE>AgeGrp13</VALUE>
    242242            </SELECTION>
    243243            <SELECTION>
     
    344344          <SECTION_NAMES>
    345345            <SECTION_NAME>AgeGrp_NCDM</SECTION_NAME>
    346             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     346            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    347347            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    348348            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
     
    410410      <!--ibis:include href="section/Diag.xml"/>
    411411                        <ibis:include href="section/Procedure.xml"/-->
    412       <!--ibis:include href="section/AgeGrp14.xml"/>
     412      <!--ibis:include href="section/AgeGrp13.xml"/>
    413413      <ibis:include href="section/AgeGrp13.xml"/-->
    414414      <ibis:include href="section/AgeGrp_NCDM.xml" />
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/InjEDCntyED.xml

    r20562 r21515  
    106106<MAP_NAME>GeoCBSA</MAP_NAME>
    107107 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    108           <SECTION_NAMES>
    109             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    110           </SECTION_NAMES>
     108          <!--SECTION_NAMES>
     109            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     110          </SECTION_NAMES-->
    111111        </EXCLUDE>
    112112      </CRITERIA>
     
    193193 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    194194          <SECTION_NAMES>
    195             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     195            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    196196            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    197197          </SECTION_NAMES>
     
    285285          <SECTION_NAMES>
    286286            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    287             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     287            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    288288            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    289289          </SECTION_NAMES>
    290290          <DIMENSION_NAMES>
    291291            <DIMENSION_NAME>AgeGrpProxy</DIMENSION_NAME>
    292             <DIMENSION_NAME>AgeGrp14</DIMENSION_NAME>
     292            <DIMENSION_NAME>AgeGrp13</DIMENSION_NAME>
    293293            <DIMENSION_NAME>AgeGrp11</DIMENSION_NAME>
    294294            <DIMENSION_NAME>AgeGrp9</DIMENSION_NAME>
     
    354354            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    355355          </MAP_NAMES>
    356           <SECTION_NAMES>
    357             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    358           </SECTION_NAMES>
     356          <!--SECTION_NAMES>
     357            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     358          </SECTION_NAMES-->
    359359        </EXCLUDE>
    360360      </CRITERIA>
     
    441441<MAP_NAME>GeoCBSA</MAP_NAME>
    442442 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    443           <SECTION_NAMES>
    444             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    445           </SECTION_NAMES>
     443          <!--SECTION_NAMES>
     444            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     445          </SECTION_NAMES-->
    446446        </EXCLUDE>
    447447      </CRITERIA>
     
    516516<MAP_NAME>GeoCBSA</MAP_NAME>
    517517 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    518           <SECTION_NAMES>
    519             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    520           </SECTION_NAMES>
     518          <!--SECTION_NAMES>
     519            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     520          </SECTION_NAMES-->
    521521        </EXCLUDE>
    522522      </CRITERIA>
     
    560560      <ibis:include href="section/Reason.xml"/>
    561561      <ibis:include href="section/InjIntent.xml"/>
    562       <ibis:include href="section/AgeGrp14.xml"/>
    563562      <ibis:include href="section/AgeGrp13.xml"/>
     563      <!--ibis:include href="section/AgeGrp13.xml"/-->
    564564      <ibis:include href="section/Sex.xml"/>
    565565      <ibis:include href="section/PriPayer.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/InjEDCntyHosp.xml

    r20562 r21515  
    106106<MAP_NAME>GeoCBSA</MAP_NAME>
    107107 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    108           <SECTION_NAMES>
    109             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    110           </SECTION_NAMES>
     108          <!--SECTION_NAMES>
     109            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     110          </SECTION_NAMES-->
    111111        </EXCLUDE>
    112112      </CRITERIA>
     
    180180 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    181181          <SECTION_NAMES>
    182             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     182            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    183183            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    184184          </SECTION_NAMES>
     
    260260          <SECTION_NAMES>
    261261            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    262             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     262            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    263263            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    264264          </SECTION_NAMES>
     
    314314            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    315315          </MAP_NAMES>
    316           <SECTION_NAMES>
    317             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    318           </SECTION_NAMES>
     316          <!--SECTION_NAMES>
     317            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     318          </SECTION_NAMES-->
    319319        </EXCLUDE>
    320320      </CRITERIA>
     
    389389<MAP_NAME>GeoCBSA</MAP_NAME>
    390390 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    391           <SECTION_NAMES>
    392             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    393           </SECTION_NAMES>
     391          <!--SECTION_NAMES>
     392            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     393          </SECTION_NAMES-->
    394394        </EXCLUDE>
    395395      </CRITERIA>
     
    452452<MAP_NAME>GeoCBSA</MAP_NAME>
    453453 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    454           <SECTION_NAMES>
    455             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    456           </SECTION_NAMES>
     454          <!--SECTION_NAMES>
     455            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     456          </SECTION_NAMES-->
    457457        </EXCLUDE>
    458458      </CRITERIA>
     
    503503<MAP_NAME>GeoCBSA</MAP_NAME>
    504504 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    505           <SECTION_NAMES>
    506             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    507           </SECTION_NAMES>
     505          <!--SECTION_NAMES>
     506            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     507          </SECTION_NAMES-->
    508508        </EXCLUDE>
    509509      </CRITERIA>
     
    576576<MAP_NAME>GeoCBSA</MAP_NAME>
    577577 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    578           <SECTION_NAMES>
    579             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    580           </SECTION_NAMES>
     578          <!--SECTION_NAMES>
     579            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     580          </SECTION_NAMES-->
    581581        </EXCLUDE>
    582582      </CRITERIA>
     
    638638<MAP_NAME>GeoCBSA</MAP_NAME>
    639639 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    640           <SECTION_NAMES>
    641             <SECTION_NAME>AgeGrp13</SECTION_NAME>
    642           </SECTION_NAMES>
     640          <!--SECTION_NAMES>
     641            <SECTION_NAME>AgeGrp13</SECTION_NAME>
     642          </SECTION_NAMES-->
    643643        </EXCLUDE>
    644644      </CRITERIA>
     
    670670      <ibis:include href="section/Reason.xml"/>
    671671      <ibis:include href="section/InjIntent.xml"/>
    672       <ibis:include href="section/AgeGrp14.xml"/>
    673672      <ibis:include href="section/AgeGrp13.xml"/>
     673      <!--ibis:include href="section/AgeGrp13.xml"/-->
    674674      <ibis:include href="section/Sex.xml"/>
    675675      <ibis:include href="section/PriPayer.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/InjEDCntyHospED.xml

    r20562 r21515  
    102102<MAP_NAME>GeoCBSA</MAP_NAME>
    103103 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    104           <SECTION_NAMES>
     104          <!--SECTION_NAMES>
    105105            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    106           </SECTION_NAMES>
     106          </SECTION_NAMES-->
    107107          <OVERVIEWS>
    108108            <ibis:include href="overview/ED.xml"/>
     
    180180 <MAP_NAME>GeoWFZone</MAP_NAME>          </MAP_NAMES>
    181181          <SECTION_NAMES>
    182             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     182            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    183183            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    184184          </SECTION_NAMES>
     
    255255          <SECTION_NAMES>
    256256            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    257             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     257            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    258258            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    259259          </SECTION_NAMES>
     
    459459      <ibis:include href="section/Reason.xml"/>
    460460      <ibis:include href="section/InjIntent.xml"/>
    461       <ibis:include href="section/AgeGrp14.xml"/>
    462461      <ibis:include href="section/AgeGrp13.xml"/>
     462      <!--ibis:include href="section/AgeGrp13.xml"/-->
    463463      <ibis:include href="section/Sex.xml"/>
    464464      <ibis:include href="section/PriPayer.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/Trend_EDCntyED.xml

    r19521 r21515  
    145145          </MAP_NAMES>
    146146          <SECTION_NAMES>
    147             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     147            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    148148            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    149149          </SECTION_NAMES>
     
    246246          <SECTION_NAMES>
    247247            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    248             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     248            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    249249            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    250250          </SECTION_NAMES>
     
    295295
    296296      <ibis:include href="section/Procedure.xml"/>
    297       <ibis:include href="section/AgeGrp14.xml"/>
    298297      <ibis:include href="section/AgeGrp13.xml"/>
     298      <!--ibis:include href="section/AgeGrp13.xml"/-->
    299299      <ibis:include href="section/Sex.xml"/>
    300300      <ibis:include href="section/PriPayer.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/Trend_EDCntyHosp.xml

    r19521 r21515  
    148148          </MAP_NAMES>
    149149          <SECTION_NAMES>
    150             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     150            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    151151            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    152152          </SECTION_NAMES>
     
    239239          <SECTION_NAMES>
    240240            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    241             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     241            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    242242            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    243243          </SECTION_NAMES>
     
    278278
    279279      <ibis:include href="section/Procedure.xml"/>
    280       <ibis:include href="section/AgeGrp14.xml"/>
    281280      <ibis:include href="section/AgeGrp13.xml"/>
     281      <!--ibis:include href="section/AgeGrp13.xml"/-->
    282282      <ibis:include href="section/Sex.xml"/>
    283283      <ibis:include href="section/PriPayer.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/Trend_EDCntyHospED.xml

    r19521 r21515  
    144144          </MAP_NAMES>
    145145          <SECTION_NAMES>
    146             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     146            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    147147            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    148148          </SECTION_NAMES>
     
    235235          <SECTION_NAMES>
    236236            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    237             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     237            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    238238            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    239239          </SECTION_NAMES>
     
    274274
    275275      <ibis:include href="section/Procedure.xml"/>
    276       <ibis:include href="section/AgeGrp14.xml"/>
    277276      <ibis:include href="section/AgeGrp13.xml"/>
     277      <!--ibis:include href="section/AgeGrp13.xml"/-->
    278278      <ibis:include href="section/Sex.xml"/>
    279279      <ibis:include href="section/PriPayer.xml"/>
     
    317317                <ibis:include href="dimension/AgeGrp11.xml"/>
    318318                <ibis:include href="dimension/AgeGrp13.xml"/>
    319                 <ibis:include href="dimension/AgeGrp14.xml"/>
     319                <ibis:include href="dimension/AgeGrp13.xml"/>
    320320                <ibis:include href="dimension/AgeGrpNCDM.xml"/>
    321321                <ibis:include href="dimension/Sex.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/Trend_InjEDCntyED.xml

    r19521 r21515  
    148148          </MAP_NAMES>
    149149          <SECTION_NAMES>
    150             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     150            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    151151            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    152152          </SECTION_NAMES>
     
    240240          <SECTION_NAMES>
    241241            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    242             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     242            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    243243            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    244244          </SECTION_NAMES>
     
    288288      <ibis:include href="section/Reason.xml"/>
    289289      <ibis:include href="section/InjIntent.xml"/>
    290       <ibis:include href="section/AgeGrp14.xml"/>
    291290      <ibis:include href="section/AgeGrp13.xml"/>
     291      <!--ibis:include href="section/AgeGrp13.xml"/-->
    292292      <ibis:include href="section/Sex.xml"/>
    293293      <ibis:include href="section/PriPayer.xml"/>
     
    312312    <ibis:include href="dimension/AgeGrp11.xml"/>
    313313    <ibis:include href="dimension/AgeGrp13.xml"/>
    314     <ibis:include href="dimension/AgeGrp14.xml"/>
     314    <ibis:include href="dimension/AgeGrp13.xml"/>
    315315    <ibis:include href="dimension/AgeGrpNCDM.xml"/>
    316316    <ibis:include href="dimension/Sex.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/Trend_InjEDCntyHosp.xml

    r19521 r21515  
    148148          </MAP_NAMES>
    149149          <SECTION_NAMES>
    150             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     150            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    151151            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    152152          </SECTION_NAMES>
     
    243243          <SECTION_NAMES>
    244244            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    245             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     245            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    246246            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    247247          </SECTION_NAMES>
     
    281281      <ibis:include href="section/Reason.xml"/>
    282282      <ibis:include href="section/InjIntent.xml"/>
    283       <ibis:include href="section/AgeGrp14.xml"/>
    284283      <ibis:include href="section/AgeGrp13.xml"/>
     284      <!--ibis:include href="section/AgeGrp13.xml"/-->
    285285      <ibis:include href="section/Sex.xml"/>
    286286      <ibis:include href="section/PriPayer.xml"/>
     
    305305    <ibis:include href="dimension/AgeGrp11.xml"/>
    306306    <ibis:include href="dimension/AgeGrp13.xml"/>
    307     <ibis:include href="dimension/AgeGrp14.xml"/>
     307    <ibis:include href="dimension/AgeGrp13.xml"/>
    308308    <ibis:include href="dimension/AgeGrpNCDM.xml"/>
    309309    <ibis:include href="dimension/Sex.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/Trend_InjEDCntyHospED.xml

    r19521 r21515  
    144144          </MAP_NAMES>
    145145          <SECTION_NAMES>
    146             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     146            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    147147            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    148148          </SECTION_NAMES>
     
    234234          <SECTION_NAMES>
    235235            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    236             <SECTION_NAME>AgeGrp14</SECTION_NAME>
     236            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    237237            <!--SECTION_NAME>GeoRes</SECTION_NAME-->
    238238          </SECTION_NAMES>
     
    271271      <ibis:include href="section/Reason.xml"/>
    272272      <ibis:include href="section/InjIntent.xml"/>
    273       <ibis:include href="section/AgeGrp14.xml"/>
    274273      <ibis:include href="section/AgeGrp13.xml"/>
     274      <!--ibis:include href="section/AgeGrp13.xml"/-->
    275275      <ibis:include href="section/Sex.xml"/>
    276276      <ibis:include href="section/PriPayer.xml"/>
     
    295295    <ibis:include href="dimension/AgeGrp11.xml"/>
    296296    <ibis:include href="dimension/AgeGrp13.xml"/>
    297     <ibis:include href="dimension/AgeGrp14.xml"/>
     297    <ibis:include href="dimension/AgeGrp13.xml"/>
    298298    <ibis:include href="dimension/AgeGrpNCDM.xml"/>
    299299    <ibis:include href="dimension/Sex.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/Trend_InjEDSareaED.xml

    r19474 r21515  
    243243            <MAP_NAME>HighLowSame_2015</MAP_NAME>
    244244          </MAP_NAMES>
    245           <SECTION_NAMES>
     245          <!--SECTION_NAMES>
    246246            <SECTION_NAME>AgeGrp13</SECTION_NAME>
    247           </SECTION_NAMES>
     247          </SECTION_NAMES-->
    248248          <DIMENSION_NAMES>
    249249            <DIMENSION_NAME>AgeGrpProxy</DIMENSION_NAME>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/data_source/GOPBSarea.xml

    r14843 r21515  
    44<DATA_SOURCE name="GOPB">
    55        <NAME>GOPB</NAME>
    6         <TEXT>The population data in this IBIS-Q query module were produced by the Utah Department of Health. Linear interpolation of US Census
     6        <TEXT>The population data in this IBIS-Q query module were produced by the Utah Department of Health. Linear interpolation of  U.S.Census
    77        and ESRI ZIP Code data provided annual population estimates for ZIP Code areas for age by sex groups.  All estimates
    8         were then weighted by US Census or GOPB county estimates so that the Small Areas summed to county totals for each age by sex group.
     8        were then weighted by  U.S.Census or GOPB county estimates so that the Small Areas summed to county totals for each age by sex group.
    99
    1010
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/dimension/AgeGrp14.xml

    r15045 r21515  
    22
    33<DIMENSION>
    4         <NAME>AgeGrp14</NAME>
     4        <NAME>AgeGrp13</NAME>
    55        <TITLE>Age Groups</TITLE>
    66        <PROXY_DIMENSION_NAME>AgeGrpProxy</PROXY_DIMENSION_NAME>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/dimension/GeoLHD.xml

    r13852 r21515  
    1010                <VALUE>3.0<TITLE>Davis County LHD</TITLE><SORT_ORDER>3</SORT_ORDER></VALUE>
    1111                <VALUE>4.0<TITLE>Salt Lake County LHD</TITLE><SORT_ORDER>4</SORT_ORDER></VALUE>
    12                 <VALUE>13.0<TITLE>San Juan, LHD </TITLE><SORT_ORDER>5</SORT_ORDER></VALUE>
     12                <VALUE>13.0<TITLE>San Juan  LHD </TITLE><SORT_ORDER>5</SORT_ORDER></VALUE>
    1313                <VALUE>5.1<TITLE>Southeast Utah LHD  </TITLE><SORT_ORDER>7</SORT_ORDER></VALUE>
    1414                <VALUE>6.0<TITLE>Southwest Utah LHD</TITLE><SORT_ORDER>8</SORT_ORDER></VALUE>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/dimension/GeoZIP.xml

    r4061 r21515  
    310310                <VALUE>84601<TITLE>84601 PROVO</TITLE></VALUE>
    311311               
    312                 <VALUE>84604<TITLE>84602 PROVO</TITLE></VALUE>
     312                <VALUE>84604<TITLE>84604 PROVO</TITLE></VALUE>
    313313               
    314314                <VALUE>84606<TITLE>84606 PROVO</TITLE></VALUE>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/dimension/ICDCCSDiag.xml

    r14985 r21515  
    4343                <VALUE>35<TITLE>35 Cancer of brain and nervous system</TITLE></VALUE>
    4444                <VALUE>36<TITLE>36 Cancer of thyroid</TITLE></VALUE>
    45                 <VALUE>37<TITLE>37 Hodgkins disease</TITLE></VALUE>
     45                <VALUE>37<TITLE>37 Hodgkin's disease</TITLE></VALUE>
    4646                <VALUE>38<TITLE>38 Non-Hodgkins lymphoma</TITLE></VALUE>
    4747                <VALUE>39<TITLE>39 Leukemias</TITLE></VALUE>
     
    8282                <VALUE>74<TITLE>74 Other mental conditions</TITLE></VALUE>
    8383                <VALUE>75<TITLE>75 Personal history of mental disorder, mental and behavioral problems. .</TITLE></VALUE>
    84                 <VALUE>76<TITLE>76 Meningitis (except by TB or STD s)</TITLE></VALUE>
    85                 <VALUE>77<TITLE>77 Encephalitis (except by TB or STD s)</TITLE></VALUE>
     84                <VALUE>76<TITLE>76 Meningitis (except by TB or STDs)</TITLE></VALUE>
     85                <VALUE>77<TITLE>77 Encephalitis (except by TB or STDs)</TITLE></VALUE>
    8686                <VALUE>78<TITLE>78 Other CNS infection and poliomyelitis</TITLE></VALUE>
    87                 <VALUE>79<TITLE>79 Parkinsons disease</TITLE></VALUE>
     87                <VALUE>79<TITLE>79 Parkinson's disease</TITLE></VALUE>
    8888                <VALUE>80<TITLE>80 Multiple sclerosiss</TITLE></VALUE>
    8989                <VALUE>81<TITLE>81 Other hereditary and degenerative nervous system conditions</TITLE></VALUE>
     
    9696                <VALUE>88<TITLE>88 Glaucoma</TITLE></VALUE>
    9797                <VALUE>89<TITLE>89 Blindness and vision defects</TITLE></VALUE>
    98                 <VALUE>90<TITLE>90 Inflammation, infection of eye (no TB or STD s)</TITLE></VALUE>
     98                <VALUE>90<TITLE>90 Inflammation, infection of eye (no TB or STDs)</TITLE></VALUE>
    9999                <VALUE>91<TITLE>91 Other eye disorders</TITLE></VALUE>
    100100                <VALUE>92<TITLE>92 Otitis media and related conditions</TITLE></VALUE>
     
    103103                <VALUE>95<TITLE>95 Other nervous system disorders</TITLE></VALUE>
    104104                <VALUE>96<TITLE>96 Heart valve disorders</TITLE></VALUE>
    105                 <VALUE>97<TITLE>97 Peri-, endo-, and myocarditis, cardiomyopathy(no TB or STDs)</TITLE></VALUE>
     105                <VALUE>97<TITLE>97 Peri-, endo-, and myocarditis, cardiomyopathy (no TB or STDs)</TITLE></VALUE>
    106106                <VALUE>98<TITLE>98 Essential hypertension</TITLE></VALUE>
    107107                <VALUE>99<TITLE>99 Hypertension with complications and secondary hypertension</TITLE></VALUE>
     
    128128                <VALUE>120<TITLE>120 Hemorrhoids</TITLE></VALUE>
    129129                <VALUE>121<TITLE>121 Other diseases of veins and lymphatics</TITLE></VALUE>
    130                 <VALUE>122<TITLE>122 Pneumonia (except that caused by tuberculosis or STDs</TITLE></VALUE>
     130                <VALUE>122<TITLE>122 Pneumonia (except that caused by tuberculosis or STDs)</TITLE></VALUE>
    131131                <VALUE>123<TITLE>123 Influenza</TITLE></VALUE>
    132132                <VALUE>124<TITLE>124 Acute and chronic tonsillitis</TITLE></VALUE>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/dimensions/Injed.xml

    r19566 r21515  
    1515    <ibis:include href="../dimension/AgeGrp11.xml"/>
    1616    <ibis:include href="../dimension/AgeGrp13.xml"/>
    17     <ibis:include href="../dimension/AgeGrp14.xml"/>
     17    <ibis:include href="../dimension/AgeGrp13.xml"/>
    1818    <ibis:include href="../dimension/AgeGrpNCDM.xml"/>
    1919    <ibis:include href="../dimension/Sex.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/dimensions/ed.xml

    r19474 r21515  
    3939  <ibis:include href="../dimension/AgeGrp11.xml"/>
    4040  <ibis:include href="../dimension/AgeGrp13.xml"/>
    41   <ibis:include href="../dimension/AgeGrp14.xml"/>
     41  <ibis:include href="../dimension/AgeGrp13.xml"/>
    4242  <ibis:include href="../dimension/AgeGrpNCDM.xml"/>
    4343  <ibis:include href="../dimension/Sex.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/dimensions/ephted.xml

    r20313 r21515  
    1212  <ibis:include href="../dimension/AgeGrp11.xml"/>
    1313  <ibis:include href="../dimension/AgeGrp13.xml"/>
    14   <ibis:include href="../dimension/AgeGrp14.xml"/>
     14  <ibis:include href="../dimension/AgeGrp13.xml"/>
    1515  <ibis:include href="../dimension/AgeGrp18.xml"/>
    1616  <ibis:include href="../dimension/AgeGrpNCDM5.xml" />
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/overview/PopDataAlert.xml

    r19131 r21515  
    44        <!--TEXT>
    55                {{class RedTextBold !*!*!*!*!*!*!*POPULATION DATA ALERT*!*!*!*!*!*!*!}}[[br]]
    6                 {{class RedText On September 25, 2019, estimates for 2010 and later have been
    7                 updated to the IBIS Version 2018 population estimates. For more information,
     6                {{class RedText On September 11, 2020, estimates for 2010 and later have been
     7                updated to the IBIS Version 2019 population estimates. For more information,
    88                go to [http://ibis.health.utah.gov/query/PopEst.html].}}
    99        </TEXT-->
     
    1111                {{style color:red
    1212        !*!*!*!*!*!*!*POPULATION DATA ALERT!*!*!*!*!*!*!*[[br]]
    13                 On September 25, 2019, estimates for 2010 and later have been
    14                 updated to the IBIS Version 2018 population estimates. For more information,
     13                On September 11, 2020, estimates for 2010 and later have been
     14                updated to the IBIS Version 2019 population estimates. For more information,
    1515                go to [http://ibis.health.utah.gov/query/PopEst.html].
    1616                }}
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/section/AgeGrp13.xml

    r10728 r21515  
    2121                </SELECTION_TYPE>
    2222                <SELECTION>
    23                         <TITLE>Age adjustment age groups (less than 1, 1-4, 5-14, 15-24, 25-34, 35-44, 45-54, 55-64, 65-74, 75-84, 85+)</TITLE>
     23                        <TITLE>Age adjustment age groups (Younger than 1, 1-4, 5-14, 15-24, 25-34, 35-44, 45-54, 55-64, 65-74, 75-84, 85 years and older)</TITLE>
    2424                        <VALUE>AgeGrp11</VALUE>
    2525                        <SELECTIONS>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/section/AgeGrp13Sarea.xml

    r10727 r21515  
    2121                </SELECTION_TYPE>
    2222                <SELECTION>
    23                         <TITLE>Age adjustment age groups (less than 1, 1-4, 5-14, 15-24, 25-34, 35-44, 45-54, 55-64, 65-74, 75-84, 85+)</TITLE>
     23                        <TITLE>Age adjustment age groups (Younger than 1, 1-4, 5-14, 15-24, 25-34, 35-44, 45-54, 55-64, 65-74, 75-84, 85 years and older)</TITLE>
    2424                        <VALUE>AgeGrp11</VALUE>
    2525                        <SELECTIONS>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/section/AgeGrp14.xml

    r15045 r21515  
    22
    33<SECTION xmlns:ibis="http://www.ibisph.org">
    4         <NAME>AgeGrp14</NAME>
     4        <NAME>AgeGrp13</NAME>
    55        <TITLE>Select age</TITLE>
    66
     
    2121                </SELECTION_TYPE>
    2222                <SELECTION>
    23                         <TITLE>Age adjustment age groups (less than 1, 1-4, 5-14, 15-24, 25-34, 35-44, 45-54, 55-64, 65-74, 75-84, 85+)</TITLE>
     23                        <TITLE>Age adjustment age groups (Younger than 1, 1-4, 5-14, 15-24, 25-34, 35-44, 45-54, 55-64, 65-74, 75-84, 85 years and older)</TITLE>
    2424                        <VALUE>AgeGrp11</VALUE>
    2525                        <SELECTIONS>
     
    3636                <SELECTION>
    3737                        <TITLE>Age groups (0-28 days, 29-365 days, 1-4, 5-9, 10-14, 15-17, 18-19, 20-24, 25-29, 30-34, 35-39, 40-44, 45-49, 50-54,55-59, 60-64, 65-69, 70-74, 75-79, 80-84, 85-89, 90+)</TITLE>
    38                         <VALUE>AgeGrp14</VALUE>
     38                        <VALUE>AgeGrp13</VALUE>
    3939                        <SELECTIONS>
    4040                                <SELECTION><TITLE>All age groups</TITLE></SELECTION>
    41                                 <DIMENSION_NAME>AgeGrp14</DIMENSION_NAME>
     41                                <DIMENSION_NAME>AgeGrp13</DIMENSION_NAME>
    4242                                <SELECTION_TYPE>
    4343                                        <LIST>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/section/AgeGrp14Sarea.xml

    r15045 r21515  
    22
    33<SECTION xmlns:ibis="http://www.ibisph.org">
    4         <NAME>AgeGrp14Sarea</NAME>
     4        <NAME>AgeGrp13Sarea</NAME>
    55        <TITLE>Select age</TITLE>
    66
     
    2121                </SELECTION_TYPE>
    2222                <SELECTION>
    23                         <TITLE>Age adjustment age groups (less than 1, 1-4, 5-14, 15-24, 25-34, 35-44, 45-54, 55-64, 65-74, 75-84, 85+)</TITLE>
     23                        <TITLE>Age adjustment age groups (Younger than 1, 1-4, 5-14, 15-24, 25-34, 35-44, 45-54, 55-64, 65-74, 75-84, 85 years and older)</TITLE>
    2424                        <VALUE>AgeGrp11</VALUE>
    2525                        <SELECTIONS>
     
    3636                <SELECTION>
    3737                        <TITLE>Age groups (0-28 days, 29-365 days, 1-4, 5-9, 10-14, 15-17, 18-19, 20-24, 25-29, 30-34, 35-39, 40-44, 45-49, 50-54,55-59, 60-64, 65-69, 70-74, 75-79, 80-84, 85-89, 90+)</TITLE>
    38                         <VALUE>AgeGrp14</VALUE>
     38                        <VALUE>AgeGrp13</VALUE>
    3939                        <SELECTIONS>
    4040                                <SELECTION><TITLE>All age groups</TITLE></SELECTION>
    41                                 <DIMENSION_NAME>AgeGrp14</DIMENSION_NAME>
     41                                <DIMENSION_NAME>AgeGrp13</DIMENSION_NAME>
    4242                                <SELECTION_TYPE>
    4343                                        <LIST>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/section/AgeGrp_NCDM.xml

    r19024 r21515  
    2222               
    2323                <SELECTION>
    24                         <TITLE>NCDM age groups (0-24, 25-44, 45-64, 65-84, 85+)</TITLE>
     24                        <TITLE>NCDM age groups (0-24, 25-44, 45-64, 65-84, 85 years and older)</TITLE>
    2525                        <VALUE>AgeGrpNCDM5</VALUE>
    2626                        <SELECTIONS>
     
    3737               
    3838                <!--SELECTION>
    39                         <TITLE>NCDM age groups (0-4, 5-14, 15-24, 25-44, 45-64, 65-84, 85+)</TITLE>
     39                        <TITLE>NCDM age groups (0-4, 5-14, 15-24, 25-44, 45-64, 65-84, 85 years and older)</TITLE>
    4040                        <VALUE>AgeGrpNCDM7</VALUE>
    4141                        <SELECTIONS>
     
    5252               
    5353                <SELECTION>
    54                         <TITLE>5-year age groups (0-4, 5-9, 10-14, 15-19, 20-24, 25-29, 30-34, 35-39, 40-44, 45-49, 50-54, 55-59, 60-64, 65-69, 70-74, 75-79, 80-84, 85+)</TITLE>
     54                        <TITLE>5-year age groups (0-4, 5-9, 10-14, 15-19, 20-24, 25-29, 30-34, 35-39, 40-44, 45-49, 50-54, 55-59, 60-64, 65-69, 70-74, 75-79, 80-84, 85 years and older)</TITLE>
    5555                        <VALUE>AgeGrp18</VALUE>
    5656                        <SELECTIONS>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/ed/selections/AgeGrp14.xml

    r4061 r21515  
    22
    33<SELECTIONS>
    4         <DIMENSION_NAME>AgeGrp14</DIMENSION_NAME>
     4        <DIMENSION_NAME>AgeGrp13</DIMENSION_NAME>
    55        <SELECTION_TYPE>
    66                <LIST>
Note: See TracChangeset for help on using the changeset viewer.