diff --git a/netforce_clinic/actions/clinic_report_hd_detail.xml b/netforce_clinic/actions/clinic_report_hd_case_detail.xml similarity index 57% rename from netforce_clinic/actions/clinic_report_hd_detail.xml rename to netforce_clinic/actions/clinic_report_hd_case_detail.xml index 523c839..f7ac6e9 100644 --- a/netforce_clinic/actions/clinic_report_hd_detail.xml +++ b/netforce_clinic/actions/clinic_report_hd_case_detail.xml @@ -1,8 +1,8 @@ --> HD Report Detail report - clinic.report.hd.detail - report_hd_detail - report_hd_detail + clinic.report.hd.case.detail + report_hd_case_detail + report_hd_case_detail clinic_menu diff --git a/netforce_clinic/actions/clinic_report_hd_medical.xml b/netforce_clinic/actions/clinic_report_hd_case_medical.xml similarity index 56% rename from netforce_clinic/actions/clinic_report_hd_medical.xml rename to netforce_clinic/actions/clinic_report_hd_case_medical.xml index 09b0345..f3f29d2 100644 --- a/netforce_clinic/actions/clinic_report_hd_medical.xml +++ b/netforce_clinic/actions/clinic_report_hd_case_medical.xml @@ -1,8 +1,8 @@ Medical Report Summary report - clinic.report.hd.medical - report_hd_medical - report_hd_medical + clinic.report.hd.case.medical + report_hd_case_medical + report_hd_case_medical clinic_menu diff --git a/netforce_clinic/actions/clinic_report_hd_payment.xml b/netforce_clinic/actions/clinic_report_hd_case_payment.xml similarity index 56% rename from netforce_clinic/actions/clinic_report_hd_payment.xml rename to netforce_clinic/actions/clinic_report_hd_case_payment.xml index 54ad850..75cdbaa 100644 --- a/netforce_clinic/actions/clinic_report_hd_payment.xml +++ b/netforce_clinic/actions/clinic_report_hd_case_payment.xml @@ -1,8 +1,8 @@ Payment Report Summary report - clinic.report.hd.payment - report_hd_payment - report_hd_payment + clinic.report.hd.case.payment + report_hd_case_payment + report_hd_case_payment clinic_menu diff --git a/netforce_clinic/actions/clinic_report_hd_summary.xml b/netforce_clinic/actions/clinic_report_hd_case_summary.xml similarity index 56% rename from netforce_clinic/actions/clinic_report_hd_summary.xml rename to netforce_clinic/actions/clinic_report_hd_case_summary.xml index 354018e..6b99d6b 100644 --- a/netforce_clinic/actions/clinic_report_hd_summary.xml +++ b/netforce_clinic/actions/clinic_report_hd_case_summary.xml @@ -1,8 +1,8 @@ HD Report Summary report - clinic.report.hd.summary - report_hd_summary - report_hd_summary + clinic.report.hd.case.summary + report_hd_case_summary + report_hd_case_summary clinic_menu diff --git a/netforce_clinic/actions/clinic_schedule.xml b/netforce_clinic/actions/clinic_schedule.xml index 2b0b1b1..4e93a76 100644 --- a/netforce_clinic/actions/clinic_schedule.xml +++ b/netforce_clinic/actions/clinic_schedule.xml @@ -1,5 +1,5 @@ - Schedules + Nurse Schedules multi_view clinic.schedule calendar,list,page,form diff --git a/netforce_clinic/layouts/clinic_gen_visit_form.xml b/netforce_clinic/layouts/clinic_gen_visit_form.xml index 0add4fe..b1e0e99 100644 --- a/netforce_clinic/layouts/clinic_gen_visit_form.xml +++ b/netforce_clinic/layouts/clinic_gen_visit_form.xml @@ -7,8 +7,8 @@ - + @@ -20,10 +20,11 @@ + - + @@ -32,7 +33,7 @@ - + diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml index 41721f8..b8144e6 100644 --- a/netforce_clinic/layouts/clinic_menu.xml +++ b/netforce_clinic/layouts/clinic_menu.xml @@ -24,24 +24,28 @@ - + - + - - - - - - " + + + +
+ +
+ + + " + diff --git a/netforce_clinic/layouts/clinic_report_hd_detail.xml b/netforce_clinic/layouts/clinic_report_hd_case_detail.xml similarity index 78% rename from netforce_clinic/layouts/clinic_report_hd_detail.xml rename to netforce_clinic/layouts/clinic_report_hd_case_detail.xml index 778daa9..3f7746c 100644 --- a/netforce_clinic/layouts/clinic_report_hd_detail.xml +++ b/netforce_clinic/layouts/clinic_report_hd_case_detail.xml @@ -1,7 +1,6 @@ -
+ - diff --git a/netforce_clinic/layouts/clinic_report_hd_medical.xml b/netforce_clinic/layouts/clinic_report_hd_case_medical.xml similarity index 55% rename from netforce_clinic/layouts/clinic_report_hd_medical.xml rename to netforce_clinic/layouts/clinic_report_hd_case_medical.xml index e8244f7..3acd7f0 100644 --- a/netforce_clinic/layouts/clinic_report_hd_medical.xml +++ b/netforce_clinic/layouts/clinic_report_hd_case_medical.xml @@ -1,3 +1,3 @@ - + diff --git a/netforce_clinic/layouts/clinic_report_hd_payment.xml b/netforce_clinic/layouts/clinic_report_hd_case_payment.xml similarity index 88% rename from netforce_clinic/layouts/clinic_report_hd_payment.xml rename to netforce_clinic/layouts/clinic_report_hd_case_payment.xml index fb6e72e..cf0b891 100644 --- a/netforce_clinic/layouts/clinic_report_hd_payment.xml +++ b/netforce_clinic/layouts/clinic_report_hd_case_payment.xml @@ -1,4 +1,4 @@ -
+ diff --git a/netforce_clinic/layouts/clinic_report_hd_summary.xml b/netforce_clinic/layouts/clinic_report_hd_case_summary.xml similarity index 55% rename from netforce_clinic/layouts/clinic_report_hd_summary.xml rename to netforce_clinic/layouts/clinic_report_hd_case_summary.xml index decc455..f0b51b1 100644 --- a/netforce_clinic/layouts/clinic_report_hd_summary.xml +++ b/netforce_clinic/layouts/clinic_report_hd_case_summary.xml @@ -1,3 +1,3 @@ - + diff --git a/netforce_clinic/layouts/clinic_schedule_form.xml b/netforce_clinic/layouts/clinic_schedule_form.xml index 9ff4400..94982f5 100644 --- a/netforce_clinic/layouts/clinic_schedule_form.xml +++ b/netforce_clinic/layouts/clinic_schedule_form.xml @@ -7,7 +7,7 @@ - + diff --git a/netforce_clinic/layouts/clinic_schedule_list.xml b/netforce_clinic/layouts/clinic_schedule_list.xml index b4e3712..fe0c16c 100644 --- a/netforce_clinic/layouts/clinic_schedule_list.xml +++ b/netforce_clinic/layouts/clinic_schedule_list.xml @@ -1,6 +1,6 @@ - + diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py index cc3d146..63423e0 100644 --- a/netforce_clinic/models/__init__.py +++ b/netforce_clinic/models/__init__.py @@ -1,3 +1,4 @@ +from . import utils from . import setting from . import cause_chronic from . import comorbidity @@ -30,11 +31,11 @@ from . import cycle_item_doctor from . import cycle_item_line from . import gen_visit from . import gen_visit_line -from . import report_hd_detail -from . import report_hd_summary -from . import report_hd_medical -from . import report_hd_payment from . import report_clinic +from . import report_hd_case_detail +from . import report_hd_case_summary +from . import report_hd_case_medical +from . import report_hd_case_payment from . import fin_setting from . import import_data_mg from . import import_data_nhso diff --git a/netforce_clinic/models/report_hd_detail.py b/netforce_clinic/models/report_hd_case_detail.py similarity index 98% rename from netforce_clinic/models/report_hd_detail.py rename to netforce_clinic/models/report_hd_case_detail.py index 39a631d..e87dbce 100644 --- a/netforce_clinic/models/report_hd_detail.py +++ b/netforce_clinic/models/report_hd_case_detail.py @@ -3,8 +3,8 @@ import time from netforce.model import Model, fields, get_model -class ReportHDDetail(Model): - _name="clinic.report.hd.detail" +class ReportHDCaseDetail(Model): + _name="clinic.report.hd.case.detail" _string="Hemodialysis Report Detail" _transient=True @@ -159,4 +159,4 @@ class ReportHDDetail(Model): } return data -ReportHDDetail.register() +ReportHDCaseDetail.register() diff --git a/netforce_clinic/models/report_hd_medical.py b/netforce_clinic/models/report_hd_case_medical.py similarity index 100% rename from netforce_clinic/models/report_hd_medical.py rename to netforce_clinic/models/report_hd_case_medical.py diff --git a/netforce_clinic/models/report_hd_payment.py b/netforce_clinic/models/report_hd_case_payment.py similarity index 98% rename from netforce_clinic/models/report_hd_payment.py rename to netforce_clinic/models/report_hd_case_payment.py index 018063d..d6ad9b7 100644 --- a/netforce_clinic/models/report_hd_payment.py +++ b/netforce_clinic/models/report_hd_case_payment.py @@ -2,9 +2,8 @@ import time from netforce.model import Model, fields, get_model - -class ReportHDPayment(Model): - _name="clinic.report.hd.payment" +class ReportHDCasePayment(Model): + _name="clinic.report.hd.case.payment" _string="Hemodialysis Report Payment" _transient=True @@ -171,4 +170,4 @@ class ReportHDPayment(Model): } return data -ReportHDPayment.register() +ReportHDCasePayment.register() diff --git a/netforce_clinic/models/report_hd_summary.py b/netforce_clinic/models/report_hd_case_summary.py similarity index 77% rename from netforce_clinic/models/report_hd_summary.py rename to netforce_clinic/models/report_hd_case_summary.py index ca1e20b..eebc9da 100644 --- a/netforce_clinic/models/report_hd_summary.py +++ b/netforce_clinic/models/report_hd_case_summary.py @@ -3,10 +3,11 @@ import time from datetime import datetime from calendar import monthrange from netforce.model import Model, fields, get_model -#from netforce.access import get_active_company -class ReportHDSummary(Model): - _name="clinic.report.hd.summary" +from . import utils + +class ReportHDCaseSummary(Model): + _name="clinic.report.hd.case.summary" _string="Hemodialysis Report Summary" _transient=True @@ -33,17 +34,18 @@ class ReportHDSummary(Model): weekday, total_day=monthrange(year, month) #date_from="%s-%s-01"%(year,month) #date_to="%s-%s-%s"%(year,month,total_day) - month_str=datetime.strptime(date,'%Y-%m-%d').strftime("%B") + #month_str=datetime.strptime(date,'%Y-%m-%d').strftime("%B") + month_str=utils.MONTHS['th_TH'][int(datetime.strptime(date,'%Y-%m-%d').strftime('%m'))] next_month = str(month + 1) if next_month == 13: next_month = 12 - next_month_str=datetime.strptime(next_month,'%m').strftime("%B") + next_month_str=utils.MONTHS['th_TH'][int(datetime.strptime(next_month,'%m').strftime("%m"))] previous_month = month-1 if previous_month == 0: previous_month = 12 #tip previous_month=str(month-1 == 0 and 12 or month) - previous_month_str=datetime.strptime('%s'%previous_month,'%m').strftime("%B") + previous_month_str=utils.MONTHS['th_TH'][int(datetime.strptime('%s'%previous_month,'%m').strftime("%m"))] time_start='2014-%s-01'%(month) # 2014-10-20 time_stop='2014-%s-%s'%(month,total_day) @@ -51,8 +53,6 @@ class ReportHDSummary(Model): dom=[] - dom.append(['type','=','mg']) - patients_mg=len(get_model("clinic.patient").search(dom)) dom.append(['type','=','sc']) patients_sc=len(get_model("clinic.patient").search(dom)) dom.append(['type','=','nhso']) @@ -124,20 +124,13 @@ class ReportHDSummary(Model): 'date_to': time_stop, }, 'topic7': - { - 'month':'', - 'amount': patients_mg, - 'date_from': time_start, - 'date_to': time_stop, - }, - 'topic8': { 'month':'', 'amount': patients_nhso, 'date_from': time_start, 'date_to': time_stop, }, - 'topic9': + 'topic8': { 'month': '', 'amount': patients_pn, @@ -147,19 +140,41 @@ class ReportHDSummary(Model): } lines=[] - for item in get_model("clinic.translate").search_browse([]): - topic=item.org - line=items.get(topic,{}) - line['topic']=item.tr + index=1 + for item in items: + topic='topic%s'%index + name=utils.TOPICS[topic]['name'] + unit=utils.TOPICS[topic]['unit'] + line=items[topic] + line['topic']=name + line['unit']=unit lines.append(line) + index+=1 + + new_pt_lines=[] + for i in range(3): + new_pt_lines.append({ + 'no': i+1, + 'name': 'xxxxx', + 'note': '', + }) + + resign_pt_lines=[] + for i in range(5): + resign_pt_lines.append({ + 'no': i+1, + 'name': 'xxxxx', + 'note': '', + }) data={ 'month': month_str, 'year': year, 'lines': lines, + 'new_pt_lines': new_pt_lines, + 'resign_pt_lines': resign_pt_lines, 'company_name': company_name, } return data - -ReportHDSummary.register() +ReportHDCaseSummary.register() diff --git a/netforce_clinic/models/schedule.py b/netforce_clinic/models/schedule.py index 3689179..a195e60 100644 --- a/netforce_clinic/models/schedule.py +++ b/netforce_clinic/models/schedule.py @@ -1,9 +1,11 @@ +from datetime import datetime, timedelta + from netforce.model import Model, fields from netforce.access import get_active_company class Schedule(Model): _name="clinic.schedule" - _string="Schedule" + _string="Nurse Schedule" #_field_name="cycle_id" def _get_name(self,ids,context={}): @@ -25,6 +27,9 @@ class Schedule(Model): _defaults={ "company_id": lambda *a: get_active_company(), + 'time_start': lambda *a: datetime.now().strftime("%Y-%m-%d %H:%M:%S"), + 'time_stop': lambda *a: (datetime.now()+timedelta(seconds=3600)).strftime("%Y-%m-%d %H:%M:%S"), + 'state': 'draft', } def confirm(self,ids,context={}): diff --git a/netforce_clinic/models/utils.py b/netforce_clinic/models/utils.py new file mode 100644 index 0000000..826c402 --- /dev/null +++ b/netforce_clinic/models/utils.py @@ -0,0 +1,17 @@ +DAYS={ 'th_TH': ['จันทร์', 'อังคาร', 'พุธ', 'พฤหัสบดี', 'ศุกร์', 'เสาร์', 'อาทิตย์'] + , 'en_US': ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'] + } + +MONTHS={ 'th_TH': [None, 'มกราคม', 'กุมภาพันธ์', 'มีนาคม', 'เมษายน', 'พฤษภาคม', 'มิถุนายน', 'กรกฎาคม', 'สิงหาคม', 'กันยายน', 'ตุลาคม', 'พฤศจิกายน', 'ธันวาคม'] + , 'en_US': [None, 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] + } +TOPICS={ + 'topic1': {'name': 'จำนวนครั้งการทำ Hemodialysis', 'unit': 'ครั้ง'}, + 'topic2': {'name': 'จำนวนผู้ป่วยยกมาจากเดือน', 'unit': 'คน'}, + 'topic3': {'name': 'จำนวนผู้ป่วยรับใหม่เดือน', 'unit': 'คน'}, + 'topic4': {'name': 'จำนวนผู้ป่วยจำหน่ายเดือน', 'unit': 'คน'}, + 'topic5': {'name': 'จำนวนผู้ป่วยยกไปเดือน', 'unit': 'คน'}, + 'topic6': {'name': 'จำนวนผู้ป่วยเบิก ปกส.', 'unit': 'คน'}, + 'topic7': {'name': 'จำนวนผู้ป่วยเบิก สปกส.', 'unit': 'คน'}, + 'topic8': {'name': 'จำนวนผู้ป่วยจ่ายเอง', 'unit': 'คน'}, +} diff --git a/netforce_clinic/reports/report_hd_detail.xlsx b/netforce_clinic/reports/report_hd_case_detail.xlsx similarity index 100% rename from netforce_clinic/reports/report_hd_detail.xlsx rename to netforce_clinic/reports/report_hd_case_detail.xlsx diff --git a/netforce_clinic/reports/report_hd_medical.xlsx b/netforce_clinic/reports/report_hd_case_medical.xlsx similarity index 100% rename from netforce_clinic/reports/report_hd_medical.xlsx rename to netforce_clinic/reports/report_hd_case_medical.xlsx diff --git a/netforce_clinic/reports/report_hd_payment.xlsx b/netforce_clinic/reports/report_hd_case_payment.xlsx similarity index 100% rename from netforce_clinic/reports/report_hd_payment.xlsx rename to netforce_clinic/reports/report_hd_case_payment.xlsx diff --git a/netforce_clinic/reports/report_hd_summary.xlsx b/netforce_clinic/reports/report_hd_case_summary.xlsx similarity index 100% rename from netforce_clinic/reports/report_hd_summary.xlsx rename to netforce_clinic/reports/report_hd_case_summary.xlsx diff --git a/netforce_clinic/templates/report_hd_detail.hbs b/netforce_clinic/templates/report_hd_case_detail.hbs similarity index 100% rename from netforce_clinic/templates/report_hd_detail.hbs rename to netforce_clinic/templates/report_hd_case_detail.hbs diff --git a/netforce_clinic/templates/report_hd_medical.hbs b/netforce_clinic/templates/report_hd_case_medical.hbs similarity index 100% rename from netforce_clinic/templates/report_hd_medical.hbs rename to netforce_clinic/templates/report_hd_case_medical.hbs diff --git a/netforce_clinic/templates/report_hd_payment.hbs b/netforce_clinic/templates/report_hd_case_payment.hbs similarity index 100% rename from netforce_clinic/templates/report_hd_payment.hbs rename to netforce_clinic/templates/report_hd_case_payment.hbs diff --git a/netforce_clinic/templates/report_hd_case_summary.hbs b/netforce_clinic/templates/report_hd_case_summary.hbs new file mode 100644 index 0000000..9724b88 --- /dev/null +++ b/netforce_clinic/templates/report_hd_case_summary.hbs @@ -0,0 +1,99 @@ +
+

