csx 3 vuotta sitten
vanhempi
commit
5262b4bfb8
2 muutettua tiedostoa jossa 13 lisäystä ja 2 poistoa
  1. 2 1
      controllers/his_api_controller.go
  2. 11 1
      service/his_service.go

+ 2 - 1
controllers/his_api_controller.go Näytä tiedosto

3935
 	keywords := c.GetString("keywords")
3935
 	keywords := c.GetString("keywords")
3936
 	p_type, _ := c.GetInt64("p_type", 0)
3936
 	p_type, _ := c.GetInt64("p_type", 0)
3937
 	sort_type, _ := c.GetInt64("sort_type", 0)
3937
 	sort_type, _ := c.GetInt64("sort_type", 0)
3938
+	charge_type, _ := c.GetInt64("charge_type", 0)
3938
 
3939
 
3939
 	timeLayout := "2006-01-02"
3940
 	timeLayout := "2006-01-02"
3940
 	loc, _ := time.LoadLocation("Local")
3941
 	loc, _ := time.LoadLocation("Local")
3961
 
3962
 
3962
 	adminUser := c.GetAdminUserInfo()
3963
 	adminUser := c.GetAdminUserInfo()
3963
 	org_id := adminUser.CurrentOrgId
3964
 	org_id := adminUser.CurrentOrgId
3964
-	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time)
3965
+	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type)
3965
 
3966
 
3966
 	for _, item := range order {
3967
 	for _, item := range order {
3967
 		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)
3968
 		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)

+ 11 - 1
service/his_service.go Näytä tiedosto

888
 	return
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
 	offset := (page - 1) * limit
892
 	offset := (page - 1) * limit
893
 	db := readDb.Model(&models.HisOrder{})
893
 	db := readDb.Model(&models.HisOrder{})
894
 
894
 
925
 		db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.order_status = 2", user_org_id)
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
 	db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
938
 	db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
929
 		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
939
 		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
930
 		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
940
 		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).