Преглед изворни кода

Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

28169 пре 1 недеља
родитељ
комит
82981cb092
1 измењених фајлова са 1 додато и 2 уклоњено
  1. 1 2
      service/inspection_service.go

+ 1 - 2
service/inspection_service.go Прегледај датотеку

@@ -350,9 +350,8 @@ func GetLastInspectionDetail(patientid int64, date int64, projectid int64, orgid
350 350
 }
351 351
 
352 352
 func GetInsepctionConfigurationList(orgid int64) (standard []*models.QualityControlStandard, err error) {
353
-
354 353
 	db := XTReadDB().Table("xt_quality_control_standard as x").Where("x.status =1")
355
-	db = db.Where("x.user_org_id = ? and x.is_status =1", orgid)
354
+	db = db.Where("x.user_org_id = ? and x.is_status =1", orgid)
356 355
 	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,x.range_value,x.range_type,s.unit,s.project_name,s.item_name,x.is_status").
357 356
 		Joins("left join xt_inspection_reference as s on s.item_id = x.inspection_minor and s.project_id = x.inspection_major").Where("s.org_id = ? and s.status = 1", orgid).Scan(&standard).Error
358 357
 	return standard, err