导出处方登记专册数据只查dm_machine_record表中type=2出库的记录
This commit is contained in:
parent
d53f297632
commit
6990170a06
|
@ -305,7 +305,7 @@ namespace DM_Weight.Report
|
||||||
,di.Drug_name,di.Drug_spec,di.big_unit,di.drug_id,dm.receivePerson,di.manuFactory,patient_card
|
,di.Drug_name,di.Drug_spec,di.big_unit,di.drug_id,dm.receivePerson,di.manuFactory,patient_card
|
||||||
from order_info oi inner join order_detail od on oi.order_no=od.Order_No
|
from order_info oi inner join order_detail od on oi.order_no=od.Order_No
|
||||||
LEFT JOIN dm_machine_record dm on oi.order_no=dm.invoice_id
|
LEFT JOIN dm_machine_record dm on oi.order_no=dm.invoice_id
|
||||||
inner JOIN drug_info di on od.drug_id=di.drug_id left join user_list ul on dm.operator=ul.id left join user_list ul2 on dm.reviewer=ul2.id WHERE dm.machine_id = '{p_machine_id}' and oi.recv_date>'{p_startDate}' and oi.recv_date<'{p_endDate}'";
|
inner JOIN drug_info di on od.drug_id=di.drug_id left join user_list ul on dm.operator=ul.id left join user_list ul2 on dm.reviewer=ul2.id WHERE dm.machine_id = '{p_machine_id}' and oi.recv_date>'{p_startDate}' and oi.recv_date<'{p_endDate}' and dm.type=2 ";
|
||||||
if (!string.IsNullOrEmpty(orderNo))
|
if (!string.IsNullOrEmpty(orderNo))
|
||||||
{
|
{
|
||||||
SQL += $" and oi.order_no='{orderNo}'";
|
SQL += $" and oi.order_no='{orderNo}'";
|
||||||
|
|
Loading…
Reference in New Issue