+ ใบสรุปการทำ Hemodialysis +

+

+ ศูนย์ไตเทียมราชวัตร {{company_name}}
+

+

+ ประจำเดือน {{month}} {{year}} +

+
+ + + + + + + + + + {{#each lines}} + + + + + + + + {{/each}} + +
{{topic}}{{month}}เท่ากับ{{amount}}{{unit}}
+ + + + + +
+ + + + + + + + {{#each new_pt_lines}} + + + + + + {{/each}} + + + +

รายชื่อผู้ป่วยรับใหม่

{{no}}{{name}}{{note}}
+ 		+ + + + + + + + {{#each resign_pt_lines}} + + + + + + {{/each}} + + + +

รายชื่อผู้ป่วยจำหน่าย

{{no}}{{name}}{{note}}
+
+ + + + +
+ + + + + + + + + + + + + + + + + +

รวมจำนวนยาที่ใช้ประจำเดือน

ปกส.ucซื้อรวม
+
diff --git a/netforce_clinic/templates/report_hd_madical_old.hbs b/netforce_clinic/templates/report_hd_madical_old.hbs deleted file mode 100644 index 43c24b7..0000000 --- a/netforce_clinic/templates/report_hd_madical_old.hbs +++ /dev/null @@ -1,29 +0,0 @@ -
-

- Summary of the Madical -

-

- [{{company_name}}]
- As at {{month}} {{year}} -

-
- - - - - - - - - - {{#each lines}} - - - - - - - - {{/each}} - -
MadicalSocial SecurityucBuyTotal
{{madical}}{{sc}}{{uc}}{{buy}}{{total}}
diff --git a/netforce_clinic/templates/report_hd_summary.hbs b/netforce_clinic/templates/report_hd_summary.hbs deleted file mode 100644 index ca07430..0000000 --- a/netforce_clinic/templates/report_hd_summary.hbs +++ /dev/null @@ -1,34 +0,0 @@ -
-

- Summary of the Hemodialysis -

-

- [{{company_name}}]
-

-

- As at {{month}} {{year}} -

-
- - - - - - - - {{#each lines}} - - - - - - {{/each}} - - - - - - - - -
TopicMonthAmount
{{topic}}{{month}}{{amount}}