hiddenInput($element, 'eye_id', false, array('class' => 'sideField'))?>
-
-
diff --git a/protected/modules/OphCoCvi/migrations/m170119_125608_add_new_preferred_info_fmt.php b/protected/modules/OphCoCvi/migrations/m170119_125608_add_new_preferred_info_fmt.php
new file mode 100644
index 0000000000..71318bd240
--- /dev/null
+++ b/protected/modules/OphCoCvi/migrations/m170119_125608_add_new_preferred_info_fmt.php
@@ -0,0 +1,34 @@
+insert('ophcocvi_clericinfo_preferred_info_fmt', array(
+ 'name' => 'No Preference',
+ 'require_email' => '0',
+ 'active' => '1',
+ 'display_order' => '5',
+ 'code' => 'NOPREF',
+ 'last_modified_user_id' => '1',
+ 'created_user_id' => '1',
+ 'deleted' => '0',
+ ));
+ }
+
+ public function down()
+ {
+ $this->delete('ophcocvi_clericinfo_preferred_info_fmt', '`name`="No Preference"');
+ }
+
+ /*
+ // Use safeUp/safeDown to do migration with transaction
+ public function safeUp()
+ {
+ }
+
+ public function safeDown()
+ {
+ }
+ */
+}
\ No newline at end of file
diff --git a/protected/modules/OphCoCvi/models/Element_OphCoCvi_ConsentSignature.php b/protected/modules/OphCoCvi/models/Element_OphCoCvi_ConsentSignature.php
index 38520029d2..776fab6d57 100644
--- a/protected/modules/OphCoCvi/models/Element_OphCoCvi_ConsentSignature.php
+++ b/protected/modules/OphCoCvi/models/Element_OphCoCvi_ConsentSignature.php
@@ -102,7 +102,7 @@ public function attributeLabels()
return array(
'id' => 'ID',
'event_id' => 'Event',
- 'is_patient' => 'Is patient',
+ 'is_patient' => 'Patient',
'signature_date' => 'Signature date',
'representative_name' => 'Representative name',
'signature_file_id' => 'Signature File',
diff --git a/protected/modules/OphCoCvi/views/default/form_Element_OphCoCvi_ConsentSignature.php b/protected/modules/OphCoCvi/views/default/form_Element_OphCoCvi_ConsentSignature.php
index 9bbb24d80b..ab30377296 100644
--- a/protected/modules/OphCoCvi/views/default/form_Element_OphCoCvi_ConsentSignature.php
+++ b/protected/modules/OphCoCvi/views/default/form_Element_OphCoCvi_ConsentSignature.php
@@ -22,13 +22,20 @@
array('style' => 'width: 110px;')) ?>
-
textField($element, 'representative_name', array('hide' => $element->is_patient), null, array('field' => 4)) ?>
diff --git a/protected/modules/OphCoMessaging/components/MessageCreator.php b/protected/modules/OphCoMessaging/components/MessageCreator.php
index bf88e6ed0a..ba78cffd67 100644
--- a/protected/modules/OphCoMessaging/components/MessageCreator.php
+++ b/protected/modules/OphCoMessaging/components/MessageCreator.php
@@ -182,7 +182,11 @@ public function emailAlert(array $recipients, $subject, $content)
$message->setSubject($subject);
$message->setBody($content);
- return \Yii::app()->mailer->sendMessage($message);
+ try {
+ return \Yii::app()->mailer->sendMessage($message);
+ } catch (\Exception $e) {
+ return false;
+ }
}
}
diff --git a/protected/modules/OphCoTherapyapplication/services/OphCoTherapyapplication_Processor.php b/protected/modules/OphCoTherapyapplication/services/OphCoTherapyapplication_Processor.php
index b9ec642835..0706c34d41 100644
--- a/protected/modules/OphCoTherapyapplication/services/OphCoTherapyapplication_Processor.php
+++ b/protected/modules/OphCoTherapyapplication/services/OphCoTherapyapplication_Processor.php
@@ -561,8 +561,8 @@ private function getServiceInfo()
private function getEmailRecipients($service_info, $recipient_type)
{
- if (!$recipients = OphCoTherapyapplication_Email_Recipient::model()->with('type')->findAll('site_id = ? and type.id is null or type.name = ?', array($service_info->site_id, $recipient_type))) {
- if (!$recipients = OphCoTherapyapplication_Email_Recipient::model()->with('type')->findAll('site_id is null and type.id is null or type.name = ?', array($recipient_type))) {
+ if (!$recipients = OphCoTherapyapplication_Email_Recipient::model()->with('type')->findAll('site_id = ? and (type.id is null or type.name = ?)', array($service_info->site_id, $recipient_type))) {
+ if (!$recipients = OphCoTherapyapplication_Email_Recipient::model()->with('type')->findAll('site_id is null and (type.id is null or type.name = ?)', array($recipient_type))) {
throw new Exception('No email recipient defined for site '.$service_info->site->name.", $recipient_type");
}
}
diff --git a/protected/modules/OphInBiometry/assets/css/module.css b/protected/modules/OphInBiometry/assets/css/module.css
index 7ccc4e18f0..604ca4e9e0 100644
--- a/protected/modules/OphInBiometry/assets/css/module.css
+++ b/protected/modules/OphInBiometry/assets/css/module.css
@@ -32,11 +32,11 @@
}
/* line 19, ../sass/components/_event.scss */
.event .event-content {
- background-image: url('../img/watermark.png?1457349986');
+ background-image: url('../img/watermark.png?1473759482');
}
/* line 22, ../sass/components/_event.scss */
.event .event-title {
- background-image: url('../img/medium.png?1457349986');
+ background-image: url('../img/medium.png?1473759482');
}
/* line 27, ../sass/components/_event.scss */
@@ -114,16 +114,25 @@ label.rse_d_left, label.rse_d_right {
.highlighted-calculation {
border-left: 3px solid #FF9900 !important;
border-right: 3px solid #FF9900 !important;
- border-bottom: 3px solid #FF9900;
+ border-top: 3px solid transparent;
}
/* line 96, ../sass/components/_event.scss */
+.highlighted-comments {
+ border-bottom: 3px solid transparent;
+ border-left: 3px solid #FF9900 !important;
+ border-right: 3px solid #FF9900 !important;
+ border-bottom: 3px solid #FF9900;
+ margin-bottom: 3px;
+}
+
+/* line 104, ../sass/components/_event.scss */
.disabled {
opacity: 0.60;
border-bottom: 3px solid transparent;
}
-/* line 101, ../sass/components/_event.scss */
+/* line 109, ../sass/components/_event.scss */
.top-pad {
border-top: 3px solid transparent;
border-left: 3px solid transparent;
@@ -131,18 +140,18 @@ label.rse_d_left, label.rse_d_right {
border-bottom: 3px solid transparent;
}
-/* line 108, ../sass/components/_event.scss */
+/* line 116, ../sass/components/_event.scss */
tr:hover, tr.even:hover, tr:nth-of-type(even):hover, tr.alt.hover {
border: 0px solid #FF9900;
background: #FFFFE0;
}
-/* line 113, ../sass/components/_event.scss */
+/* line 121, ../sass/components/_event.scss */
.highlighted, tr:nth-of-type(even).highlighted {
background-color: #FF9900;
}
-/* line 117, ../sass/components/_event.scss */
+/* line 125, ../sass/components/_event.scss */
.readonly-box {
background-color: #dddddd;
padding: 4px 6px;
@@ -152,12 +161,12 @@ tr:hover, tr.even:hover, tr:nth-of-type(even):hover, tr.alt.hover {
border-radius: 3px;
}
-/* line 126, ../sass/components/_event.scss */
+/* line 134, ../sass/components/_event.scss */
.box-margin {
margin-left: 40px;
}
-/* line 129, ../sass/components/_event.scss */
+/* line 137, ../sass/components/_event.scss */
.readonly-div {
height: auto;
border: 1px solid #6b8aaa;
@@ -165,7 +174,7 @@ tr:hover, tr.even:hover, tr:nth-of-type(even):hover, tr.alt.hover {
width: 1025px;
}
-/* line 135, ../sass/components/_event.scss */
+/* line 143, ../sass/components/_event.scss */
.closest {
font-weight: bold;
}
diff --git a/protected/modules/OphInBiometry/assets/sass/components/_event.scss b/protected/modules/OphInBiometry/assets/sass/components/_event.scss
index e1008bdce9..ec4789c737 100644
--- a/protected/modules/OphInBiometry/assets/sass/components/_event.scss
+++ b/protected/modules/OphInBiometry/assets/sass/components/_event.scss
@@ -88,9 +88,17 @@ label.rse_d_left, label.rse_d_right {
}
.highlighted-calculation{
+ border-left: 3px solid #FF9900 !important;
+ border-right: 3px solid #FF9900 !important;
+ border-top:3px solid transparent;
+}
+
+.highlighted-comments{
+ border-bottom: 3px solid transparent;
border-left: 3px solid #FF9900 !important;
border-right: 3px solid #FF9900 !important;
border-bottom: 3px solid #FF9900;
+ margin-bottom: 3px;
}
.disabled{
diff --git a/protected/modules/OphInBiometry/migrations/m161021_110716_add_eye_comments.php b/protected/modules/OphInBiometry/migrations/m161021_110716_add_eye_comments.php
new file mode 100644
index 0000000000..faec17c68f
--- /dev/null
+++ b/protected/modules/OphInBiometry/migrations/m161021_110716_add_eye_comments.php
@@ -0,0 +1,31 @@
+addColumn('et_ophinbiometry_calculation', 'comments_right', 'text');
+ $this->addColumn('et_ophinbiometry_calculation', 'comments_left', 'text');
+ $this->addColumn('et_ophinbiometry_calculation_version', 'comments_right', 'text');
+ $this->addColumn('et_ophinbiometry_calculation_version', 'comments_left', 'text');
+ }
+
+ public function down()
+ {
+ $this->dropColumn('et_ophinbiometry_calculation', 'comments_right');
+ $this->dropColumn('et_ophinbiometry_calculation', 'comments_left');
+ $this->dropColumn('et_ophinbiometry_calculation_version', 'comments_right');
+ $this->dropColumn('et_ophinbiometry_calculation_version', 'comments_left');
+ }
+
+ /*
+ // Use safeUp/safeDown to do migration with transaction
+ public function safeUp()
+ {
+ }
+
+ public function safeDown()
+ {
+ }
+ */
+}
\ No newline at end of file
diff --git a/protected/modules/OphInBiometry/models/Element_OphInBiometry_Calculation.php b/protected/modules/OphInBiometry/models/Element_OphInBiometry_Calculation.php
index 648b11f967..29d84b4186 100644
--- a/protected/modules/OphInBiometry/models/Element_OphInBiometry_Calculation.php
+++ b/protected/modules/OphInBiometry/models/Element_OphInBiometry_Calculation.php
@@ -65,7 +65,7 @@ public function rules()
// NOTE: you should only define rules for those attributes that
// will receive user inputs.
return array(
- array('event_id, target_refraction_left, eye_id, formula_id_left,target_refraction_right, formula_id_right, comments', 'safe'),
+ array('event_id, target_refraction_left, eye_id, formula_id_left,target_refraction_right, formula_id_right, comments, comments_left, comments_right', 'safe'),
array('target_refraction_left, target_refraction_right', 'match', 'pattern' => '/([0-9]*?)(\.[0-9]{0,2})?/'),
array('target_refraction_left', 'checkNumericRangeIfSide', 'side' => 'left', 'max' => 10, 'min' => -10),
array('target_refraction_right', 'checkNumericRangeIfSide', 'side' => 'right', 'max' => 10, 'min' => -10),
@@ -108,6 +108,8 @@ public function attributeLabels()
'formula_id_right' => 'Formula',
'emmetropia_left' => 'Emmetropic IOL power',
'emmetropia_right' => 'Emmetropic IOL power',
+ 'comments_right' => 'General Comments',
+ 'comments_left' => 'General Comments',
);
}
diff --git a/protected/modules/OphInBiometry/views/default/form_Element_OphInBiometry_Calculation.php b/protected/modules/OphInBiometry/views/default/form_Element_OphInBiometry_Calculation.php
index bbe7c5d9a3..c1d6b55e32 100644
--- a/protected/modules/OphInBiometry/views/default/form_Element_OphInBiometry_Calculation.php
+++ b/protected/modules/OphInBiometry/views/default/form_Element_OphInBiometry_Calculation.php
@@ -56,16 +56,52 @@
+
+
-
+
diff --git a/protected/modules/OphCoCorrespondence/views/default/update_ElementLetter.php b/protected/modules/OphCoCorrespondence/views/default/update_ElementLetter.php
index a1c8ab31d9..65decffc43 100644
--- a/protected/modules/OphCoCorrespondence/views/default/update_ElementLetter.php
+++ b/protected/modules/OphCoCorrespondence/views/default/update_ElementLetter.php
@@ -29,13 +29,14 @@
if( !$macro_id ){
$macro_id = isset($element->document_instance[0]->document_instance_data[0]->macro_id) ? $element->document_instance[0]->document_instance_data[0]->macro_id : null;
}
-$macro_name = null;
+
+$macro_letter_type_id = null;
if($macro_id){
$macro = LetterMacro::model()->findByPk($macro_id);
- $macro_name = $macro ? $macro->name : null;
+ $macro_letter_type_id = $macro->letter_type_id;
}
-$element->letter_type = ($element->letter_type ? $element->letter_type : ( $macro_name == 'Post-op' ? 2 : null ) );
+$element->letter_type_id = ($element->letter_type_id ? $element->letter_type_id : $macro_letter_type_id );
$patient_id = Yii::app()->request->getQuery('patient_id', null);
$patient = Patient::model()->findByPk($patient_id);
@@ -67,17 +68,16 @@
Remove side
@@ -39,9 +37,7 @@
+
-
\ No newline at end of file
+
Remove side
\ No newline at end of file
diff --git a/protected/modules/OphCiExamination/views/default/form_Element_OphCiExamination_PcrRisk.php b/protected/modules/OphCiExamination/views/default/form_Element_OphCiExamination_PcrRisk.php
new file mode 100644
index 0000000000..efbda4a712
--- /dev/null
+++ b/protected/modules/OphCiExamination/views/default/form_Element_OphCiExamination_PcrRisk.php
@@ -0,0 +1,196 @@
+getAssetManager()->publish(Yii::getPathOfAlias('application.assets.js'), false, -1);
+?>
+
+
+ * @copyright Copyright (c) 2008-2011, Moorfields Eye Hospital NHS Foundation Trust
+ * @copyright Copyright (c) 2011-2013, OpenEyes Foundation
+ * @license http://www.gnu.org/licenses/gpl-3.0.html The GNU General Public License V3.0
+ */
+
+/**
+ * The followings are the available columns in table '':.
+ *
+ * @property string $id
+ * @property int $event_id
+ *
+ * The followings are the available model relations:
+ * @property Event $event
+ */
+class LetterType extends BaseActiveRecordVersioned
+{
+
+ /**
+ * Returns the static model of the specified AR class.
+ *
+ * @return ElementOperation the static model class
+ */
+ public static function model($className = __CLASS__)
+ {
+ return parent::model($className);
+ }
+
+ /**
+ * @return string the associated database table name
+ */
+ public function tableName()
+ {
+ return 'ophcocorrespondence_letter_type';
+ }
+
+ /**
+ * @return array validation rules for model attributes.
+ */
+ public function rules()
+ {
+ return array(
+ array('name', 'safe'),
+ array('name', 'required'),
+ );
+ }
+
+ /**
+ * @return array relational rules.
+ */
+ public function relations()
+ {
+ // NOTE: you may need to adjust the relation name and the related
+ // class name for the relations automatically generated below.
+ return array();
+ }
+
+ /**
+ * @return array customized attribute labels (name=>label)
+ */
+ public function attributeLabels()
+ {
+ return array(
+ 'name' => 'Letter Type',
+ );
+ }
+
+ /**
+ * Retrieves a list of models based on the current search/filter conditions.
+ *
+ * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.
+ */
+ public function search()
+ {
+ // Warning: Please modify the following code to remove attributes that
+ // should not be searched.
+
+ $criteria = new CDbCriteria();
+
+ $criteria->compare('id', $this->id, true);
+ $criteria->compare('name', $this->name, true);
+
+ return new CActiveDataProvider(get_class($this), array(
+ 'criteria' => $criteria,
+ ));
+ }
+}
diff --git a/protected/modules/OphCoCorrespondence/views/admin/_macro.php b/protected/modules/OphCoCorrespondence/views/admin/_macro.php
index 5f51cfaf97..69c29c5c19 100644
--- a/protected/modules/OphCoCorrespondence/views/admin/_macro.php
+++ b/protected/modules/OphCoCorrespondence/views/admin/_macro.php
@@ -32,7 +32,7 @@
),
))?>
dropDownList($macro, 'type', array('site' => 'Site', 'subspecialty' => 'Subspecialty', 'firm' => 'Firm'), array('empty' => '- Type -'))?>
- dropDownList($macro, 'letter_type', array('1'=>'Clinic discharge letter', '2'=>'Post-op letter', '3'=>'Clinic letter', '4'=>'Other letter'), array('empty' => '- Letter type -'))?>
+ dropDownList($macro, 'letter_type_id', CHtml::listData(LetterType::model()->findAll(array('order' => 'name asc')), 'id', 'name'), array('empty' => '- Letter type -'))?>
dropDownList($macro, 'site_id', Site::model()->getListForCurrentInstitution(), array('empty' => '- Site -', 'div-class' => 'typeSite'), $macro->type != 'site')?>
dropDownList($macro, 'subspecialty_id', CHtml::listData(Subspecialty::model()->findAll(array('order' => 'name asc')), 'id', 'name'), array('empty' => '- Subspecialty -', 'div-class' => 'typeSubspecialty'), $macro->type != 'subspecialty')?>
dropDownList($macro, 'firm_id', Firm::model()->getListWithSpecialties(true), array('empty' => '- Firm -', 'div-class' => 'typeFirm'), $macro->type != 'firm')?>
diff --git a/protected/modules/OphCoCorrespondence/views/default/create_ElementLetter.php b/protected/modules/OphCoCorrespondence/views/default/create_ElementLetter.php
index 72ea903c7d..7c703563e0 100644
--- a/protected/modules/OphCoCorrespondence/views/default/create_ElementLetter.php
+++ b/protected/modules/OphCoCorrespondence/views/default/create_ElementLetter.php
@@ -25,15 +25,16 @@
$layoutColumns = $form->layoutColumns;
$macro_id = isset($_POST['macro_id']) ? $_POST['macro_id'] : (isset($element->macro->id) ? $element->macro->id : null);
-$macro_name = null;
+
+$macro_letter_type_id = null;
if($macro_id){
$macro = LetterMacro::model()->findByPk($macro_id);
- $macro_name = $macro ? $macro->name : null;
+ $macro_letter_type_id = $macro->letter_type_id;
}
$patient_id = Yii::app()->request->getQuery('patient_id', null);
$patient = Patient::model()->findByPk($patient_id);
-$element->letter_type = ($element->letter_type ? $element->letter_type : ( $macro_name == 'Post-op' ? 2 : null ) );
+$element->letter_type_id = ($element->letter_type_id ? $element->letter_type_id : $macro_letter_type_id );
?>
@@ -364,6 +362,8 @@
array('nowrapper' => true)
); ?>
-
diff --git a/protected/modules/OphCiExamination/views/default/form_Element_OphCiExamination_CataractSurgicalManagement.php b/protected/modules/OphCiExamination/views/default/form_Element_OphCiExamination_CataractSurgicalManagement.php
index 13a0edf7d2..00d9a6d176 100644
--- a/protected/modules/OphCiExamination/views/default/form_Element_OphCiExamination_CataractSurgicalManagement.php
+++ b/protected/modules/OphCiExamination/views/default/form_Element_OphCiExamination_CataractSurgicalManagement.php
@@ -18,72 +18,77 @@
*/
?>
+params['clinical_management_pcr']): ?>
+
-
+
- radioButtons($element, 'eye_id', CHtml::listData(\OEModule\OphCiExamination\models\OphCiExamination_CataractSurgicalManagement_Eye::model()->findAll(), 'id', 'name'), null, false, false, false, false, array('nowrapper' => true))?>
-
-
- Right Eye - PCR Risk %
- |
-
- Left Eye - PCR Risk %
-
-
-
-
-
+
- textfield($element, 'target_postop_refraction', array(), array(), array('label' => 3, 'field' => 1));
- $this->widget('zii.widgets.jui.CJuiSliderInput', array(
- 'name' => 'refraction',
- 'value' => $element->target_postop_refraction,
- 'event' => 'change',
- 'attribute' => 'value',
- // additional javascript options for the slider plugin
- 'options' => array(
- 'min' => -10,
- 'max' => 10,
- 'step' => 0.25,
- 'animate' => true,
- 'slide' => 'js:function(event,ui){$("#OEModule_OphCiExamination_models_Element_OphCiExamination_CataractSurgicalManagement_target_postop_refraction").val(ui.value);}',
- ),
- 'htmlOptions' => array(
- 'style' => 'height:10px; width:400px;margin-top:-10px;margin-bottom:20px;margin-left:250px;',
- ),
- ));
+ textfield($element, 'target_postop_refraction', array(), array(), array('label' => 3, 'field' => 1));
+ $this->widget('zii.widgets.jui.CJuiSliderInput', array(
+ 'name' => 'refraction',
+ 'value' => $element->target_postop_refraction,
+ 'event' => 'change',
+ 'attribute' => 'value',
+ // additional javascript options for the slider plugin
+ 'options' => array(
+ 'min' => -10,
+ 'max' => 10,
+ 'step' => 0.25,
+ 'animate' => true,
+ 'slide' => 'js:function(event,ui){$("#OEModule_OphCiExamination_models_Element_OphCiExamination_CataractSurgicalManagement_target_postop_refraction").val(ui.value);}',
+ ),
+ 'htmlOptions' => array(
+ 'style' => 'height:10px; width:400px;margin-top:-10px;margin-bottom:20px;margin-left:250px;',
+ ),
+ ));
?>
- radioBoolean($element, 'correction_discussed', array(), array('label' => 3, 'field' => 9))?>
-
+ radioButtons($element, 'eye_id',
+ CHtml::listData(\OEModule\OphCiExamination\models\OphCiExamination_CataractSurgicalManagement_Eye::model()->findAll(), 'id', 'name'), null, false, false, false, false,
+ array('nowrapper' => true)) ?>
+ params['clinical_management_pcr']): ?>
+
+
+ Right Eye - PCR Risk %
+ |
+
+ Left Eye - PCR Risk %
+
+
+
+
+
+
checkbox($element, 'city_road', array('nowrapper' => true));
- echo $form->checkbox($element, 'satellite', array('nowrapper' => true));
- }
- ?>
- checkbox($element, 'fast_track', array('nowrapper' => true))?>
-
+ if ($active_check === 'on') {
+ echo $form->checkbox($element, 'city_road', array('nowrapper' => true));
+ echo $form->checkbox($element, 'satellite', array('nowrapper' => true));
+ }
+ ?>
+ checkbox($element, 'fast_track', array('nowrapper' => true)) ?>
+
-
- radioBoolean($element, 'previous_refractive_surgery', array(), array('label' => 3, 'field' => 9))?>
- radioBoolean($element, 'vitrectomised_eye', array(), array('label' => 3, 'field' => 9))?>
-
-
-
-
- dropDownList($element, 'suitable_for_surgeon_id', '\OEModule\OphCiExamination\models\OphCiExamination_CataractSurgicalManagement_SuitableForSurgeon', array('class' => 'inline', 'empty' => '- Please select -', 'nowrapper' => true))?>
-
-
-
-
-
-
-
-
-
- radioBoolean($element, 'correction_discussed', array(), array('label' => 3, 'field' => 9)) ?>
+
-
+
+ radioBoolean($element, 'previous_refractive_surgery', array(), array('label' => 3, 'field' => 9)) ?>
+ radioBoolean($element, 'vitrectomised_eye', array(), array('label' => 3, 'field' => 9)) ?>
+
+
+
+
+ dropDownList($element, 'suitable_for_surgeon_id', '\OEModule\OphCiExamination\models\OphCiExamination_CataractSurgicalManagement_SuitableForSurgeon',
+ array('class' => 'inline', 'empty' => '- Please select -', 'nowrapper' => true)) ?>
+
+
+
+
-
+
+
+
+ multiSelectList(
$element,
'OEModule_OphCiExamination_models_Element_OphCiExamination_CataractSurgicalManagement[reasonForSurgery]',
@@ -104,35 +109,34 @@
array('label' => 3, 'field' => 9)
);
?>
-
+
- renderPartial('application.views.default._pcr_risk_form', array('side' => 'left', 'element' => $element));
- ?>
-
-
- renderPartial('application.views.default._pcr_risk_form', array('side' => 'right', 'element' => $element));
- ?>
-
-
+
+ renderPartial('application.views.default._pcr_risk_form', array('side' => 'left', 'element' => $element));
+ ?>
+
+
+ renderPartial('application.views.default._pcr_risk_form', array('side' => 'right', 'element' => $element));
+ ?>
+
+
\ No newline at end of file
diff --git a/protected/modules/OphCiExamination/views/default/form_Element_OphCiExamination_HistoryRisk.php b/protected/modules/OphCiExamination/views/default/form_Element_OphCiExamination_HistoryRisk.php
index 48f834a8f6..1bbb4371b3 100644
--- a/protected/modules/OphCiExamination/views/default/form_Element_OphCiExamination_HistoryRisk.php
+++ b/protected/modules/OphCiExamination/views/default/form_Element_OphCiExamination_HistoryRisk.php
@@ -21,11 +21,14 @@
- radioButtons($element, 'anticoagulant', array(
- 0 => 'Not Checked',
- 1 => 'Yes',
- 2 => 'No',
- ),
+ radioButtons(
+ $element,
+ 'anticoagulant',
+ array(
+ 0 => 'Not Checked',
+ 1 => 'Yes',
+ 2 => 'No',
+ ),
($element->anticoagulant !== null) ? $element->anticoagulant : 0,
false,
false,
@@ -51,16 +54,19 @@
'label' => 4,
'field' => 8,
)
- );?>
+ ); ?>
- radioButtons($element, 'alphablocker', array(
- 0 => 'Not Checked',
- 1 => 'Yes',
- 2 => 'No',
- ),
+ radioButtons(
+ $element,
+ 'alphablocker',
+ array(
+ 0 => 'Not Checked',
+ 1 => 'Yes',
+ 2 => 'No',
+ ),
($element->alphablocker !== null) ? $element->alphablocker : 0,
false,
false,
@@ -85,7 +91,7 @@
array(
'label' => 4,
'field' => 8,
- ));?>
+ )); ?>
+patient->getDiabetes()) {
+ $diabeticOptions = array('Y' => 'Diabetes present');
+}else{
+ $diabeticOptions = array('NK' => 'Not Known', 'N' => 'No Diabetes', 'Y' => 'Diabetes present');
+}
+
+
+$criteria = new CDbCriteria();
+$criteria->condition = 'has_pcr_risk';
+$grades = \DoctorGrade::model()->findAll($criteria, array('order' => 'display_order'));
+$dropDowns = array(
+ 'glaucoma' => array(
+ 'options' => array('NK' => 'Not Known', 'N' => 'No Glaucoma', 'Y' => 'Glaucoma present'),
+ 'class' => 'pcrrisk_glaucoma',
+ ),
+ 'pxf' => array(
+ 'options' => array('NK' => 'Not Known', 'N' => 'No', 'Y' => 'Yes'),
+ 'class' => 'pcrrisk_pxf_phako',
+ ),
+ 'diabetic' => array(
+ 'options' => $diabeticOptions,
+ 'class' => 'pcrrisk_diabetic',
+ ),
+ 'pupil_size' => array(
+ 'options' => array('Large' => 'Large', 'Medium' => 'Medium', 'Small' => 'Small'),
+ 'class' => 'pcrrisk_pupil_size',
+ ),
+ 'no_fundal_view' => array(
+ 'options' => array('NK' => 'Not Known', 'N' => 'No', 'Y' => 'Yes'),
+ 'class' => 'pcrrisk_no_fundal_view',
+ ),
+ 'axial_length_group' => array(
+ 'options' => array(0 => 'Not Known', 1 => '< 26', 2 => '> or = 26'),
+ 'class' => '',
+ ),
+ 'brunescent_white_cataract' => array(
+ 'options' => array('NK' => 'Not Known', 'N' => 'No', 'Y' => 'Yes'),
+ 'class' => 'pcrrisk_brunescent_white_cataract',
+ ),
+ 'alpha_receptor_blocker' => array(
+ 'options' => array('NK' => 'Not Known', 'N' => 'No', 'Y' => 'Yes'),
+ 'class' => 'pcrrisk_arb',
+ ),
+ 'doctor_grade_id' => array(
+ 'options' => $grades,
+ 'class' => 'pcr_doctor_grade',
+ ),
+ 'can_lie_flat' => array(
+ 'options' => array('N' => 'No', 'Y' => 'Yes'),
+ 'class' => '',
+ ),
+);
+echo $form->hiddenInput($element, 'eye_id', false, array('class' => 'sideField'));
+
+foreach (array('right', 'left') as $side):
+ $opposite = ($side === 'right') ? 'left' : 'right';
+ $pcrRisk = new PcrRisk();
+ $activeClass = ($element->{'has'.ucfirst($side)}()) ? 'active' : 'inactive'; ?>
+
+
+ event){
+ $patientId = $this->event->episode->patient->id;
+ } else {
+ $patientId = Yii::app()->request->getQuery('patient_id');
+ }
+
+ $pcr = $pcrRisk->getPCRData($patientId, $side, $element);
+ echo CHtml::hiddenField('age', $pcr['age_group']);
+ echo CHtml::hiddenField('gender', $pcr['gender']);
+ ?>
+
+
+
+
+ Remove side
+ $data):
+ if ($key === 'doctor_grade_id'):?>
+
+
+
+ {'left_diabetic'} == 'Y' OR $element->{'left_diabetic'} == 'N'){
+ $element->{'right_diabetic'} = $element->{'left_diabetic'};
+ }elseif($element->{'right_diabetic'} == 'Y' OR $element->{'right_diabetic'} == 'N'){
+ $element->{'left_diabetic'} = $element->{'right_diabetic'};
+ }
+ if($element->{'left_alpha_receptor_blocker'} == 'Y' OR $element->{'left_alpha_receptor_blocker'} == 'N'){
+ $element->{'right_alpha_receptor_blocker'} = $element->{'left_alpha_receptor_blocker'};
+ }elseif($element->{'right_alpha_receptor_blocker'} == 'Y' OR $element->{'right_alpha_receptor_blocker'} == 'N'){
+ $element->{'left_alpha_receptor_blocker'} = $element->{'right_alpha_receptor_blocker'};
+ }
+ echo $form->dropDownList(
+ $element,
+ $side.'_'.$key,
+ $data['options'],
+ array('class' => $data['class']),
+ false,
+ array('label' => 4, 'field' => 4)
+ );
+ endif;
+ endforeach;?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add side
+
+
+
+ Calculation data derived from
+
+ Narendran et al. The Cataract National Dataset electronic multicentre audit of 55,567 operations
+
+
diff --git a/protected/modules/OphCiExamination/views/default/view_Element_OphCiExamination_Diagnoses.php b/protected/modules/OphCiExamination/views/default/view_Element_OphCiExamination_Diagnoses.php
index b5c7fb2c6c..505d89aa63 100644
--- a/protected/modules/OphCiExamination/views/default/view_Element_OphCiExamination_Diagnoses.php
+++ b/protected/modules/OphCiExamination/views/default/view_Element_OphCiExamination_Diagnoses.php
@@ -18,53 +18,60 @@
*/
?>
-
diff --git a/protected/modules/OphCiExamination/views/default/view_Element_OphCiExamination_PcrRisk.php b/protected/modules/OphCiExamination/views/default/view_Element_OphCiExamination_PcrRisk.php
new file mode 100644
index 0000000000..90a7d38efc
--- /dev/null
+++ b/protected/modules/OphCiExamination/views/default/view_Element_OphCiExamination_PcrRisk.php
@@ -0,0 +1,112 @@
+
- find('element_diagnoses_id=? and principal=1 and eye_id in (2,3)', array($element->id))) {
- ?>
-
-
-
-
- findAll('element_diagnoses_id=? and principal=0 and eye_id in (2,3)', array($element->id)) as $diagnosis) {
- ?>
-
-
- eye->adjective?>
- disorder->term?>
-
-
-
-
-
-
- eye->adjective?>
- disorder->term?>
-
-
- find('element_diagnoses_id=? and principal=1 and eye_id in (1,3)', array($element->id))) {
- ?>
-
+
-
-
- findAll('element_diagnoses_id=? and principal=0 and eye_id in (1,3)', array($element->id)) as $diagnosis) {
- ?>
-
-
- eye->adjective?>
- disorder->term?>
-
-
-
-
-
-
- eye->adjective?>
- disorder->term?>
-
-
+ find('element_diagnoses_id=? and principal=1 and eye_id in (2,3)', array($element->id));
+ if ($principal) {
+ ?>
+
+
+
+
+ findAll('element_diagnoses_id=? and principal=0 and eye_id in (2,3)', array($element->id));
+ foreach ($diagnoses as $diagnosis) {
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ find('element_diagnoses_id=? and principal=1 and eye_id in (1,3)', array($element->id));
+ if ($principal) {
+ ?>
+
+
+
+ findAll('element_diagnoses_id=? and principal=0 and eye_id in (1,3)', array($element->id));
+ foreach ($diagnoses as $diagnosis) {
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+{'has'.ucfirst($side)}()) ? 'active' : 'inactive';
+ if(!$element->{$side.'_glaucoma'}){
+ continue;
+ }
+?>
+
\ No newline at end of file
diff --git a/protected/modules/OphCiExamination/widgets/OphCiExamination_Episode_MedicalRetinalHistory.php b/protected/modules/OphCiExamination/widgets/OphCiExamination_Episode_MedicalRetinalHistory.php
index 8d4c564c26..425c9393e0 100644
--- a/protected/modules/OphCiExamination/widgets/OphCiExamination_Episode_MedicalRetinalHistory.php
+++ b/protected/modules/OphCiExamination/widgets/OphCiExamination_Episode_MedicalRetinalHistory.php
@@ -85,9 +85,9 @@ public function addData(\FlotChart $chart)
}
/**
- * @param \FlotChart $chart
- * @param Element_OphCiExamination_OCT $oct
- * @param string $side
+ * @param \FlotChart $chart
+ * @param models\Element_OphCiExamination_OCT $oct
+ * @param string $side
*/
protected function addSftReading(\FlotChart $chart, models\Element_OphCiExamination_OCT $oct, $side)
{
@@ -114,10 +114,10 @@ protected function addInjection(\FlotChart $chart, $va_axis, array $injection, $
$this->injections[$timestamp][$side] = $drug;
- if ($side == 'right' && (!$injMin || $timestamp < $injMin)) {
+ if ($side === 'right' && (!$injMin || $timestamp < $injMin)) {
$injMin = $timestamp;
}
- if ($side == 'left' && (!$injMax || $timestamp > $injMax)) {
+ if ($side === 'left' && (!$injMax || $timestamp > $injMax)) {
$injMax = $timestamp;
}
}
diff --git a/protected/modules/OphCoCorrespondence/assets/js/module.js b/protected/modules/OphCoCorrespondence/assets/js/module.js
index 684b804917..aa3f1c0331 100644
--- a/protected/modules/OphCoCorrespondence/assets/js/module.js
+++ b/protected/modules/OphCoCorrespondence/assets/js/module.js
@@ -18,13 +18,28 @@
var correspondence_markprinted_url, correspondence_print_url;
+function setDropDownWidth(id){
+ var $option_obj;
+ var option_width;
+ var arrow_width = 30;
+
+ $option_obj = $("").html($('#' + id +' option:selected').text());
+ $option_obj.appendTo('body');
+ option_width = $option_obj.width();
+ $option_obj.remove();
+
+ $('#' + id).width(option_width + arrow_width);
+}
+
function updateCorrespondence(macro_id)
{
var nickname = $('input[id="ElementLetter_use_nickname"][type="checkbox"]').is(':checked') ? '1' : '0';
var obj = $(this);
if ( macro_id != '') {
-
+
+ setDropDownWidth('macro_id');
+
$.ajax({
'type': 'GET',
'dataType': 'json',
@@ -44,9 +59,7 @@ function updateCorrespondence(macro_id)
obj.val('');
//set letter type
- if('Post-op' == $('#macro_id option:selected').text() ){
- $('#ElementLetter_letter_type').val(2);
- }
+ $('#ElementLetter_letter_type_id').val(data.sel_letter_type_id);
}
});
}
@@ -77,6 +90,10 @@ $(document).ready(function() {
handleButton($('#et_saveprint'),function() {
$('#ElementLetter_draft').val(0);
});
+
+ handleButton($('#et_save'),function() {
+ $('#ElementLetter_draft').val(0);
+ });
handleButton($('#et_cancel'),function() {
$('#dialog-confirm-cancel').dialog({
diff --git a/protected/modules/OphCoCorrespondence/components/OphCoCorrespondence_API.php b/protected/modules/OphCoCorrespondence/components/OphCoCorrespondence_API.php
index 42fb235d61..c12eef4759 100644
--- a/protected/modules/OphCoCorrespondence/components/OphCoCorrespondence_API.php
+++ b/protected/modules/OphCoCorrespondence/components/OphCoCorrespondence_API.php
@@ -53,6 +53,225 @@ public function getLatestEvent($episode)
}
}
+ /**
+ * get the full name of the patient for use in correspondence.
+ *
+ * @param Patient $patient
+ *
+ * @return string
+ */
+ public function getFullName($patient)
+ {
+ $fullname = trim(implode(' ', array($patient->title, $patient->first_name, $patient->last_name)));
+ return $fullname;
+ }
+
+ /**
+ * get the patient title for use in correspondence.
+ *
+ * @param Patient $patient
+ *
+ * @return string
+ */
+ public function getPatientTitle($patient)
+ {
+ return $patient->title;
+ }
+
+ /**
+ * get the patient first name for use in correspondence.
+ *
+ * @param Patient $patient
+ *
+ * @return string
+ */
+ public function getFirstName($patient)
+ {
+ return $patient->first_name;
+ }
+
+
+ /**
+ * get the patient last name for use in correspondence.
+ *
+ * @param Patient $patient
+ *
+ * @return string
+ */
+ public function getLastName($patient)
+ {
+ return $patient->last_name;
+ }
+
+
+ /**
+ * get the last Examination Date for patient for use in correspondence.
+ *
+ * @param Patient $patient
+ *
+ * @return string
+ */
+ public function getLastExaminationDate(\Patient $patient)
+ {
+ if ($episode = $patient->getEpisodeForCurrentSubspecialty()) {
+ $event_type = EventType::model()->find('class_name=?', array('OphCiExamination'));
+ $event = $this->getMostRecentEventInEpisode($episode->id, $event_type->id);
+ if (isset($event->event_date)) {
+ return Helper::convertDate2NHS($event->event_date);
+ }
+ }
+
+ return '';
+ }
+
+
+ public function getOphthalmicDiagnoses(\Patient $patient)
+ {
+ $allDiagnoses ='';
+ foreach ($patient->ophthalmicDiagnoses as $diagnosis) {
+ return $diagnosis->eye->adjective . ' ' . $diagnosis->disorder->term;
+ }
+ }
+
+ public function getLastIOLType(\Patient $patient)
+ {
+ if ($episode = $patient->getEpisodeForCurrentSubspecialty()) {
+ $event_type = EventType::model()->find('class_name=?', array('OphTrOperationnote'));
+ $element = $this->getMostRecentElementInEpisode($episode->id, $event_type->id, 'Element_OphTrOperationnote_Cataract');
+ return $element->iol_type->name;
+ }
+ }
+
+ public function getLastIOLPower(\Patient $patient)
+ {
+ if ($episode = $patient->getEpisodeForCurrentSubspecialty()) {
+ $event_type = EventType::model()->find('class_name=?', array('OphTrOperationnote'));
+ $element = $this->getMostRecentElementInEpisode($episode->id, $event_type->id, 'Element_OphTrOperationnote_Cataract');
+ return $element->iol_power;
+ }
+ }
+
+ public function getLastOperatedEye(\Patient $patient)
+ {
+ if ($episode = $patient->getEpisodeForCurrentSubspecialty()) {
+ $event_type = EventType::model()->find('class_name=?', array('OphTrOperationnote'));
+ $element = $this->getMostRecentElementInEpisode($episode->id, $event_type->id,
+ 'Element_OphTrOperationnote_ProcedureList');
+ return $element->eye->adjective;
+ }
+ }
+
+ /**
+ * Get the Pre-Op Visual Acuity - both eyes.
+ *
+ * @param $patient
+ *
+ * @return string|null
+ */
+ public function getPreOpVABothEyes($patient)
+ {
+ if ($apiNote = Yii::app()->moduleAPI->get('OphTrOperationnote')) {
+ $opDate = $apiNote->getLastOperationDateUnformatted($patient);
+ }
+ $api = Yii::app()->moduleAPI->get('OphCiExamination');
+ $episode = $patient->getEpisodeForCurrentSubspecialty();
+ $event_type = EventType::model()->find('class_name=?', array('OphCiExamination'));
+ $data = '';
+ $criteria = new CDbCriteria();
+ $criteria->condition = 'episode_id = :e_id AND event_type_id = :et_id';
+ $criteria->addCondition('event_date <= :event_date');
+ $criteria->order = ' event_date DESC, created_date DESC';
+ $criteria->params = array(':e_id' => $episode->id, ':et_id' => $event_type->id, 'event_date' => $opDate);
+
+ if($events = Event::model()->findAll($criteria)){
+ for ($i = 0; $i < count($events); ++$i) {
+ // Get Most Recent VA
+ $vaID = $api->getMostRecentVA($events[$i]->id);
+ if($vaID && !$data){
+ $data = $api->getMostRecentVAData($vaID->id);
+ $chosenVA = $vaID;
+ }
+ }
+ }
+
+ if($data){
+ for ($i = 0; $i < count($data); ++$i) {
+ if($data[$i]->side == 0){
+ $rightData[] = $data[$i];
+ }
+ if($data[$i]->side == 1){
+ $leftData[] = $data[$i];
+ }
+ }
+ $unitId = $chosenVA->unit_id;
+
+ $rightVA = $api->getVAvalue($rightData[0]->value, $unitId);
+ $leftVA = $api->getVAvalue($leftData[0]->value, $unitId);
+
+ return $rightVA . " Right Eye" . " " . $leftVA . " Left Eye";
+ }else{
+ return;
+ }
+
+ }
+
+ /**
+ * Get the Pre-Op Refraction - both eyes.
+ *
+ * @param $patient
+ *
+ * @return string|null
+ */
+ public function getPreOpRefraction($patient)
+ {
+ if ($apiNote = Yii::app()->moduleAPI->get('OphTrOperationnote')) {
+ $opDate = $apiNote->getLastOperationDateUnformatted($patient);
+ }
+ $api = Yii::app()->moduleAPI->get('OphCiExamination');
+ $episode = $patient->getEpisodeForCurrentSubspecialty();
+ $event_type = EventType::model()->find('class_name=?', array('OphCiExamination'));
+ $eventtypeid = $event_type->id;
+// Refraction here
+ $refractfound = false;
+
+ if ($eventid = Event::model()->findAll(array(
+ 'condition' => 'event_type_id = ' . $eventtypeid . ' AND episode_id = ' . $episode->id . " AND event_date <= '" . $opDate . "'",
+ 'order' => 'event_date DESC',
+ ))
+ ) {
+// Loop through responses, for ones that have RefractionValues
+ for ($i = 0; $i < count($eventid); ++$i) {
+ if ($api->getRefractionValues($eventid[$i]->id)) {
+ if (!$refractfound) {
+ $refractelement = $api->getRefractionValues($eventid[$i]->id);
+ $refract_event_date = $eventid[$i]->event_date;
+ $refractfound = true;
+ $rightspherical = number_format($refractelement->{'right_sphere'} + 0.5 * $refractelement->{'right_cylinder'}, 2);
+ $leftspherical = number_format($refractelement->{'left_sphere'} + 0.5 * $refractelement->{'left_cylinder'}, 2);
+ return $rightspherical . " Right Eye" . ", " . $leftspherical . " Left Eye";
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Get Allergies in a bullet format.
+ *
+ * @param $patient
+ *
+ * @return string|null
+ */
+ public function getAllergiesBulleted($patient)
+ {
+ $multiAllergies = '';
+ foreach ($patient->allergyAssignments as $aa) {
+ $multiAllergies .= " - " . $aa->allergy->name . "\r\n";
+ }
+ return $multiAllergies;
+ }
+
+
public function getMacroTargets($patient_id, $macro_id)
{
if (!$patient = Patient::model()->findByPk($patient_id)) {
diff --git a/protected/modules/OphCoCorrespondence/controllers/DefaultController.php b/protected/modules/OphCoCorrespondence/controllers/DefaultController.php
index 5054d91f85..cc4035f383 100644
--- a/protected/modules/OphCoCorrespondence/controllers/DefaultController.php
+++ b/protected/modules/OphCoCorrespondence/controllers/DefaultController.php
@@ -256,7 +256,7 @@ public function actionGetMacroData()
$data['textappend_ElementLetter_cc'] = implode("\n", $cc['text']);
$data['elementappend_cc_targets'] = implode("\n", $cc['targets']);
- $data['sel_letter_type'] = $macro->letter_type;
+ $data['sel_letter_type_id'] = $macro->letter_type_id;
echo json_encode($data);
}
@@ -396,7 +396,12 @@ public function actionPrint($id)
if($to_recipient_gp){
// print an extra copy to note
- $this->render('print', array('element' => $letter, 'letter_address' => ($to_recipient_gp->contact_name . "\n" . $to_recipient_gp->address)));
+ if(!Yii::app()->params['disable_correspondence_notes_copy']) {
+ $this->render('print', array(
+ 'element' => $letter,
+ 'letter_address' => ($to_recipient_gp->contact_name . "\n" . $to_recipient_gp->address)
+ ));
+ }
}
$print_outputs = $letter->getOutputByType("Print");
@@ -407,7 +412,9 @@ public function actionPrint($id)
//extra printout for note
if($document_target->ToCc == 'To' && $document_target->contact_type != 'GP'){
- $this->render('print', array('element' => $letter, 'letter_address' => ($document_target->contact_name . "\n" . $document_target->address)));
+ if(!Yii::app()->params['disable_correspondence_notes_copy']){
+ $this->render('print', array('element' => $letter, 'letter_address' => ($document_target->contact_name . "\n" . $document_target->address)));
+ }
}
}
}
@@ -431,7 +438,9 @@ public function actionPrint($id)
$this->render('print', array('element' => $letter));
if ($this->pdf_print_suffix == 'all' || @$_GET['all']) {
- $this->render('print', array('element' => $letter));
+ if(!Yii::app()->params['disable_correspondence_notes_copy']) {
+ $this->render('print', array('element' => $letter));
+ }
foreach ($letter->getCcTargets() as $letter_address) {
$this->render('print', array('element' => $letter, 'letter_address' => $letter_address));
diff --git a/protected/modules/OphCoCorrespondence/models/ElementLetter.php b/protected/modules/OphCoCorrespondence/models/ElementLetter.php
index 8cf31408fd..4f3255f6a7 100644
--- a/protected/modules/OphCoCorrespondence/models/ElementLetter.php
+++ b/protected/modules/OphCoCorrespondence/models/ElementLetter.php
@@ -67,7 +67,7 @@ public function rules()
'print_all, is_signed_off',
'safe'
),
- array('letter_type', 'letterTypeValidator'),
+ array('letter_type_id', 'letterTypeValidator'),
array('site_id, date, introduction, body, footer', 'requiredIfNotDraft'),
array('use_nickname', 'required'),
array('date', 'OEDateValidator'),
@@ -75,7 +75,7 @@ public function rules()
//array('is_signed_off', 'isSignedOffValidator'), // they do not want this at the moment - waiting for the demo/feedback
// The following rule is used by search().
// Please remove those attributes that should not be searched.
- array('id, event_id, site_id, use_nickname, date, introduction, re, body, footer, draft, direct_line, letter_type', 'safe', 'on' => 'search'),
+ array('id, event_id, site_id, use_nickname, date, introduction, re, body, footer, draft, direct_line, letter_type_id', 'safe', 'on' => 'search'),
);
}
@@ -95,7 +95,7 @@ public function relations()
'site' => array(self::BELONGS_TO, 'Site', 'site_id'),
'enclosures' => array(self::HAS_MANY, 'LetterEnclosure', 'element_letter_id', 'order' => 'display_order'),
'document_instance' => array(self::HAS_MANY, 'DocumentInstance', array( 'correspondence_event_id' => 'event_id')),
-
+ 'letterType' => array(self::BELONGS_TO, 'LetterType', 'letter_type_id'),
);
}
diff --git a/protected/modules/OphCoCorrespondence/models/FirmSiteSecretary.php b/protected/modules/OphCoCorrespondence/models/FirmSiteSecretary.php
index 5fa3994c22..c53baf7146 100644
--- a/protected/modules/OphCoCorrespondence/models/FirmSiteSecretary.php
+++ b/protected/modules/OphCoCorrespondence/models/FirmSiteSecretary.php
@@ -57,7 +57,7 @@ public function rules()
// will receive user inputs.
return array(
array('firm_id, site_id, direct_line, fax', 'safe'),
- array('firm_id, site_id, direct_line', 'required'),
+ array('firm_id, site_id', 'required'),
array('firm_id', 'ext.validators.UniqueSiteFirmValidator', 'message' => 'Only one contact can be added for each firm and site'),
// The following rule is used by search().
// Please remove those attributes that should not be searched.
diff --git a/protected/modules/OphCoCorrespondence/models/LetterMacro.php b/protected/modules/OphCoCorrespondence/models/LetterMacro.php
index d9f55eba4c..ab6a6e9276 100644
--- a/protected/modules/OphCoCorrespondence/models/LetterMacro.php
+++ b/protected/modules/OphCoCorrespondence/models/LetterMacro.php
@@ -54,7 +54,7 @@ public function tableName()
public function rules()
{
return array(
- array('name, recipient_id, use_nickname, body, cc_patient, cc_doctor, display_order, site_id, subspecialty_id, firm_id, cc_drss, episode_status_id, letter_type', 'safe'),
+ array('name, recipient_id, use_nickname, body, cc_patient, cc_doctor, display_order, site_id, subspecialty_id, firm_id, cc_drss, episode_status_id, letter_type_id', 'safe'),
array('name, use_nickname, body, cc_patient, cc_doctor, type', 'required'),
array('site_id', 'RequiredIfFieldValidator', 'field' => 'type', 'value' => 'site'),
array('subspecialty_id', 'RequiredIfFieldValidator', 'field' => 'type', 'value' => 'subspecialty'),
diff --git a/protected/modules/OphCoCorrespondence/models/LetterType.php b/protected/modules/OphCoCorrespondence/models/LetterType.php
new file mode 100644
index 0000000000..8d48ae9e6e
--- /dev/null
+++ b/protected/modules/OphCoCorrespondence/models/LetterType.php
@@ -0,0 +1,100 @@
+.
+ *
+ * @link http://www.openeyes.org.uk
+ *
+ * @author OpenEyes
+
+
+
+
+
+
+ getAttributeLabel($side.'_glaucoma')?>:
+
+
+ displayValues($element->{$side.'_glaucoma'}, 'glaucoma')?>
+
+
+
+
+ getAttributeLabel($side.'_pxf')?>:
+
+
+ displayValues($element->{$side.'_pxf'})?>
+
+
+
+
+ getAttributeLabel($side.'_diabetic')?>:
+
+
+ displayValues($element->{$side.'_diabetic'}, 'diabetic')?>
+
+
+
+
+ getAttributeLabel($side.'_pupil_size')?>:
+
+
+ {$side.'_pupil_size'}?>
+
+
+
+
+ getAttributeLabel($side.'_no_fundal_view')?>:
+
+
+ displayValues($element->{$side.'_no_fundal_view'})?>
+
+
+
+
+ getAttributeLabel($side.'_axial_length_group')?>:
+
+
+ displayValues($element->{$side.'_axial_length_group'}, 'axial')?>
+
+
+
+
+ getAttributeLabel($side.'_brunescent_white_cataract')?>:
+
+
+ displayValues($element->{$side.'_brunescent_white_cataract'})?>
+
+
+
+
+ getAttributeLabel($side.'_alpha_receptor_blocker')?>:
+
+
+ displayValues($element->{$side.'_alpha_receptor_blocker'})?>
+
+
+
+
+ getAttributeLabel($side.'_doctor_grade_id')?>:
+
+
+
+ {$side.'_doctor'}) {
+ echo $element->{$side.'_doctor'}->grade;
+ }
+ ?>
+
+
+
+
+
+ getAttributeLabel($side.'_can_lie_flat')?>:
+
+
+ displayValues($element->{$side.'_can_lie_flat'})?>
+
+
+
+
+
+
+
+
+
@@ -59,8 +60,8 @@
-
- letter_macros, array('empty' => '- Macro -', 'nowrapper' => true, 'class' => 'full-width')); ?>
+
@@ -69,11 +70,8 @@
+ letter_macros, array('empty' => '- Macro -', 'nowrapper' => true, 'class' => 'full-width resizeselect')); ?>
- dropDownList($element, 'letter_type',
- array( '1' => 'Clinic discharge letter',
- '2' => 'Post-op letter',
- '3' => 'Clinic letter',
- '4' => 'Other letter'),
+
+ dropDownList($element, 'letter_type_id', CHtml::listData(LetterType::model()->findAll(array('order' => 'name asc')), 'id', 'name'),
array('empty' => '- Please select -', 'nowrapper' => true, 'class' => 'full-width')) ?>
- letter_macros, array('empty' => '- Macro -', 'nowrapper' => true, 'class' => 'full-width')); ?>
+
-
+ letter_macros, array('empty' => '- Macro -', 'nowrapper' => true, 'class' => 'full-width resizeselect')); ?>
- dropDownList($element, 'letter_type', array('1' => 'Clinic discharge letter', '2' => 'Post-op letter', '3' => 'Clinic letter', '4' => 'Other letter'),
+ dropDownList($element, 'letter_type_id', CHtml::listData(LetterType::model()->findAll(array('order' => 'name asc')), 'id', 'name'),
array('empty' => '- Please select -', 'nowrapper' => true, 'class' => 'full-width')) ?>
+
+
+
+
+
+ General Comments:
+
+
+
+
+ textArea($element, 'comments_right',
+ array('rows' => 3, 'label' => false, 'nowrapper' => true), false,
+ array('class' => 'comments_right')) ?>
+
+
+
+
+
+
+ General Comments:
+
+
+
+
+ textArea($element, 'comments_left',
+ array('rows' => 3, 'label' => false, 'nowrapper' => true), false,
+ array('class' => 'comments_left')) ?>
+
+
-
+
is_auto) {
- echo 'Comments:
diff --git a/protected/modules/OphInBiometry/views/default/form_Element_OphInBiometry_Measurement.php b/protected/modules/OphInBiometry/views/default/form_Element_OphInBiometry_Measurement.php
index dcaaf055f0..23a56ad8be 100644
--- a/protected/modules/OphInBiometry/views/default/form_Element_OphInBiometry_Measurement.php
+++ b/protected/modules/OphInBiometry/views/default/form_Element_OphInBiometry_Measurement.php
@@ -20,81 +20,477 @@
event != null && $element->event->id > 0) {
- $iolRefValues = Element_OphInBiometry_IolRefValues::Model()->findAllByAttributes(
- array(
- 'event_id' => $element->event->id,
- ));
- } else {
- $iolRefValues = array();
+if ($element->event != null && $element->event->id > 0) {
+ $iolRefValues = Element_OphInBiometry_IolRefValues::Model()->findAllByAttributes(
+ array(
+ 'event_id' => $element->event->id,
+ ));
+} else {
+ $iolRefValues = array();
+}
+
+if ($eventtype = EventType::model()->find('class_name = "OphCiExamination"')){
+ $eventtypeid = $eventtype->id;
+}
+
+?>
+episode;
+if ($api = Yii::app()->moduleAPI->get('OphCiExamination')) {
+
+ $chosenVA[] = array('');
+
+ //Get All Events for episode.
+ $criteria = new CDbCriteria();
+ $criteria->condition = 'episode_id = :e_id AND event_type_id = :e_typeid';
+ $criteria->order = ' event_date DESC';
+ $criteria->params = array(':e_id' => $episode->id, ':e_typeid' => $eventtypeid);
+
+ //For each event, check if =event_id in _visualacuity.
+
+ if($events = Event::model()->findAll($criteria)){
+ for ($i = 0; $i < count($events); ++$i) {
+ // Get Most Recent VA
+ $vaID = $api->getMostRecentVA($events[$i]->id);
+ if($vaID && !$data){
+ $data = $api->getMostRecentVAData($vaID->id);
+ $chosenVA = $vaID;
+ $VAdate = "- (exam date " . date("d M Y", strtotime($events[$i]->event_date)) . ")";
+ }
+ }
+ }
+
+ $rightData = array();
+ $leftData = array();
+
+ for ($i = 0; $i < count($data); ++$i) {
+ if($data[$i]->side == 0){
+ $rightData[] = $data[$i];
+ }
+ if($data[$i]->side == 1){
+ $leftData[] = $data[$i];
+ }
}
+
+ $methodnameRight = array();
+ $methodnameLeft = array();
+
+ if($data){
+ $unitId = $chosenVA->unit_id;
+
+ for ($i = 0; $i < count($rightData); ++$i) {
+ $VAfinalright = $api->getVAvalue($rightData[$i]->value, $unitId);
+ }
+
+ for ($i = 0; $i < count($leftData); ++$i) {
+ $VAfinalleft = $api->getVAvalue($leftData[$i]->value, $unitId);
+ }
+
+ $methodIdRight = $api->getMethodIdRight($chosenVA->id, $episode);
+ for ($i = 0; $i < count($methodIdRight); ++$i) {
+ $methodnameRight[$i] = $api->getMethodName($methodIdRight[$i]->method_id);
+ }
+
+ $methodIdLeft = $api->getMethodIdLeft($chosenVA->id, $episode);
+ for ($i = 0; $i < count($methodIdLeft); ++$i) {
+ $methodnameLeft[$i] = $api->getMethodName($methodIdLeft[$i]->method_id);
+ }
+
+ $unitname = $api->getUnitName($unitId);
+ }
+}
+
?>
-'.$element->{'comments'}.'
';
- } else {
- echo $form->textField($element, 'comments', array('style' => 'width:1027px;'), null, array('label' => 4, 'field' => 200));
- }
- ?>
+ if ($this->is_auto) {
+ if (!$this->getAutoBiometryEventData($this->event->id)[0]->is700() || $element->{'comments'}) {
+ echo 'Device Comments:';
+ echo '' . $element->{'comments'} . '
';
+ }
+ } else {
+ echo $form->textField($element, 'comments', array('style' => 'width:1027px;'), null,
+ array('label' => 4, 'field' => 200));
+ }
+ ?>
- hiddenInput($element, 'eye_id', false, array('class' => 'sideField')); ?>
-
+
-
-
-
- RIGHT
-
- Remove side
- renderPartial('form_Element_OphInBiometry_Measurement_fields', array('side' => 'right', 'element' => $element, 'form' => $form, 'data' => $data, 'measurementInput' => $iolRefValues)); ?>
-
-
-
-
-
-
-
-
- LEFT
-
- Remove side
- renderPartial('form_Element_OphInBiometry_Measurement_fields', array('side' => 'left', 'element' => $element, 'form' => $form, 'data' => $data, 'measurementInput' => $iolRefValues)); ?>
-
-
-
-
-
+
+
+
+Visual Acuity
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ getVAvalue($rightData[$i]->value, $unitId) . " " . $methodnameRight[$i];
+ if ($i != (count($methodnameRight) - 1)) {
+ echo ", ";
+ }
+ }
+ ?>
+
+
+
+
+
+ Not recorded
+
+
+
+
+
+
+
+
+
+
+
+
+
+ getVAvalue($leftData[$i]->value, $unitId) . " " . $methodnameLeft[$i];
+ if ($i != (count($methodnameLeft) - 1)) {
+ echo ", ";
+ }
+ }
+ ?>
+
+
+
+
+
+ Not recorded
+
+ Near Visual Acuity
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ getVAvalue($rightNearData[$i]->value, $unitId). " " . $methodnameRight[$i];
+ if ($i != (count($rightNearData) - 1)) {
+ echo ", ";
+ }
+ }
+ ?>
+
+
+
+
+
+ Not recorded
+
+
+
+
+
+
+
+
+
+
+
+
+
+ getVAvalue($leftNearData[$i]->value, $unitId) . " " . $methodnameLeft[$i];
+ if ($i != (count($leftNearData) - 1)) {
+ echo ", ";
+ }
+ }
+ ?>
+
+
+
+
+
+ Not recorded
+
+ Refraction - (exam date )
+
+
+
+
+ hasRight()) {
+ ?>
+
+
+ renderPartial($element->view_view . '_OEEyeDraw',
+ array('side' => 'right', 'element' => $refractelement));
+ ?>
+
+
+
+
+
+
+ Not recorded
+
+
+ hasLeft()) {
+ ?>
+ renderPartial($element->view_view . '_OEEyeDraw',
+ array('side' => 'left', 'element' => $refractelement));
+ ?>
+
+
+
+
+
+
+ Not recorded
+
+ Refraction - (Not Recorded)
+
+
+
+
+
+
+
+
+ Not recorded
+
+
+
+
+
+
+ Not recorded
+
+ +
+ hiddenInput($element, 'eye_id', false, array('class' => 'sideField')); ?>
+
+
+
+
+
+ RIGHT
+
+ Remove side
+ id, array('class' => 'element_id')); ?>
+
+
+
+
+
+ renderPartial('form_Element_OphInBiometry_Measurement_fields', array(
+ 'side' => 'right',
+ 'element' => $element,
+ 'form' => $form,
+ 'data' => $data,
+ 'measurementInput' => $iolRefValues,
+ )); ?>
+
+
+
+
+
+
+ LEFT
+
+ Remove side
+
+
+
+
+
+ renderPartial('form_Element_OphInBiometry_Measurement_fields', array(
+ 'side' => 'left',
+ 'element' => $element,
+ 'form' => $form,
+ 'data' => $data,
+ 'measurementInput' => $iolRefValues,
+ )); ?>
+
Comments: '.$element->{'comments'};
+ echo 'Device Comments: '.$element->{'comments'};
?>
diff --git a/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_Calculation_fields.php b/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_Calculation_fields.php
index af71e9bfb1..d4f64f122d 100644
--- a/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_Calculation_fields.php
+++ b/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_Calculation_fields.php
@@ -1,3 +1,18 @@
+
+
+
+
+
+ getAttributeLabel('comments_'.$side)) ?>:
+
+
+ {'comments_'.$side}) ?>
+
diff --git a/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_Measurement_OEEyeDraw.php b/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_Measurement_OEEyeDraw.php
new file mode 100644
index 0000000000..d5338cb271
--- /dev/null
+++ b/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_Measurement_OEEyeDraw.php
@@ -0,0 +1,39 @@
+.
+ *
+ * @link http://www.openeyes.org.uk
+ *
+ * @author OpenEyes
+ * @copyright Copyright (c) 2008-2011, Moorfields Eye Hospital NHS Foundation Trust
+ * @copyright Copyright (c) 2011-2013, OpenEyes Foundation
+ * @license http://www.gnu.org/licenses/gpl-3.0.html The GNU General Public License V3.0
+ */
+?>
+
diff --git a/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_VisualAcuity.php b/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_VisualAcuity.php
new file mode 100644
index 0000000000..731e60ca84
--- /dev/null
+++ b/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_VisualAcuity.php
@@ -0,0 +1,124 @@
+.
+ *
+ * @link http://www.openeyes.org.uk
+ *
+ * @author OpenEyes
+ * @copyright Copyright (c) 2008-2011, Moorfields Eye Hospital NHS Foundation Trust
+ * @copyright Copyright (c) 2011-2013, OpenEyes Foundation
+ * @license http://www.gnu.org/licenses/gpl-3.0.html The GNU General Public License V3.0
+ */
+?>
+
+id, array('class' => 'element_id')); ?>
+
+
' . $biometry->attributes['formula_' . $eyeLabel] : 'Unknown'; $this->iol_power = ($biometry) ? $biometry->attributes['iol_power_' . $eyeLabel] : 'None'; $this->predicted_refractive_outcome = ($biometry) ? $biometry->attributes['predicted_refraction_' . $eyeLabel] : 'Unknown'; $this->alpha_blockers = $patient->hasRisk('Alpha blockers'); $this->anticoagulants = $patient->hasRisk('Anticoagulants'); - $this->alpha_blocker_name = ($risks) ? $risks->alpha_blocker_name : ''; - $this->anticoagulant_name = ($risks) ? $risks->anticoagulant_name : ''; + $this->alpha_blocker_name = $blockers; + $this->anticoagulant_name = $anticoag; $this->inr = ($labResult) ? $labResult : 'None'; if (!$this->predicted_additional_equipment) { @@ -149,4 +119,122 @@ public function isEditable() { return is_object($this->booking) && $this->booking->isEditable() && !$this->is_confirmed; } + + /** + * @param $patient + * @return mixed + */ + protected function recentBiometry($patient) + { + $biometryCriteria = new CDbCriteria(); + $biometryCriteria->addCondition('patient_id = :patient_id'); + $biometryCriteria->params = array('patient_id' => $patient->id); + $biometryCriteria->order = 'last_modified_date DESC'; + $biometryCriteria->limit = 1; + $biometry = Element_OphTrOperationnote_Biometry::model()->find($biometryCriteria); + + return $biometry; + } + + /** + * @param $episode + * + * @return string + */ + protected function allergyString($episode) + { + $allergies = Yii::app()->db->createCommand() + ->select('a.name as name, pas.other as other') + ->from('patient_allergy_assignment pas') + ->leftJoin('allergy a', 'pas.allergy_id = a.id') + ->where("a.name != 'Other' AND pas.patient_id = {$episode->patient_id}") + ->order('a.name') + ->queryAll(); + + $allergiesOther = Yii::app()->db->createCommand() + ->select('a.name as name, pas.other as other') + ->from('patient_allergy_assignment pas') + ->leftJoin('allergy a', 'pas.allergy_id = a.id') + ->where("a.name = 'Other' AND pas.patient_id = {$episode->patient_id}") + ->order('a.name') + ->queryAll(); + + + $allergyString = 'None'; + if ($allergies || $allergiesOther) { + $allergyString = implode(', ', array_column($allergies, 'name')); + $allergyOtherString = implode(', ', array_column($allergiesOther, 'other')); + + if ($allergyOtherString && $allergyString){ + $allergyString = $allergyString . ", " . $allergyOtherString; + } + + if ($allergyOtherString && !$allergyString){ + $allergyString = $allergyOtherString; + } + + + return $allergyString; + } + + return $allergyString; + } + + /** + * @param $id + * + * @return mixed + */ + protected function operation($id) + { + $operation = Yii::app()->db->createCommand() + ->select('proc.term as term') + ->from('et_ophtroperationbooking_operation op') + ->leftJoin('ophtroperationbooking_operation_procedures_procedures opp', 'opp.element_id = op.id') + ->leftJoin('proc', 'opp.proc_id = proc.id') + ->where("op.event_id = {$id}") + ->queryAll(); + + return $operation; + } + + /** + * @param $patient + * + * @return string + */ + protected function alphaBlockerStatusAndDate($patient) + { + $risks = new \OEModule\OphCiExamination\models\Element_OphCiExamination_HistoryRisk(); + $blockers = $risks->mostRecentCheckedAlpha($patient->id); + if ($blockers) { + if ($blockers->alphablocker === '2') { + return 'No (' . Helper::convertMySQL2NHS($blockers->event->event_date) . ')'; + } else { + return 'Yes - ' . $blockers->alpha_blocker_name . ' (' . Helper::convertMySQL2NHS($blockers->event->event_date) . ')'; + } + } else { + return 'Not Checked'; + } + } + + /** + * @param $patient + * + * @return string + */ + protected function anticoagsStatusAndDate($patient) + { + $risks = new \OEModule\OphCiExamination\models\Element_OphCiExamination_HistoryRisk(); + $anticoag = $risks->mostRecentCheckedAnticoag($patient->id); + if ($anticoag) { + if ($anticoag->anticoagulant === '2') { + return 'No (' . Helper::convertMySQL2NHS($anticoag->event->event_date) . ')'; + } else { + return 'Yes - ' . $anticoag->anticoagulant_name . ' (' . Helper::convertMySQL2NHS($anticoag->event->event_date) . ')'; + } + } else { + return 'Not Checked'; + } + } } diff --git a/protected/modules/OphTrOperationbooking/views/booking/schedule.php b/protected/modules/OphTrOperationbooking/views/booking/schedule.php index 935daead40..4bed00cdcc 100644 --- a/protected/modules/OphTrOperationbooking/views/booking/schedule.php +++ b/protected/modules/OphTrOperationbooking/views/booking/schedule.php @@ -18,6 +18,11 @@ */ ?> beginContent('//patient/event_container'); ?> +checkAccess('OprnViewClinical'); + +$warnings = $this->patient->getWarnings($clinical); +?>
diff --git a/protected/modules/OphTrOperationnote/assets/js/module.js b/protected/modules/OphTrOperationnote/assets/js/module.js
index 43afbe3b56..0b5c8d4bd9 100644
--- a/protected/modules/OphTrOperationnote/assets/js/module.js
+++ b/protected/modules/OphTrOperationnote/assets/js/module.js
@@ -675,11 +675,11 @@ function changeEye() {
if(typeof pcrCalculate === 'function'){
if($("#Element_OphTrOperationnote_ProcedureList_eye_id_2").attr('checked') == "checked") {
- pcrCalculate('right');
+ pcrCalculate($('#ophCiExaminationPCRRiskRightEye'), 'right');
}
if($("#Element_OphTrOperationnote_ProcedureList_eye_id_1").attr('checked') == "checked") {
- pcrCalculate('left');
+ pcrCalculate($('#ophCiExaminationPCRRiskLeftEye'), 'left');
}
}
diff --git a/protected/modules/OphTrOperationnote/components/OphTrOperationnote_API.php b/protected/modules/OphTrOperationnote/components/OphTrOperationnote_API.php
index d63baa5e64..032ac10bf4 100644
--- a/protected/modules/OphTrOperationnote/components/OphTrOperationnote_API.php
+++ b/protected/modules/OphTrOperationnote/components/OphTrOperationnote_API.php
@@ -145,6 +145,27 @@ public function getLastOperationDate(\Patient $patient)
return '';
}
+ /**
+ * Get the last operation date
+ *
+ * @param Patient $patient
+ *
+ * @return false|string
+ */
+ public function getLastOperationDateUnformatted(\Patient $patient)
+ {
+ if ($episode = $patient->getEpisodeForCurrentSubspecialty()) {
+ $event_type = EventType::model()->find('class_name=?', array('OphTrOperationnote'));
+ $event = $this->getMostRecentEventInEpisode($episode->id, $event_type->id);
+ if (isset($event->event_date)) {
+ return $event->event_date;
+ }
+ }
+
+ return '';
+ }
+
+
/**
* Get the last operation's surgeon name
diff --git a/protected/modules/OphTrOperationnote/config/common.php b/protected/modules/OphTrOperationnote/config/common.php
index d4fe3e8ca5..254e78fab2 100644
--- a/protected/modules/OphTrOperationnote/config/common.php
+++ b/protected/modules/OphTrOperationnote/config/common.php
@@ -28,6 +28,7 @@
'Per Op Instructions' => '/OphTrOperationnote/admin/postOpInstructions',
'Default Incision Length' => '/OphTrOperationnote/admin/viewIncisionLengthDefaults',
'Operative Devices' => '/OphTrOperationnote/OperativeDevice/list',
+ 'Operative Devices Mapping' => '/OphTrOperationnote/OperativeDeviceMapping/list',
),
'reports' => array(
'Operations' => '/OphTrOperationnote/report/operation',
diff --git a/protected/modules/OphTrOperationnote/controllers/DefaultController.php b/protected/modules/OphTrOperationnote/controllers/DefaultController.php
index a1538adfb8..beb3e51dc4 100644
--- a/protected/modules/OphTrOperationnote/controllers/DefaultController.php
+++ b/protected/modules/OphTrOperationnote/controllers/DefaultController.php
@@ -197,8 +197,10 @@ protected function initActionCreate()
{
parent::initActionCreate();
+ $api = Yii::app()->moduleAPI->get('OphTrOperationbooking');
+
if (isset($_GET['booking_event_id'])) {
- if (!$api = Yii::app()->moduleAPI->get('OphTrOperationbooking')) {
+ if (!$api) {
throw new Exception('invalid request for booking event');
}
if (!$this->booking_operation = $api->getOperationForEvent($_GET['booking_event_id'])) {
@@ -207,6 +209,18 @@ protected function initActionCreate()
} elseif (isset($_GET['unbooked'])) {
$this->unbooked = true;
}
+
+ $is_auto_schedule_operation = Yii::app()->params['auto_schedule_operation'];
+
+ if ($api && $is_auto_schedule_operation) {
+ $schedule_result = $api->autoScheduleOperationBookings($this->current_episode);
+ if( $schedule_result !== true ){
+ foreach($schedule_result as $error){
+ Yii::app()->user->setFlash('error.alert', $error);
+ }
+
+ }
+ }
$this->initEdit();
}
@@ -273,6 +287,7 @@ public function actionCreate()
$this->render('select_event', array(
'errors' => $errors,
'bookings' => $bookings,
+ 'is_auto_schedule_operation' => Yii::app()->params['auto_schedule_operation']
));
}
}
diff --git a/protected/modules/OphTrOperationnote/controllers/OperativeDeviceMappingController.php b/protected/modules/OphTrOperationnote/controllers/OperativeDeviceMappingController.php
new file mode 100644
index 0000000000..b56372e019
--- /dev/null
+++ b/protected/modules/OphTrOperationnote/controllers/OperativeDeviceMappingController.php
@@ -0,0 +1,228 @@
+.
+ *
+ * @link http://www.openeyes.org.uk
+ *
+ * @author OpenEyes
+ format->text($element->getCombined($side)) ?>
+ Spherical equivalent: {$side.'_sphere'} + 0.5 * $element->{$side.'_cylinder'}, 2)?> + {$side.'_notes'}) { + ?> + textWithLineBreaks($side.'_notes')?> + +
++ Spherical equivalent: {$side.'_sphere'} + 0.5 * $element->{$side.'_cylinder'}, 2)?> + {$side.'_notes'}) { + ?> + textWithLineBreaks($side.'_notes')?> + +
+ widget('application.modules.eyedraw.OEEyeDrawWidget', array(
+ 'idSuffix' => $side.'_'.$element->elementType->id.'_'.$element->id,
+ 'side' => ($side == 'right') ? 'R' : 'L',
+ 'mode' => 'view',
+ 'width' => 100,
+ 'height' => 100,
+ 'model' => $element,
+ 'attribute' => $side.'_axis_eyedraw',
+ ))?>
+
diff --git a/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_Selection_fields.php b/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_Selection_fields.php
index 4b4c23d1c1..f7c9fe5da4 100644
--- a/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_Selection_fields.php
+++ b/protected/modules/OphInBiometry/views/default/view_Element_OphInBiometry_Selection_fields.php
@@ -54,18 +54,20 @@ class="field-info">getAttributeLabel('lens
is_auto) {
$iolrefValues = Element_OphInBiometry_IolRefValues::model()->findAllByAttributes(array('event_id' => $element->event->id));
foreach ($iolrefValues as $iolrefData) {
if (isset($data)) {
if ($iolrefData->lens_id == $element->{'lens_'.$side}->id && $iolrefData->formula_id == $data[0]->id) {
- echo $this->formatAconst($iolrefData->constant);
+ $aconst = $this->formatAconst($iolrefData->constant);
}
}
}
} else {
- echo ($element->{'lens_'.$side}) ? $this->formatAconst($element->{'lens_'.$side}->acon) : 'None';
+ $aconst = ($element->{'lens_'.$side}) ? $this->formatAconst($element->{'lens_'.$side}->acon) : 'None';
}
+ echo $aconst;
?>
+
diff --git a/protected/modules/OphTrIntravitrealinjection/components/OphTrIntravitrealinjection_API.php b/protected/modules/OphTrIntravitrealinjection/components/OphTrIntravitrealinjection_API.php
index 7308a5fcef..a490acba7f 100644
--- a/protected/modules/OphTrIntravitrealinjection/components/OphTrIntravitrealinjection_API.php
+++ b/protected/modules/OphTrIntravitrealinjection/components/OphTrIntravitrealinjection_API.php
@@ -1,4 +1,5 @@
legacy_api;
}
- /**
- * caching method for previous injections store.
- *
- * @param Patient $patient
- * @param Episode $episode
- *
- * @return Element_OphTrIntravitrealinjection_Treatment[]
- */
- protected function previousInjectionsForPatientEpisode($patient, $episode)
- {
- if (!isset($this->previous_treatments[$patient->id])) {
- $this->previous_treatments[$patient->id] = array();
- }
-
- if (!isset($this->previous_treatments[$patient->id][$episode->id])) {
- $events = $this->getEventsInEpisode($patient, $episode);
- $previous = array();
- foreach ($events as $event) {
- if ($treat = Element_OphTrIntravitrealinjection_Treatment::model()->find('event_id = :event_id', array(':event_id' => $event->id))) {
- $previous[] = $treat;
- }
- }
- $this->previous_treatments[$patient->id][$episode->id] = $previous;
- }
-
- return $this->previous_treatments[$patient->id][$episode->id];
- }
-
/**
* return only previous injections given a starting event id.
*/
@@ -71,73 +44,103 @@ public function previousInjectionsByEvent($event_id, $side, $drug)
$event = Event::model()->find('id = :id', array(':id' => $event_id));
$episode = $event->episode;
$patient = $event->episode->patient;
- $injections = $this->previousInjections($patient, $episode, $side, $drug);
- //remove this event and events in the future
- $previousInjections = array();
- foreach ($injections as $injection) {
- if ($event_id > $injection['event_id']) {
- $previousInjections[] = $injection;
- }
- }
-
- return $previousInjections;
+ return $this->previousInjections($patient, $episode, $side, $drug, $event->event_date);
}
/**
* return the set of treatment elements from previous injection events in descending order.
*
- * @param Patient $patient
- * @param Episode $episode
- * @param string $side
- * @param Drug $drug
+ * @param Patient $patient
+ * @param Episode $episode
+ * @param string $side
+ * @param OphTrIntravitrealinjection_Treatment_Drug $drug
+ * @param string $since
*
* @throws Exception
*
* @return array {$side . '_drug_id' => integer, $side . '_number' => integer, 'date' => datetime}[] - array of treatment elements for the eye and optional drug
*/
- public function previousInjections($patient, $episode, $side, $drug = null)
+ public function previousInjections($patient, $episode, $side, $drug = null, $since = 'now')
{
$res = array();
+ // NOTE: we assume that all legacy injections would be from before any injections in
+ // this module. Should this prove not to be the case, we would need to sort the result
+ // data structure by date
+ if ($legacy_api = $this->getLegacyAPI()) {
+ foreach ($legacy_api->previousInjections($patient, $episode, $side, $drug) as $legacy) {
+ $res[] = $legacy;
+ }
+ }
+
+ if (!$drug || get_class($drug) !== 'OphTrIntravitrealinjection_Treatment_Drug') {
+ $drug = new OphTrIntravitrealinjection_Treatment_Drug();
+ }
+
+ $injections = $this->injectionsSinceByEpisodeSideAndDrug($episode, $side, $drug, $since);
+
+ foreach ($injections as $injection) {
+ $res[] = array(
+ $side . '_drug_id' => $injection->{$side . '_drug_id'},
+ $side . '_drug' => $injection->{$side . '_drug'}->name,
+ $side . '_number' => $injection->{$side . '_number'},
+ 'date' => $injection->event->event_date,
+ 'event_id' => $injection->event_id,
+ );
+ }
+
+ return $res;
+ }
- $previous = $this->previousInjectionsForPatientEpisode($patient, $episode);
+ /**
+ * @param Episode $episode
+ * @param string $side
+ * @param OphTrIntravitrealinjection_Treatment_Drug $drug
+ * @param string $since
+ *
+ * @return mixed
+ *
+ * @throws Exception
+ */
+ protected function injectionsSinceByEpisodeSideAndDrug(Episode $episode, $side, OphTrIntravitrealinjection_Treatment_Drug $drug, $since = 'now')
+ {
switch ($side) {
case 'left':
- $eye_ids = array(SplitEventTypeElement::LEFT, SplitEventTypeElement::BOTH);
+ $eye_id = SplitEventTypeElement::LEFT;
break;
case 'right':
- $eye_ids = array(SplitEventTypeElement::RIGHT, SplitEventTypeElement::BOTH);
+ $eye_id = SplitEventTypeElement::RIGHT;
break;
default:
- throw new Exception('invalid side value provided: '.$side);
+ throw new Exception('invalid side value provided: ' . $side);
break;
}
- foreach ($previous as $prev) {
- if (in_array($prev->eye_id, $eye_ids)) {
- if ($drug == null || $prev->{$side.'_drug_id'} == $drug->id) {
- $res[] = array(
- $side.'_drug_id' => $prev->{$side.'_drug_id'},
- $side.'_drug' => $prev->{$side.'_drug'}->name,
- $side.'_number' => $prev->{$side.'_number'},
- 'date' => $prev->created_date,
- 'event_id' => $prev->event_id,
- );
- }
- }
- }
+ $sinceDate = new DateTime($since);
- // NOTE: we assume that all legacy injections would be from before any injections in
- // this module. Should this prove not to be the case, we would need to sort the result
- // data structure by date
- if ($legacy_api = $this->getLegacyAPI()) {
- foreach ($legacy_api->previousInjections($patient, $episode, $side, $drug) as $legacy) {
- $res[] = $legacy;
- }
+ $criteria = new CDbCriteria();
+ $criteria->alias = 'treatment';
+ $criteria->addCondition(array(
+ 'event.episode_id = :episode_id',
+ 'treatment.eye_id in (:eye_id,'.SplitEventTypeElement::BOTH.')',
+ 'event_date <= :since',
+ )
+ );
+ $criteria->join = 'JOIN event ON treatment.event_id = event.id';
+ $criteria->order = 'event.event_date ASC';
+ $criteria->params = array(
+ 'episode_id' => $episode->id,
+ 'eye_id' => $eye_id,
+ 'since' => $sinceDate->format('Y-m-d'),
+ );
+
+ if ($drug->id) {
+ $criteria->addCondition('treatment.' . $side . '_drug_id = :drug_id');
+ $criteria->params['drug_id'] = $drug->id;
}
- return $res;
+ return Element_OphTrIntravitrealinjection_Treatment::model()->findAll($criteria);
}
/**
@@ -151,7 +154,7 @@ public function previousInjections($patient, $episode, $side, $drug = null)
*/
protected function getPreviousTreatmentForSide($patient, $episode, $side)
{
- $checker = ($side == 'left') ? 'hasLeft' : 'hasRight';
+ $checker = ($side === 'left') ? 'hasLeft' : 'hasRight';
$treatment = $this->getElementForLatestEventInEpisode($episode, 'Element_OphTrIntravitrealinjection_Treatment');
if ($treatment && $treatment->$checker()) {
return $treatment;
@@ -170,7 +173,7 @@ protected function getPreviousTreatmentForSide($patient, $episode, $side)
public function getLetterTreatmentDrugForSide($patient, $episode, $side)
{
if ($injection = $this->getPreviousTreatmentForSide($patient, $episode, $side)) {
- return $injection->{$side.'_drug'}->name;
+ return $injection->{$side . '_drug'}->name;
}
}
@@ -216,12 +219,12 @@ public function getLetterTreatmentDrugBoth($patient)
$right = $this->getLetterTreatmentDrugForSide($patient, $episode, 'right');
$left = $this->getLetterTreatmentDrugForSide($patient, $episode, 'left');
if ($right) {
- $res = $right.' injection to the right eye';
+ $res = $right . ' injection to the right eye';
if ($left) {
- $res .= ', and '.$left.' injection to the left eye';
+ $res .= ', and ' . $left . ' injection to the left eye';
}
} elseif ($left) {
- $res = $left.' injection on the left eye';
+ $res = $left . ' injection on the left eye';
}
return $res;
@@ -240,7 +243,7 @@ public function getLetterTreatmentDrugBoth($patient)
public function getLetterTreatmentNumberForSide($patient, $episode, $side)
{
if ($injection = $this->getPreviousTreatmentForSide($patient, $episode, $side)) {
- return $injection->{$side.'_number'};
+ return $injection->{$side . '_number'};
}
}
@@ -283,12 +286,12 @@ public function getLetterTreatmentNumberBoth($patient)
$left = $this->getLetterTreatmentNumberLeft($patient);
$res = '';
if ($right) {
- $res = $right.' on the right eye';
+ $res = $right . ' on the right eye';
if ($left) {
- $res .= ', and '.$left.' on the left eye';
+ $res .= ', and ' . $left . ' on the left eye';
}
} elseif ($left) {
- $res = $left.' on the left eye';
+ $res = $left . ' on the left eye';
}
return $res;
@@ -307,10 +310,10 @@ public function getLetterPostInjectionDrops($patient)
if ($el = $this->getElementForLatestEventInEpisode($episode, 'Element_OphTrIntravitrealinjection_PostInjectionExamination')) {
$drops = array();
if ($el->hasRight()) {
- $drops[] = $el->right_drops->name.' to the right eye';
+ $drops[] = $el->right_drops->name . ' to the right eye';
}
if ($el->hasLeft()) {
- $drops[] = $el->left_drops->name.' to the left eye';
+ $drops[] = $el->left_drops->name . ' to the left eye';
}
return implode(', and ', $drops);
diff --git a/protected/modules/OphTrIntravitrealinjection/controllers/DefaultController.php b/protected/modules/OphTrIntravitrealinjection/controllers/DefaultController.php
index df88b2d5e7..8e7cbdae8a 100644
--- a/protected/modules/OphTrIntravitrealinjection/controllers/DefaultController.php
+++ b/protected/modules/OphTrIntravitrealinjection/controllers/DefaultController.php
@@ -155,7 +155,7 @@ protected function setElementOptions($action)
$element->eye_id = $default_eye;
}
- if (get_class($element) == 'Element_OphTrIntravitrealinjection_Treatment') {
+ if (get_class($element) === 'Element_OphTrIntravitrealinjection_Treatment') {
if ($therapy_api) {
// get the latest drug that has been applied for and set it as default (for the appropriate eye)
if ($default_left_drug) {
@@ -176,7 +176,7 @@ protected function setElementOptions($action)
$element->left_injection_given_by_id = Yii::app()->user->id;
$element->right_injection_given_by_id = Yii::app()->user->id;
}
- if (get_class($element) == 'Element_OphTrIntravitrealinjection_Site') {
+ if (get_class($element) === 'Element_OphTrIntravitrealinjection_Site') {
$element->site_id = $this->selectedSiteId;
}
}
diff --git a/protected/modules/OphTrIntravitrealinjection/models/OphTrIntravitrealinjection_ReportInjections.php b/protected/modules/OphTrIntravitrealinjection/models/OphTrIntravitrealinjection_ReportInjections.php
index 878f9bc12e..02d0596679 100644
--- a/protected/modules/OphTrIntravitrealinjection/models/OphTrIntravitrealinjection_ReportInjections.php
+++ b/protected/modules/OphTrIntravitrealinjection/models/OphTrIntravitrealinjection_ReportInjections.php
@@ -1,4 +1,5 @@
given_by_id) {
if (!$user = User::model()->findByPk($this->given_by_id)) {
- throw new Exception('User not found: '.$this->given_by_id);
+ throw new Exception('User not found: ' . $this->given_by_id);
}
}
if ($this->drug_id) {
if (!$drug = OphTrIntravitrealinjection_Treatment_Drug::model()->findByPk($this->drug_id)) {
- throw new Exception('Drug not found: '.$this->drug_id);
+ throw new Exception('Drug not found: ' . $this->drug_id);
}
}
if ($this->pre_antisept_drug_id) {
if (!$pre_antisept_drug = OphTrIntravitrealinjection_AntiSepticDrug::model()->findByPk($this->pre_antisept_drug_id)) {
- throw new Exception('Drug not found: '.$this->pre_antisept_drug_id);
+ throw new Exception('Drug not found: ' . $this->pre_antisept_drug_id);
}
}
if ($this->summary) {
- $this->injections = $this->getSummaryInjections($this->date_from, $this->date_to, @$user, @$drug, @$pre_antisept_drug);
+ $this->injections = $this->getSummaryInjections($this->date_from, $this->date_to, @$user, @$drug,
+ @$pre_antisept_drug);
$this->view = '_summary_injections';
} else {
- $this->injections = $this->getInjections($this->date_from, $this->date_to, @$user, @$drug, @$pre_antisept_drug);
+ $this->injections = $this->getInjections($this->date_from, $this->date_to, @$user, @$drug,
+ @$pre_antisept_drug);
$this->view = '_injections';
}
}
@@ -145,25 +148,25 @@ protected function getSummaryInjections($date_from, $date_to, $given_by_user, $d
$patient_data = array();
$where = '';
$command = Yii::app()->db->createCommand()
- ->select(
- 'p.id as patient_id, treat.left_drug_id, treat.right_drug_id, treat.left_number, treat.right_number, e.id,
- e.created_date, c.first_name, c.last_name, e.created_date, p.hos_num,p.gender, p.dob, eye.name AS eye, site.name as site_name'
- )
- ->from('et_ophtrintravitinjection_treatment treat')
- ->join('event e', 'e.id = treat.event_id')
- ->join('episode ep', 'e.episode_id = ep.id')
- ->join('patient p', 'ep.patient_id = p.id')
- ->join('contact c', 'p.contact_id = c.id')
- ->join('eye', 'eye.id = treat.eye_id')
- ->join('et_ophtrintravitinjection_site insite', 'insite.event_id = treat.event_id')
- ->leftJoin('site', 'insite.site_id = site.id')
- ->order('p.id, e.created_date asc');
+ ->select(
+ 'p.id as patient_id, treat.left_drug_id, treat.right_drug_id, treat.left_number, treat.right_number, e.id,
+ e.event_date, c.first_name, c.last_name, e.created_date, p.hos_num,p.gender, p.dob, eye.name AS eye, site.name as site_name'
+ )
+ ->from('et_ophtrintravitinjection_treatment treat')
+ ->join('event e', 'e.id = treat.event_id')
+ ->join('episode ep', 'e.episode_id = ep.id')
+ ->join('patient p', 'ep.patient_id = p.id')
+ ->join('contact c', 'p.contact_id = c.id')
+ ->join('eye', 'eye.id = treat.eye_id')
+ ->join('et_ophtrintravitinjection_site insite', 'insite.event_id = treat.event_id')
+ ->leftJoin('site', 'insite.site_id = site.id')
+ ->order('p.id, e.event_date asc');
// for debug
if ($this->patient_id) {
- $where = 'ep.patient_id = :pat_id and e.deleted = 0 and ep.deleted = 0 and e.created_date >= :from_date and e.created_date < (:to_date + interval 1 day)';
+ $where = 'ep.patient_id = :pat_id and e.deleted = 0 and ep.deleted = 0 and e.event_date >= :from_date and e.event_date < (:to_date + interval 1 day)';
$params = array(':from_date' => $date_from, ':to_date' => $date_to, ':pat_id' => $this->patient_id);
} else {
- $where = 'e.deleted = 0 and ep.deleted = 0 and e.created_date >= :from_date and e.created_date < (:to_date + interval 1 day)';
+ $where = 'e.deleted = 0 and ep.deleted = 0 and e.event_date >= :from_date and e.event_date < (:to_date + interval 1 day)';
$params = array(':from_date' => $date_from, ':to_date' => $date_to);
}
@@ -205,10 +208,10 @@ protected function getSummaryInjections($date_from, $date_to, $given_by_user, $d
$site = 'Unknown';
}
foreach (array('left', 'right') as $side) {
- $dt = date('j M Y', strtotime($row['created_date']));
- if ($drug = $this->getDrugById($row[$side.'_drug_id'])) {
+ $dt = date('j M Y', strtotime($row['event_date']));
+ if ($drug = $this->getDrugById($row[$side . '_drug_id'])) {
$patient_data[$side][$drug->name][$site]['last_injection_date'] = $dt;
- $patient_data[$side][$drug->name][$site]['injection_number'] = $row[$side.'_number'];
+ $patient_data[$side][$drug->name][$site]['injection_number'] = $row[$side . '_number'];
if (!isset($patient_data[$side][$drug->name][$site]['first_injection_date'])) {
$patient_data[$side][$drug->name][$site]['first_injection_date'] = $dt;
}
@@ -224,24 +227,25 @@ protected function getSummaryInjections($date_from, $date_to, $given_by_user, $d
protected function getInjections($date_from, $date_to, $given_by_user, $drug, $pre_antisept_drug)
{
- $where = 'e.deleted = 0 and ep.deleted = 0 and e.created_date >= :from_date and e.created_date < (:to_date + interval 1 day)';
+ $where = 'e.deleted = 0 and ep.deleted = 0 and e.event_date >= :from_date and e.event_date < (:to_date + interval 1 day)';
$command = Yii::app()->db->createCommand()
- ->select(
- 'p.id as patient_id, treat.left_drug_id, treat.right_drug_id, treat.left_number, treat.right_number, e.id,
- e.created_date, c.first_name, c.last_name, e.created_date, p.hos_num,p.gender, p.dob, eye.name AS eye, site.name as site_name,treat.left_injection_given_by_id, treat.right_injection_given_by_id,
- treat.left_pre_antisept_drug_id, treat.right_pre_antisept_drug_id, anteriorseg.left_lens_status_id, anteriorseg.right_lens_status_id'
- )
- ->from('et_ophtrintravitinjection_treatment treat')
- ->join('event e', 'e.id = treat.event_id')
- ->join('episode ep', 'e.episode_id = ep.id')
- ->join('patient p', 'ep.patient_id = p.id')
- ->join('contact c', 'p.contact_id = c.id')
- ->join('eye', 'eye.id = treat.eye_id')
- ->join('et_ophtrintravitinjection_site insite', 'insite.event_id = treat.event_id')
- ->join('et_ophtrintravitinjection_anteriorseg anteriorseg', 'anteriorseg.event_id = treat.event_id')
- ->join('site', 'insite.site_id = site.id')
- ->order('p.id, e.created_date asc');
+ ->select(
+ 'p.id as patient_id, treat.left_drug_id, treat.right_drug_id, treat.left_number, treat.right_number, e.id,
+ e.event_date, c.first_name, c.last_name, p.hos_num, p.gender, p.dob, eye.name AS eye, site.name as site_name,
+ treat.left_injection_given_by_id, treat.right_injection_given_by_id,
+ treat.left_pre_antisept_drug_id, treat.right_pre_antisept_drug_id, anteriorseg.left_lens_status_id, anteriorseg.right_lens_status_id'
+ )
+ ->from('et_ophtrintravitinjection_treatment treat')
+ ->join('event e', 'e.id = treat.event_id')
+ ->join('episode ep', 'e.episode_id = ep.id')
+ ->join('patient p', 'ep.patient_id = p.id')
+ ->join('contact c', 'p.contact_id = c.id')
+ ->join('eye', 'eye.id = treat.eye_id')
+ ->join('et_ophtrintravitinjection_site insite', 'insite.event_id = treat.event_id')
+ ->join('et_ophtrintravitinjection_anteriorseg anteriorseg', 'anteriorseg.event_id = treat.event_id')
+ ->join('site', 'insite.site_id = site.id')
+ ->order('p.id, e.event_date asc');
$params = array(':from_date' => $date_from, ':to_date' => $date_to);
if ($given_by_user) {
@@ -263,32 +267,32 @@ protected function getInjections($date_from, $date_to, $given_by_user, $drug, $p
$results = array();
foreach ($command->queryAll(true, $params) as $row) {
- $diagnosisData = $this->getDiagnosisData($row['patient_id'], $row['created_date']);
+ $diagnosisData = $this->getDiagnosisData($row['patient_id'], $row['event_date']);
$record = array(
- 'injection_date' => date('j M Y', strtotime($row['created_date'])),
- 'patient_hosnum' => $row['hos_num'],
- 'patient_firstname' => $row['first_name'],
- 'patient_surname' => $row['last_name'],
- 'patient_gender' => $row['gender'],
- 'patient_dob' => date('j M Y', strtotime($row['dob'])),
- 'eye' => $row['eye'],
- 'site_name' => $row['site_name'],
- 'left_drug' => $this->getDrugString($row['left_drug_id']),
- 'left_injection_number' => $row['left_number'],
- 'right_drug' => $this->getDrugString($row['right_drug_id']),
- 'right_injection_number' => $row['right_number'],
- 'pre_antisept_drug_left' => $this->getPreAntiseptDrugString($row['left_pre_antisept_drug_id']),
- 'pre_antisept_drug_right' => $this->getPreAntiseptDrugString($row['right_pre_antisept_drug_id']),
- 'given_by_left' => $this->getGivenByName($row['left_injection_given_by_id']),
- 'given_by_right' => $this->getGivenByName($row['right_injection_given_by_id']),
- 'lens_status_left' => $this->getLensStatus($row['left_lens_status_id']),
- 'lens_status_right' => $this->getLensStatus($row['right_lens_status_id']),
- 'diagnosis_left' => $this->getDiagnosisName($diagnosisData['left_diagnosis_id']),
- 'diagnosis_right' => $this->getDiagnosisName($diagnosisData['right_diagnosis_id']),
+ 'injection_date' => date('j M Y', strtotime($row['event_date'])),
+ 'patient_hosnum' => $row['hos_num'],
+ 'patient_firstname' => $row['first_name'],
+ 'patient_surname' => $row['last_name'],
+ 'patient_gender' => $row['gender'],
+ 'patient_dob' => date('j M Y', strtotime($row['dob'])),
+ 'eye' => $row['eye'],
+ 'site_name' => $row['site_name'],
+ 'left_drug' => $this->getDrugString($row['left_drug_id']),
+ 'left_injection_number' => $row['left_number'],
+ 'right_drug' => $this->getDrugString($row['right_drug_id']),
+ 'right_injection_number' => $row['right_number'],
+ 'pre_antisept_drug_left' => $this->getPreAntiseptDrugString($row['left_pre_antisept_drug_id']),
+ 'pre_antisept_drug_right' => $this->getPreAntiseptDrugString($row['right_pre_antisept_drug_id']),
+ 'given_by_left' => $this->getGivenByName($row['left_injection_given_by_id']),
+ 'given_by_right' => $this->getGivenByName($row['right_injection_given_by_id']),
+ 'lens_status_left' => $this->getLensStatus($row['left_lens_status_id']),
+ 'lens_status_right' => $this->getLensStatus($row['right_lens_status_id']),
+ 'diagnosis_left' => $this->getDiagnosisName($diagnosisData['left_diagnosis_id']),
+ 'diagnosis_right' => $this->getDiagnosisName($diagnosisData['right_diagnosis_id']),
);
- $this->appendExaminationValues($record, $row['patient_id'], $row['created_date']);
+ $this->appendExaminationValues($record, $row['patient_id'], $row['event_date']);
$results[] = $record;
}
@@ -305,10 +309,11 @@ public function description()
}
if ($this->given_by_id) {
- $description .= ' given by '.User::model()->findByPk($this->given_by_id)->fullName;
+ $description .= ' given by ' . User::model()->findByPk($this->given_by_id)->fullName;
}
- $description .= ' between '.date('j M Y', strtotime($this->date_from)).' and '.date('j M Y', strtotime($this->date_to));
+ $description .= ' between ' . date('j M Y', strtotime($this->date_from)) . ' and ' . date('j M Y',
+ strtotime($this->date_to));
if ($this->pre_va && $this->post_va) {
$description .= ' with pre-injection and post-injection VA';
@@ -328,10 +333,10 @@ public function description()
*/
public function toCSV()
{
- $output = $this->description()."\n\n";
+ $output = $this->description() . "\n\n";
if ($this->summary) {
- $output .= Patient::model()->getAttributeLabel('hos_num').','.Patient::model()->getAttributeLabel('first_name').','.Patient::model()->getAttributeLabel('last_name').','.Patient::model()->getAttributeLabel('gender').','.Patient::model()->getAttributeLabel('dob').',Eye,Drug,Site,First injection date,Last injection date,Injection no';
+ $output .= Patient::model()->getAttributeLabel('hos_num') . ',' . Patient::model()->getAttributeLabel('first_name') . ',' . Patient::model()->getAttributeLabel('last_name') . ',' . Patient::model()->getAttributeLabel('gender') . ',' . Patient::model()->getAttributeLabel('dob') . ',Eye,Drug,Site,First injection date,Last injection date,Injection no';
if ($this->pre_va) {
$output .= ',Left pre-injection VA,Right pre-injection VA';
@@ -341,7 +346,7 @@ public function toCSV()
}
$output .= "\n";
} else {
- $output .= 'Date,'.Patient::model()->getAttributeLabel('hos_num').','.Patient::model()->getAttributeLabel('first_name').','.Patient::model()->getAttributeLabel('last_name').','.Patient::model()->getAttributeLabel('gender').','.Patient::model()->getAttributeLabel('dob').',Eye,Site,Left drug,Left injection no,Right drug,Right injection no,Left Pre-injection Antiseptics,Right Pre-injection Antiseptics,Left Injection given by,Right Injection given by,Left Lens Status,Right Lens Status,Left Diagnosis,Right Diagnosis';
+ $output .= 'Date,' . Patient::model()->getAttributeLabel('hos_num') . ',' . Patient::model()->getAttributeLabel('first_name') . ',' . Patient::model()->getAttributeLabel('last_name') . ',' . Patient::model()->getAttributeLabel('gender') . ',' . Patient::model()->getAttributeLabel('dob') . ',Eye,Site,Left drug,Left injection no,Right drug,Right injection no,Left Pre-injection Antiseptics,Right Pre-injection Antiseptics,Left Injection given by,Right Injection given by,Left Lens Status,Right Lens Status,Left Diagnosis,Right Diagnosis';
if ($this->pre_va) {
$output .= ',Left pre-injection VA,Right pre-injection VA';
@@ -352,7 +357,7 @@ public function toCSV()
$output .= "\n";
}
- return $output.$this->array2Csv($this->injections);
+ return $output . $this->array2Csv($this->injections);
}
protected function getDiagnosisDataFromEvent($patient_id, $close_to_date, $event_type_id, $model)
@@ -374,7 +379,7 @@ protected function getDiagnosisDataFromEvent($patient_id, $close_to_date, $event
if ($eventData) {
$criteria = new CDbCriteria();
- $criteria->addCondition('event_id = '.$eventData['id']);
+ $criteria->addCondition('event_id = ' . $eventData['id']);
$injectionManagementData = $model::model()->find($criteria);
//var_dump($injectionManagementData);
@@ -392,14 +397,18 @@ protected function getDiagnosisDataFromEvent($patient_id, $close_to_date, $event
}
}
}
+
//var_dump('Patient: '.$patient_id.' LEFT: '.$left_diagnosis_id." RIGHT: ".$right_diagnosis_id." Command: ".$command->getText()." :: ".print_r($command->params));
return array('left_diagnosis_id' => $left_diagnosis_id, 'right_diagnosis_id' => $right_diagnosis_id);
}
/**
- * a) From the injection management element under Examination event saved before the injection event - usually on the same day
- * b) If no injection management saved then this can be obtained from the application event If there is an application event saved before the injection started for the patient
- * c) if there is no application then diagnoses for the episode.
+ * a) From the injection management element under Examination event saved before the injection event - usually on the same day
+ * b) If no injection management saved then this can be obtained from the application event If there is an application event saved before the injection started for the patient
+ * c) if there is no application then diagnoses for the episode.
+ * @param $patient_id
+ * @param $close_to_date
+ * @return array
*/
protected function getDiagnosisData($patient_id, $close_to_date)
{
@@ -407,10 +416,13 @@ protected function getDiagnosisData($patient_id, $close_to_date)
// check for examination data
// search for the closest examination event first
- $diagnosisData = $this->getDiagnosisDataFromEvent($patient_id, $close_to_date, $this->getExaminationEventTypeId(), 'OEModule\OphCiExamination\models\Element_OphCiExamination_InjectionManagementComplex');
+ $diagnosisData = $this->getDiagnosisDataFromEvent($patient_id, $close_to_date,
+ $this->getExaminationEventTypeId(),
+ 'OEModule\OphCiExamination\models\Element_OphCiExamination_InjectionManagementComplex');
if (!$diagnosisData['left_diagnosis_id'] || !$diagnosisData['right_diagnosis_id']) {
- $diagnosisData = $this->getDiagnosisDataFromEvent($patient_id, $close_to_date, $this->getApplicationEventTypeID(), 'Element_OphCoTherapyapplication_Therapydiagnosis');
+ $diagnosisData = $this->getDiagnosisDataFromEvent($patient_id, $close_to_date,
+ $this->getApplicationEventTypeID(), 'Element_OphCoTherapyapplication_Therapydiagnosis');
}
return $diagnosisData;
@@ -450,7 +462,7 @@ protected function getGivenByName($user_id)
return 'N/A';
}
if ($user = User::model()->findByPk($user_id)) {
- return $user->first_name.' '.$user->last_name;
+ return $user->first_name . ' ' . $user->last_name;
} else {
return 'UNKNOWN';
}
@@ -502,16 +514,21 @@ protected function getDrugString($drug_id)
protected function appendExaminationValues(&$record, $patient_id, $event_date)
{
if ($this->pre_va || $this->post_va) {
- foreach (array('left_preinjection_va', 'right_preinjection_va', 'left_postinjection_va', 'right_postinjection_va') as $k) {
+ foreach (array(
+ 'left_preinjection_va',
+ 'right_preinjection_va',
+ 'left_postinjection_va',
+ 'right_postinjection_va',
+ ) as $k) {
$record[$k] = 'N/A';
}
$vas = $this->getPatientVAElements($patient_id);
$before = null;
$after = null;
foreach ($vas as $va) {
- if ($va->created_date < $event_date) {
+ if ($va->event->event_date < $event_date) {
$before = $va;
- } elseif ($va->created_date > $event_date) {
+ } elseif ($va->event->event_date > $event_date) {
$after = $va;
break;
}
@@ -550,21 +567,22 @@ protected function getPatientVAElements($patient_id)
if ($patient_id != $this->_current_patient_id) {
$this->_current_patient_id = $patient_id;
$command = Yii::app()->db->createCommand()
- ->select(
- 'e.id'
- )
- ->from('event e')
- ->join('episode ep', 'e.episode_id = ep.id')
- ->where('e.deleted = 0 and ep.deleted = 0 and ep.patient_id = :patient_id and e.event_type_id = :etype_id',
- array(':patient_id' => $patient_id, ':etype_id' => $this->getExaminationEventTypeId())
- );
+ ->select('e.id')
+ ->from('event e')
+ ->join('episode ep', 'e.episode_id = ep.id')
+ ->where('e.deleted = 0 and ep.deleted = 0 and ep.patient_id = :patient_id and e.event_type_id = :etype_id',
+ array(':patient_id' => $patient_id, ':etype_id' => $this->getExaminationEventTypeId())
+ );
$event_ids = array();
foreach ($command->queryAll() as $res) {
$event_ids[] = $res['id'];
}
$criteria = new CDbCriteria();
$criteria->addInCondition('event_id', $event_ids);
- $this->_patient_vas = OEModule\OphCiExamination\models\Element_OphCiExamination_VisualAcuity::model()->with('right_readings', 'left_readings')->findAll($criteria);
+ $criteria->order = 'event_date asc';
+ $this->_patient_vas = OEModule\OphCiExamination\models\Element_OphCiExamination_VisualAcuity::model()
+ ->with('right_readings', 'left_readings', 'event')
+ ->findAll($criteria);
}
return $this->_patient_vas;
@@ -574,14 +592,16 @@ protected function getPatientVAElements($patient_id)
* Simple wrapper function for getting a string representation of the best VA reading for a side from the given element.
*
* @param $side
- * @param Element_OphCiExamination_VisualAcuity $va
+ * @param OEModule\OphCiExamination\models\Element_OphCiExamination_VisualAcuity $va
*
* @return string
*/
- protected function getBestVaFromReading($side, OEModule\OphCiExamination\models\Element_OphCiExamination_VisualAcuity $va)
- {
+ protected function getBestVaFromReading(
+ $side,
+ OEModule\OphCiExamination\models\Element_OphCiExamination_VisualAcuity $va
+ ) {
if ($reading = $va->getBestReading($side)) {
- return $reading->convertTo($reading->value, $va->unit_id).' ('.$reading->method->name.')';
+ return $reading->convertTo($reading->value, $va->unit_id) . ' (' . $reading->method->name . ')';
}
return 'N/A';
diff --git a/protected/modules/OphTrIntravitrealinjection/views/default/form_Element_OphTrIntravitrealinjection_Treatment_fields.php b/protected/modules/OphTrIntravitrealinjection/views/default/form_Element_OphTrIntravitrealinjection_Treatment_fields.php
index 9d1ed722d7..a177e5c826 100644
--- a/protected/modules/OphTrIntravitrealinjection/views/default/form_Element_OphTrIntravitrealinjection_Treatment_fields.php
+++ b/protected/modules/OphTrIntravitrealinjection/views/default/form_Element_OphTrIntravitrealinjection_Treatment_fields.php
@@ -19,188 +19,205 @@
?>
with('allergies')->activeOrPk($element->{$side.'_pre_antisept_drug_id'})->findAll();
- $antiseptic_drugs_opts = array(
- 'empty' => '- Please select -',
- 'nowrapper' => true,
- 'options' => array(),
- );
- $antiseptic_allergic = false;
- foreach ($antiseptic_drugs as $drug) {
- $opts = array();
- foreach ($drug->allergies as $allergy) {
- if ($this->patient->hasAllergy($allergy)) {
- $opts['data-allergic'] = 1;
- if ($drug->id == $element->{$side.'_pre_antisept_drug_id'}) {
- $antiseptic_allergic = true;
- }
+$antiseptic_drugs = OphTrIntravitrealinjection_AntiSepticDrug::model()->with('allergies')->activeOrPk($element->{$side . '_pre_antisept_drug_id'})->findAll();
+$antiseptic_drugs_opts = array(
+ 'empty' => '- Please select -',
+ 'nowrapper' => true,
+ 'options' => array(),
+);
+$antiseptic_allergic = false;
+foreach ($antiseptic_drugs as $drug) {
+ $opts = array();
+ foreach ($drug->allergies as $allergy) {
+ if ($this->patient->hasAllergy($allergy)) {
+ $opts['data-allergic'] = 1;
+ if ($drug->id == $element->{$side . '_pre_antisept_drug_id'}) {
+ $antiseptic_allergic = true;
}
}
- $antiseptic_drugs_opts['options'][(string) $drug->id] = $opts;
}
- $skin_drugs = OphTrIntravitrealinjection_SkinDrug::model()->with('allergies')->activeOrPk($element->{$side.'_pre_skin_drug_id'})->findAll();
- $skin_drugs_opts = array('empty' => '- Please select -', 'nowrapper' => true, 'options' => array());
- $skin_allergic = false;
- foreach ($skin_drugs as $drug) {
- $opts = array();
- foreach ($drug->allergies as $allergy) {
- if ($this->patient->hasAllergy($allergy)) {
- $opts['data-allergic'] = 1;
- if ($drug->id == $element->{$side.'_pre_skin_drug_id'}) {
- $skin_allergic = true;
- }
+ $antiseptic_drugs_opts['options'][(string)$drug->id] = $opts;
+}
+$skin_drugs = OphTrIntravitrealinjection_SkinDrug::model()->with('allergies')->activeOrPk($element->{$side . '_pre_skin_drug_id'})->findAll();
+$skin_drugs_opts = array('empty' => '- Please select -', 'nowrapper' => true, 'options' => array());
+$skin_allergic = false;
+foreach ($skin_drugs as $drug) {
+ $opts = array();
+ foreach ($drug->allergies as $allergy) {
+ if ($this->patient->hasAllergy($allergy)) {
+ $opts['data-allergic'] = 1;
+ if ($drug->id == $element->{$side . '_pre_skin_drug_id'}) {
+ $skin_allergic = true;
}
}
- $skin_drugs_opts['options'][(string) $drug->id] = $opts;
}
+ $skin_drugs_opts['options'][(string)$drug->id] = $opts;
+}
?>
-
+ hasRight()) {
+ ?>
+ getCombined('right')) {
+ ?>
+
+
+
+
+ unit->name ?>
+
+
+
+
+
+ getCombined('right') ?>
+
+
+
+
+
+
+ Not recorded
+ right_unable_to_assess) {
+ ?>
+ (Unable to assessright_eye_missing) {
+ ?>, eye missing)
+ right_eye_missing) {
+ ?>
+ (Eye missing)
+
+
+
+
+
+
+ Not recorded
+
+
+ hasLeft()) {
+ ?>
+ getCombined('left')) {
+ ?>
+
+
+
+
+ unit->name ?>
+
+
+
+
+
+ getCombined('left') ?>
+
+
+
+
+
+
+ Not recorded
+ left_unable_to_assess) {
+ ?>
+ (Unable to assessleft_eye_missing) {
+ ?>, eye missing)
+ left_eye_missing) {
+ ?>
+ (Eye missing)
+
+
+
+
+
+
+ Not recorded
+
+
-
-*/?>
+*/ ?>
{ $side.'_post_ioplowering_required'};
+$div_class = 'eventDetail';
+$show = $element->{$side . '_post_ioplowering_required'};
- if (isset($_POST[get_class($element)])) {
- $show = $_POST[get_class($element)][$side.'_post_ioplowering_required'];
- }
+if (isset($_POST[get_class($element)])) {
+ $show = $_POST[get_class($element)][$side . '_post_ioplowering_required'];
+}
- if (!$show) {
- $div_class .= ' hidden';
- }
+if (!$show) {
+ $div_class .= ' hidden';
+}
- $html_options = array(
- 'options' => array(),
- 'empty' => '- Please select -',
- 'div_id' => 'div_'.get_class($element).'_'.$side.'_post_ioploweringdrugs',
- 'label' => $element->getAttributeLabel($side.'_post_ioploweringdrugs'),
- 'div_class' => $div_class, );
- $ioplowering_drugs = OphTrIntravitrealinjection_IOPLoweringDrug::model()->activeOrPk($element->iopLoweringDrugValues)->findAll(array('order' => 'display_order asc'));
- foreach ($ioplowering_drugs as $drug) {
- $html_options['options'][(string) $drug->id] = array('data-order' => $drug->display_order);
- }
- echo $form->multiSelectList($element, get_class($element).'['.$side.'_post_ioploweringdrugs]', $side.'_post_ioploweringdrugs', 'id', CHtml::listData($ioplowering_drugs, 'id', 'name'), array(), $html_options, false, false, null, false, false, array('field' => 6));
+$html_options = array(
+ 'options' => array(),
+ 'empty' => '- Please select -',
+ 'div_id' => 'div_' . get_class($element) . '_' . $side . '_post_ioploweringdrugs',
+ 'label' => $element->getAttributeLabel($side . '_post_ioploweringdrugs'),
+ 'div_class' => $div_class,
+);
+$ioplowering_drugs = OphTrIntravitrealinjection_IOPLoweringDrug::model()->activeOrPk($element->iopLoweringDrugValues)->findAll(array('order' => 'display_order asc'));
+foreach ($ioplowering_drugs as $drug) {
+ $html_options['options'][(string)$drug->id] = array('data-order' => $drug->display_order);
+}
+echo $form->multiSelectList($element, get_class($element) . '[' . $side . '_post_ioploweringdrugs]', $side . '_post_ioploweringdrugs', 'id',
+ CHtml::listData($ioplowering_drugs, 'id', 'name'), array(), $html_options, false, false, null, false, false, array('field' => 6));
?>
diff --git a/protected/modules/OphTrOperationbooking/components/OphTrOperationbooking_API.php b/protected/modules/OphTrOperationbooking/components/OphTrOperationbooking_API.php
index 7a168a8943..62659a76bd 100644
--- a/protected/modules/OphTrOperationbooking/components/OphTrOperationbooking_API.php
+++ b/protected/modules/OphTrOperationbooking/components/OphTrOperationbooking_API.php
@@ -423,11 +423,128 @@ public function getAllBookingsWithoutOperationNotes(\Patient $patient)
$booking_procs = OphTrOperationbooking_Operation_Procedures::model()->findAll($criteria);
if ($booking_procs) {
foreach ($booking_procs as $proc) {
- $not_booked_events[] = $proc->procedure->term;
+ $not_booked_events[] = $proc->element->eye->getAdjective() . ' ' . $proc->procedure->term;
}
}
return implode(', ', $not_booked_events);
}
+
+ /**
+ * Automatically scheduleds all the un-scheduled op bookings in the episode
+ * @param \Episode $episode
+ * @return type
+ */
+ public function autoScheduleOperationBookings(\Episode $episode)
+ {
+ $errors = array();
+
+ $criteria = new CDbCriteria();
+ $criteria->order = 't.created_date asc';
+ $criteria->condition = 't.status_id = 1';
+ $criteria->compare('episode_id', $episode->id);
+
+ $operations = Element_OphTrOperationbooking_Operation::model()->with(array(
+ 'event' => array(
+ 'condition'=>'event.deleted=0',
+ )
+ ))->findAll($criteria);
+
+ $op_status_scheduled = OphTrOperationbooking_Operation_Status::model()->find('name=?', array('Scheduled'));
+ $ep_status_listed = EpisodeStatus::model()->find('name=?', array('Listed/booked'));
+
+ foreach($operations as $operation){
+ // get the first bookable session regardless of the firm
+ $session = $this->getFirstBookableSession($operation);
+
+ //we need to pass to schedule the op
+ $schedule_options = Element_OphTrOperationbooking_ScheduleOperation::model()->find('event_id = ?', array($operation->event->id));
+
+ if($session){
+ $transaction = Yii::app()->db->beginTransaction();
+
+ try {
+
+ $ward = OphTrOperationbooking_Operation_Ward::model()->find('site_id = ?', array($operation->site->id));
+ if(!$ward){
+ //as this feature is used when the client/hospital doesn't use the
+ //scheduling, most likely it will have a dummy ward set up for only one site
+ $ward = OphTrOperationbooking_Operation_Ward::model()->find();
+ }
+ $booking = new OphTrOperationbooking_Operation_Booking('insert');
+ $booking->ward_id = $ward->id;
+ $booking->element_id = $operation->id;
+ $booking->session_id = $session->id;
+ $booking->session_theatre_id = 1;
+ $booking->session_date = date("Y-m-d H:i:s");
+ $booking->session_start_time = $session->start_time;
+ $booking->admission_time = $session->start_time;
+ $booking->session_end_time = $session->end_time;
+ $booking->cancellation_comment = '';
+ //$booking will be saved in $operation->schedule()
+
+ $result = $operation->schedule($booking, '', '', '', false, null, $schedule_options);
+
+ if ($result !== true) {
+ $errors[$operation->id] = $result;
+ } else {
+ $operation->status_id = $op_status_scheduled->id;
+ $operation->save();
+
+ $episode->episode_status_id = $ep_status_listed->id;
+ $episode->save();
+
+ $operation->event->deleteIssues();
+
+ $transaction->commit();
+ }
+
+ } catch (RaceConditionException $e) {
+ $errors[$operation->id] = $e->getMessage();
+ $transaction->rollback();
+ } catch (Exception $e) {
+ $errors[$operation->id] = $e->getMessage();
+ $transaction->rollback();
+ }
+
+ } else {
+ $errors[$operation->id] = 'Operation notes cannot be created for un-scheduled Operations. Please add free sessions.';
+ }
+
+ if( isset($errors[$operation->id]) ){
+ $evevnt_date = new DateTime($operation->event->event_date);
+ $errors[$operation->id] .= ' (' . $evevnt_date->format("d M Y") .': '. $operation->getProceduresCommaSeparated() . ')';
+ }
+ }
+
+ return $errors ? $errors : true;
+
+ }
+
+ public function getFirstBookableSession(\Element_OphTrOperationbooking_Operation $operation)
+ {
+ $criteria = new CDbCriteria();
+ $criteria->compare('available', 1);
+ $criteria->addCondition("date >= '" . date("Y-m-d") . "'" );
+ $criteria->order = 'date asc';
+
+ $dataProvider = new CActiveDataProvider('OphTrOperationbooking_Operation_Session',
+ array(
+ 'criteria' => $criteria
+ )
+ );
+
+ $session_iterator = new CDataProviderIterator($dataProvider);
+
+ foreach ($session_iterator as $session){
+ $is_bookable = $session->operationBookable($operation);
+
+ if ($is_bookable && ($session->availableMinutes >= $operation->total_duration)) {
+ return $session;
+ }
+ }
+
+ return null;
+ }
}
diff --git a/protected/modules/OphTrOperationbooking/controllers/TheatreDiaryController.php b/protected/modules/OphTrOperationbooking/controllers/TheatreDiaryController.php
index 5e21326b3a..cecc88afd6 100644
--- a/protected/modules/OphTrOperationbooking/controllers/TheatreDiaryController.php
+++ b/protected/modules/OphTrOperationbooking/controllers/TheatreDiaryController.php
@@ -38,6 +38,16 @@ public function accessRules()
),
);
}
+
+ protected function beforeAction($action)
+ {
+ $is_auto_schedule_operation = isset(Yii::app()->params['auto_schedule_operation']) && Yii::app()->params['auto_schedule_operation'] === true;
+
+ if($is_auto_schedule_operation){
+ Yii::app()->user->setFlash('warning.alert', 'Operation bookings are automatically scheduled to the next available slot, regardless of the firms.');
+ }
+ return parent::beforeAction($action);
+ }
/**
* @return array
diff --git a/protected/modules/OphTrOperationbooking/controllers/WhiteboardController.php b/protected/modules/OphTrOperationbooking/controllers/WhiteboardController.php
index 191b50e59a..96368c455b 100644
--- a/protected/modules/OphTrOperationbooking/controllers/WhiteboardController.php
+++ b/protected/modules/OphTrOperationbooking/controllers/WhiteboardController.php
@@ -109,6 +109,11 @@ public function actionView($id)
}
$this->setWhiteboard($whiteboard);
+ if (is_object($whiteboard->booking) && $whiteboard->booking->isEditable() && !$whiteboard->is_confirmed)
+ {
+ $whiteboard->loadData($id);
+ }
+
$this->render('view', array('data' => $whiteboard), false, true);
}
diff --git a/protected/modules/OphTrOperationbooking/models/OphTrOperationbooking_Whiteboard.php b/protected/modules/OphTrOperationbooking/models/OphTrOperationbooking_Whiteboard.php
index 3c5e12bab8..6c5278497a 100644
--- a/protected/modules/OphTrOperationbooking/models/OphTrOperationbooking_Whiteboard.php
+++ b/protected/modules/OphTrOperationbooking/models/OphTrOperationbooking_Whiteboard.php
@@ -74,42 +74,12 @@ public function loadData($id)
$episode = Episode::model()->findByPk($event->episode_id);
$patient = Patient::model()->findByPk($episode->patient_id);
$contact = Contact::model()->findByPk($patient->contact_id);
-
- $biometryCriteria = new CDbCriteria();
- $biometryCriteria->addCondition('patient_id = :patient_id');
- $biometryCriteria->params = array('patient_id' => $patient->id);
- $biometryCriteria->order = 'last_modified_date DESC';
- $biometryCriteria->limit = 1;
- $biometry = Element_OphTrOperationnote_Biometry::model()->find($biometryCriteria);
-
- $examination = $event->getPreviousInEpisode(EventType::model()->findByAttributes(array('name' => 'Examination'))->id);
- $risks = new \OEModule\OphCiExamination\models\Element_OphCiExamination_HistoryRisk();
- if ($examination) {
- $risks = $risks->findByAttributes(array('event_id' => $examination->id));
- }
-
+ $biometry = $this->recentBiometry($patient);
+ $blockers = $this->alphaBlockerStatusAndDate($patient);
+ $anticoag = $this->anticoagsStatusAndDate($patient);
$labResult = Element_OphInLabResults_Inr::model()->findPatientResultByType($patient->id, '1');
-
- $allergies = Yii::app()->db->createCommand()
- ->select('a.name as name')
- ->from('patient_allergy_assignment pas')
- ->leftJoin('allergy a', 'pas.allergy_id = a.id')
- ->where("pas.patient_id = {$episode->patient_id}")
- ->order('a.name')
- ->queryAll();
-
- $allergyString = 'None';
- if ($allergies) {
- $allergyString = implode(',', array_column($allergies, 'name'));
- }
-
- $operation = Yii::app()->db->createCommand()
- ->select('proc.term as term')
- ->from('et_ophtroperationbooking_operation op')
- ->leftJoin('ophtroperationbooking_operation_procedures_procedures opp', 'opp.element_id = op.id')
- ->leftJoin('proc', 'opp.proc_id = proc.id')
- ->where("op.event_id = {$id}")
- ->queryAll();
+ $allergyString = $this->allergyString($episode);
+ $operation = $this->operation($id);
$this->event_id = $id;
$this->booking = $booking;
@@ -118,15 +88,15 @@ public function loadData($id)
$this->patient_name = $contact['title'] . ' ' . $contact['first_name'] . ' ' . $contact['last_name'];
$this->date_of_birth = $patient['dob'];
$this->hos_num = $patient['hos_num'];
- $this->procedure = implode(',', array_column($operation, 'term'));
+ $this->procedure = implode(', ', array_column($operation, 'term'));
$this->allergies = $allergyString;
$this->iol_model = ($biometry) ? $biometry->attributes['lens_description_' . $eyeLabel] . '
-
-
-
-
-
- dropDownList($element, $side.'_pre_antisept_drug_id', CHtml::listData($antiseptic_drugs, 'id', 'name'), $antiseptic_drugs_opts);
+
+
+
+
+
+
+
+
+ dropDownList($element, $side . '_pre_antisept_drug_id', CHtml::listData($antiseptic_drugs, 'id', 'name'), $antiseptic_drugs_opts);
?>
-
-
-
-textField($element, $side.'_batch_number', array(), array(), array('field' => 6))?>
+textField($element, $side . '_batch_number', array(), array(), array('field' => 6)) ?>
getIsNewRecord()) {
@@ -210,38 +227,40 @@ class="row field-row">
}
?>
-datePicker($element, $side.'_batch_expiry_date', $expiry_date_params, array(), array(
+datePicker($element, $side . '_batch_expiry_date', $expiry_date_params, array(), array(
'label' => $form->layoutColumns['label'],
'field' => 3,
-))?>
+)) ?>
-dropDownList($element, $side.'_injection_given_by_id', CHtml::listData(OphTrIntravitrealinjection_InjectionUser::model()->getUsers(), 'id', 'ReversedFullNameAndUserName'), array('empty' => '- Please select -'), false, array('field' => 6))?>
+dropDownList($element, $side . '_injection_given_by_id',
+ CHtml::listData(OphTrIntravitrealinjection_InjectionUser::model()->getUsers(), 'id', 'ReversedFullNameAndUserName'), array('empty' => '- Please select -'), false,
+ array('field' => 6)) ?>
-
-
-
-
-
checkbox($element, $side.'_pre_ioplowering_required');
+echo $form->checkbox($element, $side . '_pre_ioplowering_required');
?>
{ $side.'_pre_ioplowering_required'};
+$show = $element->{$side . '_pre_ioplowering_required'};
if (isset($_POST[get_class($element)])) {
- $show = $_POST[get_class($element)][$side.'_pre_ioplowering_required'];
+ $show = $_POST[get_class($element)][$side . '_pre_ioplowering_required'];
}
?>
array(),
- 'empty' => '- Please select -',
- 'div_id' => 'div_'.get_class($element).'_'.$side.'_pre_ioploweringdrugs',
- 'label' => $element->getAttributeLabel($side.'_pre_ioploweringdrugs'),
- 'div_class' => $div_class, );
- $ioplowering_drugs = OphTrIntravitrealinjection_IOPLoweringDrug::model()->activeOrPk($element->iopLoweringDrugValues)->findAll(array('order' => 'display_order asc'));
- foreach ($ioplowering_drugs as $drug) {
- $html_options['options'][(string) $drug->id] = array('data-order' => $drug->display_order);
- }
- echo $form->multiSelectList($element, get_class($element).'['.$side.'_pre_ioploweringdrugs]', $side.'_pre_ioploweringdrugs', 'id', CHtml::listData($ioplowering_drugs, 'id', 'name'), array(), $html_options, false, false, null, false, false, array('field' => 6));
+$div_class = 'eventDetail';
+if (!$show) {
+ $div_class .= ' hidden';
+}
- $drugs = OphTrIntravitrealinjection_Treatment_Drug::model()->activeOrPk($element->{$side.'_drug_id'})->findAll();
+$html_options = array(
+ 'options' => array(),
+ 'empty' => '- Please select -',
+ 'div_id' => 'div_' . get_class($element) . '_' . $side . '_pre_ioploweringdrugs',
+ 'label' => $element->getAttributeLabel($side . '_pre_ioploweringdrugs'),
+ 'div_class' => $div_class,
+);
+$ioplowering_drugs = OphTrIntravitrealinjection_IOPLoweringDrug::model()->activeOrPk($element->iopLoweringDrugValues)->findAll(array('order' => 'display_order asc'));
+foreach ($ioplowering_drugs as $drug) {
+ $html_options['options'][(string)$drug->id] = array('data-order' => $drug->display_order);
+}
- $html_options = array(
- 'empty' => '- Please select -',
- 'options' => array(),
- );
- // get the previous injection counts for each of the drug options for this eye
- $drug_history = array();
+echo $form->multiSelectList(
+ $element,
+ get_class($element) . '[' . $side . '_pre_ioploweringdrugs]', $side . '_pre_ioploweringdrugs',
+ 'id',
+ CHtml::listData($ioplowering_drugs, 'id', 'name'),
+ array(),
+ $html_options,
+ false,
+ false,
+ null,
+ false,
+ false,
+ array('field' => 6)
+);
- foreach ($drugs as $drug) {
- if ($element->event_id) {
- $previous = $injection_api->previousInjectionsByEvent($element->event_id, $side, $drug);
- } else {
- $previous = $injection_api->previousInjections($this->patient, $episode, $side, $drug);
- }
- $count = 0;
- if (sizeof($previous)) {
- $count = $previous[0][$side.'_number'];
- }
- $drug_history[$drug->id] = array_reverse($previous);
+$drugs = OphTrIntravitrealinjection_Treatment_Drug::model()->activeOrPk($element->{$side . '_drug_id'})->findAll();
- $html_options['options'][$drug->id] = array(
- 'data-previous' => $count,
- );
+$html_options = array(
+ 'empty' => '- Please select -',
+ 'options' => array(),
+);
+// get the previous injection counts for each of the drug options for this eye
+$drug_history = array();
- // if this is an edit, we want to know what the original count was so that we don't replace it
- if ($element->{$side.'_drug_id'} && $element->{$side.'_drug_id'} == $drug->id) {
- $html_options['options'][$drug->id]['data-original-count'] = $element->{$side.'_number'};
- }
+foreach ($drugs as $drug) {
+ if ($element->event_id) {
+ $previous = $injection_api->previousInjectionsByEvent($element->event_id, $side, $drug);
+ } else {
+ $previous = $injection_api->previousInjections($this->patient, $episode, $side, $drug);
+ }
+ $count = 0;
+ if (count($previous)) {
+ $count = $previous[count($previous) - 1][$side . '_number'];
}
+ $drug_history[$drug->id] = $previous;
- echo $form->dropDownList($element, $side.'_drug_id', CHtml::listData($drugs, 'id', 'name'), $html_options, false, array('field' => 6));
+ $html_options['options'][$drug->id] = array(
+ 'data-previous' => $count,
+ );
- $selected_drug = null;
- if (@$_POST['Element_OphTrIntravitrealinjection_Treatment']) {
- $selected_drug = $_POST['Element_OphTrIntravitrealinjection_Treatment'][$side.'_drug_id'];
- } else {
- $selected_drug = $element->{$side.'_drug_id'};
+ // if this is an edit, we want to know what the original count was so that we don't replace it
+ if ($element->{$side . '_drug_id'} && $element->{$side . '_drug_id'} == $drug->id) {
+ $html_options['options'][$drug->id]['data-original-count'] = $element->{$side . '_number'};
}
+}
+
+echo $form->dropDownList($element, $side . '_drug_id', CHtml::listData($drugs, 'id', 'name'), $html_options, false, array('field' => 6));
+
+$selected_drug = null;
+if (@$_POST['Element_OphTrIntravitrealinjection_Treatment']) {
+ $selected_drug = $_POST['Element_OphTrIntravitrealinjection_Treatment'][$side . '_drug_id'];
+} else {
+ $selected_drug = $element->{$side . '_drug_id'};
+}
?>
-
- dropDownList($element, $side.'_pre_skin_drug_id', CHtml::listData($skin_drugs, 'id', 'name'), $skin_drugs_opts);
+
+
+
+
+
+
+
+
+ dropDownList($element, $side . '_pre_skin_drug_id', CHtml::listData($skin_drugs, 'id', 'name'), $skin_drugs_opts);
?>
-
-
-
-
-
-
-
+
-
+
- textField($element, $side.'_number', array('size' => '10', 'nowrapper' => true))?>
-
-
-
+ 
+
-
-
-
-
- {$side.'_injection_time'} != null) {
- $val = date('H:i', strtotime($element->{$side.'_injection_time'}));
- } else {
- $val = date('H:i');
- }
+
checkbox($element, $side.'_post_ioplowering_required');
+echo $form->checkbox($element, $side . '_post_ioplowering_required');
?>
+
+
+
+
+ {$side . '_injection_time'} != null) {
+ $val = date('H:i', strtotime($element->{$side . '_injection_time'}));
+ } else {
+ $val = date('H:i');
+ }
- if (isset($_POST[get_class($element)])) {
- $val = $_POST[get_class($element)][$side.'_injection_time'];
- }
- echo CHtml::textField(get_class($element).'['.$side.'_injection_time]', $val, array('autocomplete' => Yii::app()->params['html_autocomplete']));
+ if (isset($_POST[get_class($element)])) {
+ $val = $_POST[get_class($element)][$side . '_injection_time'];
+ }
+ echo CHtml::textField(get_class($element) . '[' . $side . '_injection_time]', $val, array('autocomplete' => Yii::app()->params['html_autocomplete']));
?>
-
+ ' . $biometry->attributes['formula_' . $eyeLabel] : 'Unknown'; $this->iol_power = ($biometry) ? $biometry->attributes['iol_power_' . $eyeLabel] : 'None'; $this->predicted_refractive_outcome = ($biometry) ? $biometry->attributes['predicted_refraction_' . $eyeLabel] : 'Unknown'; $this->alpha_blockers = $patient->hasRisk('Alpha blockers'); $this->anticoagulants = $patient->hasRisk('Anticoagulants'); - $this->alpha_blocker_name = ($risks) ? $risks->alpha_blocker_name : ''; - $this->anticoagulant_name = ($risks) ? $risks->anticoagulant_name : ''; + $this->alpha_blocker_name = $blockers; + $this->anticoagulant_name = $anticoag; $this->inr = ($labResult) ? $labResult : 'None'; if (!$this->predicted_additional_equipment) { @@ -149,4 +119,122 @@ public function isEditable() { return is_object($this->booking) && $this->booking->isEditable() && !$this->is_confirmed; } + + /** + * @param $patient + * @return mixed + */ + protected function recentBiometry($patient) + { + $biometryCriteria = new CDbCriteria(); + $biometryCriteria->addCondition('patient_id = :patient_id'); + $biometryCriteria->params = array('patient_id' => $patient->id); + $biometryCriteria->order = 'last_modified_date DESC'; + $biometryCriteria->limit = 1; + $biometry = Element_OphTrOperationnote_Biometry::model()->find($biometryCriteria); + + return $biometry; + } + + /** + * @param $episode + * + * @return string + */ + protected function allergyString($episode) + { + $allergies = Yii::app()->db->createCommand() + ->select('a.name as name, pas.other as other') + ->from('patient_allergy_assignment pas') + ->leftJoin('allergy a', 'pas.allergy_id = a.id') + ->where("a.name != 'Other' AND pas.patient_id = {$episode->patient_id}") + ->order('a.name') + ->queryAll(); + + $allergiesOther = Yii::app()->db->createCommand() + ->select('a.name as name, pas.other as other') + ->from('patient_allergy_assignment pas') + ->leftJoin('allergy a', 'pas.allergy_id = a.id') + ->where("a.name = 'Other' AND pas.patient_id = {$episode->patient_id}") + ->order('a.name') + ->queryAll(); + + + $allergyString = 'None'; + if ($allergies || $allergiesOther) { + $allergyString = implode(', ', array_column($allergies, 'name')); + $allergyOtherString = implode(', ', array_column($allergiesOther, 'other')); + + if ($allergyOtherString && $allergyString){ + $allergyString = $allergyString . ", " . $allergyOtherString; + } + + if ($allergyOtherString && !$allergyString){ + $allergyString = $allergyOtherString; + } + + + return $allergyString; + } + + return $allergyString; + } + + /** + * @param $id + * + * @return mixed + */ + protected function operation($id) + { + $operation = Yii::app()->db->createCommand() + ->select('proc.term as term') + ->from('et_ophtroperationbooking_operation op') + ->leftJoin('ophtroperationbooking_operation_procedures_procedures opp', 'opp.element_id = op.id') + ->leftJoin('proc', 'opp.proc_id = proc.id') + ->where("op.event_id = {$id}") + ->queryAll(); + + return $operation; + } + + /** + * @param $patient + * + * @return string + */ + protected function alphaBlockerStatusAndDate($patient) + { + $risks = new \OEModule\OphCiExamination\models\Element_OphCiExamination_HistoryRisk(); + $blockers = $risks->mostRecentCheckedAlpha($patient->id); + if ($blockers) { + if ($blockers->alphablocker === '2') { + return 'No (' . Helper::convertMySQL2NHS($blockers->event->event_date) . ')'; + } else { + return 'Yes - ' . $blockers->alpha_blocker_name . ' (' . Helper::convertMySQL2NHS($blockers->event->event_date) . ')'; + } + } else { + return 'Not Checked'; + } + } + + /** + * @param $patient + * + * @return string + */ + protected function anticoagsStatusAndDate($patient) + { + $risks = new \OEModule\OphCiExamination\models\Element_OphCiExamination_HistoryRisk(); + $anticoag = $risks->mostRecentCheckedAnticoag($patient->id); + if ($anticoag) { + if ($anticoag->anticoagulant === '2') { + return 'No (' . Helper::convertMySQL2NHS($anticoag->event->event_date) . ')'; + } else { + return 'Yes - ' . $anticoag->anticoagulant_name . ' (' . Helper::convertMySQL2NHS($anticoag->event->event_date) . ')'; + } + } else { + return 'Not Checked'; + } + } } diff --git a/protected/modules/OphTrOperationbooking/views/booking/schedule.php b/protected/modules/OphTrOperationbooking/views/booking/schedule.php index 935daead40..4bed00cdcc 100644 --- a/protected/modules/OphTrOperationbooking/views/booking/schedule.php +++ b/protected/modules/OphTrOperationbooking/views/booking/schedule.php @@ -18,6 +18,11 @@ */ ?> beginContent('//patient/event_container'); ?> +checkAccess('OprnViewClinical'); + +$warnings = $this->patient->getWarnings($clinical); +?>
@@ -39,6 +44,20 @@
+
+
+
+
+
+
+
+
+
patient->getDisplayName() ?> (patient->hos_num ?>
)
diff --git a/protected/modules/OphTrOperationbooking/views/default/create.php b/protected/modules/OphTrOperationbooking/views/default/create.php
index a541768b33..8ed2088ab4 100644
--- a/protected/modules/OphTrOperationbooking/views/default/create.php
+++ b/protected/modules/OphTrOperationbooking/views/default/create.php
@@ -18,6 +18,11 @@
*/
?>
beginContent('//patient/event_container'); ?>
+checkAccess('OprnViewClinical');
+
+$warnings = $this->patient->getWarnings($clinical);
+?>
beginWidget('BaseEventTypeCActiveForm', array(
@@ -32,6 +37,18 @@
$this->event_actions[] = EventAction::button('Save and Schedule now', '#', array('level' => 'secondary'), array('name' => 'scheduleNow', 'id' => 'et_save_and_schedule', 'class' => 'button small', 'form' => 'clinical-create', 'style' => $this->checkScheduleAccess() ? '' : 'display: none;'));
?>
+
+
+
+
+
displayErrors($errors);
$this->renderOpenElements($this->action->id, $form);
diff --git a/protected/modules/OphTrOperationbooking/views/default/update.php b/protected/modules/OphTrOperationbooking/views/default/update.php
index 332d55b450..a0da7de49b 100644
--- a/protected/modules/OphTrOperationbooking/views/default/update.php
+++ b/protected/modules/OphTrOperationbooking/views/default/update.php
@@ -18,6 +18,11 @@
*/
?>
beginContent('//patient/event_container'); ?>
+checkAccess('OprnViewClinical');
+
+$warnings = $this->patient->getWarnings($clinical);
+?>
beginWidget('BaseEventTypeCActiveForm', array(
@@ -43,6 +48,19 @@
params['OphTrOperationbooking_duplicate_proc_warn']) {?>
+
+
+
+
+
+
+
+
displayErrors($errors)?>
renderOpenElements($this->action->id, $form); ?>
renderOptionalElements($this->action->id, $form); ?>
diff --git a/protected/modules/OphTrOperationbooking/views/default/view.php b/protected/modules/OphTrOperationbooking/views/default/view.php
index 0cf9ed2319..13e3763e1d 100644
--- a/protected/modules/OphTrOperationbooking/views/default/view.php
+++ b/protected/modules/OphTrOperationbooking/views/default/view.php
@@ -17,6 +17,11 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html The GNU General Public License V3.0
*/
?>
+checkAccess('OprnViewClinical');
+
+$warnings = $this->patient->getWarnings($clinical);
+?>
beginContent('//patient/event_container'); ?>
@@ -24,6 +29,19 @@
$this->moduleNameCssClass .= ' highlight-fields';
$this->title .= ' ('.Element_OphTrOperationbooking_Operation::model()->find('event_id=?', array($this->event->id))->status->name.')'?>
+
+
+
+
+
+
+
+
has_gp) {?>
+
+
+
+
+
+ Admission category:
+overnight_stay) ? 'An overnight stay' : 'Day case'?>
+
+
+
+ Total theatre time (mins):
+total_duration)?>
+
special_equipment)): ?>
diff --git a/protected/modules/OphTrOperationbooking/views/theatreDiary/index.php b/protected/modules/OphTrOperationbooking/views/theatreDiary/index.php
index a9a22b1e3f..26c3ddb244 100644
--- a/protected/modules/OphTrOperationbooking/views/theatreDiary/index.php
+++ b/protected/modules/OphTrOperationbooking/views/theatreDiary/index.php
@@ -18,11 +18,15 @@
*/
?>
@@ -92,12 +88,8 @@
Theatre Diaries
- +
+
+ renderPartial('//base/_messages'); ?>
+
+
-
+
Use the filters below to view Theatre schedules:
diff --git a/protected/modules/OphTrOperationbooking/views/whiteboard/header.php b/protected/modules/OphTrOperationbooking/views/whiteboard/header.php
index d51f66d9ba..c1aabef3d4 100644
--- a/protected/modules/OphTrOperationbooking/views/whiteboard/header.php
+++ b/protected/modules/OphTrOperationbooking/views/whiteboard/header.php
@@ -24,12 +24,6 @@
Refresh
refresh
-
endWidget()?>
diff --git a/protected/modules/OphTrOperationbooking/views/whiteboard/view.php b/protected/modules/OphTrOperationbooking/views/whiteboard/view.php
index b179006089..33ad41a006 100644
--- a/protected/modules/OphTrOperationbooking/views/whiteboard/view.php
+++ b/protected/modules/OphTrOperationbooking/views/whiteboard/view.php
@@ -78,11 +78,7 @@
Alpha-blockers
- alpha_blockers):?>
- Yes - alpha_blocker_name?>
-
- No
-
+ alpha_blocker_name?>
Anticoagulants
- anticoagulants):?>
- Yes - anticoagulant_name?>
- INR: inr?> - - No - + anticoagulant_name?>
+ INR: inr?>
- INR: inr?> - - No - + anticoagulant_name?>
+ INR: inr?>
-
diff --git a/protected/modules/OphTrOperationnote/views/default/form_Element_OphTrOperationnote_Cataract_OEEyeDraw_fields.php b/protected/modules/OphTrOperationnote/views/default/form_Element_OphTrOperationnote_Cataract_OEEyeDraw_fields.php
index 05a06d293a..9e0f1c9714 100644
--- a/protected/modules/OphTrOperationnote/views/default/form_Element_OphTrOperationnote_Cataract_OEEyeDraw_fields.php
+++ b/protected/modules/OphTrOperationnote/views/default/form_Element_OphTrOperationnote_Cataract_OEEyeDraw_fields.php
@@ -18,33 +18,53 @@
*/
?>
-dropDownList($element, 'incision_site_id', 'OphTrOperationnote_IncisionSite', array('empty' => '- Please select -', 'textAttribute' => 'data-value'), false, array('field' => 4))?>
-textField($element, 'length', array(), array(), array_merge($form->layoutColumns, array('field' => 3)))?>
-textField($element, 'meridian', array(), array(), array_merge($form->layoutColumns, array('field' => 3)))?>
-dropDownList($element, 'incision_type_id', 'OphTrOperationnote_IncisionType', array('empty' => '- Please select -', 'textAttribute' => 'data-value'), false, array('field' => 4))?>
-textArea($element, 'report', array(), false, array('rows' => 6))?>
+dropDownList($element, 'incision_site_id', 'OphTrOperationnote_IncisionSite',
+ array('empty' => '- Please select -', 'textAttribute' => 'data-value'), false, array('field' => 4)) ?>
+textField($element, 'length', array(), array(),
+ array_merge($form->layoutColumns, array('field' => 3))) ?>
+textField($element, 'meridian', array(), array(),
+ array_merge($form->layoutColumns, array('field' => 3))) ?>
+dropDownList($element, 'incision_type_id', 'OphTrOperationnote_IncisionType',
+ array('empty' => '- Please select -', 'textAttribute' => 'data-value'), false, array('field' => 4)) ?>
+textArea($element, 'report', array(), false, array('rows' => 6)) ?>
dropDownList($element, 'iol_type_id', array(
- CHtml::listData(OphTrOperationnote_IOLType::model()->activeOrPk($element->iol_type_id)->findAll(array('condition' => 'private=0', 'order' => 'display_order asc')), 'id', 'name'),
- CHtml::listData(OphTrOperationnote_IOLType::model()->activeOrPk($element->iol_type_id)->findAll(array('condition' => 'private=1', 'order' => 'display_order')), 'id', 'name'),
- ),
- array('empty' => '- Please select -', 'divided' => true), $element->iol_hidden, array('field' => 4))?>
-
-
+
+ PCR Risk
+ %
+
-
- renderPartial($element->form_view.'_OEEyeDraw', array(
+
+
+
-
- PCR Risk
- %
-
+
+ renderPartial($element->form_view . '_OEEyeDraw', array(
'element' => $element,
'form' => $form,
)); ?>
-
-
- renderPartial($element->form_view.'_OEEyeDraw_fields', array(
+
+
+ renderPartial($element->form_view . '_OEEyeDraw_fields', array(
'form' => $form,
'element' => $element,
)); ?>
-
-
-
-
+
+
+ renderPartial('application.views.default._pcr_risk_form',
array('form' => $form, 'element' => $element, 'side' => 'left'));
?>
-
-
-
+
+
+ renderPartial('application.views.default._pcr_risk_form',
array('form' => $form, 'element' => $element, 'side' => 'right'));
?>
-
-
-
+ CHtml::listData(OphTrOperationnote_IOLType::model()->activeOrPk($element->iol_type_id)->findAll(array(
+ 'condition' => 'private=0',
+ 'order' => 'display_order asc',
+ )), 'id', 'name'),
+ CHtml::listData(OphTrOperationnote_IOLType::model()->activeOrPk($element->iol_type_id)->findAll(array(
+ 'condition' => 'private=1',
+ 'order' => 'display_order',
+ )), 'id', 'name'),
+),
+ array('empty' => '- Please select -', 'divided' => true), $element->iol_hidden, array('field' => 4)) ?>
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-dropDownList($element, 'iol_position_id', 'OphTrOperationnote_IOLPosition', array('empty' => '- Please select -'), $element->iol_hidden, array('field' => 4))?>
-multiSelectList($element, 'OphTrOperationnote_CataractOperativeDevices', 'operative_devices', 'id', $this->getOperativeDeviceList($element), $this->getOperativeDeviceDefaults(), array('empty' => '- Devices -', 'label' => 'Devices'), false, false, null, false, false, array('field' => 4))?>
-multiSelectList($element, 'OphTrOperationnote_CataractComplications', 'complications', 'id', CHtml::listData(OphTrOperationnote_CataractComplications::model()->activeOrPk($element->cataractComplicationValues)->findAll(array('order' => 'display_order asc')), 'id', 'name'), null, array('empty' => '- Complications -', 'label' => 'Complications'), false, false, null, false, false, array('field' => 4))?>
-textArea($element, 'complication_notes', array(), false, array('rows' => 6))?>
-hiddenInput($element, 'pcr_risk')?>
\ No newline at end of file
+dropDownList($element, 'iol_position_id', 'OphTrOperationnote_IOLPosition',
+ array('empty' => '- Please select -'), $element->iol_hidden, array('field' => 4)) ?>
+multiSelectList($element, 'OphTrOperationnote_CataractOperativeDevices', 'operative_devices', 'id',
+ $this->getOperativeDeviceList($element), $this->getOperativeDeviceDefaults(),
+ array('empty' => '- Agents -', 'label' => 'Agents'), false, false, null, false, false, array('field' => 4)) ?>
+multiSelectList($element, 'OphTrOperationnote_CataractComplications', 'complications', 'id',
+ CHtml::listData(OphTrOperationnote_CataractComplications::model()->activeOrPk($element->cataractComplicationValues)->findAll(array('order' => 'display_order asc')),
+ 'id', 'name'), null, array('empty' => '- Complications -', 'label' => 'Complications'), false, false, null,
+ false, false, array('field' => 4)) ?>
+textArea($element, 'complication_notes', array(), false, array('rows' => 6)) ?>
+hiddenInput($element, 'pcr_risk') ?>
\ No newline at end of file
diff --git a/protected/modules/OphTrOperationnote/views/default/select_event.php b/protected/modules/OphTrOperationnote/views/default/select_event.php
index 6c07701b98..bc5ea54346 100644
--- a/protected/modules/OphTrOperationnote/views/default/select_event.php
+++ b/protected/modules/OphTrOperationnote/views/default/select_event.php
@@ -65,12 +65,17 @@
+
+
+
+
+
+
+
+
+
+
+
+ ->assetManager->createUrl('img/small.png', $assetAliasPath)?>)
-
+
operation->booking->session->NHSDate('date')?>
+
Operation
+
+
+ operation->comments; ?>
+
operation->procedures as $i => $procedure) {
if ($i > 0) { echo ''; } diff --git a/protected/tests/unit/components/PatientMergeTest.php b/protected/tests/unit/components/PatientMergeTest.php index 1e3a3e1624..6dadb800ad 100644 --- a/protected/tests/unit/components/PatientMergeTest.php +++ b/protected/tests/unit/components/PatientMergeTest.php @@ -43,26 +43,26 @@ public function setUp() public function testComparePatientDetails() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); - $primaryPatient = $this->patients('patient7'); - $secondaryPatient = $this->patients('patient8'); + $primary_patient = $this->patients('patient7'); + $secondary_patient = $this->patients('patient8'); - $result = $mergeHandler->comparePatientDetails($primaryPatient, $secondaryPatient); + $result = $merge_handler->comparePatientDetails($primary_patient, $secondary_patient); $this->assertTrue(is_array($result)); - $this->assertFalse($result['isConflict'], 'Personal details should be the same at this point.'); + $this->assertFalse($result['is_conflict'], 'Personal details should be the same at this point.'); $this->assertEmpty($result['details']); // Change the dob and gender - $primaryPatient->gender = 'M'; - $primaryPatient->dob = '1981-12-21'; + $primary_patient->gender = 'M'; + $primary_patient->dob = '1981-12-21'; - $primaryPatient->save(); + $primary_patient->save(); - $result = $mergeHandler->comparePatientDetails($primaryPatient, $secondaryPatient); + $result = $merge_handler->comparePatientDetails($primary_patient, $secondary_patient); - $this->assertTrue($result['isConflict'], 'Personal details should NOT be the same. Both DOB and Gender are different at this point.'); + $this->assertTrue($result['is_conflict'], 'Personal details should NOT be the same. Both DOB and Gender are different at this point.'); $this->assertEquals($result['details'][0]['column'], 'dob'); $this->assertEquals($result['details'][0]['primary'], '1981-12-21'); @@ -75,10 +75,10 @@ public function testComparePatientDetails() public function testUpdateEpisodesWhenPrimaryHasNoEpisodes() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); - $primaryPatient = $this->patients('patient7'); - $secondaryPatient = $this->patients('patient8'); + $primary_patient = $this->patients('patient7'); + $secondary_patient = $this->patients('patient8'); $episode7 = $this->episodes('episode7'); $episode7->patient_id = 1; @@ -88,15 +88,15 @@ public function testUpdateEpisodesWhenPrimaryHasNoEpisodes() $episode8->patient_id = 1; $episode8->save(); - $primaryPatient->refresh(); + $primary_patient->refresh(); // primary has no episodes - $this->assertEquals(count($primaryPatient->episodes), 0); + $this->assertEquals(count($primary_patient->episodes), 0); // at this pont the primary patient has no episodes and the secondary has // move the episodes , (secondary INTO primary) - $result = $mergeHandler->updateEpisodes($primaryPatient, $secondaryPatient); + $result = $merge_handler->updateEpisodes($primary_patient, $secondary_patient); $this->assertTrue($result); @@ -106,25 +106,25 @@ public function testUpdateEpisodesWhenPrimaryHasNoEpisodes() $episode10 = $this->episodes('episode10'); $this->assertEquals($episode10->patient_id, 7); - $secondaryPatient->refresh(); + $secondary_patient->refresh(); // secondary has no episodes - $this->assertEquals(count($secondaryPatient->episodes), 0); + $this->assertEquals(count($secondary_patient->episodes), 0); } public function testUpdateEpisodesWhenBothHaveEpisodesNoConflict() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); - $primaryPatient = $this->patients('patient7'); - $secondaryPatient = $this->patients('patient8'); + $primary_patient = $this->patients('patient7'); + $secondary_patient = $this->patients('patient8'); // this episode conflicts with episode7, so assign it to a different user to avoid the conflict $eposode9 = $this->episodes('episode9'); $eposode9->patient_id = 1; $eposode9->save(); - $secondaryPatient->refresh(); + $secondary_patient->refresh(); // now primary has Episode7 and Episode8 //secondary has Episode 10 @@ -138,10 +138,10 @@ public function testUpdateEpisodesWhenBothHaveEpisodesNoConflict() $eposode10 = $this->episodes('episode10'); $this->assertEquals($eposode10->patient_id, 8); - $this->assertEquals(2, count($primaryPatient->episodes)); - $this->assertEquals(1, count($secondaryPatient->episodes)); + $this->assertEquals(2, count($primary_patient->episodes)); + $this->assertEquals(1, count($secondary_patient->episodes)); - $result = $mergeHandler->updateEpisodes($primaryPatient, $secondaryPatient); + $result = $merge_handler->updateEpisodes($primary_patient, $secondary_patient); $this->assertTrue($result); @@ -155,45 +155,47 @@ public function testUpdateEpisodesWhenBothHaveEpisodesNoConflict() } /** - * We have to keep the newer/most recent episode - * so if the Secondary Episode is the older one than we flag it as deleted + * We have to keep the episode with greater status + * so if the Secondary Episode has greater status we flag it as deleted */ - public function testUpdateEpisodesWhenBothHaveEpisodesConflict_secondaryEpisodeOlder() + public function testUpdateEpisodesWhenBothHaveEpisodesConflict_secondaryEpisodeHasLessStatus() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); - // $primaryPatient has episode7 and episode8 - $primaryPatient = $this->patients('patient7'); // episode7 + // $primary_patient has episode7 and episode8 + $primary_patient = $this->patients('patient7'); // episode7 - // $secondaryPatient has episode9, episode10 - $secondaryPatient = $this->patients('patient8'); //episode9 + // $secondary_patient has episode9, episode10 + $secondary_patient = $this->patients('patient8'); //episode9 $episode7 = $this->episodes('episode7'); - $episode7->created_date = date('Y-m-d', strtotime('-15 days')); + $episode7->episode_status_id = 5; + $episode7->start_date = date('Y-m-d', strtotime('-30 days')); + $episode7->end_date = date('Y-m-d', strtotime('-15 days')); $episode7->save(); $episode9 = $this->episodes('episode9'); - $episode9->created_date = date('Y-m-d', strtotime('-30 days')); + $episode9->episode_status_id = 2; + $episode9->start_date = date('Y-m-d', strtotime('-20 days')); + $episode9->end_date = date('Y-m-d', strtotime('-10 days')); $episode9->save(); + + $this->assertTrue($episode7->status->order > $episode9->status->order); - // conflicting episodes : - // episode7 <-> episode9 - - $this->assertTrue($episode7->created_date > $episode9->created_date); - $this->assertEquals(count($primaryPatient->episodes), 2); - $this->assertEquals(count($secondaryPatient->episodes), 2); + $this->assertEquals(count($primary_patient->episodes), 2); + $this->assertEquals(count($secondary_patient->episodes), 2); // move the episodes , (secondary INTO primary) - $result = $mergeHandler->updateEpisodes($primaryPatient, $secondaryPatient); + $result = $merge_handler->updateEpisodes($primary_patient, $secondary_patient); - $this->assertTrue($result, 'Merge result FALSE.'); + $episode7->refresh(); + $this->assertEquals( date('Y-m-d 00:00:00', strtotime('-30 days')), $episode7->start_date ); + $this->assertEquals( date('Y-m-d 00:00:00', strtotime('-10 days')), $episode7->end_date ); - // The conflicting episodes: - // episode9 created 30 days ago and the episode7 created 15 days ago - // as we keep the older episode we move events from episode7 to episode9 than move episode9 to Patient7 + $this->assertTrue($result, 'Merge result FALSE.'); - $this->assertEquals(count($primaryPatient->episodes), 2); + $this->assertEquals(count($primary_patient->episodes), 2); $event16 = $this->events('event16'); $this->assertEquals($event16->episode_id, 9); @@ -219,34 +221,48 @@ public function testUpdateEpisodesWhenBothHaveEpisodesConflict_secondaryEpisodeO $episode10->refresh(); $this->assertEquals($episode10->patient_id, 7); - $secondaryPatient->refresh(); - $this->assertEquals(count($secondaryPatient->episodes), 0); + $secondary_patient->refresh(); + $this->assertEquals(count($secondary_patient->episodes), 0); - $primaryPatient->refresh(); - $this->assertEquals(count($primaryPatient->episodes), 3); + $primary_patient->refresh(); + $this->assertEquals(count($primary_patient->episodes), 3); } - public function testUpdateEpisodesWhenBothHaveEpisodesConflict_primaryEpisodeOlder() + public function testUpdateEpisodesWhenBothHaveEpisodesConflict_primaryEpisodeHasLessStatus() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); - // $primaryPatient has episode7 and episode8 - $primaryPatient = $this->patients('patient7'); + // $primary_patient has episode7 and episode8 + $primary_patient = $this->patients('patient7'); - // $secondaryPatient has episode9, episode10 - $secondaryPatient = $this->patients('patient8'); + // $secondary_patient has episode9, episode10 + $secondary_patient = $this->patients('patient8'); // conflicting episodes : // episode7 <-> episode9 $episode7 = $this->episodes('episode7'); + $episode7->episode_status_id = 2; + $episode7->start_date = date('Y-m-d', strtotime('-20 days')); + $episode7->end_date = date('Y-m-d', strtotime('-10 days')); + $episode7->save(); + $episode9 = $this->episodes('episode9'); - $this->assertTrue($episode7->created_date < $episode9->created_date); + $episode9->episode_status_id = 5; + $episode9->start_date = date('Y-m-d', strtotime('-30 days')); + $episode9->end_date = null; + $episode9->save(); + + $this->assertTrue($episode7->status->order < $episode9->status->order); - $this->assertEquals(count($primaryPatient->episodes), 2); - $this->assertEquals(count($secondaryPatient->episodes), 2); + $this->assertEquals(count($primary_patient->episodes), 2); + $this->assertEquals(count($secondary_patient->episodes), 2); - $result = $mergeHandler->updateEpisodes($primaryPatient, $secondaryPatient); + $result = $merge_handler->updateEpisodes($primary_patient, $secondary_patient); + + $episode9->refresh(); + $this->assertEquals( date('Y-m-d 00:00:00', strtotime('-30 days')), $episode9->start_date ); + $this->assertEquals( null, $episode9->end_date ); $this->assertTrue($result, 'Merge result FALSE.'); @@ -273,22 +289,22 @@ public function testUpdateEpisodesWhenBothHaveEpisodesConflict_primaryEpisodeOld $episode8 = $this->episodes('episode8'); $this->assertEquals($episode8->patient_id, 7); - $secondaryPatient->refresh(); - $this->assertEquals(count($secondaryPatient->episodes), 0); + $secondary_patient->refresh(); + $this->assertEquals(count($secondary_patient->episodes), 0); - $primaryPatient->refresh(); - $this->assertEquals(count($primaryPatient->episodes), 3); + $primary_patient->refresh(); + $this->assertEquals(count($primary_patient->episodes), 3); } public function testUpdateLegacyEpisodes_primaryNoLegacyEpisodes() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); - // $primaryPatient has episode7 and episode8 - $primaryPatient = $this->patients('patient7'); + // $primary_patient has episode7 and episode8 + $primary_patient = $this->patients('patient7'); - // $secondaryPatient has episode9, episode10 - $secondaryPatient = $this->patients('patient8'); + // $secondary_patient has episode9, episode10 + $secondary_patient = $this->patients('patient8'); // Lets modify the episodes to have a legacy episode @@ -300,9 +316,9 @@ public function testUpdateLegacyEpisodes_primaryNoLegacyEpisodes() $episode9->save(); $this->assertEquals(1, $episode9->legacy); - $primaryPatient->refresh(); + $primary_patient->refresh(); - $result = $mergeHandler->updateLegacyEpisodes($primaryPatient, $secondaryPatient); + $result = $merge_handler->updateLegacyEpisodes($primary_patient, $secondary_patient); $this->assertTrue($result, 'Merge result FALSE.'); @@ -311,22 +327,22 @@ public function testUpdateLegacyEpisodes_primaryNoLegacyEpisodes() $episode9 = $this->episodes('episode9'); $this->assertEquals($episode9->patient_id, 7); - $secondaryPatient->refresh(); - $this->assertEquals(count($secondaryPatient->legacyepisodes), 0); + $secondary_patient->refresh(); + $this->assertEquals(count($secondary_patient->legacyepisodes), 0); - $primaryPatient->refresh(); - $this->assertEquals(count($primaryPatient->legacyepisodes), 1); + $primary_patient->refresh(); + $this->assertEquals(count($primary_patient->legacyepisodes), 1); } public function testUpdateLegacyEpisodes_bothHaveLegacyEpisodes_secondaryOlder() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); - // $primaryPatient has episode7 and episode8 - $primaryPatient = $this->patients('patient7'); + // $primary_patient has episode7 and episode8 + $primary_patient = $this->patients('patient7'); - // $secondaryPatient has episode9, episode10 - $secondaryPatient = $this->patients('patient8'); + // $secondary_patient has episode9, episode10 + $secondary_patient = $this->patients('patient8'); // Lets modify the episodes to have a legacy episode @@ -346,7 +362,7 @@ public function testUpdateLegacyEpisodes_bothHaveLegacyEpisodes_secondaryOlder() $this->assertTrue($episode7->created_date > $episode9->created_date); - $result = $mergeHandler->updateLegacyEpisodes($primaryPatient, $secondaryPatient); + $result = $merge_handler->updateLegacyEpisodes($primary_patient, $secondary_patient); $this->assertTrue($result, 'Merge result FALSE.'); @@ -361,23 +377,23 @@ public function testUpdateLegacyEpisodes_bothHaveLegacyEpisodes_secondaryOlder() $this->assertEquals($episode9->patient_id, 7); $this->assertEquals(count($episode9->events), 4); - $primaryPatient->refresh(); - $this->assertEquals(count($primaryPatient->legacyepisodes), 1); - $this->assertEquals(count($primaryPatient->legacyepisodes[0]->events), 4); + $primary_patient->refresh(); + $this->assertEquals(count($primary_patient->legacyepisodes), 1); + $this->assertEquals(count($primary_patient->legacyepisodes[0]->events), 4); - $secondaryPatient->refresh(); - $this->assertEquals(count($secondaryPatient->legacyepisodes), 0); + $secondary_patient->refresh(); + $this->assertEquals(count($secondary_patient->legacyepisodes), 0); } public function testUpdateLegacyEpisodes_bothHaveLegacyEpisodes_primaryOlder() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); - // $primaryPatient has episode7 and episode8 - $primaryPatient = $this->patients('patient7'); + // $primary_patient has episode7 and episode8 + $primary_patient = $this->patients('patient7'); - // $secondaryPatient has episode9, episode10 - $secondaryPatient = $this->patients('patient8'); + // $secondary_patient has episode9, episode10 + $secondary_patient = $this->patients('patient8'); // Lets modify the episodes to have a legacy episode @@ -395,7 +411,7 @@ public function testUpdateLegacyEpisodes_bothHaveLegacyEpisodes_primaryOlder() $this->assertTrue($episode7->created_date < $episode9->created_date); - $result = $mergeHandler->updateLegacyEpisodes($primaryPatient, $secondaryPatient); + $result = $merge_handler->updateLegacyEpisodes($primary_patient, $secondary_patient); $this->assertTrue($result, 'Merge result FALSE.'); @@ -411,16 +427,16 @@ public function testUpdateLegacyEpisodes_bothHaveLegacyEpisodes_primaryOlder() $episode9->refresh(); $this->assertEquals(count($episode9->events), 0); - $primaryPatient->refresh(); - $this->assertEquals(count($primaryPatient->legacyepisodes), 1); + $primary_patient->refresh(); + $this->assertEquals(count($primary_patient->legacyepisodes), 1); - $secondaryPatient->refresh(); - $this->assertEquals(count($secondaryPatient->legacyepisodes), 0); + $secondary_patient->refresh(); + $this->assertEquals(count($secondary_patient->legacyepisodes), 0); } public function testUpdateAllergyAssignments_primaryHasNoAllergyAssignments() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); $assignment1 = $this->patient_allergy_assignment('assignment1'); $assignment2 = $this->patient_allergy_assignment('assignment2'); @@ -428,43 +444,43 @@ public function testUpdateAllergyAssignments_primaryHasNoAllergyAssignments() $assignment1->patient_id = 1; $assignment1->save(); - $primaryPatient = $this->patients('patient7'); - $secondaryPatient = $this->patients('patient8'); + $primary_patient = $this->patients('patient7'); + $secondary_patient = $this->patients('patient8'); - $this->assertEquals(count($primaryPatient->allergyAssignments), 0); - $this->assertEquals(count($secondaryPatient->allergyAssignments), 1); + $this->assertEquals(count($primary_patient->allergyAssignments), 0); + $this->assertEquals(count($secondary_patient->allergyAssignments), 1); - $result = $mergeHandler->updateAllergyAssignments($primaryPatient, $secondaryPatient); + $result = $merge_handler->updateAllergyAssignments($primary_patient, $secondary_patient); - $primaryPatient->refresh(); - $secondaryPatient->refresh(); + $primary_patient->refresh(); + $secondary_patient->refresh(); $this->assertTrue($result, 'Update Allergy Assigmant FAILED.'); $assignment2->refresh(); $this->assertEquals($assignment2->patient_id, 7); - $this->assertEquals(count($primaryPatient->allergyAssignments), 1); - $this->assertEquals(count($secondaryPatient->allergyAssignments), 0); + $this->assertEquals(count($primary_patient->allergyAssignments), 1); + $this->assertEquals(count($secondary_patient->allergyAssignments), 0); } public function testUpdateAllergyAssignments_bothHaveDifferentAllergyAssignments() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); $assignment1 = $this->patient_allergy_assignment('assignment1'); $assignment2 = $this->patient_allergy_assignment('assignment2'); - $primaryPatient = $this->patients('patient7'); - $secondaryPatient = $this->patients('patient8'); + $primary_patient = $this->patients('patient7'); + $secondary_patient = $this->patients('patient8'); - $this->assertEquals(count($primaryPatient->allergyAssignments), 1); - $this->assertEquals(count($secondaryPatient->allergyAssignments), 1); + $this->assertEquals(count($primary_patient->allergyAssignments), 1); + $this->assertEquals(count($secondary_patient->allergyAssignments), 1); - $result = $mergeHandler->updateAllergyAssignments($primaryPatient, $secondaryPatient); + $result = $merge_handler->updateAllergyAssignments($primary_patient, $secondary_patient); - $primaryPatient->refresh(); - $secondaryPatient->refresh(); + $primary_patient->refresh(); + $secondary_patient->refresh(); $this->assertTrue($result, 'Update Allergy Assigmant FAILED.'); @@ -474,13 +490,13 @@ public function testUpdateAllergyAssignments_bothHaveDifferentAllergyAssignments $assignment2->refresh(); $this->assertEquals($assignment2->patient_id, 7); - $this->assertEquals(count($primaryPatient->allergyAssignments), 2); - $this->assertEquals(count($secondaryPatient->allergyAssignments), 0); + $this->assertEquals(count($primary_patient->allergyAssignments), 2); + $this->assertEquals(count($secondary_patient->allergyAssignments), 0); } public function testUpdateAllergyAssignments_bothHaveSameAllergyAssignments() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); $assignment1 = $this->patient_allergy_assignment('assignment1'); $assignment2 = $this->patient_allergy_assignment('assignment2'); @@ -491,16 +507,16 @@ public function testUpdateAllergyAssignments_bothHaveSameAllergyAssignments() $this->assertEquals($assignment1->allergy_id, $assignment2->allergy_id); - $primaryPatient = $this->patients('patient7'); - $secondaryPatient = $this->patients('patient8'); + $primary_patient = $this->patients('patient7'); + $secondary_patient = $this->patients('patient8'); - $this->assertEquals(count($primaryPatient->allergyAssignments), 1); - $this->assertEquals(count($secondaryPatient->allergyAssignments), 1); + $this->assertEquals(count($primary_patient->allergyAssignments), 1); + $this->assertEquals(count($secondary_patient->allergyAssignments), 1); - $result = $mergeHandler->updateAllergyAssignments($primaryPatient, $secondaryPatient); + $result = $merge_handler->updateAllergyAssignments($primary_patient, $secondary_patient); - $primaryPatient->refresh(); - $secondaryPatient->refresh(); + $primary_patient->refresh(); + $secondary_patient->refresh(); $assignment1->refresh(); $this->assertEquals($assignment1->patient_id, 7); @@ -515,104 +531,172 @@ public function testUpdateRiskAssignments() public function testUpdatePreviousOperations() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); - $primaryPatient = $this->patients('patient7'); - $secondaryPatient = $this->patients('patient8'); + $primary_patient = $this->patients('patient7'); + $secondary_patient = $this->patients('patient8'); - $previousOperation1 = $this->previous_operation('previousOperation1'); + $previous_operation1 = $this->previous_operation('previousOperation1'); - $previousOperation1->patient_id = 8; - $previousOperation1->save(); - $previousOperation1->refresh(); + $previous_operation1->patient_id = 8; + $previous_operation1->save(); + $previous_operation1->refresh(); // Before we update the Previous Operations we check if the patient id is equals to the secondary patient id - $this->assertEquals(8, $previousOperation1->patient_id); + $this->assertEquals(8, $previous_operation1->patient_id); - $primaryPatient->refresh(); - $secondaryPatient->refresh(); - $this->assertEquals(0, count($primaryPatient->previousOperations) ); - $this->assertEquals(1, count($secondaryPatient->previousOperations) ); + $primary_patient->refresh(); + $secondary_patient->refresh(); + $this->assertEquals(0, count($primary_patient->previousOperations) ); + $this->assertEquals(1, count($secondary_patient->previousOperations) ); - $mergeHandler->updatePreviousOperations($primaryPatient, $secondaryPatient->previousOperations); + $merge_handler->updatePreviousOperations($primary_patient, $secondary_patient->previousOperations); - $primaryPatient->refresh(); - $secondaryPatient->refresh(); - $this->assertTrue(is_array($secondaryPatient->previousOperations)); + $primary_patient->refresh(); + $secondary_patient->refresh(); + $this->assertTrue(is_array($secondary_patient->previousOperations)); - $this->assertEquals(0, count($secondaryPatient->previousOperations) ); - $this->assertEquals(1, count($primaryPatient->previousOperations) ); + $this->assertEquals(0, count($secondary_patient->previousOperations) ); + $this->assertEquals(1, count($primary_patient->previousOperations) ); - $previousOperation1->refresh(); + $previous_operation1->refresh(); - $this->assertEquals(7, $previousOperation1->patient_id); + $this->assertEquals(7, $previous_operation1->patient_id); } public function testUpdateOphthalmicDiagnoses() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); - $primaryPatient = $this->patients('patient7'); - $secondaryPatient = $this->patients('patient8'); + $primary_patient = $this->patients('patient7'); + $secondary_patient = $this->patients('patient8'); - $secondaryDiagnoses8 = $this->secondary_diagnosis('secondaryDiagnoses8'); - $secondaryDiagnoses8->patient_id = 8; - $secondaryDiagnoses8->save(); - $secondaryDiagnoses8->refresh(); + $secondary_diagnoses8 = $this->secondary_diagnosis('secondaryDiagnoses8'); + $secondary_diagnoses8->patient_id = 8; + $secondary_diagnoses8->save(); + $secondary_diagnoses8->refresh(); // Before we update the Ophthalmic Diagnoses we check if the patient id is equals to the secondary patient id - $this->assertEquals(8, $secondaryDiagnoses8->patient_id); + $this->assertEquals(8, $secondary_diagnoses8->patient_id); - $secondaryPatient->refresh(); - $this->assertTrue(is_array($secondaryPatient->ophthalmicDiagnoses) ); - $this->assertEquals(1, count($secondaryPatient->ophthalmicDiagnoses) ); + $secondary_patient->refresh(); + $this->assertTrue(is_array($secondary_patient->ophthalmicDiagnoses) ); + $this->assertEquals(1, count($secondary_patient->ophthalmicDiagnoses) ); - $mergeHandler->updateOphthalmicDiagnoses($primaryPatient, $secondaryPatient->ophthalmicDiagnoses); + $merge_handler->updateOphthalmicDiagnoses($primary_patient, $secondary_patient->ophthalmicDiagnoses); - $secondaryDiagnoses8->refresh(); - $secondaryPatient->refresh(); + $secondary_diagnoses8->refresh(); + $secondary_patient->refresh(); - $this->assertEquals(0, count($secondaryPatient->ophthalmicDiagnoses) ); + $this->assertEquals(0, count($secondary_patient->ophthalmicDiagnoses) ); - $this->assertEquals(7, $secondaryDiagnoses8->patient_id); + $this->assertEquals(7, $secondary_diagnoses8->patient_id); } public function testUpdateSystemicDiagnoses() { - $mergeHandler = new PatientMerge(); + $merge_handler = new PatientMerge(); - $primaryPatient = $this->patients('patient7'); - $secondaryPatient = $this->patients('patient8'); - - $secondaryDiagnoses8 = $this->secondary_diagnosis('secondaryDiagnoses8'); - $secondaryDiagnoses8->patient_id = 8; - $secondaryDiagnoses8->disorder_id = 5; - $secondaryDiagnoses8->save(); - $secondaryDiagnoses8->refresh(); + $primary_patient = $this->patients('patient7'); + $secondary_patient = $this->patients('patient8'); + $secondary_diagnoses8 = $this->secondary_diagnosis('secondaryDiagnoses8'); + $secondary_diagnoses8->patient_id = 8; + $secondary_diagnoses8->disorder_id = 5; + $secondary_diagnoses8->save(); + $secondary_diagnoses8->refresh(); + // Befor we update the Ophthalmic Diagnoses we check if the patient id is equals to the secondary patient id - $this->assertEquals(8, $secondaryDiagnoses8->patient_id); - $this->assertEquals(5, $secondaryDiagnoses8->disorder_id); + $this->assertEquals(8, $secondary_diagnoses8->patient_id); + $this->assertEquals(5, $secondary_diagnoses8->disorder_id); - $secondaryPatient->refresh(); - $this->assertTrue(is_array($secondaryPatient->systemicDiagnoses) ); - $this->assertEquals(1, count($secondaryPatient->systemicDiagnoses) ); + $secondary_patient->refresh(); + $this->assertTrue(is_array($secondary_patient->systemicDiagnoses) ); + $this->assertEquals(1, count($secondary_patient->systemicDiagnoses) ); - $mergeHandler->updateOphthalmicDiagnoses($primaryPatient, $secondaryPatient->systemicDiagnoses); + $merge_handler->updateOphthalmicDiagnoses($primary_patient, $secondary_patient->systemicDiagnoses); - $secondaryDiagnoses8->refresh(); + $secondary_diagnoses8->refresh(); - $this->assertEquals(7, $secondaryDiagnoses8->patient_id); + $this->assertEquals(7, $secondary_diagnoses8->patient_id); - $this->assertEquals(0, count($secondaryPatient->systemicDiagnoses) ); - $this->assertEquals(1, count($primaryPatient->systemicDiagnoses) ); + $this->assertEquals(0, count($secondary_patient->systemicDiagnoses) ); + $this->assertEquals(1, count($primary_patient->systemicDiagnoses) ); } - + public function testGetTwoEpisodesStartEndDate() + { + $merge_handler = new PatientMerge(); + + $episode7 = $this->episodes('episode7'); + $episode7->start_date = date('Y-m-d', strtotime('-30 days')); + $episode7->end_date = date('Y-m-d', strtotime('-15 days')); + $episode7->save(); + + $episode9 = $this->episodes('episode9'); + $episode9->start_date = date('Y-m-d', strtotime('-20 days')); + $episode9->end_date = date('Y-m-d', strtotime('-10 days')); + $episode9->save(); + + list($start_date, $end_date) = $merge_handler->getTwoEpisodesStartEndDate($episode7, $episode9); + + $this->assertEquals($start_date, $episode7->start_date); + $this->assertEquals($end_date, $episode9->end_date); + + /******/ + + $episode7->start_date = date('Y-m-d', strtotime('-20 days')); + $episode7->save(); + + $episode9->start_date = date('Y-m-d', strtotime('-30 days')); + $episode9->save(); + + list($start_date, $end_date) = $merge_handler->getTwoEpisodesStartEndDate($episode7, $episode9); + + $this->assertEquals($start_date, $episode9->start_date); + $this->assertEquals($end_date, $episode9->end_date); + + /******/ + + $episode7->end_date = null; + $episode7->save(); + + list($start_date, $end_date) = $merge_handler->getTwoEpisodesStartEndDate($episode7, $episode9); + + $this->assertEquals($start_date, $episode9->start_date); + $this->assertEquals($end_date, null); + + /******/ + + $episode7->end_date = date('Y-m-d', strtotime('-15 days')); + $episode7->save(); + + $episode9->end_date = null; + $episode9->save(); + + list($start_date, $end_date) = $merge_handler->getTwoEpisodesStartEndDate($episode7, $episode9); + + $this->assertEquals($start_date, $episode9->start_date); + $this->assertEquals($end_date, null); + + /******/ + + $episode7->end_date = date('Y-m-d', strtotime('-10 days')); + $episode7->save(); + + $episode9->end_date = date('Y-m-d', strtotime('-15 days')); + $episode9->save(); + + list($start_date, $end_date) = $merge_handler->getTwoEpisodesStartEndDate($episode7, $episode9); + + $this->assertEquals($start_date, $episode9->start_date); + $this->assertEquals($end_date, $episode7->end_date); + + } public function testIsSecondaryPatientDeleted() { diff --git a/protected/views/admin/commissioning_body_services.php b/protected/views/admin/commissioning_body_services.php index 5bf229cd87..33fced8d5c 100644 --- a/protected/views/admin/commissioning_body_services.php +++ b/protected/views/admin/commissioning_body_services.php @@ -49,7 +49,7 @@ with = array('commissioning_body'); - $criteria->order = 't.name asc'; + $criteria->order = 'LOWER(t.name) asc'; if (isset($commissioning_bt)) { $criteria->addColumnCondition(array('commissioning_body.commissioning_body_type_id' => $commissioning_bt->id)); diff --git a/protected/views/admin/worklists/definition_worklists_delete.php b/protected/views/admin/worklists/definition_worklists_delete.php index 41df83c1d3..fa27cffbc2 100644 --- a/protected/views/admin/worklists/definition_worklists_delete.php +++ b/protected/views/admin/worklists/definition_worklists_delete.php @@ -19,7 +19,7 @@
Confirm Delete
Are you sure you want to delete all the instances for the worklist definition name ?>? - There are currently worklists) ?> instances that have been generated.
+ There are currently getWorklistCount() ?> instances that have been generated.