From 4c996693a3ce56cac988e16b1a362f3bf12177c8 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Wed, 31 Aug 2016 20:15:46 +0700
Subject: [PATCH] mdc_name & mdc_desc

---
 netforce_clinic/models/hd_case.py             |   7 ++++++-
 netforce_clinic/models/report_cycle_item.py   |   1 +
 .../reports/report_cycle_item.xlsx            | Bin 5852 -> 6041 bytes
 .../templates/report_cycle_item.hbs           |   4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index e07ab4e..3c1c09e 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -104,6 +104,7 @@ class HDCase(Model):
             dlz_name=','.join([dlz for dlz in dlz_name])
             epo_names=[]
             mdc_names=[]
+            mdc_descs=[]
             iron_names=[]
             fee=0
             lab=0
@@ -124,6 +125,7 @@ class HDCase(Model):
                         sign=-1
                     if categ.parent_id:
                         if categ.parent_id.code=='MDC':
+                            mdc_descs.append(prod.description or "")
                             if reimbursable_ctx:
                                 if reimbursable_ctx==line.reimbursable:
                                     mdc+=amt
@@ -134,6 +136,7 @@ class HDCase(Model):
                             mdc_items.setdefault(prod_name,0)
                             mdc_items[prod_name]=line.qty
                     if categ.code=='EPO':
+                        mdc_descs.append((prod.description or "").title())
                         epo_names.append(prod_name.title())
                         mdc_items.setdefault(prod_name,0)
                         mdc_items[prod_name]=line.qty
@@ -160,6 +163,7 @@ class HDCase(Model):
             res[obj.id]={
                 'epo': ','.join([n for n in epo_names]),
                 'mdc_name': ','.join([n for n in mdc_names]),
+                'mdc_desc': ','.join([n for n in mdc_descs]),
                 'mdc_items': str(mdc_items),
                 'iron_name': ','.join([n for n in iron_names]),
                 'fee': fee,
@@ -228,7 +232,8 @@ class HDCase(Model):
         "dlz_id": fields.Integer("DZ ID",function="_get_expense",function_multi=True),
         "mdc": fields.Float("MDC",function="_get_expense",function_multi=True),
         "srv": fields.Float("Service",function="_get_expense",function_multi=True),
-        "mdc_name": fields.Float("MDC Name",function="_get_expense",function_multi=True),
+        "mdc_name": fields.Char("MDC Name",function="_get_expense",function_multi=True),
+        "mdc_desc": fields.Char("MDC Desc",function="_get_expense",function_multi=True),
         "mdc_items": fields.Float("MDC Items",function="_get_expense",function_multi=True),
         "iron_name": fields.Float("Iron Name",function="_get_expense",function_multi=True),
         'sickbed_id': fields.Many2One("clinic.sickbed",'Sickbed'),
diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py
index 5d7024e..c7fd5e5 100644
--- a/netforce_clinic/models/report_cycle_item.py
+++ b/netforce_clinic/models/report_cycle_item.py
@@ -176,6 +176,7 @@ class ReportCycleItem(Model):
                    'hdcase_number': reformat_number(hdcase.number),
                    'hdcase_id': hdcase.id,
                    'mdc_name': hdcase.mdc_name or hdcase.epo,
+                   'mdc_desc': hdcase.mdc_desc,
                    'mdc_items': hdcase.mdc_items,
                    'iron_name': hdcase.iron_name or '',
                    'fee': abs(hdcase.fee),
diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx
index fc1e5b1291c1caea404f26a440b1f93becfef71f..6a5f737d8a1410f83dec7638647c828dad88e8d3 100644
GIT binary patch
delta 5066
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

delta 4869
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

diff --git a/netforce_clinic/templates/report_cycle_item.hbs b/netforce_clinic/templates/report_cycle_item.hbs
index 5cab149..011b848 100644
--- a/netforce_clinic/templates/report_cycle_item.hbs
+++ b/netforce_clinic/templates/report_cycle_item.hbs
@@ -38,7 +38,7 @@
                     <td><a href="/ui#name=clinic_patient&active_id={{pid}}&mode=form">{{pname}}</a></td>
                     <td><a href="/ui#name=clinic_staff&active_id={{did}}&mode=form">{{dname}}</a></td>
                     <td><a href="/ui#name=clinic_patient_type&active_id={{tid}}&mode=form">{{tname}}</a></td>
-                    <td style="text-align:left">{{mdc_name}}</td>
+                    <td style="text-align:left">{{mdc_desc}}</td>
                     <td style="text-align:left">{{iron_name}}</td>
                     <td style="text-align:right">{{hct}}</td>
                     <td><a href="/ui#name=clinic_dialyzer&active_id={{dlz_id}}&mode=form">{{dlz_name}}</a></td>
@@ -62,7 +62,7 @@
                         <td><a href="/ui#name=clinic_patient&active_id={{pid}}&mode=form">{{pname}}</a></td>
                         <td><a href="/ui#name=clinic_staff&active_id={{did}}&mode=form">{{dname}}</a></td>
                         <td><a href="/ui#name=clinic_patient_type&active_id={{tid}}&mode=form">{{tname}}</a></td>
-                        <td style="text-align:left">{{mdc_name}}</td>
+                        <td style="text-align:left">{{mdc_desc}}</td>
                         <td style="text-align:left">{{iron_name}}</td>
                         <td style="text-align:right">{{hct}}</td>
                         <td><a href="/ui#name=clinic_dialyzer&active_id={{dlz_id}}&mode=form">{{dlz_name}}</a></td>