treatment record revised

scheduler time format fixed
Merge branch 'treatment-record-revision' into development
Merge remote-tracking branch 'origin/development' into mic_branch