更新

conf/app.conf

@@ -81,7 +81,7 @@ redisdb = 0
 
 [dev]
 httpdomain = http://api.test1.sgjyun.com
-sso_domain = http://testsso.sgjyun.com
+sso_domain = https://testsso.sgjyun.com
 front_end_domain = "http://test1.sgjyun.com/#"
 
 openwechattoken = dwqofqon2e12en2o

controllers/article/article_controller.go

@@ -29,7 +29,7 @@ func ArticleRouters() {
 	beego.Router("/api/acticle/prviewArticle",&ArticleManage{},"Post:PrviewArticle")
 	beego.Router("/api/acticle/getarticlePreview",&ArticleManage{},"Get:GetArtilcePreview")
 	beego.Router("/api/acticle/save",&ArticleManage{},"Post:AddDraft")
-	beego.Router("/api/acticle/getEditArticle",&ArticleManage{},"Get:GetArticleInfo")
+	beego.Router("/api/acticle/getEditArticle",&ArticleManage{},"Post:GetArticleInfo")
 	beego.Router("/api/article/Delete",&ArticleManage{},"Delete:DeleteArticle")
 	beego.Router("/api/acticle/getMenus",&ArticleManage{},"Get:GetMenus")
 	beego.Router("/api/acticle/updateArticlesInfo",&ArticleManage{},"Post:UpdataArticleInfo")
@@ -53,7 +53,7 @@ func ArticleRouters() {
     beego.Router("/api/acticle/savevidodraft",&ArticleManage{},"Post:SaveVidoDraft")
 	beego.Router("/api/article/openDeleteReply",&ArticleManage{},"Delete:DeleteAllReply")
 	beego.Router("/api/article/deleteAllArticles",&ArticleManage{},"Delete:DeleteAllArticles")
-
+	beego.Router("api/aritcle/getallcategory",&ArticleManage{},"Get:GetAllCategory")
 }
 
 type ArticleManage struct {
@@ -154,16 +154,15 @@ func (this *ArticleManage) GetAllArticles()  {
 	if limit <= 0 {
 		limit = 10
 	}
-
-
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
-	org := adminUserInfo.Orgs[adminUserInfo.CurrentOrgId]
-	OrgName := org.OrgName
-	fmt.Println("机构姓名:",OrgName)
+	//org := adminUserInfo.Orgs[adminUserInfo.CurrentOrgId]
+	//OrgName := org.OrgName
+	//fmt.Println("机构姓名:",OrgName)
 	if(status == 1){
 		articles, total, err := article_service.GetPublished(userOrgID, page, limit, searchKey)
 		category, err := article_service.FindCategoryList(userOrgID)
+		fmt.Println("分类号",category)
 		if err !=nil{
 			this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取文章分类列表失败")
 			return
@@ -172,7 +171,7 @@ func (this *ArticleManage) GetAllArticles()  {
 			"articles":articles,
 			"total":total,
 			"category":category,
-			"OrgName":OrgName,
+
 		})
 	}
 	if(status == 2){
@@ -186,7 +185,7 @@ func (this *ArticleManage) GetAllArticles()  {
 			"articles":articles,
 			"total":total,
 			"category":category,
-			"OrgName":OrgName,
+
 		})
 	}
 
@@ -201,7 +200,6 @@ func (this *ArticleManage) GetAllArticles()  {
 			"articles":articles,
 			"total":total,
 			"category":category,
-			"OrgName":OrgName,
 		})
 	}
 
@@ -223,10 +221,41 @@ func (this *ArticleManage) GetAllArticles()  {
 		"articles":articles,
 		"total":total,
 		"category":category,
-		"OrgName":OrgName,
+
 	})
 	return
 }
