|
@@ -888,7 +888,7 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
|
888
|
888
|
return
|
889
|
889
|
}
|
890
|
890
|
|
891
|
|
-func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string) (order []*models.HisOrder, err error, total int64) {
|
|
891
|
+func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64) (order []*models.HisOrder, err error, total int64) {
|
892
|
892
|
offset := (page - 1) * limit
|
893
|
893
|
db := readDb.Model(&models.HisOrder{})
|
894
|
894
|
|
|
@@ -925,6 +925,16 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
|
925
|
925
|
db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.order_status = 2", user_org_id)
|
926
|
926
|
|
927
|
927
|
}
|
|
928
|
+
|
|
929
|
+ if charge_type > 0 {
|
|
930
|
+ if charge_type == 2 {
|
|
931
|
+ db = db.Where("his_order.is_medicine_insurance = 0")
|
|
932
|
+ } else {
|
|
933
|
+
|
|
934
|
+ db = db.Where("his_order.is_medicine_insurance = ?", charge_type)
|
|
935
|
+
|
|
936
|
+ }
|
|
937
|
+ }
|
928
|
938
|
db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
|
929
|
939
|
Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
|
930
|
940
|
Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
|