微网站

controllers/article/article_controller.go

@@ -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")
+	beego.Router("/api/aritcle/getallcategory",&ArticleManage{},"Get:GetAllCategory")
 	beego.Router("/api/article/getarticledetail",&ArticleManage{},"Get:GetArticleDetail")
 	beego.Router("/api/article/getvidodetail",&ArticleManage{},"Get:GetVidoDetail")
 	beego.Router("/api/article/geteditarticlecontent",&ArticleManage{},"Get:GetEditArticleContent")

controllers/micro/micro_controller.go

@@ -42,6 +42,7 @@ func (this *Micro) ServeSuccessJSON(data map[string]interface{}) {
 
 
 func (this *Micro) GetData(){
+	fmt.Println("我和我的祖国")
 	orgid, _ := this.GetInt64("orgid")
 	fmt.Println("小明id",orgid)
 	model, err := micro_service.GetData(orgid)

controllers/site/site_controller.go

@@ -55,7 +55,7 @@ func siteRouters() {
 	beego.Router("/api/site/saveoffice",&Microwebsite{},"Post:SaveOffice")
 	beego.Router("/api/site/gethospital",&Microwebsite{},"Post:GetHospital")
 	beego.Router("/api/site/getDefaultData",&Microwebsite{},"Get:GetDefaultData")
-	beego.Router("/api/site/getdata",&Microwebsite{},"Post:GetData")
+	beego.Router("/api/site/getdata",&Microwebsite{},"Get:GetData")
 	beego.Router("/api/site/editdoc",&Microwebsite{},"Get:EditDoc")
 	beego.Router("/api/site/savedocinfo",&Microwebsite{},"Post:SaveDocInfo")
 	beego.Router("/api/site/editImages",&Microwebsite{},"Get:EditImages")
@@ -156,7 +156,7 @@ func siteRouters() {
 	beego.Router("/api/site/getlinkaddress",&Microwebsite{},"Get:GetLinkAddress")
 	beego.Router("/api/site/getcountimages",&Microwebsite{},"Get:GetCountImages")
     beego.Router("/api/site/addNavigationlinkform",&Microwebsite{},"Post:AddNavigationLinkform")
-	beego.Router("api/site/getnavigationlinkaddress",&Microwebsite{},"Get:GetNavigationlinkaddress")
+	beego.Router("/api/site/getnavigationlinkaddress",&Microwebsite{},"Get:GetNavigationlinkaddress")
     beego.Router("/api/site/updateditnavigationlinkform",&Microwebsite{},"Post:UpdateditnavigationLink")
 	beego.Router("/api/site/addoctorinfotwo",&Microwebsite{},"Post:AddDoctorInfoTwo")
 	beego.Router("/api/site/getuserorgid",&Microwebsite{},"Get:GetUserOrgID")
@@ -171,6 +171,9 @@ func siteRouters() {
 	beego.Router("/api/site/addlinkaddressfour",&Microwebsite{},"Post:AddLinkAddressFour")
     beego.Router("/api/site/getmaginclinkaddressbyid",&Microwebsite{},"Get:GetMagicLinkAddressById")
 	beego.Router("/api.site/getmagicclickbylinkid",&Microwebsite{},"Get:GetMagicClickByLinkID")
+	beego.Router("/api/site/editrotationemages",&Microwebsite{},"Get:GeteditRotationEmages")
+	beego.Router("/api/site/getoutrotationlink",&Microwebsite{},"Get:GetOutRotationLink")
+	beego.Router("/api/site/updatedrolinkaddress",&Microwebsite{},"Post:UpdatedRolinkAddress")
 }
 
 type Microwebsite struct {
@@ -1790,11 +1793,21 @@ func (this *Microwebsite) GetDefaultData()  {
 
 
 func (this *Microwebsite) GetData()  {
+	//每1秒监听一次使用定时器
+	//ticker := time.NewTicker(5 * time.Second)
+	//	//for _ = range ticker.C {
+	//	//	fmt.Println("当前是时间是是啥呢吗打发发发呆阿道夫",time.Now())
+	//	//
+	//	//}
+
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := int64(adminUserInfo.CurrentOrgId)
-	fmt.Println("机构ID" ,userOrgID)
+	fmt.Println("机构ID机构ID机构ID机构IDvvvv机构ID机构ID机构ID机构ID机构ID机构ID" ,userOrgID)
 	model, err := site_service.GetData(userOrgID)
-	if (len(model) == 0){
+	fmt.Println("model是什么",model)
+	fmt.Println("长度",len(model))
+	fmt.Println("err",err)
+	if(len(model) == 0){
 		patientModel := models.SgjPatientModel{
 			Title:     "轮播图",
 			Sort:      1,
@@ -1817,239 +1830,239 @@ func (this *Microwebsite) GetData()  {
 		}
 		err = site_service.AddPatientEdit(&editpiclink)
 		fmt.Println("err",err)
-
-		patientmodefour := models.SgjPatientModel{
-			Title:     "魔方导航",
-			Sort:      2,
-			UserOrgId: userOrgID,
-			Ctime:     time.Now().Unix(),
-			Status:    1,
-			ModeType:  8,
-		}
-		addPatientModelTwo := site_service.AddPatientModelTwo(&patientmodefour)
-		fmt.Println(addPatientModelTwo)
-		sgjpatietnmodelfour, err := site_service.GetQueryModelByLastData(userOrgID)
-		fmt.Println("第二个模块id",sgjpatietnmodelfour)
-		fmt.Println(err)
-		editmargin := models.SgjPatientEditmargin{
-			Margtitle: "医院介绍",
-			Margimage: "https://images.shengws.com/2109_o_1569824063320.png",
-			UserOrgId: userOrgID,
-			Status:    1,
-			Ctime:     time.Now().Unix(),
-			Modeid:    sgjpatietnmodelfour.ID,
-		}
-		margin := site_service.AddEditMargin(&editmargin)
-		fmt.Println(margin)
-
-		patientEditmargin := models.SgjPatientEditmargin{
-			Margtitle: "医护团队",
-			Margimage: "https://images.shengws.com/2121_o_1569824193950.png",
-			UserOrgId: userOrgID,
-			Status:    1,
-			Ctime:     time.Now().Unix(),
-			Modeid:    sgjpatietnmodelfour.ID,
-		}
-		err = site_service.AddEditMargin(&patientEditmargin)
-		fmt.Println(err)
-
-		sgjPatientEditmargin := models.SgjPatientEditmargin{
-			Margtitle: "科室介绍",
-			Margimage: "https://images.shengws.com/2113_o_1569824421007.png",
-			UserOrgId: userOrgID,
-			Status:    1,
-			Ctime:     time.Now().Unix(),
-			Modeid:    sgjpatietnmodelfour.ID,
-		}
-
-		err = site_service.AddEditMargin(&sgjPatientEditmargin)
-		fmt.Println(err)
-
-		patienteditmarginfour := models.SgjPatientEditmargin{
-			Margtitle: "医院活动",
-			Margimage: "https://images.shengws.com/2131_o_1569824498886.png",
-			UserOrgId: userOrgID,
-			Status:    1,
-			Ctime:     time.Now().Unix(),
-			Modeid:    sgjpatietnmodelfour.ID,
-		}
-
-		err = site_service.AddEditMargin(&patienteditmarginfour)
-		fmt.Println(err)
-
-		patienteditmarginfive := models.SgjPatientEditmargin{
-			Margtitle: "医院环境",
-			Margimage: "https://images.shengws.com/2131_o_1569824498886.png",
-			UserOrgId: userOrgID,
-			Status:    1,
-			Ctime:     time.Now().Unix(),
-			Modeid:    sgjpatietnmodelfour.ID,
-		}
-
-		err = site_service.AddEditMargin(&patienteditmarginfive)
-		fmt.Println(err)
-
-		patienteditmarginsix := models.SgjPatientEditmargin{
-			Margtitle: "咨询服务",
-			Margimage: "https://images.shengws.com/2111_o_1569824596227.png",
-			UserOrgId: userOrgID,
-			Status:    1,
-			Ctime:     time.Now().Unix(),
-			Modeid:    sgjpatietnmodelfour.ID,
-		}
-		err = site_service.AddEditMargin(&patienteditmarginsix)
-		fmt.Println(err)
-
-		patienteditmarginserven := models.SgjPatientEditmargin{
-			Margtitle: "加入会员",
-			Margimage: "https://images.shengws.com/2126_o_1569824611892.png",
-			UserOrgId: userOrgID,
-			Status:    1,
-			Ctime:     time.Now().Unix(),
-			Modeid:    sgjpatietnmodelfour.ID,
-		}
-
-		err = site_service.AddEditMargin(&patienteditmarginserven)
-		fmt.Println(err)
-
-		patienteditmargineghit := models.SgjPatientEditmargin{
-			Margtitle: "联系我们",
-			Margimage: "https://images.shengws.com/2141_o_1569824626531.png",
-			UserOrgId: userOrgID,
-			Status:    1,
-			Ctime:     time.Now().Unix(),
-			Modeid:    sgjpatietnmodelfour.ID,
-		}
-		err = site_service.AddEditMargin(&patienteditmargineghit)
-		fmt.Println(err)
-
-		patientModelTwo := models.SgjPatientModel{
-			Title:     "医院介绍",
-			Sort:      3,
-			UserOrgId: userOrgID,
-			Ctime:     time.Now().Unix(),
-			Status:    1,
-			ModeType:  2,
-		}
-		two := site_service.AddPatientModelTwo(&patientModelTwo)
-		fmt.Println(two)
-		sgjPatientModelTwo, err := site_service.GetQueryModelByLastData(userOrgID)
-		hospital := models.SgjPatientHospital{
-			Title:        "医院介绍",
-			Sort:         3,
-			Introduction: "暂无数据",
-			UserOrgId:    userOrgID,
-			Modleid:      sgjPatientModelTwo.ID,
-			Status:       1,
-			Ctime:        time.Now().Unix(),
-		}
-		addHospital := site_service.AddHospital(&hospital)
-		fmt.Println(addHospital)
-
-		Sgjpatientmodelthree := models.SgjPatientModel{
-			Title:     "科室介绍",
-			Sort:      4,
-			UserOrgId: userOrgID,
-			Ctime:     time.Now().Unix(),
-			Status:    1,
-			ModeType:  3,
-
-		}
-
-		modelTwo := site_service.AddPatientModelTwo(&Sgjpatientmodelthree)
-		fmt.Println(modelTwo)
-		datathree, err := site_service.GetQueryModelByLastData(userOrgID)
-		offices := models.SgjPatientOffices{
-			Title:     "科室介绍",
-			Sort:      4,
-			UserOrgId: userOrgID,
-			Ctime:     time.Now().Unix(),
-			Status:    1,
-			Modleid:   datathree.ID,
-			Introduction:"暂无数据",
-		}
-		err = site_service.AddPatientOffices(&offices)
-		fmt.Println(err)
-
-		patientModelFive := models.SgjPatientModel{
-			Title:     "医护团队",
-			Sort:      5,
-			UserOrgId: userOrgID,
-			Ctime:     time.Now().Unix(),
-			Status:    1,
-			ModeType:  4,
-		}
-		err = site_service.AddPatientModelTwo(&patientModelFive)
-		fmt.Println("err",err)
-		data, err := site_service.GetQueryModelByLastData(userOrgID)
-		fmt.Println(err)
-		editdoctor := models.SgjPatientEditdoctor{
-			Dochead:         "https://images.shengws.com/2062_o_1570608303729.png",
-			DocSort:         1,
-			Docintroduction: "暂时无数据",
-			UserOrgId:       userOrgID,
-			Modleid:         data.ID,
-			Status:1,
-			Ctime:time.Now().Unix(),
-			DocPostion:1,
-		}
-		doctor := site_service.AddEditDoctor(&editdoctor)
-		fmt.Println("doctor",doctor)
-
-		modelserven := models.SgjPatientModel{
-			Title:     "医院环境",
-			Sort:      6,
-			UserOrgId: userOrgID,
-			Ctime:     time.Now().Unix(),
-			Status:    1,
-			ModeType:  5,
-		}
-		err = site_service.AddPatientModelTwo(&modelserven)
-		lastData, err := site_service.GetQueryModelByLastData(userOrgID)
-		enviroimages := models.SgjPatientEnviroimages{
-			Enviroimages: "https://images.shengws.com/2074_o_1570608492452.png",
-			Sort:         1,
-			UserOrgId:    userOrgID,
-			Status:       1,
-			Modeid:       lastData.ID,
-			Ctime:        time.Now().Unix(),
+		fmt.Println("editpiclink",editpiclink)
+		if err !=nil{
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+			return
 		}
-		err = site_service.AddImages(&enviroimages)
-		fmt.Println("err",err)
-
-		//modeleight := models.SgjPatientModel{
-		//	Title:     "文章列表",
-		//	Sort:      7,
-		//	UserOrgId: userOrgID,
-		//	Ctime:     time.Now().Unix(),
-		//	Status:    1,
-		//	ModeType:  6,
-		//}
-		//err = site_service.AddPatientModelTwo(&modeleight)
-		//fmt.Println("文章列表错误u",err)
-		//articles := models.Articles{
-		//	Title:       "暂无数据",
-		//	Imgs:        "https://images.shengws.com/2139_o_1566989829686.jpg",
-		//	RealReadNum: 0,
-		//	CommentNum:  0,
-		//	StarNum:     0,
-		//	UserOrgId:userOrgID,
-		//	Ctime: time.Now().Unix(),
-		//	Status:1,
-		//	ArticleStatus:1,
-		//}
-		//err = site_service.AddActicles(&articles)
-		//fmt.Println("文章错误err",err)
-		//if err !=nil{
-		//	this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
-		//	return
-		//}
-		//this.ServeSuccessJSON(map[string]interface{}{
-		//	"articles":articles,
-		//})
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patientModels":model,
+		})
 	}
-
-	fmt.Println("错误是设么",err)
+	if (len(model) == 0){
+			patientModel := models.SgjPatientModel{
+				Title:     "轮播图",
+				Sort:      1,
+				UserOrgId: userOrgID,
+				Ctime:     time.Now().Unix(),
+				Status:    1,
+				ModeType:  1,
+			}
+			addPatientModel := site_service.AddPatientModelTwo(&patientModel)
+			fmt.Println("第一个模块id",addPatientModel)
+			sgjPatientModel, err := site_service.GetQueryModelByLastData(userOrgID)
+			fmt.Println("查询模块错误是设么",err)
+			editpiclink := models.SgjPatientEditpiclink{
+				Images:    "https://images.shengws.com/2124_o_1570607834870.png",
+				Sort:      1,
+				UserOrgId: userOrgID,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Modeid:sgjPatientModel.ID,
+			}
+			err = site_service.AddPatientEdit(&editpiclink)
+			fmt.Println("err",err)
+
+			patientmodefour := models.SgjPatientModel{
+				Title:     "魔方导航",
+				Sort:      2,
+				UserOrgId: userOrgID,
+				Ctime:     time.Now().Unix(),
+				Status:    1,
+				ModeType:  8,
+			}
+			addPatientModelTwo := site_service.AddPatientModelTwo(&patientmodefour)
+			fmt.Println(addPatientModelTwo)
+			sgjpatietnmodelfour, err := site_service.GetQueryModelByLastData(userOrgID)
+			fmt.Println("第二个模块id",sgjpatietnmodelfour)
+			fmt.Println(err)
+			editmargin := models.SgjPatientEditmargin{
+				Margtitle: "医院介绍",
+				Margimage: "https://images.shengws.com/2109_o_1569824063320.png",
+				UserOrgId: userOrgID,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Modeid:    sgjpatietnmodelfour.ID,
+			}
+			margin := site_service.AddEditMargin(&editmargin)
+			fmt.Println(margin)
+
+			patientEditmargin := models.SgjPatientEditmargin{
+				Margtitle: "医护团队",
+				Margimage: "https://images.shengws.com/2121_o_1569824193950.png",
+				UserOrgId: userOrgID,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Modeid:    sgjpatietnmodelfour.ID,
+			}
+			err = site_service.AddEditMargin(&patientEditmargin)
+			fmt.Println(err)
+
+			sgjPatientEditmargin := models.SgjPatientEditmargin{
+				Margtitle: "科室介绍",
+				Margimage: "https://images.shengws.com/2113_o_1569824421007.png",
+				UserOrgId: userOrgID,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Modeid:    sgjpatietnmodelfour.ID,
+			}
+
+			err = site_service.AddEditMargin(&sgjPatientEditmargin)
+			fmt.Println(err)
+
+			patienteditmarginfour := models.SgjPatientEditmargin{
+				Margtitle: "医院活动",
+				Margimage: "https://images.shengws.com/2131_o_1569824498886.png",
+				UserOrgId: userOrgID,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Modeid:    sgjpatietnmodelfour.ID,
+			}
+
+			err = site_service.AddEditMargin(&patienteditmarginfour)
+			fmt.Println(err)
+
+			patienteditmarginfive := models.SgjPatientEditmargin{
+				Margtitle: "医院环境",
+				Margimage: "https://images.shengws.com/2131_o_1569824498886.png",
+				UserOrgId: userOrgID,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Modeid:    sgjpatietnmodelfour.ID,
+			}
+
+			err = site_service.AddEditMargin(&patienteditmarginfive)
+			fmt.Println(err)
+
+			patienteditmarginsix := models.SgjPatientEditmargin{
+				Margtitle: "咨询服务",
+				Margimage: "https://images.shengws.com/2111_o_1569824596227.png",
+				UserOrgId: userOrgID,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Modeid:    sgjpatietnmodelfour.ID,
+			}
+			err = site_service.AddEditMargin(&patienteditmarginsix)
+			fmt.Println(err)
+
+			patienteditmarginserven := models.SgjPatientEditmargin{
+				Margtitle: "加入会员",
+				Margimage: "https://images.shengws.com/2126_o_1569824611892.png",
+				UserOrgId: userOrgID,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Modeid:    sgjpatietnmodelfour.ID,
+			}
+
+			err = site_service.AddEditMargin(&patienteditmarginserven)
+			fmt.Println(err)
+
+			patienteditmargineghit := models.SgjPatientEditmargin{
+				Margtitle: "联系我们",
+				Margimage: "https://images.shengws.com/2141_o_1569824626531.png",
+				UserOrgId: userOrgID,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Modeid:    sgjpatietnmodelfour.ID,
+			}
+			err = site_service.AddEditMargin(&patienteditmargineghit)
+			fmt.Println(err)
+
+			patientModelTwo := models.SgjPatientModel{
+				Title:     "医院介绍",
+				Sort:      3,
+				UserOrgId: userOrgID,
+				Ctime:     time.Now().Unix(),
+				Status:    1,
+				ModeType:  2,
+			}
+			two := site_service.AddPatientModelTwo(&patientModelTwo)
+			fmt.Println(two)
+			sgjPatientModelTwo, err := site_service.GetQueryModelByLastData(userOrgID)
+			hospital := models.SgjPatientHospital{
+				Title:        "医院介绍",
+				Sort:         3,
+				Introduction: "暂无数据",
+				UserOrgId:    userOrgID,
+				Modleid:      sgjPatientModelTwo.ID,
+				Status:       1,
+				Ctime:        time.Now().Unix(),
+			}
+			addHospital := site_service.AddHospital(&hospital)
+			fmt.Println(addHospital)
+
+			Sgjpatientmodelthree := models.SgjPatientModel{
+				Title:     "科室介绍",
+				Sort:      4,
+				UserOrgId: userOrgID,
+				Ctime:     time.Now().Unix(),
+				Status:    1,
+				ModeType:  3,
+
+			}
+
+			modelTwo := site_service.AddPatientModelTwo(&Sgjpatientmodelthree)
+			fmt.Println(modelTwo)
+			datathree, err := site_service.GetQueryModelByLastData(userOrgID)
+			offices := models.SgjPatientOffices{
+				Title:     "科室介绍",
+				Sort:      4,
+				UserOrgId: userOrgID,
+				Ctime:     time.Now().Unix(),
+				Status:    1,
+				Modleid:   datathree.ID,
+				Introduction:"暂无数据",
+			}
+			err = site_service.AddPatientOffices(&offices)
+			fmt.Println(err)
+
+			patientModelFive := models.SgjPatientModel{
+				Title:     "医护团队",
+				Sort:      5,
+				UserOrgId: userOrgID,
+				Ctime:     time.Now().Unix(),
+				Status:    1,
+				ModeType:  4,
+			}
+			err = site_service.AddPatientModelTwo(&patientModelFive)
+			fmt.Println("err",err)
+			data, err := site_service.GetQueryModelByLastData(userOrgID)
+			fmt.Println(err)
+			editdoctor := models.SgjPatientEditdoctor{
+				Dochead:         "https://images.shengws.com/2062_o_1570608303729.png",
+				DocSort:         1,
+				Docintroduction: "暂时无数据",
+				UserOrgId:       userOrgID,
+				Modleid:         data.ID,
+				Status:1,
+				Ctime:time.Now().Unix(),
+				DocPostion:1,
+			}
+			doctor := site_service.AddEditDoctor(&editdoctor)
+			fmt.Println("doctor",doctor)
+
+			modelserven := models.SgjPatientModel{
+				Title:     "医院环境",
+				Sort:      6,
+				UserOrgId: userOrgID,
+				Ctime:     time.Now().Unix(),
+				Status:    1,
+				ModeType:  5,
+			}
+			err = site_service.AddPatientModelTwo(&modelserven)
+			lastData, err := site_service.GetQueryModelByLastData(userOrgID)
+			enviroimages := models.SgjPatientEnviroimages{
+				Enviroimages: "https://images.shengws.com/2074_o_1570608492452.png",
+				Sort:         1,
+				UserOrgId:    userOrgID,
+				Status:       1,
+				Modeid:       lastData.ID,
+				Ctime:        time.Now().Unix(),
+			}
+			err = site_service.AddImages(&enviroimages)
+			fmt.Println("err",err)
+	}
+	fmt.Println(model,err)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
 		return
@@ -2058,6 +2071,8 @@ func (this *Microwebsite) GetData()  {
 		"patientModels":model,
 
 	})
+
+
 }
 
 func (this *Microwebsite) EditDoctor()  {
@@ -2509,8 +2524,6 @@ func (this *Microwebsite) AddNavigation()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := int64(adminUserInfo.CurrentOrgId)
 	fmt.Println("机构ID",userOrgID)
-	linkid, _ := this.GetInt64("id")
-	fmt.Println("linkid",linkid)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -2533,6 +2546,7 @@ func (this *Microwebsite) AddNavigation()  {
 		return
 	}
     fmt.Println("导航图片",navigationImages)
+	nonavigationimages := dataBody["nonavigationImages"].(string)
 	jumpset := int64(dataBody["jumpset"].(float64))
 	if jumpset <= 0 {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "跳转设置不能为空")
@@ -2541,9 +2555,12 @@ func (this *Microwebsite) AddNavigation()  {
     fmt.Println("调转设置",jumpset)
 	navigationaddress := dataBody["navigationaddress"].(string)
 	fmt.Println("链接地址",navigationaddress)
+	linkid := int64(dataBody["linkid"].(float64))
+	fmt.Println("linkID",linkid)
 	navigation := models.SgjPatientNavigation{
 		Navtitle:   navtitle,
 		Navimages:  navigationImages,
+		Nonavimages:nonavigationimages,
 		Jumpset:    jumpset,
 		Navaddress: navigationaddress,
 		UserOrgId:userOrgID,
@@ -2727,7 +2744,8 @@ func  (this *Microwebsite) AddRotationpic()  {
     fmt.Println("图片链接",piclink)
 	linkaddress := dataBody["linkaddress"].(string)
 	fmt.Println("链接地址",linkaddress)
-
+	linkid := int64(dataBody["linkid"].(float64))
+	fmt.Println("linkid是什么",linkid)
 	conrotation := models.SgjPatientConrotation{
 		Images:      images,
 		Sort:        sort,
@@ -2738,6 +2756,7 @@ func  (this *Microwebsite) AddRotationpic()  {
 		UserOrgId:   userOrgID,
 		Modeid:0,
 		ImgShow:1,
+		Linkid:linkid,
 	}
 
 	err = site_service.AddRotationpic(conrotation)
@@ -2746,11 +2765,10 @@ func  (this *Microwebsite) AddRotationpic()  {
 	fmt.Println("err是什么",err)
 	conrotations, total, err := site_service.GetTotalCount(userOrgID)
 	fmt.Println("conrotations",conrotations)
-	conlinkaddress := models.SgjPatientConlinkaddress{
-		ConId:patientConrotation.ID,
-	}
-	err = site_service.UpdateConLinkAddress(userOrgID, 0, conlinkaddress)
-	fmt.Println("错误是小夏",err)
+	//conlinkaddress := models.SgjPatientConlinkaddress{
+	//	ConId:patientConrotation.ID,
+	//}
+	//err = site_service.UpdateConLinkAddress(userOrgID, 0, conlinkaddress)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
 		return
@@ -3226,12 +3244,12 @@ func (this *Microwebsite) SaveNavigation()  {
 		return
 	}
 
-	//noCheckImages := dataBody["noCheckImages"].(string)
-	//fmt.Println("导航图标选中",navimages)
-	//if len(navimages) == 0 {
-	//	this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "图片编辑不能为空")
-	//	return
-	//}
+	noCheckImages := dataBody["nonavimages"].(string)
+	fmt.Println("导航图标未选中",noCheckImages)
+	if len(navimages) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "图片编辑不能为空")
+		return
+	}
 	jumpset := int64(dataBody["jumpset"].(float64))
 	fmt.Println("跳转设置",jumpset)
 	if jumpset <= 0 {
@@ -3243,6 +3261,7 @@ func (this *Microwebsite) SaveNavigation()  {
 	navigation := models.SgjPatientNavigation{
 		Navtitle:   navtitle,
 		Navimages:  navimages,
+        Nonavimages:noCheckImages,
 		Jumpset:    jumpset,
 		Navaddress: navaddress,
 	}
@@ -4621,43 +4640,22 @@ func (this *Microwebsite) AddPicLinkAddress()  {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
 		return
 	}
-	linkType := int64(dataBody["linkType"].(float64))
-	fmt.Println("链接类型",linkType)
-	linkTypeTwo := int64(dataBody["linkTypeTwo"].(float64))
-	fmt.Println("链接类型二",linkTypeTwo)
-	linkTypeThree := int64(dataBody["linkTypeThree"].(float64))
-	fmt.Println("链接类型三",linkTypeThree)
-	linkTypeFour := int64(dataBody["linkTypeFour"].(float64))
-	fmt.Println("链接类型四",linkTypeFour)
-	linkAddress := dataBody["linkAddress"].(string)
-	fmt.Println("链接地址",linkAddress)
-	defineAddress := dataBody["defineAddress"].(string)
-	fmt.Println("自定义地址",defineAddress)
-	if(defineAddress != ""){
-		linkAddress  = defineAddress
-	}
+	defineaddress := dataBody["defineaddress"].(string)
+	fmt.Println("defineaddress",defineaddress)
 	conlinkaddress := models.SgjPatientConlinkaddress{
+		Defineaddress: defineaddress,
 		UserOrgId:     userOrgID,
-		Linktype:      linkType,
-		Linktypetwo:   linkTypeTwo,
-		Linktypethree: linkTypeThree,
-		Linktypefour:  linkTypeFour,
-		Linkaddress:   linkAddress,
-		Defineaddress: defineAddress,
-		Ctime:         time.Now().Unix(),
 		Status:        1,
-		ConId:0,
+		Ctime:         time.Now().Unix(),
 	}
-	err = site_service.AddPicLinkAddress(&conlinkaddress)
-	patientConlinkaddress, err := site_service.GetConLinkAddressById(userOrgID)
-	fmt.Println("数据",patientConlinkaddress)
+	err  = site_service.AddConlinkaddress(&conlinkaddress)
 	fmt.Println("错误",err)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"patientConlinkaddress":patientConlinkaddress,
+		"conlinkaddress":conlinkaddress,
 	})
 }
 
@@ -4690,38 +4688,7 @@ func (this *Microwebsite) UpdatePicFformThree()  {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
 		return
 	}
-	linkType := int64(dataBody["linktype"].(float64))
-	fmt.Println("链接1",linkType)
-	linkTypeTwo := int64(dataBody["linktypetwo"].(float64))
-	fmt.Println("链接2",linkTypeTwo)
-	linkTypeThree := int64(dataBody["linktypethree"].(float64))
-	fmt.Println("链接3",linkTypeThree)
-	linkTypeFour := int64(dataBody["linktypefour"].(float64))
-	fmt.Println("链接4",linkTypeFour)
-	linkAddress := dataBody["linkAddress"].(string)
-	fmt.Println("链接5",linkAddress)
-	defineAddress := dataBody["defineaddress"].(string)
-	fmt.Println("自定义地址",defineAddress)
-	if(defineAddress != ""){
-		linkAddress  = defineAddress
-	}
-	conlinkaddress := models.SgjPatientConlinkaddress{
-		Linktype:      linkType,
-		Linktypetwo:   linkTypeTwo,
-		Linktypethree: linkTypeThree,
-		Linktypefour:  linkTypeFour,
-		Linkaddress:   linkAddress,
-		Defineaddress: defineAddress,
-	}
-	err = site_service.UpdatePicFformThree(userOrgID, id, conlinkaddress)
-	fmt.Println("错误实时设么",err)
-	if err !=nil{
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
-		return
-	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"conlinkaddress":conlinkaddress,
-	})
+
 }
 
 func (this *Microwebsite) GetEnImagesTwo()  {
@@ -5181,49 +5148,41 @@ func (this*Microwebsite) AddNavigationLinkform()  {
 		return
 	}
 	linktype := int64(dataBody["linktype"].(float64))
-	fmt.Println("链接类型",linktype)
-	linktypetwo := int64(dataBody["linktypetwo"].(float64))
-	fmt.Println("链接类型2",linktypetwo)
-	articetype := int64(dataBody["articetype"].(float64))
-	fmt.Println("文章分类",articetype)
-	title := int64(dataBody["title"].(float64))
-	fmt.Println("文章标题",title)
+	fmt.Println("linktype",linktype)
+	navitionlinktype := int64(dataBody["navitionlinktype"].(float64))
+	fmt.Println("navitionlinktype",navitionlinktype)
 	phone := dataBody["phone"].(string)
-	fmt.Println("电话号码",phone)
-	outstation := dataBody["outstation"].(string)
-	fmt.Println("站外链接",outstation)
-	linkaddress := dataBody["linkaddress"].(string)
-	fmt.Println("链接地址",linkaddress)
-	if(phone != ""){
-      linkaddress = phone
+	if(phone == "0"){
+		phone = ""
 	}
-	if(outstation != ""){
-		linkaddress = outstation
+	fmt.Println("phone",phone)
+
+	outstationlink := dataBody["outstationlink"].(string)
+	if(outstationlink == "0"){
+		outstationlink = ""
 	}
-	navgationlink := models.SgjPatientNavgationlink{
-		Linktype:    linktype,
-		Linktypetwo: linktypetwo,
-		Articetype:  articetype,
-		Title:       title,
-		Phone:       phone,
-		Outstation:  outstation,
-		Status:      1,
-		Ctime:       time.Now().Unix(),
-		UserOrgId:   userOrgID,
+	fmt.Println("outstationlink",outstationlink)
+	linkaddress := dataBody["linkaddress"].(string)
+	fmt.Println("linkaddress",linkaddress)
+	navgationlink := models.PatientNavgationlink{
+		Linktype:         linktype,
+		Navitionlinktype: navitionlinktype,
+		Phone:            phone,
+		Outstationlink:   outstationlink,
+		Status:           1,
+		Ctime:            time.Now().Unix(),
 		Linkaddress:linkaddress,
+		UserOrgId:userOrgID,
 	}
-	addNavgationlink := site_service.AddNavgationlink(&navgationlink)
-	patientNavgationlink, err:= site_service.GetNavgationlinkLastData(userOrgID)
-	fmt.Println("错误",err)
-	fmt.Println("patientNavgationlink",patientNavgationlink)
+	err = site_service.AddNavitaionLinkAddress(&navgationlink)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"addNavgationlink":addNavgationlink,
-		"patientNavgationlink":patientNavgationlink,
+		"navgationlink":navgationlink,
 	})
+
 }
 
 func (this*Microwebsite) GetNavigationlinkaddress()  {
@@ -5248,8 +5207,6 @@ func (this*Microwebsite) UpdateditnavigationLink() {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
 	fmt.Println("机构id", 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 {
@@ -5257,36 +5214,26 @@ func (this*Microwebsite) UpdateditnavigationLink() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
 		return
 	}
+	id := int64(dataBody["id"].(float64))
+	fmt.Println("id是什么",id)
 	linktype := int64(dataBody["linktype"].(float64))
-	fmt.Println("链接类型",linktype)
-	linktypetwo := int64(dataBody["linktypetwo"].(float64))
-	fmt.Println("链接类型二",linktypetwo)
-	articetype := int64(dataBody["articetype"].(float64))
-	fmt.Println("文章分类",articetype)
-	title := int64(dataBody["title"].(float64))
-	fmt.Println("文章标题",title)
+	fmt.Println("linktype",linktype)
+	navitionlinktype := int64(dataBody["navitionlinktype"].(float64))
+	fmt.Println("navitionlinktype",navitionlinktype)
 	phone := dataBody["phone"].(string)
-	fmt.Println("电话号码",phone)
-	outstation := dataBody["outstation"].(string)
-	fmt.Println("站外链接",outstation)
+	fmt.Println("phone",phone)
+	outstationlink := dataBody["outstationlink"].(string)
+	fmt.Println("outstationlink",outstationlink)
 	linkaddress := dataBody["linkaddress"].(string)
-	fmt.Println("链接地址",linkaddress)
-	if(phone!=""){
-		linkaddress = phone;
-	}
-	if(outstation != ""){
-		linkaddress = outstation;
-	}
-	navgationlink := models.SgjPatientNavgationlink{
-		Linktype:    linktype,
-		Linktypetwo: linktype,
-		Articetype:  articetype,
-		Title:       title,
-		Phone:       phone,
-		Outstation:outstation,
-		Linkaddress: linkaddress,
+	fmt.Println("linkaddress",linkaddress)
+	navgationlink := models.PatientNavgationlink{
+		Linktype:         linktype,
+		Navitionlinktype: navitionlinktype,
+		Outstationlink:   outstationlink,
+		Linkaddress:      linkaddress,
+		Phone:phone,
 	}
-	err = site_service.UpdateditnavigationLink(userOrgID, id, navgationlink)
+	err = site_service.UpdateditnavigationLink(id, userOrgID, navgationlink)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return
@@ -5294,6 +5241,7 @@ func (this*Microwebsite) UpdateditnavigationLink() {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"navgationlink":navgationlink,
 	})
+
 }
 
 func (this*Microwebsite)  AddDoctorInfoTwo()  {
@@ -5363,6 +5311,7 @@ func (this *Microwebsite) GetNavigationset()  {
 		sgjPatientNavigation := models.SgjPatientNavigation{
 			Navtitle:   "首页",
 			Navimages:  "https://images.shengws.com/2099_o_1570840397245.png",
+			Nonavimages:"https://images.shengws.com/2099_o_1570840397245.png",
 			Jumpset:    1,
 			Navaddress: "",
 			Ctime:      time.Now().Unix(),
@@ -5373,6 +5322,7 @@ func (this *Microwebsite) GetNavigationset()  {
 		patientNavigation := models.SgjPatientNavigation{
 			Navtitle:   "微商城",
 			Navimages:  "https://images.shengws.com/2122_o_1570840361702.png",
+			Nonavimages:"https://images.shengws.com/2122_o_1570840361702.png",
 			Jumpset:    1,
 			Navaddress: "http://shop.kuyicloud.com/app/index.php?i=2&c=entry&m=ewei_shopv2&do=mobile&fxtoken=bdc5659cbd1bd67baa9af215b0d6ae4c&fxorgid=3877&timestamp=1571050598&fxadmin=185&wxref=mp.weixin.qq.com#wechat_redirect",
 			Ctime:      time.Now().Unix(),
@@ -5385,6 +5335,7 @@ func (this *Microwebsite) GetNavigationset()  {
 		sgjPatientNavigationtwo := models.SgjPatientNavigation{
 			Navtitle:   "联系我们",
 			Navimages:  "https://images.shengws.com/2138_o_1570840377129.png",
+			Nonavimages:"https://images.shengws.com/2138_o_1570840377129.png",
 			Jumpset:    1,
 			Navaddress: "",
 			Ctime:      time.Now().Unix(),
@@ -5397,6 +5348,7 @@ func (this *Microwebsite) GetNavigationset()  {
 		sgjPatientNavigationthree := models.SgjPatientNavigation{
 			Navtitle:   "在线客服",
 			Navimages:  "https://images.shengws.com/2079_o_1570842501972.png",
+			Nonavimages:"https://images.shengws.com/2079_o_1570842501972.png",
 			Jumpset:    1,
 			Navaddress: "0755-86526342",
 			Ctime:      time.Now().Unix(),
@@ -5603,4 +5555,52 @@ func (this *Microwebsite) GetMagicClickByLinkID()  {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"magiclink":magiclink,
 	})
+}
+
+func (this *Microwebsite) GeteditRotationEmages()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id",userOrgID)
+	id, _ := this.GetInt64("id")
+	fmt.Println("id",id)
+	conrotation, err := site_service.GetEditRotationEmages(id, userOrgID)
+	fmt.Println("错误",err)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"conrotation":conrotation,
+	})
+}
+
+func (this *Microwebsite) GetOutRotationLink()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id",userOrgID)
+	linkid, _ := this.GetInt64("id")
+	fmt.Println("id",linkid)
+	conlinkaddress, err := site_service.GetOutRotationLink(userOrgID, linkid)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"conlinkaddress":conlinkaddress,
+	})
+}
+
+func (this *Microwebsite) UpdatedRolinkAddress()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := 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
+	}
+	id := int64(dataBody["id"].(float64))
+	fmt.Println("id是什么",id)
 }

models/article_models.go

@@ -12,7 +12,7 @@ type ArticleCategory struct{
 	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Num int64 `gorm:"column:num" json:"num" form:"num"`
-
+	Count int64
 }
 
 func (ArticleCategory) TableName() string  {

models/site_models.go

@@ -228,6 +228,7 @@ type SgjPatientNavigation struct {
 	Status int64 `gorm:"column:status" json:"status" form:"status"`
 	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	Linkid int64 `gorm:"column:linkid" json:"linkid" form:"linkid"`
+	Nonavimages string `gorm:"column:nonavimages" json:"nonavimages" form:"nonavimages"`
 }
 
 func (SgjPatientNavigation) TableName() string  {
@@ -335,6 +336,7 @@ type SgjPatientConrotation struct {
 	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Modeid int64 `gorm:"column:modeid" json:"modeid" form:"modeid"`
 	ImgShow int64 `gorm:"column:img_show" json:"img_show" form:"img_show"`
+	Linkid int64 `gorm:"column:linkid" json:"linkid" form:"linkid"`
 }
 
 func (SgjPatientConrotation) TableName() string  {
@@ -489,18 +491,11 @@ func (SgjPatientLinkaddress)TableName() string {
 type SgjPatientConlinkaddress struct {
 	ID int64 `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Linktype int64 `gorm:"column:linktype" json:"linktype" form:"linktype"`
-	Linktypetwo int64 `gorm:"column:linktypetwo" json:"linktypetwo" form:"linktypetwo"`
-	Linktypethree int64 `gorm:"column:linktypethree" json:"linktypethree" form:"linktypethree"`
-	Linktypefour int64 `gorm:"column:linktypefour" json:"linktypefour" form:"linktypefour"`
-	Linkaddress string `gorm:"column:linkaddress" json:"linkaddress" form:"linkaddress"`
 	Defineaddress string `gorm:"column:defineaddress" json:"defineaddress" form:"defineaddress"`
 	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Status int64 `gorm:"column:status" json:"status" form:"status"`
-	ConId int64 `gorm:"column:con_id" json:"con_id" form:"con_id"`
 }
-
 func (SgjPatientConlinkaddress)TableName() string  {
 
 	return "sgj_patient_conlinkaddress"
@@ -526,22 +521,22 @@ func (SgjPatientMagiclink)TableName() string  {
 	return "sgj_patient_magiclink"
 }
 
-type SgjPatientNavgationlink struct {
+
+type PatientNavgationlink struct {
 	ID int64 `gorm:"column:id" json:"id" form:"id"`
-	Linktype int64 `gorm:"column:linktype" json:"linktype" form:"linktype"`
-	Linktypetwo int64 `gorm:"column:linktypetwo" json:"linktypetwo" form:"linktypetwo"`
-	Articetype int64 `gorm:"column:articetype" json:"articetype" form:"articetype"`
-	Title int64 `gorm:"column:title" json:"title" form:"title"`
 	Phone string `gorm:"column:phone" json:"phone" form:"phone"`
-	Outstation string `gorm:"column:outstation" json:"outstation" form:"outstation"`
+	Outstationlink string `gorm:"column:outstationlink" json:"outstationlink" form:"outstationlink"`
 	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"`
 	Linkaddress string `gorm:"column:linkaddress" json:"linkaddress" form:"linkaddress"`
+	Instationlink int64 `gorm:"column:instationlink" json:"instationlink" form:"instationlink"`
+	Linktype int64 `gorm:"column:linktype" json:"linktype" form:"linktype"`
+	Navitionlinktype int64 `gorm:"column:navitionlinktype" json:"navitionlinktype" form:"navitionlinktype"`
 }
 
-func (SgjPatientNavgationlink) TableName() string {
+func (PatientNavgationlink) TableName() string  {
 
 	return "sgj_patient_navgationlink"
 }

service/article_service/article_category_service.go

@@ -84,6 +84,9 @@ func GetCategorys(page int64,limit int64,orgID int64) ( categorys []*models.Arti
 	if err != nil {
 		return
 	}
+	//rows, err := db.Raw("SELECT t.name,(SELECT count(id) from sgj_patient_articles as a WHERE a.class_id = t.id) as count from sgj_patient_articles_menu as t").Rows()
+	//fmt.Println("错误",err)
+	//fmt.Println("rows是谁很忙",rows)
 	return
 }
 
@@ -235,7 +238,7 @@ func DeleteArticles(id int64,orgID int64)( err error)  {
 }
 
 func GetMenus(OrgID int64)(categorys []*models.ArticleCategory,err error)  {
-	err = service.PatientReadDB().Where("user_org_id = ?", OrgID).Find(&categorys).Error
+	err = service.PatientReadDB().Where("user_org_id = ? AND status = ?", OrgID,1).Find(&categorys).Error
 	return  categorys ,err
 }
 

service/site_service/site_microwebsite_service.go

@@ -414,7 +414,7 @@ func GetShareInfo(orgid int64)(models.SgjPatientShare,error)  {
 }
 
 func DeleteNavitionById(orgID int64,id int64)(error)  {
-	err := service.PatientWriteDB().Model(models.SgjPatientNavigation{}).Where("user_org_id = ? AND id = ?", orgID, id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err := service.PatientWriteDB().Model(models.PatientNavgationlink{}).Where("user_org_id = ? AND id = ?", orgID, id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return  err
 }
 
@@ -571,7 +571,7 @@ func EditNavigation(orgid int64,id int64)(models.SgjPatientNavigation,error){
 }
 
 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
+	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,"nonavimages":navigation.Nonavimages, "jumpset": navigation.Jumpset, "navaddress": navigation.Navaddress, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -635,7 +635,7 @@ func GetPatientConrotationLast(orgid int64)( models.SgjPatientConrotation,error)
 	return conrotation,err
 }
 func UpdateConLinkAddress(orgid int64,conid int64,conlinkaddress models.SgjPatientConlinkaddress) error {
-	err := service.PatientWriteDB().Model(&conlinkaddress).Where("user_org_id = ? and status = ? and con_id = ?", orgid, 1, conid).Update(map[string]interface{}{"con_id": conlinkaddress.ConId, "mtime": time.Now().Unix()}).Error
+	err := service.PatientWriteDB().Model(&conlinkaddress).Where("user_org_id = ? and status = ? and con_id = ?", orgid, 1, conid).Update(map[string]interface{}{"mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -930,7 +930,7 @@ func UpdateHosAddress(id int64,orgid int64,hosaddress models.SgjPatientHosaddres
 	return err
 }
 
-func AddPicLinkAddress(conlinkaddress *models.SgjPatientConlinkaddress) error {
+func AddConlinkaddress (conlinkaddress *models.SgjPatientConlinkaddress) error {
 	err := service.PatientWriteDB().Create(&conlinkaddress).Error
 	return  err
 }
@@ -947,11 +947,11 @@ func GetLinkAddressDetail(orgid int64,conid int64)(models.SgjPatientConlinkaddre
 	return conlinkaddress,err
 }
 
-func UpdatePicFformThree(orgid int64,id int64,conlinkaddress models.SgjPatientConlinkaddress) error {
-
-	err := service.PatientReadDB().Model(&conlinkaddress).Where("user_org_id = ? AND id = ? AND status = ?", orgid, id, 1).Update(map[string]interface{}{"linktype": conlinkaddress.Linktype, "linktypetwo": conlinkaddress.Linktypetwo, "linktypethree": conlinkaddress.Linktypethree, "linktypefour": conlinkaddress.Linktypefour,"linkaddress":conlinkaddress.Linkaddress,"defineaddress":conlinkaddress.Defineaddress}).Error
-	return err
-}
+//func UpdatePicFformThree(orgid int64,id int64,conlinkaddress models.SgjPatientConlinkaddress) error {
+//
+//	err := service.PatientReadDB().Model(&conlinkaddress).Where("user_org_id = ? AND id = ? AND status = ?", orgid, id, 1).Update(map[string]interface{}{"linktype": conlinkaddress.Linktype, "linktypetwo": conlinkaddress.Linktypetwo, "linktypethree": conlinkaddress.Linktypethree, "linktypefour": conlinkaddress.Linktypefour,"linkaddress":conlinkaddress.Linkaddress,"defineaddress":conlinkaddress.Defineaddress}).Error
+//	return err
+//}
 
 func GetEnImagesTwo(orgid int64)(editpiclink []models.SgjPatientEditpiclink,err error)  {
 	err = service.PatientReadDB().Model(&editpiclink).Where("user_org_id = ? AND status = ?", orgid, 1).Order("sort").Find(&editpiclink).Error
@@ -1047,6 +1047,11 @@ func AddMacLinkAddress(magiclink *models.SgjPatientMagiclink)error  {
 	return  err
 }
 
+func AddNavitaionLinkAddress(navgationlink *models.PatientNavgationlink)error  {
+	err := service.PatientWriteDB().Create(&navgationlink).Error
+	return  err
+}
+
 func GetPatientLinkAddress(id int64,orgid int64)(models.SgjPatientLinkaddress,error)  {
 	linkaddress := models.SgjPatientLinkaddress{}
 	err := service.PatientReadDB().Where(" id = ? AND user_org_id = ?", id, orgid).Find(&linkaddress).Error
@@ -1083,27 +1088,27 @@ func QueryEditpiclinkCount(mid int64,orgid int64)(editpiclink []models.SgjPatien
 	return editpiclink,total,err
 }
 
-func AddNavgationlink(navgationlink *models.SgjPatientNavgationlink)error  {
+func AddNavgationlink(navgationlink *models.PatientNavgationlink)error  {
 	err := service.PatientWriteDB().Create(&navgationlink).Error
 	return err
 }
 
-func GetNavgationlinkLastData(orgid int64)(models.SgjPatientNavgationlink,error)  {
-	navgationlink := models.SgjPatientNavgationlink{}
+func GetNavgationlinkLastData(orgid int64)(models.PatientNavgationlink,error)  {
+	navgationlink := models.PatientNavgationlink{}
 	err := service.PatientReadDB().Where("user_org_id = ? AND status = ?", orgid, 1).Last(&navgationlink).Error
 	return navgationlink,err
 }
 
-func GetNavgationlinkAddressBylinkId(orgid int64,linkid int64)(models.SgjPatientNavgationlink,error)  {
-	navgationlink := models.SgjPatientNavgationlink{}
+func GetNavgationlinkAddressBylinkId(orgid int64,linkid int64)(models.PatientNavgationlink,error)  {
+	navgationlink := models.PatientNavgationlink{}
 	err := service.PatientReadDB().Where("user_org_id = ? AND id = ?", orgid, linkid).Find(&navgationlink).Error
 	return navgationlink,err
 }
 
-func UpdateditnavigationLink(orgid int64,id int64,navgationlink models.SgjPatientNavgationlink) error {
+func UpdateditnavigationLink(id int64,orgid int64,navgationlink models.PatientNavgationlink) error {
 
-	err := service.PatientWriteDB().Model(&navgationlink).Where("user_org_id = ? AND id =?", orgid, id).Update(map[string]interface{}{"linktype": navgationlink.Linktype, "linktypetwo": navgationlink.Linktypetwo, "articetype": navgationlink.Articetype, "title": navgationlink.Title, "phone": navgationlink.Phone, "outstation":
-	navgationlink.Outstation, "linkaddress": navgationlink.Linkaddress, "mtime": time.Now().Unix()}).Error
+	err := service.PatientWriteDB().Model(&navgationlink).Where("id = ? AND user_org_id =?", id, orgid).Update(map[string]interface{}{"linktype": navgationlink.Linktype, "navitionlinktype": navgationlink.Navitionlinktype,  "phone": navgationlink.Phone, "outstationlink":
+	navgationlink.Outstationlink, "linkaddress": navgationlink.Linkaddress, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1216,4 +1221,16 @@ func GetMagicClickByLinkID(orgid int64,linkid int64)(models.SgjPatientMagiclink,
 	magiclink := models.SgjPatientMagiclink{}
 	err := service.PatientReadDB().Model(&magiclink).Where("user_org_id = ? AND id = ? AND status = ?", orgid, linkid, 1).Find(&magiclink).Error
 	return magiclink,err
+}
+
+func GetEditRotationEmages(id int64,orgid int64)(models.SgjPatientConrotation,error)  {
+	conrotation := models.SgjPatientConrotation{}
+	err := service.PatientReadDB().Where("id = ? AND user_org_id = ?", id, orgid).Find(&conrotation).Error
+	return  conrotation,err
+}
+
+func GetOutRotationLink(orgid int64,linkid int64)(models.SgjPatientConlinkaddress,error)  {
+	conlinkaddress := models.SgjPatientConlinkaddress{}
+	err := service.PatientReadDB().Where("user_org_id = ? AND id = ?", orgid, linkid).Find(&conlinkaddress).Error
+	return  conlinkaddress,err
 }