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

service/his_service.go

@@ -1081,7 +1081,7 @@ func GetNewHisOrderListTwo(user_org_id int64, start_time_timestamp int64, end_ti
 	if end_time_timestamp != 0 {
 		db = db.Where("his_order.settle_accounts_date<=?", end_time_timestamp)
 	}
-	db = db.Where("user_org_id = ?", user_org_id)
+	db = db.Where("user_org_id = ? and order_status = 2 and status = 1", user_org_id)
 	err = db.Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).Find(&order).Error
 	return
 }