diff --git a/onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessing.xlsx b/onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessing.xlsx deleted file mode 100644 index 9979a28d5..000000000 Binary files a/onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessing.xlsx and /dev/null differ diff --git a/onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessingTemplate.xlsx b/onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessingTemplate.xlsx old mode 100644 new mode 100755 index bae51e026..66f764b22 Binary files a/onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessingTemplate.xlsx and b/onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessingTemplate.xlsx differ diff --git a/onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessingTemplate_TPR_Master.xlsx b/onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessingTemplate_TPR_Master.xlsx old mode 100644 new mode 100755 index d3affcd46..a3ff5ddee Binary files a/onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessingTemplate_TPR_Master.xlsx and b/onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessingTemplate_TPR_Master.xlsx differ diff --git a/onprc_ehr/resources/web/onprc_ehr/window/ClinicalMassProcessing.js b/onprc_ehr/resources/web/onprc_ehr/window/ClinicalMassProcessing.js index 74cb01ae1..9633f508b 100644 --- a/onprc_ehr/resources/web/onprc_ehr/window/ClinicalMassProcessing.js +++ b/onprc_ehr/resources/web/onprc_ehr/window/ClinicalMassProcessing.js @@ -305,6 +305,8 @@ Ext4.define('ONPRC_EHR.window.ClinicalProcessingWindow', { {snomedcode = 'F-31030'} if (row[7]== 3 ) {snomedcode = 'F-31040'} + if (row[7]== 'No' ) + {snomedcode = 'F-30980'} var obj = { Id: id, date: this.getTime(date, times, errors, rowIdx), diff --git a/onprc_ehr/resources/web/onprc_ehr/window/ClinicalMassProcessing_TPR.js b/onprc_ehr/resources/web/onprc_ehr/window/ClinicalMassProcessing_TPR.js index 3c7d37472..f883a9b76 100644 --- a/onprc_ehr/resources/web/onprc_ehr/window/ClinicalMassProcessing_TPR.js +++ b/onprc_ehr/resources/web/onprc_ehr/window/ClinicalMassProcessing_TPR.js @@ -420,6 +420,8 @@ Ext4.define('ONPRC_EHR.window.ClinicalProcessingTPRWindow', { {snomedcode = 'F-31030'} if (row[10]== 3 ) {snomedcode = 'F-31040'} + if (row[10]== 'No' ) + {snomedcode = 'F-30980'} var obj = { Id: id, date: this.getTime(date, times, errors, rowIdx),