Merge branch 'master' of http://git.shengws.com/zhangbj/scrm-go

controllers/micro/micro_controller.go

 	beego.Router("/api/site/singleactivitinfo",&Micro{},"Get:GetActivitDetail")
 	beego.Router("/api/site/singlearticleinfo",&Micro{},"Get:GetArticlesDetail")
    beego.Router("/api/site/singledoctorinfo",&Micro{},"Get:GetDoctorInfo")
+   beego.Router("/api/site/getdata",&Micro,"Get:GetData")
 }
 
 type Micro struct {
 
 
 func (this *Micro) GetDataByOrgId(){
-	fmt.Println("我和我的祖国")
+	fmt.Println("我的 ")
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("小明id",orgid)
+	model, err := micro_service.GetData(orgid)
+	fmt.Println("model是什么",model)
+	fmt.Println("err",err)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patientModels":model,
+	})
+}
+
+func (this *Micro) GetData(){
+	// fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
+	fmt.Println("我的 ")
 	orgid, _ := this.GetInt64("orgid")
 	fmt.Println("小明id",orgid)
 	model, err := micro_service.GetData(orgid)