From deea48655681aad284bd37c947605a4d4b093bd7 Mon Sep 17 00:00:00 2001 From: "watcha.h@almacom.co.th" Date: Tue, 24 Mar 2015 10:56:24 +0700 Subject: [PATCH] picking --- .../clinic_report_account_hd_case_summary.xml | 2 +- .../actions/clinic_report_claim.xml | 2 +- .../layouts/clinic_account_menu.xml | 2 +- netforce_clinic/layouts/clinic_menu.xml | 2 +- netforce_clinic/layouts/clinic_setting.xml | 2 +- .../models/report_account_hd_case_summary.py | 11 ++- netforce_clinic/models/setting.py | 66 +++--------------- .../report_account_hd_case_summary.xlsx | Bin 5743 -> 5827 bytes .../report_account_hd_case_summary.hbs | 16 +++++ netforce_clinic/todo.txt | 8 +++ 10 files changed, 47 insertions(+), 64 deletions(-) diff --git a/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml b/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml index e220d99..67fa412 100644 --- a/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml +++ b/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml @@ -1,5 +1,5 @@ - Report Claim/No Claim + Report Claim Expense report clinic.report.account.hd.case.summary report_account_hd_case_summary diff --git a/netforce_clinic/actions/clinic_report_claim.xml b/netforce_clinic/actions/clinic_report_claim.xml index d758ea4..be5c742 100644 --- a/netforce_clinic/actions/clinic_report_claim.xml +++ b/netforce_clinic/actions/clinic_report_claim.xml @@ -1,5 +1,5 @@ - Report Claim/No Claim + Report Claim Expense report clinic.report.account.hd.case.summary report_account_hd_case_summary diff --git a/netforce_clinic/layouts/clinic_account_menu.xml b/netforce_clinic/layouts/clinic_account_menu.xml index 92d7df7..2521b41 100644 --- a/netforce_clinic/layouts/clinic_account_menu.xml +++ b/netforce_clinic/layouts/clinic_account_menu.xml @@ -7,7 +7,7 @@
- + diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml index 05e6bba..7db8d58 100644 --- a/netforce_clinic/layouts/clinic_menu.xml +++ b/netforce_clinic/layouts/clinic_menu.xml @@ -46,7 +46,7 @@ - + diff --git a/netforce_clinic/layouts/clinic_setting.xml b/netforce_clinic/layouts/clinic_setting.xml index 9660d2a..2325576 100644 --- a/netforce_clinic/layouts/clinic_setting.xml +++ b/netforce_clinic/layouts/clinic_setting.xml @@ -1,7 +1,7 @@
diff --git a/netforce_clinic/models/report_account_hd_case_summary.py b/netforce_clinic/models/report_account_hd_case_summary.py index a9c6f16..4307af2 100644 --- a/netforce_clinic/models/report_account_hd_case_summary.py +++ b/netforce_clinic/models/report_account_hd_case_summary.py @@ -105,14 +105,17 @@ class ReportAccountHDCaseSummary(Model): items[code].append({ 'amount': amt, }) - pm_number='' - for pm in hdcase.payments: - pm_number+=pm.number or "" + pm_number=','.join([pm.number for pm in hdcase.payments if pm.number]) inv_number="" inv_ref="" for inv in hdcase.invoices: inv_number+=inv.number or "" inv_ref+=inv.ref or "" + pick_ref="" + pick_id=None + for pick in hdcase.pickings: + pick_ref=pick.number or "" + pick_id=pick.id patient=hdcase.patient_id ptype=hdcase.patient_type_id cycle=hdcase.cycle_id @@ -146,6 +149,8 @@ class ReportAccountHDCaseSummary(Model): 'lab': hdcase.lab, 'misc': hdcase.misc, 'inv_ref': inv_ref and inv_ref or "-", + 'pick_ref': pick_ref and pick_ref or "-", + 'pick_id': pick_id, } for code, item in items.items(): vals.update({ diff --git a/netforce_clinic/models/setting.py b/netforce_clinic/models/setting.py index 82e93d8..bf1ac48 100644 --- a/netforce_clinic/models/setting.py +++ b/netforce_clinic/models/setting.py @@ -152,65 +152,19 @@ class ClinicSetting(Model): if user_id !=1: print("Only admin!!") return - - dom=[ - ['type','=','doctor'], - ] - for st in get_model("clinic.staff").search_browse(dom): - dpt_ids=[] - for b in get_model("clinic.branch").browse([]): - for dpt in b.departments: - dpt_ids.append(dpt.id) - st.write({ - 'departments': [('set',dpt_ids)], - }) - print('dpt_ids ', dpt_ids) - print("Done!") - return - - files=['Patients_Data_LS1.csv','Patients_Data_LS2.csv','Patients_Data_LS3.csv'] - self.update_patient_file(files) - print("Done!") - return + for pt in get_model("clinic.patient").browse([1267]): + print(pt.name or "") + cycles={} + for vs in pt.visits: + date=vs.visit_date + wd=datetime.strptime(date,"%Y-%m-%d").weekday() + key='%s-%s-%s'%(vs.cycle_id.id, wd, vs.department_id.id) + cycles[key]=key + for k, v in cycles.items(): + print(k) ###TODO remove douplicate patient ###TODO remove douplicate staff ###TODO remove douplicate visit - visits={} - for visit in get_model("clinic.visit").search_browse([]): - key='%s-%s'%(visit.visit_date, visit.patient_id.id) - if not key in visits.keys(): - visits[key]=[] - hd_ids=[] - for hdcase in visit.hd_cases: - hd_ids.append(hdcase.id) - visits[key].append({ - 'id': visit.id, - 'date': visit.visit_date, - 'patient_id': visit.patient_id.id, - 'state': visit.state, - 'hd_ids': hd_ids, - }) - for k, vs in visits.items(): - if len(vs) > 1: - vids=[] - for v in vs: - if v['state']=='pending': - visit=get_model("clinic.visit").browse(v['id']) - for hdcase in visit.hd_cases: - hdcase.delete() - visit.delete() - print('deleted id ', v['id'], v['patient_id'], v['date']) - elif len(v['hd_ids']) < 1: - visit=get_model("clinic.visit").browse(v['id']) - if visit: - for hdcase in visit.hd_cases: - hdcase.delete() - visit.to_draft() - visit.delete() - print('deleted id ', v['id'], v['patient_id'], v['date']) - elif v['state'] in ('confirmed', 'cancelled'): - vids.append(v['id']) - print('need to delete id ', vids, vids[0]) print("Done!") def multi_department(self,ids,context={}): diff --git a/netforce_clinic/reports/report_account_hd_case_summary.xlsx b/netforce_clinic/reports/report_account_hd_case_summary.xlsx index 11e745e405c8793df93fe1ff3cd7c1eb93a01a76..f8c89cca69c8aa819f6449409484f46ab2bc7fc1 100644 GIT binary patch delta 4573 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 R^*=zTC}lb>Lilf={{sisP4WN$ delta 4477 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 EU&(D4_W%F@ diff --git a/netforce_clinic/templates/report_account_hd_case_summary.hbs b/netforce_clinic/templates/report_account_hd_case_summary.hbs index 872faa2..892710f 100644 --- a/netforce_clinic/templates/report_account_hd_case_summary.hbs +++ b/netforce_clinic/templates/report_account_hd_case_summary.hbs @@ -45,6 +45,7 @@ Misc. Dlz Ref.Inv# + Picking# {{else}} Date Cycle# @@ -58,6 +59,7 @@ ค่าฟอก ค่ายา ค่าบริการฉีดยา + Picking# แพทย์ พยาบาล {{/ifeq}} @@ -85,6 +87,13 @@ {{currency misc zero=""}} {{dlz_name}} {{inv_ref}} + + {{#if pick_id}} + {{view "link" string=pick_ref action="pick_out" action_options="mode=form" active_id=pick_id}} + {{else}} + - + {{/if}} + {{else}} {{date}} {{cycle}} @@ -100,6 +109,13 @@ {{currency fee zero=""}} {{currency epo zero=""}} {{currency srv zero=""}} + + {{#if pick_id}} + {{view "link" string=pick_ref action="pick_out" action_options="mode=form" active_id=pick_id}} + {{else}} + - + {{/if}} + {{dname}} {{view "link" string="View" action="clinic_cycle_item" action_options="mode=form" active_id=cycle_item_id}} diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt index e69de29..d28e542 100644 --- a/netforce_clinic/todo.txt +++ b/netforce_clinic/todo.txt @@ -0,0 +1,8 @@ + report cycle item + - remove minus from fee amount + - summary amount +report medical + - see detail of amount (department, patient, cycle, hdcase#) + +report claim expense: + - add good issue columns