提交代码

service/his_charge_service.go

@@ -209,8 +209,8 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
 				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id ").
-				Joins(" join xt_his_project project on  p.project_id = project.id").
-				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins(" left join xt_his_project project on  p.project_id = project.id").
+				Joins(" left join  xt_good_information good on  p.project_id = good.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
 				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
@@ -235,8 +235,8 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
 				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id and p.type = 2").
-				Joins(" join xt_his_project project on  p.project_id = project.id").
-				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins("left join xt_his_project project on  p.project_id = project.id").
+				Joins("left join  xt_good_information good on  p.project_id = good.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
 				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
@@ -245,8 +245,8 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
 				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id and p.type = 3").
-				Joins(" join xt_his_project project on  p.project_id = project.id").
-				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins("left join xt_his_project project on  p.project_id = project.id").
+				Joins("left join  xt_good_information good on  p.project_id = good.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
 				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
@@ -261,8 +261,8 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
 				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id ").
-				Joins(" join xt_his_project project on  p.project_id = project.id").
-				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins("left join xt_his_project project on  p.project_id = project.id").
+				Joins("left join  xt_good_information good on  p.project_id = good.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id and pp.name like ?", keyword).
 				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
@@ -272,8 +272,8 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
 				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id and p.type = 2").
-				Joins(" join xt_his_project project on  p.project_id = project.id").
-				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins("left join xt_his_project project on  p.project_id = project.id").
+				Joins("left join  xt_good_information good on  p.project_id = good.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id and pp.name like ?", keyword).
 				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
@@ -282,8 +282,8 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
 				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id and p.type = 3").
-				Joins(" join xt_his_project project on  p.project_id = project.id").
-				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins("left join xt_his_project project on  p.project_id = project.id").
+				Joins("left join  xt_good_information good on  p.project_id = good.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id and pp.name like ?", keyword).
 				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error