+
+//func (this *ArticleManage) GetAllartic()  {
+//	page, _ := this.GetInt64("page", 1)
+//	fmt.Println("页面2",page)
+//	limit, _ := this.GetInt64("limit", 10)
+//	fmt.Println("限制3",limit)
+//	adminUserInfo := this.GetAdminUserInfo()
+//	userOrgID := adminUserInfo.CurrentOrgId
+//	if page <= 0 {
+//		page = 1
+//	}
+//	if limit <= 0 {
+//		limit = 10
+//	}
+//	articles, total, err := article_service.GetAllartic(page, limit, userOrgID)
+//	fmt.Println("articles",articles)
+//	fmt.Println("total",total)
+//	fmt.Println("err",err)
+//	if err !=nil{
+//		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取文章分类列表失败")
+//		return
+//	}
+//	//org := adminUserInfo.Orgs[adminUserInfo.CurrentOrgId]
+//	//OrgName := org.OrgName
+//	//fmt.Println("OrgName",OrgName)
+//	this.ServeSuccessJSON(map[string]interface{}{
+//		"articles":articles,
+//		"total":total,
+//	})
+//}
+
 func (this *ArticleManage) AddCategory(){
 
 	dataBody := make(map[string]interface{}, 0)
@@ -714,11 +743,12 @@ func (this *ArticleManage) GetArticleInfo()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
 	articles, err := article_service.GetArticleInfo(userOrgID, id)
+	fmt.Println("错误是什么",err)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "查询文章信息失败")
 		return
 	}
-	fmt.Println("内容是啥什么",articles)
+	fmt.Println("编辑文章内容是啥什么",articles)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"articles":articles,
 	})
@@ -1386,4 +1416,17 @@ func (this *ArticleManage) DeleteAllArticles()  {
 	returnData["msg"] = "ok"
 	this.ServeSuccessJSON(returnData)
 	return
+}
+
+func (this *ArticleManage) GetAllCategory()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	categorys, err := article_service.GetMenus(userOrgID)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "查询回复内容失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"categorys":categorys,
+	})
 }

controllers/base_api_controller.go

@@ -78,8 +78,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
 
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 }
 

controllers/site/site_controller.go

@@ -78,6 +78,13 @@ func siteRouters() {
 	beego.Router("/api/site/addmagicnavi",&Microwebsite{},"Post:AddMagicNavi")
 	beego.Router("/api/site/getmagicimages",&Microwebsite{},"Post:GetMagicImages")
 	beego.Router("/api/site/addmarginchart",&Microwebsite{},"Post:AddMarginChart")
+	beego.Router("/api/site/deleteRotations",&Microwebsite{},"Post:DeleteRotations")
+	beego.Router("/api/site/editRotationImages",&Microwebsite{},"Post:EditRotationImages")
+	beego.Router("/api/site/updaterotaionimages",&Microwebsite{},"Post:SaveRotationImages")
+	beego.Router("/api/site/editnavigation",&Microwebsite{},"Post:EditNavigation")
+	beego.Router("/api/site/savenavigation",&Microwebsite{},"Post:SaveNavigation")
+	beego.Router("/api/site/addhospital",&Microwebsite{},"Post:AddHospital")
+	beego.Router("/api/site/deletimages",&Microwebsite{},"Post:DeleteImages")
 }
 
 type Microwebsite struct {
@@ -1836,9 +1843,11 @@ func (this *Microwebsite) GetShareInfo()  {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
 		return
 	}
+	fmt.Println("错误是什么?",err)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"share":share,
 	})
+	fmt.Println("share是什么",share)
 }
 
 func (this *Microwebsite) DeleteNavition()  {
@@ -2209,4 +2218,242 @@ func (this *Microwebsite) AddMarginChart()  {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"macnavigation":macnavigation,
 	})
