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

@@ -1086,7 +1086,7 @@ func GetHisPrescriptionDrugDetails(org_id int64, start_time_str string, end_time
 			db = db.Joins("JOIN `his_prescription` o ON oi.`prescription_id` = o.id and   FROM_UNIXTIME(o.record_date, '%Y-%m-%d %H:%i:%S') BETWEEN ? AND ?  and o.status = 1 and o.order_status <> 2", start_time_str, end_time_str)
 		}
 	}
-	db = db.Joins("JOIN `his_order` oo on oo.`number` = o.`batch_number` and oo.user_org_id = ?", org_id)
+	db = db.Joins("left JOIN `his_order` oo on oo.`number` = o.`batch_number` and oo.user_org_id = ?", org_id)
 
 	err = db.Where(" oi.user_org_id = ?  AND o.record_date >= ? AND o.record_date <= ? AND oi.status = 1", org_id, start_time, end_time).Scan(&patients).Error
 
@@ -1113,7 +1113,7 @@ func GetHisPrescriptionProjectDetails(org_id int64, start_time_str string, end_t
 	} else {
 		db = db.Joins("JOIN `his_prescription` o ON oi.`prescription_id` = o.id and   FROM_UNIXTIME(o.record_date, '%Y-%m-%d %H:%i:%S') BETWEEN ? AND ?  and o.status = 1", start_time_str, end_time_str)
 	}
-	db = db.Joins("JOIN `his_order` oo on oo.`number` = o.`batch_number` and oo.user_org_id = ?", org_id)
+	db = db.Joins("left JOIN `his_order` oo on oo.`number` = o.`batch_number` and oo.user_org_id = ?", org_id)
 
 	err = db.Where(" oi.user_org_id = ?  AND o.record_date >= ? AND o.record_date <= ? AND oi.status = 1", org_id, start_time, end_time).Scan(&patients).Error
 	return

service/his_summary_service.go

@@ -297,7 +297,7 @@ func GetHisLastOrder(org_id int64, patient_id int64, start_time int64, end_time
 
 	order := models.HisOrder{}
 
-	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and ctime>=? and ctime<=? and fa_piao_number<> ''", org_id, patient_id, start_time, end_time).Last(&order).Error
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and ctime>=? and ctime<=? and status = 1", org_id, patient_id, start_time, end_time).Last(&order).Error
 	return order, err
 }