changeset 5307:b6717840dc19

task #16247: Enhancements on Surgery package. Include lab test and medical specialty in preop assessment
author Luis Falcon <falcon@gnuhealth.org>
date Sat, 10 Sep 2022 11:39:12 +0100
parents 86bc4aeb5354
children c56051196ad5
files tryton/health_surgery/health_surgery.py tryton/health_surgery/view/gnuhealth_preoperative_assessment.xml tryton/health_surgery/view/gnuhealth_surgery_protocol.xml
diffstat 3 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tryton/health_surgery/health_surgery.py
+++ b/tryton/health_surgery/health_surgery.py
@@ -846,6 +846,8 @@
 
     surgery = fields.Many2One('gnuhealth.surgery', 'Surgery')
 
+    specialty = fields.Many2One('gnuhealth.specialty', 'Specialty')
+
     assessment_date = fields.Date(
         'Date', help="Date of the assessment")
 
@@ -915,6 +917,12 @@
         domain=[('patient', '=', Eval('patient'))],
         help='Link to the associated Dx imaging test')
 
+    # Include link to patient lab test (eg, CBC)
+    lab_test = fields.Many2One(
+        'gnuhealth.lab', 'Lab',
+        domain=[('patient', '=', Eval('patient'))],
+        help='Link to the associated lab test')
+
     @staticmethod
     def default_assessment_date():
         return datetime.now()
--- a/tryton/health_surgery/view/gnuhealth_preoperative_assessment.xml
+++ b/tryton/health_surgery/view/gnuhealth_preoperative_assessment.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <form>
-    <group id="preop_header" col="6">
+    <group id="preop_header" colspan="4" col="6">
         <label name="patient"/>
         <field name="patient"/>
         <label name="health_professional"/>
         <field name="health_professional"/>
         <label name="assessment_date"/>
         <field name="assessment_date"/>
+        <label name="specialty"/>
+        <field name="specialty"/>
         <label name="surgery"/>
         <field name="surgery"/>
     </group>
@@ -22,11 +24,13 @@
         <field name="surgical_wound"/>
     </group>
     <newline/>
-    <group string="Complementary tests" id="preop_complementary_tests">
+    <group string="Complementary tests" id="preop_complementary_tests" colspan="4" col="6">
         <label name="ecg"/>
         <field name="ecg"/>
         <label name="imaging_test"/>
         <field name="imaging_test"/>
+        <label name="lab_test"/>
+        <field name="lab_test"/>
     </group>
     <newline/>
     <group string="Misc" id="preop_misc">
--- a/tryton/health_surgery/view/gnuhealth_surgery_protocol.xml
+++ b/tryton/health_surgery/view/gnuhealth_surgery_protocol.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <form>
+    <group string="Header" id="protocol_header_group" colspan="4">
     <label name="name"/>
     <field name="name"/>
     <label name="description"/>