历史排班

controllers/dialysis_api_controller.go

@@ -5095,8 +5095,10 @@ func (this *DialysisApiController) GetDialysisParameterList() {
 
 	page, _ := this.GetInt64("page")
 
-	partition_id, _ := this.GetInt64("partition_id")
+	//partition_id, _ := this.GetInt64("partition_id")
 
+	partion_type := this.GetString("partition_id")
+	idSplit := strings.Split(partion_type, ",")
 	schedule_type, _ := this.GetInt64("schedule_type")
 
 	start_time := this.GetString("schedule_date")
@@ -5111,7 +5113,7 @@ func (this *DialysisApiController) GetDialysisParameterList() {
 	if scheduids != "" {
 		ids = strings.Split(scheduids, ",")
 	}
-	list, total, err := service.GetDialysisParameterList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId, ids)
+	list, total, err := service.GetDialysisParameterList(keyword, limit, page, idSplit, schedule_type, startTime.Unix(), orgId, ids)
 
 	dialysisSett, _ := service.GetDialysisSetting(orgId)
 	if err == nil {

service/dialysis_solution_service.go

@@ -139,7 +139,7 @@ func GetDialysisSetting(orgid int64) (models.XtDialysisSetting, error) {
 	return setting, err
 }
 
-func GetDialysisParameterList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64, ids []string) (schedule []*models.VmBloodSchedule, total int64, err error) {
+func GetDialysisParameterList(keywords string, limit int64, page int64, partition_id []string, schedule_type int64, scheduleDate int64, orgID int64, ids []string) (schedule []*models.VmBloodSchedule, total int64, err error) {
 	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
@@ -148,8 +148,11 @@ func GetDialysisParameterList(keywords string, limit int64, page int64, partitio
 	if schedule_type > 0 {
 		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
 	}
-	if partition_id > 0 {
-		db = db.Where("xt_schedule.partition_id = ?", partition_id)
+	//if partition_id > 0 {
+	//	db = db.Where("xt_schedule.partition_id = ?", partition_id)
+	//}
+	if len(partition_id) > 0 {
+		db = db.Where("xt_schedule.partition_id in(?)", partition_id)
 	}
 	if orgID > 0 {
 		db = db.Where("xt_schedule.user_org_id  = ?", orgID)