提交代码

controllers/gobal_config_api_controller.go

 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
 	p_type, _ := c.GetInt64("p_type")
+	ex_type, _ := c.GetInt64("sort_type")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 		endTime = theTime.Unix()
 	}
 	adminInfo := c.GetAdminUserInfo()
-	order, _ := service.GetExportHisOrderList(adminInfo.CurrentOrgId, startTime, endTime, p_type)
+	var order []*models.HisOrder
+	if ex_type == 1 {
+		order, _ = service.GetExportHisOrderList(adminInfo.CurrentOrgId, startTime, endTime, p_type)
+	} else {
+		order, _ = service.GetExportHisOrderListBySetlTIME(adminInfo.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", p_type)
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"order": order,
 	})

service/gobal_config_service.go

 	return
 }
 
+func GetExportHisOrderListBySetlTIME(user_org_id int64, start_time string, end_time string, p_type int64) (order []*models.HisOrder, err error) {
+	db := readDb.Model(&models.HisOrder{})
+	if len(start_time) > 0 {
+		db = db.Where("his_order.setl_time >= ?", start_time)
+	}
+	if len(end_time) > 0 {
+		db = db.Where("his_order.setl_time <= ?", end_time)
+	}
+
+	if p_type > 0 {
+		db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.order_status = 2 AND p_type = ? ", user_org_id, p_type)
+
+	} else {
+
+		db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.order_status = 2", user_org_id)
+
+	}
+
+	db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisHospitalCheckRecord", "status = 1 AND user_org_id = ? AND in_hospital_status = 1 AND out_hospital_status = 1 ", user_org_id).
+		Preload("HisPrescriptionInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", user_org_id).Preload("XtHisDepartment", "status = 1")
+		})
+	err = db.Order("setl_time asc").Find(&order).Error
+	return
+}
+
 func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64, storehouse_id int64) (drugInfo []*models.BloodDrugWarehouseInfo, total int64, err error) {
 
 	likeKey := "%" + keyword + "%"