体积小

models/xcx_user_models.go

@@ -576,6 +576,12 @@ type XcxInspection struct {
 	Status       int64            `gorm:"column:status" json:"status" form:"status"`
 	CreatedTime  int64            `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime  int64            `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	RangeType    int64            `gorm:"column:range_type" json:"range_type" form:"range_type"`
+	RangeMin     string           `gorm:"column:range_min" json:"range_min" form:"range_min"`
+	RangeMax     string           `gorm:"column:range_max" json:"range_max" form:"range_max"`
+	RangeValue   string           `gorm:"column:range_value" json:"range_value" form:"range_value"`
+	RangeOptions string           `gorm:"column:range_options" json:"range_options" form:"range_options"`
+	Unit         string           `gorm:"column:unit" json:"unit" form:"unit"`
 	Childs       []*XcxInspection `json:"childs" `
 }
 

service/xcx_mobile_api_service.go

@@ -597,7 +597,9 @@ func GetInspectionGroupList(patientid int64, startime int64, endtime int64) (ins
 }
 
 func GetInsepctionList(patientid int64, startime int64, endtime int64) (inspection []*models.XcxInspection, err error) {
-	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_inspection as x").Where("x.status =1")
+	table := XTReadDB().Table("xt_inspection_reference as r")
+	fmt.Print("table", table)
 	if patientid > 0 {
 		db = db.Where("x.patient_id = ?", patientid)
 	}
@@ -607,6 +609,6 @@ func GetInsepctionList(patientid int64, startime int64, endtime int64) (inspecti
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <= ?", endtime)
 	}
-	err = db.Find(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on (r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0)   ").Scan(&inspection).Error
 	return inspection, err
 }