+}
+
+func (this *Microwebsite) DeleteRotations(){
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := int64(adminUserInfo.CurrentOrgId)
+	//fmt.Println("机构ID",userOrgID)
+	id, _ := this.GetInt64("id")
+	//fmt.Println("id是什么",id)
+	err := site_service.DeleteRotations(id, userOrgID)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除图片失败")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func  (this *Microwebsite) EditRotationImages()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := int64(adminUserInfo.CurrentOrgId)
+	fmt.Println(userOrgID)
+	id, _ := this.GetInt64("id")
+	//fmt.Println("id是什么",id)
+	editpiclink, err := site_service.UpdateRotationImages(userOrgID, id)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"editpiclink":editpiclink,
+	})
+}
+
+func (this *Microwebsite) SaveRotationImages()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := int64(adminUserInfo.CurrentOrgId)
+	fmt.Println("",userOrgID)
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是什么",id)
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+	images := dataBody["images"].(string)
+	fmt.Println("图片编辑",images)
+	if len(images) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "图片编辑不能为空")
+		return
+	}
+	sort :=int64(dataBody["sort"].(float64))
+	fmt.Println("排序",sort)
+   if(sort<=0){
+   	  this.ServeFailJsonSend(enums.ErrorCodeParamWrong,"排序不能为空")
+   	  return
+   }
+	piclink :=int64(dataBody["piclink"].(float64))
+	fmt.Println("图片链接",piclink)
+	if (piclink <= 0) {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "图片编辑不能为空")
+		return
+	}
+	linkaddress := dataBody["linkaddress"].(string)
+	if len(linkaddress) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "图片编辑不能为空")
+		return
+	}
+	fmt.Println("链接地址",linkaddress)
+
+	editpiclink := models.SgjPatientEditpiclink{
+		Images:      images,
+		Sort:        sort,
+		Piclink:     piclink,
+		Linkaddress: linkaddress,
+	}
+	err = site_service.SaveRotationImages(id, userOrgID, editpiclink)
+	fmt.Println("错误",err)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"editpiclink":editpiclink,
+	})
+}
+
+func (this *Microwebsite) EditNavigation()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := int64(adminUserInfo.CurrentOrgId)
+	fmt.Println("",userOrgID)
+	id, _ := this.GetInt64("id")
+	//fmt.Println("id是什么",id)
+	navigation, err := site_service.EditNavigation(userOrgID,id)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"navigation":navigation,
+	})
+}
+
+func (this *Microwebsite) SaveNavigation()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := int64(adminUserInfo.CurrentOrgId)
+	fmt.Println("",userOrgID)
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是多少呢",id)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+	navtitle := dataBody["navtitle"].(string)
+	fmt.Println("导航标题",navtitle)
+	if len(navtitle) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "图片编辑不能为空")
+		return
+	}
+	navimages := dataBody["navimages"].(string)
+	fmt.Println("导航图标选中",navimages)
+	if len(navimages) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "图片编辑不能为空")
+		return
+	}
+
+	//noCheckImages := dataBody["noCheckImages"].(string)
+	//fmt.Println("导航图标选中",navimages)
+	//if len(navimages) == 0 {
+	//	this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "图片编辑不能为空")
+	//	return
+	//}
+	jumpset := int64(dataBody["jumpset"].(float64))
+	fmt.Println("跳转设置",jumpset)
+	if jumpset <= 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "图片编辑不能为空")
+		return
+	}
+	navaddress := dataBody["navaddress"].(string)
+	fmt.Println("链接地址",navaddress)
+	navigation := models.SgjPatientNavigation{
+		Navtitle:   navtitle,
+		Navimages:  navimages,
+		Jumpset:    jumpset,
+		Navaddress: navaddress,
+	}
+	err = site_service.UpdateNavtion(id, userOrgID, navigation)
+	fmt.Println("err是什么",err)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"navigation":navigation,
+	})
+}
+
+func (this *Microwebsite) AddHospital()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := int64(adminUserInfo.CurrentOrgId)
+	fmt.Println("机构ID",userOrgID)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+	title := dataBody["title"].(string)
+	fmt.Println("导航标题",title)
+	if len(title) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "标题不能为空")
+		return
+	}
+	sort := int64(dataBody["sort"].(float64))
+	if sort<=0{
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong,"排序不能为空")
+		return
+	}
+	fmt.Println("排序",sort)
+	address :=dataBody["address"].(string)
+	fmt.Println("医院地址",address)
+	if len(address) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "标题不能为空")
+		return
+	}
+	patientOrdmodel := models.SgjPatientOrdmodel{
+		Title:     title,
+		Sort:      sort,
+		UserOrgId: userOrgID,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		ModeType: 2,
+	}
+	site_service.AddOrdModel(&patientOrdmodel)
+	ordmodel, err := site_service.QueryOrdeModelByID(userOrgID)
+
+	hosaddress := models.SgjPatientHosaddress{
+		Title:     title,
+		Sort:      sort,
+		Address:   address,
+		UserOrgId: userOrgID,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Modeid:    ordmodel.ID,
+	}
+	err = site_service.AddHosAddress(&hosaddress)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"hosaddress":hosaddress,
+	})
+}
+
+func (this *Microwebsite) DeleteImages()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := int64(adminUserInfo.CurrentOrgId)
+	fmt.Println("机构ID",userOrgID)
+	id, _:= this.GetInt64("id")
+	fmt.Println("id是神么",id)
+	err := site_service.DeleteImages(id, userOrgID)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
 }

