Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

service/his_charge_service.go

@@ -157,19 +157,19 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 		switch item_type {
 		case 0:
 			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.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_order o ON oi.order_number = o.number  and FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d') BETWEEN ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
 				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
-				Where("oi.advice_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
+				Where("oi.advice_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 			break
 		case 1:
 			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.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_order o ON oi.order_number = o.number   and FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d') BETWEEN ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
 				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
-				Where("oi.advice_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
+				Where("oi.advice_id > 0 and oi.user_org_id = ? and  o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?    and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 			break
 
 		}
@@ -179,20 +179,20 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 		switch item_type {
 		case 0:
 			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.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_order o ON oi.order_number = o.number   and FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d') BETWEEN ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id and pp.name like ?", keyword).
 				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
-				Where("oi.advice_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
+				Where("oi.advice_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?  and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
 			break
 		case 1:
 			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.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_order o ON oi.order_number = o.number   and FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d') BETWEEN ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id and pp.name like ?", keyword).
 				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
-				Where("oi.advice_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
+				Where("oi.advice_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
 			break
 
@@ -207,12 +207,12 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 		switch item_type {
 		case 0:
 			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_order o ON oi.order_number = o.number  and FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d') 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(" 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
+				Where("oi.project_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
 			//err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 			//	return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
@@ -233,66 +233,58 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			break
 		case 2:
 			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_order o ON oi.order_number = o.number   and FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d') 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("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
-
+				Where("oi.project_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?  and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 			break
 		case 3:
 			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_order o ON oi.order_number = o.number   and FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d') 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("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
-
+				Where("oi.project_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 			break
-
 		}
-
 	} else {
 		keyword := "%" + keyword + "%"
 		switch item_type {
 		case 0:
 			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_order o ON oi.order_number = o.number   and FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d') 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("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
+				Where("oi.project_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
 			break
 
 		case 2:
 			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_order o ON oi.order_number = o.number   and FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d') 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("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
+				Where("oi.project_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
 			break
 		case 3:
 			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_order o ON oi.order_number = o.number   and FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d') 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("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
-
+				Where("oi.project_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 			break
-
 		}
-
 	}
-
 	return
 }