Mercurial > hgweb > health
changeset 4788:bc7c4e39b712
health_lab: Complete task #16062: include health condition code in order form
| author | Luis Falcon <falcon@gnuhealth.org> |
|---|---|
| date | Fri, 19 Nov 2021 13:08:02 +0000 |
| parents | 780706ba2023 |
| children | 4ee934d96a39 |
| files | tryton/health_lab/health_lab.py tryton/health_lab/report/labtest_report.fodt tryton/health_lab/view/gnuhealth_lab_test_request_form.xml tryton/health_lab/view/gnuhealth_lab_test_request_tree.xml tryton/health_lab/view/patient_lab_test_request_start_form.xml tryton/health_lab/wizard/wizard_create_lab_test.py |
| diffstat | 6 files changed, 184 insertions(+), 138 deletions(-) [+] |
line wrap: on
line diff
--- a/tryton/health_lab/health_lab.py +++ b/tryton/health_lab/health_lab.py @@ -291,6 +291,10 @@ select=True) doctor_id = fields.Many2One('gnuhealth.healthprofessional', 'Doctor', help="Doctor who Request the lab test.", select=True) + context = fields.Many2One('gnuhealth.pathology', 'Context', + help="Health context for this order. It can be a suspected or" + " existing health condition, a regular health checkup, ...", + select=True) request = fields.Integer('Order', readonly=True) urgent = fields.Boolean('Urgent')
--- a/tryton/health_lab/report/labtest_report.fodt +++ b/tryton/health_lab/report/labtest_report.fodt @@ -1,15 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:officeooo="http://openoffice.org/2009/office" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - <office:meta><meta:generator>LibreOffice/7.0.3.1$Linux_X86_64 LibreOffice_project/00$Build-1</meta:generator><meta:creation-date>2009-11-21T22:44:03</meta:creation-date><dc:date>2017-11-06T18:59:25.343464597</dc:date><meta:editing-cycles>204</meta:editing-cycles><meta:editing-duration>P1DT9H40M13S</meta:editing-duration><meta:document-statistic meta:table-count="8" meta:image-count="0" meta:object-count="0" meta:page-count="2" meta:paragraph-count="64" meta:word-count="91" meta:character-count="1013" meta:non-whitespace-character-count="985"/><meta:user-defined meta:name="Info 1">http://localhost:8069</meta:user-defined><meta:user-defined meta:name="Info 2">admin</meta:user-defined><meta:user-defined meta:name="Info 3">820</meta:user-defined><meta:user-defined meta:name="Info 4">medical.patient</meta:user-defined></office:meta> + <office:meta><meta:generator>LibreOffice/7.2.2.2$Linux_X86_64 LibreOffice_project/20$Build-2</meta:generator><meta:creation-date>2009-11-21T22:44:03</meta:creation-date><dc:date>2021-11-18T19:34:43.865822303</dc:date><meta:editing-cycles>207</meta:editing-cycles><meta:editing-duration>P1DT10H6M48S</meta:editing-duration><meta:document-statistic meta:table-count="8" meta:image-count="0" meta:object-count="0" meta:page-count="2" meta:paragraph-count="64" meta:word-count="91" meta:character-count="1013" meta:non-whitespace-character-count="985"/><meta:user-defined meta:name="Info 1">http://localhost:8069</meta:user-defined><meta:user-defined meta:name="Info 2">admin</meta:user-defined><meta:user-defined meta:name="Info 3">820</meta:user-defined><meta:user-defined meta:name="Info 4">medical.patient</meta:user-defined></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="ViewAreaTop" config:type="long">0</config:config-item> <config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item> - <config:config-item config:name="ViewAreaWidth" config:type="long">2</config:config-item> - <config:config-item config:name="ViewAreaHeight" config:type="long">2</config:config-item> + <config:config-item config:name="ViewAreaWidth" config:type="long">29390</config:config-item> + <config:config-item config:name="ViewAreaHeight" config:type="long">15990</config:config-item> <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item> <config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item> + <config:config-item-map-indexed config:name="Views"> + <config:config-item-map-entry> + <config:config-item config:name="ViewId" config:type="string">view2</config:config-item> + <config:config-item config:name="ViewLeft" config:type="long">5900</config:config-item> + <config:config-item config:name="ViewTop" config:type="long">2501</config:config-item> + <config:config-item config:name="VisibleLeft" config:type="long">0</config:config-item> + <config:config-item config:name="VisibleTop" config:type="long">0</config:config-item> + <config:config-item config:name="VisibleRight" config:type="long">29388</config:config-item> + <config:config-item config:name="VisibleBottom" config:type="long">15988</config:config-item> + <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> + <config:config-item config:name="ViewLayoutColumns" config:type="short">1</config:config-item> + <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item> + <config:config-item config:name="ZoomFactor" config:type="short">140</config:config-item> + <config:config-item config:name="IsSelectedFrame" config:type="boolean">false</config:config-item> + <config:config-item config:name="KeepRatio" config:type="boolean">false</config:config-item> + <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item> + </config:config-item-map-entry> + </config:config-item-map-indexed> </config:config-item-set> <config:config-item-set config:name="ooo:configuration-settings"> <config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item> @@ -30,6 +48,7 @@ <config:config-item config:name="SubtractFlysAnchoredAtFlys" config:type="boolean">true</config:config-item> <config:config-item config:name="PropLineSpacingShrinksFirstLine" config:type="boolean">false</config:config-item> <config:config-item config:name="ApplyParagraphMarkFormatToNumbering" config:type="boolean">false</config:config-item> + <config:config-item config:name="GutterAtTop" config:type="boolean">false</config:config-item> <config:config-item config:name="TreatSingleColumnBreakAsPageBreak" config:type="boolean">false</config:config-item> <config:config-item config:name="EmbedSystemFonts" config:type="boolean">false</config:config-item> <config:config-item config:name="EmbedComplexScriptFonts" config:type="boolean">true</config:config-item> @@ -53,6 +72,7 @@ <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item> <config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item> <config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item> + <config:config-item config:name="FrameAutowidthWithMorePara" config:type="boolean">false</config:config-item> <config:config-item config:name="CurrentDatabaseCommand" config:type="string"/> <config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item> @@ -68,7 +88,7 @@ <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item> <config:config-item config:name="PrinterSetup" config:type="base64Binary"/> <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item> - <config:config-item config:name="Rsid" config:type="int">3020650</config:config-item> + <config:config-item config:name="Rsid" config:type="int">3120810</config:config-item> <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/> <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item> <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item> @@ -86,6 +106,7 @@ <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item> <config:config-item config:name="TabAtLeftIndentForParagraphsInList" config:type="boolean">false</config:config-item> <config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item> + <config:config-item config:name="TabOverSpacing" config:type="boolean">false</config:config-item> <config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item> <config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/> <config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item> @@ -118,20 +139,21 @@ </office:script> </office:scripts> <office:font-face-decls> + <style:font-face style:name="Andale Sans UI" svg:font-family="'Andale Sans UI'" style:font-family-generic="system" style:font-pitch="variable"/> + <style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/> + <style:font-face style:name="Arial Unicode MS" svg:font-family="'Arial Unicode MS'" style:font-family-generic="system" style:font-pitch="variable"/> + <style:font-face style:name="Cantarell" svg:font-family="Cantarell" style:font-pitch="variable"/> + <style:font-face style:name="DejaVu Sans Mono" svg:font-family="'DejaVu Sans Mono'" style:font-family-generic="modern" style:font-pitch="fixed"/> + <style:font-face style:name="Hack" svg:font-family="Hack" style:font-pitch="fixed"/> <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/> + <style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-family-generic="system" style:font-pitch="variable"/> <style:font-face style:name="Tahoma1" svg:font-family="Tahoma"/> - <style:font-face style:name="DejaVu Sans Mono" svg:font-family="'DejaVu Sans Mono'" style:font-family-generic="modern" style:font-pitch="fixed"/> - <style:font-face style:name="Cantarell" svg:font-family="Cantarell" style:font-pitch="variable"/> <style:font-face style:name="Thorndale AMT" svg:font-family="'Thorndale AMT'" style:font-family-generic="roman" style:font-pitch="variable"/> - <style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/> - <style:font-face style:name="Andale Sans UI" svg:font-family="'Andale Sans UI'" style:font-family-generic="system" style:font-pitch="variable"/> - <style:font-face style:name="Arial Unicode MS" svg:font-family="'Arial Unicode MS'" style:font-family-generic="system" style:font-pitch="variable"/> - <style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-family-generic="system" style:font-pitch="variable"/> </office:font-face-decls> <office:styles> <style:default-style style:family="graphic"> <style:graphic-properties svg:stroke-color="#000000" draw:fill-color="#99ccff" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.1181in" draw:shadow-offset-y="0.1181in" draw:start-line-spacing-horizontal="0.1114in" draw:start-line-spacing-vertical="0.1114in" draw:end-line-spacing-horizontal="0.1114in" draw:end-line-spacing-vertical="0.1114in" style:flow-with-text="false"/> - <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false"> + <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:font-independent-line-spacing="false"> <style:tab-stops/> </style:paragraph-properties> <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="en" fo:country="US" style:letter-kerning="true" style:font-name-asian="Andale Sans UI" style:font-size-asian="10.5pt" style:language-asian="zxx" style:country-asian="none" style:font-name-complex="Andale Sans UI" style:font-size-complex="12pt" style:language-complex="zxx" style:country-complex="none"/> @@ -241,52 +263,52 @@ <style:text-properties style:text-position="super 58%"/> </style:style> <text:outline-style style:name="Outline"> - <text:outline-level-style text:level="1" style:num-format=""> + <text:outline-level-style text:level="1" loext:num-list-format="%1%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.3in" fo:text-indent="-0.3in" fo:margin-left="0.3in"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="2" style:num-format=""> + <text:outline-level-style text:level="2" loext:num-list-format="%2%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.4in" fo:text-indent="-0.4in" fo:margin-left="0.4in"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="3" style:num-format=""> + <text:outline-level-style text:level="3" loext:num-list-format="%3%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.5in" fo:text-indent="-0.5in" fo:margin-left="0.5in"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="4" style:num-format=""> + <text:outline-level-style text:level="4" loext:num-list-format="%4%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.6in" fo:text-indent="-0.6in" fo:margin-left="0.6in"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="5" style:num-format=""> + <text:outline-level-style text:level="5" loext:num-list-format="%5%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.7in" fo:text-indent="-0.7in" fo:margin-left="0.7in"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="6" style:num-format=""> + <text:outline-level-style text:level="6" loext:num-list-format="%6%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.8in" fo:text-indent="-0.8in" fo:margin-left="0.8in"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="7" style:num-format=""> + <text:outline-level-style text:level="7" loext:num-list-format="%7%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.9in" fo:text-indent="-0.9in" fo:margin-left="0.9in"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="8" style:num-format=""> + <text:outline-level-style text:level="8" loext:num-list-format="%8%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1in" fo:text-indent="-1in" fo:margin-left="1in"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="9" style:num-format=""> + <text:outline-level-style text:level="9" loext:num-list-format="%9%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.1in" fo:text-indent="-1.1in" fo:margin-left="1.1in"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="10" style:num-format=""> + <text:outline-level-style text:level="10" loext:num-list-format="%10%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.2in" fo:text-indent="-1.2in" fo:margin-left="1.2in"/> </style:list-level-properties> @@ -298,10 +320,10 @@ </office:styles> <office:automatic-styles> <style:style style:name="Table3" style:family="table"> - <style:table-properties table:align="margins"/> + <style:table-properties style:width="6.925in" table:align="margins"/> </style:style> <style:style style:name="Table3.A" style:family="table-column"> - <style:table-column-properties style:rel-column-width="65535*"/> + <style:table-column-properties style:column-width="6.925in" style:rel-column-width="65535*"/> </style:style> <style:style style:name="Table3.A1" style:family="table-cell"> <style:table-cell-properties fo:background-color="#e6e6e6" fo:padding="0.0382in" fo:border="0.05pt solid #000000"> @@ -309,76 +331,76 @@ </style:table-cell-properties> </style:style> <style:style style:name="Table2" style:family="table"> - <style:table-properties fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> + <style:table-properties style:width="6.9271in" fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> </style:style> <style:style style:name="Table2.A" style:family="table-column"> - <style:table-column-properties style:rel-column-width="6786*"/> + <style:table-column-properties style:column-width="0.7174in" style:rel-column-width="6786*"/> </style:style> <style:style style:name="Table2.B" style:family="table-column"> - <style:table-column-properties style:rel-column-width="23067*"/> + <style:table-column-properties style:column-width="2.4382in" style:rel-column-width="23067*"/> </style:style> <style:style style:name="Table2.C" style:family="table-column"> - <style:table-column-properties style:rel-column-width="11037*"/> + <style:table-column-properties style:column-width="1.1667in" style:rel-column-width="11037*"/> </style:style> <style:style style:name="Table2.D" style:family="table-column"> - <style:table-column-properties style:rel-column-width="8468*"/> + <style:table-column-properties style:column-width="0.8951in" style:rel-column-width="8468*"/> </style:style> <style:style style:name="Table2.E" style:family="table-column"> - <style:table-column-properties style:rel-column-width="5912*"/> + <style:table-column-properties style:column-width="0.625in" style:rel-column-width="5912*"/> </style:style> <style:style style:name="Table2.F" style:family="table-column"> - <style:table-column-properties style:rel-column-width="10265*"/> + <style:table-column-properties style:column-width="1.0847in" style:rel-column-width="10265*"/> </style:style> <style:style style:name="Table2.A1" style:family="table-cell"> <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/> </style:style> <style:style style:name="Tabla4" style:family="table"> - <style:table-properties fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> + <style:table-properties style:width="6.9271in" fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> </style:style> <style:style style:name="Tabla4.A" style:family="table-column"> - <style:table-column-properties style:rel-column-width="6786*"/> + <style:table-column-properties style:column-width="0.7174in" style:rel-column-width="6786*"/> </style:style> <style:style style:name="Tabla4.B" style:family="table-column"> - <style:table-column-properties style:rel-column-width="30464*"/> + <style:table-column-properties style:column-width="3.2201in" style:rel-column-width="30464*"/> </style:style> <style:style style:name="Tabla4.C" style:family="table-column"> - <style:table-column-properties style:rel-column-width="3639*"/> + <style:table-column-properties style:column-width="0.3847in" style:rel-column-width="3639*"/> </style:style> <style:style style:name="Tabla4.D" style:family="table-column"> - <style:table-column-properties style:rel-column-width="8468*"/> + <style:table-column-properties style:column-width="0.8951in" style:rel-column-width="8468*"/> </style:style> <style:style style:name="Tabla4.E" style:family="table-column"> - <style:table-column-properties style:rel-column-width="5912*"/> + <style:table-column-properties style:column-width="0.625in" style:rel-column-width="5912*"/> </style:style> <style:style style:name="Tabla4.F" style:family="table-column"> - <style:table-column-properties style:rel-column-width="10266*"/> + <style:table-column-properties style:column-width="1.0854in" style:rel-column-width="10266*"/> </style:style> <style:style style:name="Tabla4.A1" style:family="table-cell"> <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/> </style:style> <style:style style:name="Tabla8" style:family="table"> - <style:table-properties fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> + <style:table-properties style:width="6.9271in" fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> </style:style> <style:style style:name="Tabla8.A" style:family="table-column"> - <style:table-column-properties style:rel-column-width="4119*"/> + <style:table-column-properties style:column-width="0.4354in" style:rel-column-width="4119*"/> </style:style> <style:style style:name="Tabla8.B" style:family="table-column"> - <style:table-column-properties style:rel-column-width="13619*"/> + <style:table-column-properties style:column-width="1.4396in" style:rel-column-width="13619*"/> </style:style> <style:style style:name="Tabla8.C" style:family="table-column"> - <style:table-column-properties style:rel-column-width="10038*"/> + <style:table-column-properties style:column-width="1.0611in" style:rel-column-width="10038*"/> </style:style> <style:style style:name="Tabla8.D" style:family="table-column"> - <style:table-column-properties style:rel-column-width="7693*"/> + <style:table-column-properties style:column-width="0.8132in" style:rel-column-width="7693*"/> </style:style> <style:style style:name="Tabla8.E" style:family="table-column"> - <style:table-column-properties style:rel-column-width="7108*"/> + <style:table-column-properties style:column-width="0.7514in" style:rel-column-width="7108*"/> </style:style> <style:style style:name="Tabla8.F" style:family="table-column"> - <style:table-column-properties style:rel-column-width="10643*"/> + <style:table-column-properties style:column-width="1.125in" style:rel-column-width="10643*"/> </style:style> <style:style style:name="Tabla8.G" style:family="table-column"> - <style:table-column-properties style:rel-column-width="12315*"/> + <style:table-column-properties style:column-width="1.3014in" style:rel-column-width="12315*"/> </style:style> <style:style style:name="Tabla8.1" style:family="table-row"> <style:table-row-properties style:min-row-height="0.625in"/> @@ -441,37 +463,37 @@ <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/> </style:style> <style:style style:name="Tabla9" style:family="table"> - <style:table-properties fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> + <style:table-properties style:width="6.9271in" fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> </style:style> <style:style style:name="Tabla9.A" style:family="table-column"> - <style:table-column-properties style:rel-column-width="10643*"/> + <style:table-column-properties style:column-width="1.125in" style:rel-column-width="10643*"/> </style:style> <style:style style:name="Tabla9.B" style:family="table-column"> - <style:table-column-properties style:rel-column-width="54892*"/> + <style:table-column-properties style:column-width="5.8021in" style:rel-column-width="54892*"/> </style:style> <style:style style:name="Tabla9.A1" style:family="table-cell"> <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/> </style:style> <style:style style:name="Tabla1" style:family="table"> - <style:table-properties fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> + <style:table-properties style:width="6.9271in" fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> </style:style> <style:style style:name="Tabla1.A" style:family="table-column"> - <style:table-column-properties style:rel-column-width="10643*"/> + <style:table-column-properties style:column-width="1.125in" style:rel-column-width="10643*"/> </style:style> <style:style style:name="Tabla1.B" style:family="table-column"> - <style:table-column-properties style:rel-column-width="54892*"/> + <style:table-column-properties style:column-width="5.8021in" style:rel-column-width="54892*"/> </style:style> <style:style style:name="Tabla1.A1" style:family="table-cell"> <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/> </style:style> <style:style style:name="Tabla2" style:family="table"> - <style:table-properties fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> + <style:table-properties style:width="6.9271in" fo:margin-left="0in" fo:margin-right="-0.0021in" table:align="margins"/> </style:style> <style:style style:name="Tabla2.A" style:family="table-column"> - <style:table-column-properties style:rel-column-width="10643*"/> + <style:table-column-properties style:column-width="1.125in" style:rel-column-width="10643*"/> </style:style> <style:style style:name="Tabla2.B" style:family="table-column"> - <style:table-column-properties style:rel-column-width="54892*"/> + <style:table-column-properties style:column-width="5.8021in" style:rel-column-width="54892*"/> </style:style> <style:style style:name="Tabla2.A1" style:family="table-cell"> <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/> @@ -487,66 +509,66 @@ <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/> <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" officeooo:paragraph-rsid="001ad730" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/> + <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/> + <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" officeooo:paragraph-rsid="001d3b0c" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard"> <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/> <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" officeooo:paragraph-rsid="00144819" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/> + <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard"> <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" officeooo:paragraph-rsid="0014aa8b" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Standard"> <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/> <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" officeooo:rsid="00166302" officeooo:paragraph-rsid="00166302" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard"> <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" officeooo:rsid="00166302" officeooo:paragraph-rsid="00166302" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard"> - <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> - <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="bold" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> - </style:style> - <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Standard"> - <loext:graphic-properties draw:fill="solid" draw:fill-color="#47b8b8" draw:opacity="100%"/> - <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" fo:background-color="#47b8b8"/> - <style:text-properties fo:color="#ffffff" loext:opacity="100%" style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="bold" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> - </style:style> - <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard"> - <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/> - <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="normal" officeooo:rsid="00b2781d" officeooo:paragraph-rsid="001ad730" style:font-size-asian="10pt" style:font-weight-asian="normal" style:font-size-complex="10pt" style:font-weight-complex="normal"/> - </style:style> <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Table_20_Contents"> - <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/> + <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Table_20_Contents"> - <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/> - <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" officeooo:paragraph-rsid="001d3b0c" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" officeooo:paragraph-rsid="00161016" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Table_20_Contents"> - <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/> - <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard"> + <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> + <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="bold" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> - <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="bold" officeooo:paragraph-rsid="002ba0f2" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Table_20_Contents"> - <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" officeooo:paragraph-rsid="00161016" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/> + <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="00144819" officeooo:paragraph-rsid="00144819" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> - <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="bold" officeooo:paragraph-rsid="002ba0f2" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> + <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="002ba0f2" officeooo:paragraph-rsid="002ba0f2" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Table_20_Contents"> - <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/> - <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="00144819" officeooo:paragraph-rsid="00144819" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> + <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Standard"> + <loext:graphic-properties draw:fill="solid" draw:fill-color="#47b8b8" draw:opacity="100%"/> + <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" fo:background-color="#47b8b8"/> + <style:text-properties fo:color="#ffffff" loext:opacity="100%" style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="bold" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Table_20_Contents"> - <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> - <style:text-properties style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="bold" officeooo:rsid="002ba0f2" officeooo:paragraph-rsid="002ba0f2" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> + <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Standard"> + <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/> + <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="normal" officeooo:rsid="00b2781d" officeooo:paragraph-rsid="001ad730" style:font-size-asian="10pt" style:font-weight-asian="normal" style:font-size-complex="10pt" style:font-weight-complex="normal"/> </style:style> <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> @@ -580,6 +602,11 @@ <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> <style:text-properties fo:color="#ff0000" loext:opacity="100%" style:font-name="Cantarell" fo:font-size="10pt" officeooo:paragraph-rsid="00250669" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> + <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Standard"> + <loext:graphic-properties draw:fill="solid" draw:fill-color="#47b8b8" draw:opacity="100%"/> + <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" fo:background-color="#47b8b8"/> + <style:text-properties fo:color="#000000" loext:opacity="100%" style:font-name="Cantarell" fo:font-size="10pt" fo:font-weight="bold" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> + </style:style> <style:style style:name="T1" style:family="text"> <style:text-properties officeooo:rsid="000fb348"/> </style:style> @@ -590,23 +617,26 @@ <style:text-properties fo:font-weight="bold" officeooo:rsid="001f060d" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> <style:page-layout style:name="pm1"> - <style:page-layout-properties fo:page-width="8.5in" fo:page-height="11in" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.7874in" fo:margin-bottom="0.7874in" fo:margin-left="0.7874in" fo:margin-right="0.7874in" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.278in" style:layout-grid-ruby-height="0.139in" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0in"> + <style:page-layout-properties fo:page-width="8.5in" fo:page-height="11in" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.7874in" fo:margin-bottom="0.7874in" fo:margin-left="0.7874in" fo:margin-right="0.7874in" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.278in" style:layout-grid-ruby-height="0.139in" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0in" loext:margin-gutter="0in"> <style:footnote-sep style:width="0.0071in" style:distance-before-sep="0.0398in" style:distance-after-sep="0.0398in" style:line-style="none" style:adjustment="left" style:rel-width="25%" style:color="#000000"/> </style:page-layout-properties> <style:header-style/> <style:footer-style/> </style:page-layout> <style:page-layout style:name="pm2"> - <style:page-layout-properties fo:page-width="8.5in" fo:page-height="11in" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.7874in" fo:margin-bottom="0.7874in" fo:margin-left="0.7874in" fo:margin-right="0.7874in" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.278in" style:layout-grid-ruby-height="0.139in" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0in"> + <style:page-layout-properties fo:page-width="8.5in" fo:page-height="11in" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.7874in" fo:margin-bottom="0.7874in" fo:margin-left="0.7874in" fo:margin-right="0.7874in" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.278in" style:layout-grid-ruby-height="0.139in" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0in" loext:margin-gutter="0in"> <style:footnote-sep style:line-style="none" style:adjustment="left" style:rel-width="25%" style:color="#000000"/> </style:page-layout-properties> <style:header-style/> <style:footer-style/> </style:page-layout> + <style:style style:name="dp1" style:family="drawing-page"> + <style:drawing-page-properties draw:background-size="full"/> + </style:style> </office:automatic-styles> <office:master-styles> - <style:master-page style:name="Standard" style:page-layout-name="pm1"/> - <style:master-page style:name="Endnote" style:page-layout-name="pm2"/> + <style:master-page style:name="Standard" style:page-layout-name="pm1" draw:style-name="dp1"/> + <style:master-page style:name="Endnote" style:page-layout-name="pm2" draw:style-name="dp1"/> </office:master-styles> <office:body> <office:text text:use-soft-page-breaks="true"> @@ -622,13 +652,13 @@ <text:p text:style-name="P1"/> <table:table table:name="Table3" table:style-name="Table3"> <table:table-column table:style-name="Table3.A"/> - <table:table-row table:style-name="TableLine93985124155632"> + <table:table-row table:style-name="TableLine94884494963328"> <table:table-cell table:style-name="Table3.A1" office:value-type="string"> - <text:p text:style-name="P9">LABORATORY REPORT</text:p> + <text:p text:style-name="P28">LABORATORY REPORT</text:p> </table:table-cell> </table:table-row> </table:table> - <text:p text:style-name="P8"/> + <text:p text:style-name="P14"/> <text:p text:style-name="P1"/> <table:table table:name="Table2" table:style-name="Table2"> <table:table-column table:style-name="Table2.A"/> @@ -637,12 +667,12 @@ <table:table-column table:style-name="Table2.D"/> <table:table-column table:style-name="Table2.E"/> <table:table-column table:style-name="Table2.F"/> - <table:table-row table:style-name="TableLine93985124495216"> + <table:table-row table:style-name="TableLine94884494996288"> <table:table-cell table:style-name="Table2.A1" office:value-type="string"> - <text:p text:style-name="P18">Name</text:p> + <text:p text:style-name="P16">Name</text:p> </table:table-cell> <table:table-cell table:style-name="Table2.A1" table:number-columns-spanned="2" office:value-type="string"> - <text:p text:style-name="P4"><text:placeholder text:placeholder-type="text"><test.patient.name.lastname></text:placeholder>,<text:placeholder text:placeholder-type="text"><test.patient.name.name></text:placeholder></text:p> + <text:p text:style-name="P6"><text:placeholder text:placeholder-type="text"><test.patient.name.lastname></text:placeholder>,<text:placeholder text:placeholder-type="text"><test.patient.name.name></text:placeholder></text:p> </table:table-cell> <table:covered-table-cell/> <table:table-cell table:style-name="Table2.A1" office:value-type="string"> @@ -653,21 +683,21 @@ </table:table-cell> <table:covered-table-cell/> </table:table-row> - <table:table-row table:style-name="TableLine93985124584016"> + <table:table-row table:style-name="TableLine94884494564272"> <table:table-cell table:style-name="Table2.A1" office:value-type="string"> - <text:p text:style-name="P12">Date</text:p> + <text:p text:style-name="P4">Date</text:p> </table:table-cell> <table:table-cell table:style-name="Table2.A1" office:value-type="string"> <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text"><test.date_analysis></text:placeholder></text:p> </table:table-cell> <table:table-cell table:style-name="Table2.A1" office:value-type="string"> - <text:p text:style-name="P12">Age</text:p> + <text:p text:style-name="P4">Age</text:p> </table:table-cell> <table:table-cell table:style-name="Table2.A1" office:value-type="string"> - <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><test.patient.age></text:placeholder></text:p> + <text:p text:style-name="P19"><text:placeholder text:placeholder-type="text"><test.patient.age></text:placeholder></text:p> </table:table-cell> <table:table-cell table:style-name="Table2.A1" office:value-type="string"> - <text:p text:style-name="P12">Sex</text:p> + <text:p text:style-name="P4">Sex</text:p> </table:table-cell> <table:table-cell table:style-name="Table2.A1" office:value-type="string"> <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text"><if test="test.patient.gender=='f'"></text:placeholder></text:p> @@ -687,24 +717,24 @@ <table:table-column table:style-name="Tabla4.D"/> <table:table-column table:style-name="Tabla4.E"/> <table:table-column table:style-name="Tabla4.F"/> - <table:table-row table:style-name="TableLine93985124550784"> + <table:table-row table:style-name="TableLine94884495015616"> <table:table-cell table:style-name="Tabla4.A1" office:value-type="string"> - <text:p text:style-name="P12">Doctor:</text:p> + <text:p text:style-name="P4">Doctor:</text:p> </table:table-cell> <table:table-cell table:style-name="Tabla4.A1" office:value-type="string"> - <text:p text:style-name="P16"><text:placeholder text:placeholder-type="text"><test.requestor.name.lastname></text:placeholder>, <text:placeholder text:placeholder-type="text"><test.requestor.name.name></text:placeholder></text:p> + <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text"><test.requestor.name.lastname></text:placeholder>, <text:placeholder text:placeholder-type="text"><test.requestor.name.name></text:placeholder></text:p> </table:table-cell> <table:table-cell table:style-name="Tabla4.A1" office:value-type="string"> - <text:p text:style-name="P12"/> + <text:p text:style-name="P4"/> </table:table-cell> <table:table-cell table:style-name="Tabla4.A1" office:value-type="string"> - <text:p text:style-name="P14"/> + <text:p text:style-name="P7"/> </table:table-cell> <table:table-cell table:style-name="Tabla4.A1" office:value-type="string"> - <text:p text:style-name="P12"/> + <text:p text:style-name="P4"/> </table:table-cell> <table:table-cell table:style-name="Tabla4.A1" office:value-type="string"> - <text:p text:style-name="P13"><text:span text:style-name="T3">Order #</text:span><text:span text:style-name="T2"> </text:span><text:placeholder text:placeholder-type="text"><test.request_order or ''></text:placeholder></text:p> + <text:p text:style-name="P5"><text:span text:style-name="T3">Order #</text:span><text:span text:style-name="T2"> </text:span><text:placeholder text:placeholder-type="text"><test.request_order or ''></text:placeholder></text:p> </table:table-cell> </table:table-row> </table:table> @@ -719,7 +749,7 @@ <table:table-column table:style-name="Tabla8.G"/> <table:table-row table:style-name="Tabla8.1"> <table:table-cell table:style-name="Tabla8.A1" table:number-columns-spanned="7" office:value-type="string"> - <text:p text:style-name="P17"><text:placeholder text:placeholder-type="text"><test.test.name></text:placeholder></text:p> + <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"><test.test.name></text:placeholder></text:p> </table:table-cell> <table:covered-table-cell/> <table:covered-table-cell/> @@ -730,30 +760,30 @@ </table:table-row> <table:table-row table:style-name="Tabla8.2"> <table:table-cell table:style-name="Tabla8.A2" office:value-type="string"> - <text:p text:style-name="P19">Warn</text:p> + <text:p text:style-name="P17">Warn</text:p> </table:table-cell> <table:table-cell table:style-name="Tabla8.B2" office:value-type="string"> - <text:p text:style-name="P19">Analyte</text:p> + <text:p text:style-name="P17">Analyte</text:p> </table:table-cell> <table:table-cell table:style-name="Tabla8.C2" office:value-type="string"> - <text:p text:style-name="P19">Value</text:p> + <text:p text:style-name="P17">Value</text:p> </table:table-cell> <table:table-cell table:style-name="Tabla8.D2" office:value-type="string"> - <text:p text:style-name="P19">Reference</text:p> + <text:p text:style-name="P17">Reference</text:p> </table:table-cell> <table:table-cell table:style-name="Tabla8.E2" office:value-type="string"> - <text:p text:style-name="P19">Unit</text:p> + <text:p text:style-name="P17">Unit</text:p> </table:table-cell> <table:table-cell table:style-name="Tabla8.F2" office:value-type="string"> - <text:p text:style-name="P19">Results</text:p> + <text:p text:style-name="P17">Results</text:p> </table:table-cell> <table:table-cell table:style-name="Tabla8.G2" office:value-type="string"> - <text:p text:style-name="P19">Remarks</text:p> + <text:p text:style-name="P17">Remarks</text:p> </table:table-cell> </table:table-row> </table:table> - <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text"><for each="case in test.critearea"></text:placeholder></text:p> - <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text"><if test="case.excluded==0"></text:placeholder></text:p> + <text:p text:style-name="P7"><text:placeholder text:placeholder-type="text"><for each="case in test.critearea"></text:placeholder></text:p> + <text:p text:style-name="P7"><text:placeholder text:placeholder-type="text"><if test="case.excluded==0"></text:placeholder></text:p> <table:table table:name="Tabla5" table:style-name="Tabla5"> <table:table-column table:style-name="Tabla5.A"/> <table:table-column table:style-name="Tabla5.B"/> @@ -785,25 +815,25 @@ <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p> </table:table-cell> <table:table-cell table:style-name="Tabla5.A1" office:value-type="string"> - <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"><case.normal_range></text:placeholder></text:p> + <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text"><case.normal_range></text:placeholder></text:p> </table:table-cell> <table:table-cell table:style-name="Tabla5.A1" office:value-type="string"> - <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"><case.units and case.units.name></text:placeholder></text:p> + <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text"><case.units and case.units.name></text:placeholder></text:p> </table:table-cell> <table:table-cell table:style-name="Tabla5.A1" office:value-type="string"> - <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"><case.result_text></text:placeholder></text:p> + <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text"><case.result_text></text:placeholder></text:p> </table:table-cell> <table:table-cell table:style-name="Tabla5.A1" office:value-type="string"> - <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"><case.remarks></text:placeholder></text:p> + <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text"><case.remarks></text:placeholder></text:p> </table:table-cell> </table:table-row> </table:table> - <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p> - <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p> + <text:p text:style-name="P7"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p> + <text:p text:style-name="P7"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p> <table:table table:name="Tabla9" table:style-name="Tabla9"> <table:table-column table:style-name="Tabla9.A"/> <table:table-column table:style-name="Tabla9.B"/> - <table:table-row table:style-name="TableLine93985124617968"> + <table:table-row table:style-name="TableLine94884495105488"> <table:table-cell table:style-name="Tabla9.A1" office:value-type="string"> <text:p text:style-name="P2"/> </table:table-cell> @@ -816,12 +846,12 @@ <table:table table:name="Tabla1" table:style-name="Tabla1"> <table:table-column table:style-name="Tabla1.A"/> <table:table-column table:style-name="Tabla1.B"/> - <table:table-row table:style-name="TableLine93985124649904"> + <table:table-row table:style-name="TableLine94884495138208"> <table:table-cell table:style-name="Tabla1.A1" office:value-type="string"> <text:p text:style-name="P2">Pathologist</text:p> </table:table-cell> <table:table-cell table:style-name="Tabla1.A1" office:value-type="string"> - <text:p text:style-name="P5"><text:placeholder text:placeholder-type="text"><test.pathologist.name.lastname></text:placeholder>, <text:placeholder text:placeholder-type="text"><test.pathologist.name.name></text:placeholder></text:p> + <text:p text:style-name="P8"><text:placeholder text:placeholder-type="text"><test.pathologist.name.lastname></text:placeholder>, <text:placeholder text:placeholder-type="text"><test.pathologist.name.name></text:placeholder></text:p> </table:table-cell> </table:table-row> </table:table> @@ -829,24 +859,24 @@ <table:table table:name="Tabla2" table:style-name="Tabla2"> <table:table-column table:style-name="Tabla2.A"/> <table:table-column table:style-name="Tabla2.B"/> - <table:table-row table:style-name="TableLine93985124654496"> + <table:table-row table:style-name="TableLine94884495143360"> <table:table-cell table:style-name="Tabla2.A1" office:value-type="string"> - <text:p text:style-name="P6">Diagnosis</text:p> + <text:p text:style-name="P9">Diagnosis</text:p> </table:table-cell> <table:table-cell table:style-name="Tabla2.A1" office:value-type="string"> - <text:p text:style-name="P7"><text:placeholder text:placeholder-type="text"><test.diagnosis></text:placeholder></text:p> - <text:p text:style-name="P7"/> + <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><test.diagnosis></text:placeholder></text:p> + <text:p text:style-name="P10"/> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine93985124669472"> + <table:table-row table:style-name="TableLine94884495158928"> <table:table-cell table:style-name="Tabla2.A1" office:value-type="string"> - <text:p text:style-name="P6">Results</text:p> + <text:p text:style-name="P9">Results</text:p> </table:table-cell> <table:table-cell table:style-name="Tabla2.A1" office:value-type="string"> - <text:p text:style-name="P7"><text:placeholder text:placeholder-type="text"><test.results></text:placeholder></text:p> + <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><test.results></text:placeholder></text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine93985124670176"> + <table:table-row table:style-name="TableLine94884495159584"> <table:table-cell table:style-name="Tabla2.A1" office:value-type="string"> <text:p text:style-name="P2">Signature</text:p> </table:table-cell> @@ -855,9 +885,9 @@ </table:table-cell> </table:table-row> </table:table> + <text:p text:style-name="P1"/> + <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p> <text:p text:style-name="P1"><text:soft-page-break/></text:p> - <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p> - <text:p text:style-name="P1"/> </office:text> </office:body> </office:document> \ No newline at end of file
--- a/tryton/health_lab/view/gnuhealth_lab_test_request_form.xml +++ b/tryton/health_lab/view/gnuhealth_lab_test_request_form.xml @@ -11,6 +11,8 @@ <field name="patient_id"/> <label name="doctor_id"/> <field name="doctor_id"/> + <label name="context"/> + <field name="context"/> <label name="urgent"/> <field name="urgent"/> <label name="state"/>
--- a/tryton/health_lab/view/gnuhealth_lab_test_request_tree.xml +++ b/tryton/health_lab/view/gnuhealth_lab_test_request_tree.xml @@ -6,6 +6,7 @@ <field name="date" widget="time"/> <field name="patient_id" expand="1"/> <field name="doctor_id" expand="1"/> + <field name="context" expand="1"/> <field name="state" readonly="1" expand="1"/> <field name="urgent"/> </tree>
--- a/tryton/health_lab/view/patient_lab_test_request_start_form.xml +++ b/tryton/health_lab/view/patient_lab_test_request_start_form.xml @@ -4,10 +4,14 @@ <field name="date"/> <label name="urgent"/> <field name="urgent"/> + <newline/> <label name="patient"/> <field name="patient"/> + <newline/> + <label name="context"/> + <field name="context"/> <label name="doctor"/> <field name="doctor" widget="selection"/> <newline/> <field name="tests" colspan="4"/> -</form> \ No newline at end of file +</form>
--- a/tryton/health_lab/wizard/wizard_create_lab_test.py +++ b/tryton/health_lab/wizard/wizard_create_lab_test.py @@ -108,6 +108,9 @@ date = fields.DateTime('Date') patient = fields.Many2One('gnuhealth.patient', 'Patient', required=True) + context = fields.Many2One('gnuhealth.pathology', 'Context', + help="Health context for this order. It can be a suspected or" + " existing health condition, a regular health checkup, ...") doctor = fields.Many2One('gnuhealth.healthprofessional', 'Doctor', help="Doctor who Request the lab tests.") tests = fields.Many2Many('gnuhealth.request-test', 'request', 'test', @@ -157,6 +160,8 @@ lab_test['patient_id'] = self.start.patient.id if self.start.doctor: lab_test['doctor_id'] = self.start.doctor.id + if self.start.context: + lab_test['context'] = self.start.context.id lab_test['date'] = self.start.date lab_test['urgent'] = self.start.urgent lab_tests.append(lab_test)
