提交代码

controllers/his_api_controller.go

@@ -6212,6 +6212,7 @@ func (c *HisApiController) GetHisOrderList() {
 	charge_type, _ := c.GetInt64("charge_type", 0)
 	sch_type, _ := c.GetInt64("sch_type", 0)
 	zone_type, _ := c.GetInt64("zone_type", 0)
+	med_type, _ := c.GetInt64("med_type", 0)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -6238,7 +6239,7 @@ func (c *HisApiController) GetHisOrderList() {
 
 	adminUser := c.GetAdminUserInfo()
 	org_id := adminUser.CurrentOrgId
-	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type, sch_type, zone_type)
+	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type, sch_type, zone_type, med_type)
 
 	for _, item := range order {
 		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)

service/his_service.go

@@ -975,7 +975,7 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	return
 }
 
-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, sch_type int64, zone_type int64) (order []*models.HisOrder, err error, total int64) {
+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, sch_type int64, zone_type int64, med_type int64) (order []*models.HisOrder, err error, total int64) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisOrder{})
 
@@ -998,6 +998,10 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id  AND sch.schedule_date >= ? AND sch.schedule_date <= ? AND sch.partition_id = ? AND sch.status = 1", start_time_timestamp, end_time_timestamp, zone_type)
 	}
 
+	if med_type > 0 {
+		db = db.Where("his_order.med_type = ?", med_type)
+	}
+
 	//if zone_type > 0 {
 	//	db = db.Joins("join xt_schedule sch_two on sch_two.schedule_date = his_order.settle_accounts_date AND sch_two.patient_id = his_order.patient_id AND sch_two.partition_id = ?", zone_type)
 	//}