models/article_models.go

@@ -19,32 +19,63 @@ func (ArticleCategory) TableName() string  {
 	return "sgj_patient_articles_menu"
 }
 
+//type Articles struct {
+//	ID            int64     `gorm:"column:id" json:"id"`
+//	Title         string    `gorm:"column:title" json:"title"`
+//	Summary       string    `gorm:"column:summary" json:"summary"`
+//	Content       string    `gorm:"column:content" json:"content"`
+//	Type          int       `gorm:"column:type" json:"type"`
+//	Num           int       `gorm:"column:num" json:"num"`
+//	Realreadnum   int64       `gorm:"column:real_read_num" json:"real_read_num"`
+//	Mtime         int64     `gorm:"column:mtime" json:"mtime"`
+//	Ctime         int64     `gorm:"column:ctime" json:"ctime"`
+//	ClassId       int64     `gorm:"column:class_id" json:"class_id"`
+//	Author        string    `gorm:"column:author" json:"author"`
+//	Status        int       `gorm:"column:status" json:"status"`
+//	Reason        string    `gorm:"column:reason" json:"reason"`
+//	StarNum       int       `gorm:"column:star_num" json:"star_num"`
+//	CommentNum    int       `gorm:"column:comment_num" json:"comment_num"`
+//	UserOrgId     int64     `gorm:"column:user_org_id" json:"user_org_id"`
+//	ArticleStatus int64     `gorm:"column:article_status" json:"article_status"`
+//	Imgs          string    `gorm:"column:imgs" json:"imgs"`
+//	VideoUrl      string    `gorm:"column:video_url" json:"video_url"`
+//	Cover         string    `gorm:"-" json:"cover"`
+//	PublicTime    string    `gorm:"-" json:"publicTime"`
+//	Comments      []Comment `gorm:"ForeignKey:ArticleId"`
+//	ArticleId	  int64		 `gorm:"-"`
+//}
 type Articles struct {
-	ID            int64     `gorm:"column:id" json:"id"`
-	Title         string    `gorm:"column:title" json:"title"`
-	Summary       string    `gorm:"column:summary" json:"summary"`
-	Content       string    `gorm:"column:content" json:"content"`
-	Type          int       `gorm:"column:type" json:"type"`
-	Num           int       `gorm:"column:num" json:"num"`
-	Realreadnum   int64       `gorm:"column:real_read_num" json:"real_read_num"`
-	Mtime         int64     `gorm:"column:mtime" json:"mtime"`
-	Ctime         int64     `gorm:"column:ctime" json:"ctime"`
-	ClassId       int64     `gorm:"column:class_id" json:"class_id"`
-	Author        string    `gorm:"column:author" json:"author"`
-	Status        int       `gorm:"column:status" json:"status"`
-	Reason        string    `gorm:"column:reason" json:"reason"`
-	StarNum       int       `gorm:"column:star_num" json:"star_num"`
-	CommentNum    int       `gorm:"column:comment_num" json:"comment_num"`
-	UserOrgId     int64     `gorm:"column:user_org_id" json:"user_org_id"`
-	ArticleStatus int64     `gorm:"column:article_status" json:"article_status"`
-	Imgs          string    `gorm:"column:imgs" json:"imgs"`
-	VideoUrl      string    `gorm:"column:video_url" json:"video_url"`
-	Cover         string    `gorm:"-" json:"cover"`
-	PublicTime    string    `gorm:"-" json:"publicTime"`
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
+	Title string `gorm:"column:title" json:"title" form:"title"`
+	Summary string `gorm:"column:summary" json:"summary" form:"summary"`
+	Content string `gorm:"column:content" json:"content" form:"content"`
+	Type int64 `gorm:"column:type" json:"type" form:"type"`
+	Num int64 `gorm:"column:num" json:"num" form:"num"`
+	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	RealReadNum int64 `gorm:"column:real_read_num" json:"real_read_num" form:"real_read_num"`
+	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ClassId int64 `gorm:"column:class_id" json:"class_id" form:"class_id"`
+	Author string `gorm:"column:author" json:"author" form:"author"`
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
+	Reason string `gorm:"column:reason" json:"reason" form:"reason"`
+	StarNum int64 `gorm:"column:star_num" json:"star_num" form:"star_num"`
+	CommentNum int64 `gorm:"column:comment_num" json:"comment_num" form:"comment_num"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ArticleStatus int64 `gorm:"column:article_status" json:"article_status" form:"article_status"`
+	Imgs string `gorm:"column:imgs" json:"imgs" form:"imgs"`
+	VideoUrl string `gorm:"column:video_url" json:"video_url" form:"video_url"`
+	Source int64 `gorm:"column:source" json:"source" form:"source"`
+	CategoryId int64 `gorm:"column:category_id" json:"category_id" form:"category_id"`
+	Ttid int64 `gorm:"column:ttid" json:"ttid" form:"ttid"`
+	Ttype int64 `gorm:"column:ttype" json:"ttype" form:"ttype"`
+	Toid int64 `gorm:"column:toid" json:"toid" form:"toid"`
 	Comments      []Comment `gorm:"ForeignKey:ArticleId"`
+	PublicTime    string    `gorm:"-" json:"publicTime"`
 	ArticleId	  int64		 `gorm:"-"`
 }
 
+
+
 func (Articles) TableName() string {
 	return "sgj_patient_articles"
 }

models/site_models.go

@@ -232,6 +232,7 @@ type SgjPatientOrdmodel struct {
 	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	Status int64 `gorm:"column:status" json:"status" form:"status"`
 	ModeType int64 `gorm:"column:mode_type" json:"mode_type" form:"mode_type"`
+	Hosaddress     SgjPatientHosaddress `gorm:"ForeignKey:Modeid"`
 	Connectway     []SgjPatientConnectway `gorm:"ForeignKey:ModeId"`
 	Worktime     SgjPatientWorktime `gorm:"ForeignKey:ModeId"`
 	Rideway  SgjPatientRideway `gorm:"ForeignKey:ModeId"`
@@ -380,3 +381,20 @@ func (SgjPatientMacnavigation) TableName() string {
 	return "sgj_patient_macnavigation"
 }
 
+type SgjPatientHosaddress struct {
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
+	Title string `gorm:"column:title" json:"title" form:"title"`
+	Sort int64 `gorm:"column:sort" json:"sort" form:"sort"`
+	Address string `gorm:"column:address" json:"address" form:"address"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Modeid int64 `gorm:"column:modeid" json:"modeid" form:"modeid"`
+}
+
+func (SgjPatientHosaddress) TableName() string  {
+
+	return "sgj_patient_hosaddress"
+}
+

