提交代码

controllers/his_charge_api_controller.go

@@ -238,6 +238,7 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
 
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
+	time_type := c.GetString("time_type")
 	keyword := c.GetString("keyword")
 	item_type, _ := c.GetInt64("type")
 
@@ -259,8 +260,8 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
 
 	switch item_type {
 	case 0:
-		chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
-		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
 		chargeDrug = append(chargeDrug, chargeProject...)
 		b, _ := structToBytes(chargeDrug)
 		//cd, _ := compressData(b)
@@ -281,7 +282,7 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
 		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
 		break
 	case 1:
-		chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
 		//chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
 		//chargeDrug = append(chargeDrug, chargeProject...)
 		b, _ := structToBytes(chargeDrug)
@@ -304,7 +305,7 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
 		break
 	case 2:
 		//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
-		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
 		//chargeDrug = append(chargeDrug, chargeProject...)
 		b, _ := structToBytes(chargeProject)
 		//cd, _ := compressData(b)
@@ -327,7 +328,7 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
 
 	case 3:
 		//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
-		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
 		//chargeDrug = append(chargeDrug, chargeProject...)
 		b, _ := structToBytes(chargeProject)
 		//cd, _ := compressData(b)

service/his_charge_service.go

@@ -10,6 +10,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 	if len(keyword) == 0 {
 		switch item_type {
 		case 0:
+
 			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").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
@@ -152,24 +153,50 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 	return
 }
 
-func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_time_str string, start_time int64, end_time int64, keyword string, item_type int64) (patients []*models.NewChargeDetail, err error) {
+func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_time_str string, start_time int64, end_time int64, keyword string, item_type int64, time_type string) (patients []*models.NewChargeDetail, err error) {
 	if len(keyword) == 0 {
 		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 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+
+				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_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
+
+			}
+
 			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 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  o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?    and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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  o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?    and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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_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
+
+			}
+
 			break
 
 		}
@@ -178,21 +205,46 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 		keyword := "%" + keyword + "%"
 		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 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?  and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?  and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+
+				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_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
+
+			}
 
 			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 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+
+				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_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
+
+			}
 
 			break
 
@@ -202,17 +254,30 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 
 	return
 }
-func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str string, end_time_str string, start_time int64, end_time int64, keyword string, item_type int64) (patients []*models.NewChargeDetail, err error) {
+func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str string, end_time_str string, start_time int64, end_time int64, keyword string, item_type int64, time_type string) (patients []*models.NewChargeDetail, err error) {
 	if len(keyword) == 0 {
 		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 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+
+				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(" 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
+
+			}
 
 			//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").
@@ -232,56 +297,123 @@ 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 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?  and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?  and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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("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
+
+			}
+
 			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 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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("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
+
+			}
+
 			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 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+
+				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("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
+
+			}
 
 			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 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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("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
+
+			}
 
 			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 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S')  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
+
+			} else {
+
+				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("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
+
+			}
+
 			break
 		}
 	}