service/article_service/article_category_service.go

@@ -154,6 +154,23 @@ func GetPublished(orgID int64,page int64,limit int64, searchKey string)(articles
 	return
 }
 
+//func GetAllartic(page int64,limit int64,orgID int64)(articles []*models.Articles,total int64, err error)  {
+//	db := service.PatientReadDB().Table("sgj_patient_articles as a ").Where("a.status=1")
+//	if (orgID > 0) {
+//		db = db.Where("a.user_org_id=? AND article_status = ?", orgID,1)
+//	}
+//	offset := (page - 1) * limit
+//	err = db.Count(&total).Order("a.ctime desc").Offset(offset).Limit(limit).
+//		Preload("Comments", func(db *gorm.DB) *gorm.DB {
+//		return  db.Where(" status = ?",1)
+//	}).Select("a.id, a.title, a.summary, a.content, a.type, a.num, a.mtime, a.real_read_num, a.ctime, a.class_id, a.author, a.status, a.reason,a.star_num, a.comment_num,a.user_org_id, a.article_status, a.imgs, a.video_url, a.source, a.category_id, a.ttid, a.ttype, a.toid").Find(&articles).Error
+//	fmt.Println("err是啥呢?",err)
+//	if err != nil {
+//		return
+//	}
+//	return
+//}
+
 func GetDraftbox(orgID int64,page int64,limit int64, searchKey string)(articles []*models.Articles,total int64, err error) {
 	db := service.PatientReadDB().Table("sgj_patient_articles as a ").Where("a.status=1")
 	if (orgID > 0) {

service/site_service/site_microwebsite_service.go

@@ -352,6 +352,12 @@ func AddOrdModel(ordmodel *models.SgjPatientOrdmodel)error  {
 	return err
 }
 
+func AddHosAddress(hosaddress *models.SgjPatientHosaddress) error  {
+
+	err := service.PatientWriteDB().Create(&hosaddress).Error
+	return  err
+}
+
 func QueryOrdeModelByID(orgid int64)(models.SgjPatientOrdmodel,error)  {
 	ordmodel := models.SgjPatientOrdmodel{}
 	err := service.PatientReadDB().Where("user_org_id = ? AND status = ? ", orgid, 1).Last(&ordmodel).Error
@@ -373,7 +379,7 @@ func GetOrederModel(orgid int64)(model []*models.SgjPatientOrdmodel,err error)
 	if(orgid > 0){
 		db = db.Where("user_org_id = ?", orgid)
 	}
-	err = db.Preload("Connectway").Preload("Worktime").Preload("Rideway").Preload("Oldration").
+	err = db.Preload("Hosaddress").Preload("Connectway").Preload("Worktime").Preload("Rideway").Preload("Oldration").
 		Select("o.id,o.title,o.sort,o.ctime,o.mtime,o.mode_type").Order("sort").Find(&model).Error
     fmt.Println("sql错误是什么",err)
 	return
@@ -420,3 +426,39 @@ func AddMarginChart(macnavigation *models.SgjPatientMacnavigation) error  {
 	err := service.PatientWriteDB().Create(&macnavigation).Error
 	return err
 }
+
+func DeleteRotations(id int64, orgid int64)(error)  {
+	err := service.PatientWriteDB().Model(models.SgjPatientEditpiclink{}).Where("id = ? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return  err
+}
+
+func UpdateRotationImages(orgid int64,id int64)(models.SgjPatientEditpiclink,error){
+	editpiclink := models.SgjPatientEditpiclink{}
+	err := service.PatientReadDB().Model(&editpiclink).Where("user_org_id = ? AND id = ? AND status = ?", orgid, id, 1).Find(&editpiclink).Error
+	return editpiclink,err
+}
+
+func SaveRotationImages(id int64,orgid int64,editpiclink models.SgjPatientEditpiclink)error  {
+	err := service.PatientWriteDB().Model(editpiclink).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"images": editpiclink.Images, "sort": editpiclink.Sort, "piclink": editpiclink.Piclink, "linkaddress": editpiclink.Linkaddress, "mtime": time.Now().Unix()}).Error
+	return  err
+}
+
+func EditNavigation(orgid int64,id int64)(models.SgjPatientNavigation,error){
+	navigation := models.SgjPatientNavigation{}
+	err := service.PatientReadDB().Model(&navigation).Where("user_org_id = ? AND id = ? AND status = ?", orgid, id, 1).Find(&navigation).Error
+	return  navigation,err
+}
+
+func UpdateNavtion(id int64,orgid int64,navigation models.SgjPatientNavigation) error {
+	err := service.PatientWriteDB().Model(navigation).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"navtitle": navigation.Navtitle, "navimages": navigation.Navimages, "jumpset": navigation.Jumpset, "navaddress": navigation.Navaddress, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func DeleteImages(id int64,orgid int64)(error)  {
+	err := service.PatientWriteDB().Model(models.SgjPatientConrotation{}).Where("id = ? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+
+
+