bug修改

controllers/site/site_controller.go

@@ -152,6 +152,10 @@ func siteRouters() {
 	beego.Router("/api/site/updatelinkaddress",&Microwebsite{},"Post:UpdateLinkAddress")
 	beego.Router("/api/site/addmaclinkaddress",&Microwebsite{},"Post:AddMacLinkAddress")
 	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/updateditnavigationlinkform",&Microwebsite{},"Post:UpdateditnavigationLink")
 }
 
 type Microwebsite struct {
@@ -568,6 +572,7 @@ func (this *Microwebsite) AddKeEnvironment()  {
 		id := int64(idsInter.(float64))
 		ids = append(ids, id)
 	}
+	fmt.Println("ids是什么",ids)
 	model := models.SgjPatientModel{
 		Title:     title,
 		Sort:      sort,
@@ -1398,6 +1403,12 @@ func (this *Microwebsite) Deletemodlebyid()  {
 	err := site_service.DeletemodleById(id, userOrgID)
 	modelid := site_service.DeleteHospitalByModelid(id, userOrgID)
 	byModelid := site_service.DeleteOfficeByModelid(id, userOrgID)
+	linkByModelid := site_service.DeleteEditPicLinkByModelid(id, userOrgID)
+	enviroments := site_service.DeleteEnviroments(id, userOrgID)
+	conrotation := site_service.DeleteConrotation(id, userOrgID)
+	fmt.Println("linkByModelid",linkByModelid)
+	fmt.Println("enviroments",enviroments)
+	fmt.Println("enviroments",conrotation)
 	fmt.Println(modelid,byModelid)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除成功")
@@ -1767,6 +1778,8 @@ func (this *Microwebsite) AddImages()  {
 		UserOrgId:    userOrgID,
 		Ctime:        time.Now().Unix(),
 		Status:       1,
+		Imgshow:1,
+
 	}
 	err = site_service.AddImages(&patientEnviroimages)
 	if err !=nil{
@@ -1941,6 +1954,8 @@ 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 {
@@ -1979,6 +1994,7 @@ func (this *Microwebsite) AddNavigation()  {
 		UserOrgId:userOrgID,
 		Status: 1,
 		Ctime:time.Now().Unix(),
+		Linkid:linkid,
 	}
 	err = site_service.AddNavigation(&navigation)
 	if err !=nil{
@@ -2097,7 +2113,9 @@ func (this *Microwebsite) DeleteModle()  {
 	errtw := site_service.DeleteModleByModeID(userOrgID, id)
 	way := site_service.DeleteRideWay(userOrgID, id)
 	workTime := site_service.DeleteWorkTime(userOrgID, id)
+	conrotation := site_service.DeleteConrotation(id, userOrgID)
 	fmt.Println("错误是什么",errtw,way,workTime)
+	fmt.Println(conrotation)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除成功")
 		return
@@ -2171,6 +2189,8 @@ func  (this *Microwebsite) AddRotationpic()  {
 	patientConrotation, err := site_service.GetPatientConrotationLast(userOrgID)
 	fmt.Println("patientConrotation是设么",patientConrotation.ID)
 	fmt.Println("err是什么",err)
+	conrotations, total, err := site_service.GetTotalCount(userOrgID)
+	fmt.Println("conrotations",conrotations)
 	conlinkaddress := models.SgjPatientConlinkaddress{
 		ConId:patientConrotation.ID,
 	}
@@ -2181,6 +2201,7 @@ func  (this *Microwebsite) AddRotationpic()  {
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
+		"total":total,
 		"conrotation":conrotation,
 	})
 }
@@ -2329,12 +2350,15 @@ func (this *Microwebsite)  AddImageslink()  {
 	}
 
 	err = site_service.AddImageslink(&editpiclink)
+	edipiclink, total, err := site_service.GetCountImages(userOrgID)
+	fmt.Println(edipiclink)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"editpiclink":editpiclink,
+		"total":total,
 	})
 }
 
@@ -2520,6 +2544,15 @@ func (this *Microwebsite) DeleteRotations(){
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除图片失败")
 		return
 	}
+	edipiclink, total, err := site_service.GetCountImages(userOrgID)
+	fmt.Println("edipiclink",edipiclink)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":total,
+	})
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "ok"
 	this.ServeSuccessJSON(returnData)
@@ -2738,6 +2771,15 @@ func (this *Microwebsite) DeleteImages()  {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
 		return
 	}
+	conrotation, total, err := site_service.GetTotalCount(userOrgID)
+	fmt.Println("conrotation",conrotation)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":total,
+	})
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "ok"
 	this.ServeSuccessJSON(returnData)
@@ -2755,6 +2797,15 @@ func (this *Microwebsite) DeleteSingleImages()  {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
 		return
 	}
+	edipiclink, total, err := site_service.GetCountImages(userOrgID)
+	fmt.Println(edipiclink)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":total,
+	})
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "ok"
 	this.ServeSuccessJSON(returnData)
@@ -2962,6 +3013,8 @@ func (this *Microwebsite) SaveEditpic()  {
 	fmt.Println("图片链接",piclink)
 	linkaddress := dataBody["linkaddress"].(string)
 	fmt.Println("链接地址",linkaddress)
+	modeid := int64(dataBody["modeid"].(float64))
+	fmt.Println("天梦中",modeid)
 	conrotation := models.SgjPatientConrotation{
 		Images:      images,
 		Sort:        sort,
@@ -2974,8 +3027,12 @@ func (this *Microwebsite) SaveEditpic()  {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return
 	}
+	conrotations, err := site_service.QueryConRotation(modeid, userOrgID)
+	fmt.Println("错误小小马",err)
+	fmt.Println(conrotations)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"conrotation":conrotation,
+		"conrotations":conrotations,
 	})
 }
 
@@ -3003,14 +3060,16 @@ func (this *Microwebsite) AddEditpic()  {
 	linkaddress := dataBody["linkaddress"].(string)
 	fmt.Println("链接地址",linkaddress)
 	id, _ := this.GetInt64("id")
+	fmt.Println("下孟子id",id)
 	oldrotation, err := site_service.QueryOldrotion(id, userOrgID)
+	fmt.Println("oldrotation",oldrotation)
 	conrotation := models.SgjPatientConrotation{
 		Images:      images,
 		Sort:        sort,
 		Piclink:     piclink,
 		Linkaddress: linkaddress,
 		Status:      1,
-		Modeid:      oldrotation.ModeId,
+		Modeid:      id,
 		UserOrgId:   userOrgID,
 		Ctime:time.Now().Unix(),
 		ImgShow:1,
@@ -3020,8 +3079,12 @@ func (this *Microwebsite) AddEditpic()  {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return
 	}
+	conrotations, erros := site_service.QueryConRotation(id, userOrgID)
+	fmt.Println("门前错误",erros)
+	fmt.Println("conrotations是什么",conrotations)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"conrotation":conrotation,
+		"conrotations":conrotations,
 	})
 }
 
@@ -3053,13 +3116,14 @@ func (this *Microwebsite) AddEdialogVisible()  {
 	}
 	err = site_service.UpdateConrotaionById(id, userOrgID,oldrotation)
 	fmt.Println(err)
-	patientOldrotation, err:= site_service.QueryOldrotion(id, userOrgID)
+	fmt.Println("马文强错错误是什么",err)
 	ordmodel := models.SgjPatientOrdmodel{
 		Title: title,
 		Sort:  sort,
 	}
-	err = site_service.UpdateOrdeModel(patientOldrotation.ModeId, userOrgID, ordmodel)
-	if err !=nil{
+	err = site_service.UpdateOrdeModel(id, userOrgID, ordmodel)
+
+		if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return
 	}
@@ -3081,13 +3145,17 @@ func (this *Microwebsite) GetEditRotationimages()  {
 	editpiclink, err := site_service.QueryEditpiclink(id, userOrgID)
 	fmt.Println("错误是多少",err)
 	fmt.Println("返回数据",editpiclink)
+	editpiclinks, total, err := site_service.QueryEditpiclinkCount(id, userOrgID)
+	fmt.Println(editpiclinks)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return
 	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"patientEditpiclink":patientEditpiclink,
 		"editpiclink":editpiclink,
+		"total":total,
 	})
 
 }
@@ -3136,6 +3204,8 @@ func (this *Microwebsite) UpdateSingleForm()  {
 	fmt.Println("图片链接",piclink)
     linkaddress := dataBody["linkaddress"].(string)
     fmt.Println("链接地址",linkaddress)
+	modelid := int64(dataBody["modeid"].(float64))
+
 	editpiclink := models.SgjPatientEditpiclink{
 		Images:      images,
 		Sort:        sort,
@@ -3144,7 +3214,7 @@ func (this *Microwebsite) UpdateSingleForm()  {
 	}
 	err = site_service.UpdateEditPatPicLink(id, userOrgID, editpiclink)
 	fmt.Println("第一个错误是设么",err)
-	patientEditpiclink, err := site_service.GetQueryEditpiclink(id, userOrgID)
+	patientEditpiclink, err := site_service.GetQueryEditpiclink(modelid, userOrgID)
 	fmt.Println("错误是多",err)
     fmt.Println("pateientEditpiclink是多少",patientEditpiclink)
 	if err !=nil{
@@ -3194,12 +3264,15 @@ func (this *Microwebsite) AddEditPicForm()  {
 		ImgShow:1,
 	}
 	err = site_service.AddImageslink(&editpiclink)
+	edipiclink, total, err := site_service.GetCountPicImages(userOrgID, patientRotation.ModelId)
+	fmt.Println(edipiclink)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"editpiclink":editpiclink,
+		"total":total,
 	})
 }
 
@@ -3644,11 +3717,14 @@ func  (this *Microwebsite) AddOfficeTwo()  {
 	}
 	sort:= int64(dataBody["sort"].(float64))
 	fmt.Println("排序",sort)
+	modelid := int64(dataBody["modelid"].(float64))
+	fmt.Println("小泽",modelid)
 	enviroimages := models.SgjPatientEnviroimages{
 		Enviroimages: officeImages,
 		Sort:         sort,
 	}
 	err = site_service.UpdateOfficeTwo(userOrgID, id, enviroimages)
+	patientEnviroimages, err := site_service.GetQueryEnviroimage(userOrgID, modelid)
 	fmt.Println("错误是什么",err)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
@@ -3656,6 +3732,7 @@ func  (this *Microwebsite) AddOfficeTwo()  {
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"enviroimages":enviroimages,
+		"patientEnviroimages":patientEnviroimages,
 	})
 }
 
@@ -4527,3 +4604,140 @@ func  (this*Microwebsite) GetLinkAddress()  {
 		"linkaddress":linkaddress,
 	})
 }
+
+func (this*Microwebsite) GetCountImages()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id", userOrgID)
+	edipiclink, total, err := site_service.GetCountImages(userOrgID)
+	fmt.Println(edipiclink)
+	fmt.Println("total是什么",total)
+	fmt.Println("err是什么",err)
+}
+
+func (this*Microwebsite) AddNavigationLinkform()  {
+	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
+	}
+	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)
+	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(outstation != ""){
+		linkaddress = outstation
+	}
+	navgationlink := models.SgjPatientNavgationlink{
+		Linktype:    linktype,
+		Linktypetwo: linktypetwo,
+		Articetype:  articetype,
+		Title:       title,
+		Phone:       phone,
+		Outstation:  outstation,
+		Status:      1,
+		Ctime:       time.Now().Unix(),
+		UserOrgId:   userOrgID,
+		Linkaddress:linkaddress,
+	}
+	addNavgationlink := site_service.AddNavgationlink(&navgationlink)
+	patientNavgationlink, err:= site_service.GetNavgationlinkLastData(userOrgID)
+	fmt.Println("错误",err)
+	fmt.Println("patientNavgationlink",patientNavgationlink)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"addNavgationlink":addNavgationlink,
+		"patientNavgationlink":patientNavgationlink,
+	})
+}
+
+func (this*Microwebsite) GetNavigationlinkaddress()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id", userOrgID)
+	id,_ := this.GetInt64("id")
+	fmt.Println("id是什么",id)
+	navgationlink, err := site_service.GetNavgationlinkAddressBylinkId(userOrgID, id)
+	fmt.Println("大错误",err)
+	fmt.Println(navgationlink)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"navgationlink":navgationlink,
+	})
+}
+
+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 {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+	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)
+	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(outstation != ""){
+		linkaddress = outstation;
+	}
+	navgationlink := models.SgjPatientNavgationlink{
+		Linktype:    linktype,
+		Linktypetwo: linktype,
+		Articetype:  articetype,
+		Title:       title,
+		Phone:       phone,
+		Outstation:outstation,
+		Linkaddress: linkaddress,
+	}
+	err = site_service.UpdateditnavigationLink(userOrgID, id, navgationlink)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"navgationlink":navgationlink,
+	})
+}

models/site_models.go

@@ -36,6 +36,9 @@ type SgjPatientModel struct {
 	Addactivity  SgjPatientAddactivity `gorm:"ForeignKey:Modeid"`
 	Articlelist  SgjPatientArticlelist `gorm:"ForeignKey:Modeid"`
 	Editmargin  []SgjPatientEditmargin `gorm:"ForeignKey:Modeid"`
+	Enviroimages  []SgjPatientEnviroimages `gorm:"ForeignKey:Modeid"`
+	PatientEditpiclink  []SgjPatientEditpiclink `gorm:"ForeignKey:Modeid"`
+
 
 
 
@@ -71,6 +74,7 @@ type SgjPatientEnviroimages struct {
 	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"`
+	Imgshow int64 `gorm:"column:imgshow" json:"imgshow" form:"imgshow"`
 }
 
 func (SgjPatientEnviroimages) TableName() string  {
@@ -222,6 +226,7 @@ type SgjPatientNavigation struct {
 	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	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"`
 }
 
 func (SgjPatientNavigation) TableName() string  {
@@ -259,7 +264,7 @@ type SgjPatientOrdmodel struct {
 	Worktime     SgjPatientWorktime `gorm:"ForeignKey:ModeId"`
 	Rideway  SgjPatientRideway `gorm:"ForeignKey:ModeId"`
 	Oldration  SgjPatientOldrotation `gorm:"ForeignKey:ModeId"`
-
+	Conrotation  []SgjPatientConrotation `gorm:"ForeignKey:Modeid"`
 }
 
 func (SgjPatientOrdmodel) TableName() string  {
@@ -521,4 +526,24 @@ type SgjPatientMagiclink struct {
 func (SgjPatientMagiclink)TableName() string  {
 
 	return "sgj_patient_magiclink"
+}
+
+type SgjPatientNavgationlink 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"`
+	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"`
+}
+
+func (SgjPatientNavgationlink) TableName() string {
+
+	return "sgj_patient_navgationlink"
 }

service/site_service/site_microwebsite_service.go

@@ -245,6 +245,22 @@ func DeleteOfficeByModelid(mid int64,orgID int64)(error)  {
 	return  err
 }
 
+func DeleteEditPicLinkByModelid(mid int64,orgID int64)(error)  {
+	err := service.PatientWriteDB().Model(models.SgjPatientEditpiclink{}).Where("modeid = ? AND user_org_id = ?", mid, orgID).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return  err
+}
+
+func DeleteEnviroments(mid int64,orgID int64)(error)  {
+	err := service.PatientWriteDB().Model(models.SgjPatientEnviroimages{}).Where("modeid = ? AND user_org_id = ?", mid, orgID).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return  err
+}
+
+func DeleteConrotation(mid int64,orgID int64)(error)  {
+	err := service.PatientWriteDB().Model(models.SgjPatientConrotation{}).Where("modeid = ? AND user_org_id = ?", mid, orgID).Update(map[string]interface{}{"status": 0,"img_show":0, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+
 func UpdateOffices(id int64,orgID int64,offices models.SgjPatientOffices) error {
 	err := service.PatientWriteDB().Model(offices).Where("id = ? AND user_org_id = ? AND status = ?", id, orgID, 1).Update(map[string]interface{}{"title": offices.Title, "sort": offices.Sort, "introduction": offices.Introduction, "mtime": time.Now().Unix()}).Error
 	return  err
@@ -261,7 +277,7 @@ func GetData(orgid int64)(model []*models.SgjPatientModel,err error)  {
 		db = db.Where("user_org_id = ? ", orgid)
 	}
 	err = db.Preload("Hospitals").Preload("Offices").Preload("Doctors").Preload("OfficeEnviroment").
-		Preload("Editdoctor").Preload("Rotation").Preload("Macnavigation").Preload("Editmargin").
+		Preload("Editdoctor").Preload("Rotation").Preload("Macnavigation").Preload("Editmargin").Preload("Enviroimages").Preload("PatientEditpiclink").
 		Select("m.id,m.title,m.sort,m.ctime,m.mtime,m.user_org_id,m.status,m.mode_type").Order("sort").Find(&model).Error
 	return
 }
@@ -346,9 +362,8 @@ func GetDoctorDetail(orgid int64,id int64)(editdoctor []*models.SgjPatientEditdo
 	err = service.PatientReadDB().Model(&editdoctor).Where("user_org_id = ? AND modleid = ? AND status = ?", orgid, id, 1).Order("doc_sort").Find(&editdoctor).Error
 	return
 }
-func GetOfficEnviromentDetail(orgid int64,id int64)(models.SgjPatientOffenvironment,error)  {
-	offenvironment := models.SgjPatientOffenvironment{}
-	err := service.PatientReadDB().Model(&offenvironment).Where("user_org_id = ? AND modelid = ? AND status = ?", orgid, id, 1).Order("sort").Find(&offenvironment).Error
+func GetOfficEnviromentDetail(orgid int64,id int64)(offenvironment []models.SgjPatientEnviroimages,err error)  {
+	err = service.PatientReadDB().Model(&offenvironment).Where("user_org_id = ? AND modeid = ? AND status = ?", orgid, id, 1).Order("sort").Find(&offenvironment).Error
 	return offenvironment,err
 }
 
@@ -426,7 +441,7 @@ func GetOrederModel(orgid int64)(model []*models.SgjPatientOrdmodel,err error)
 	if(orgid > 0){
 		db = db.Where("user_org_id = ?", orgid)
 	}
-	err = db.Preload("Hosaddress").Preload("Connectway").Preload("Worktime").Preload("Rideway").Preload("Oldration").
+	err = db.Preload("Hosaddress").Preload("Connectway").Preload("Worktime").Preload("Rideway").Preload("Oldration").Preload("Conrotation").
 		Select("o.id,o.title,o.sort,o.ctime,o.mtime,o.mode_type").Order("sort").Find(&model).Error
     fmt.Println("sql错误是什么",err)
 	return
@@ -464,15 +479,15 @@ func AddImageslink(editpiclink *models.SgjPatientEditpiclink) error  {
 	return  err
 }
 func GetEnImages(orgid int64)(enviroimages []models.SgjPatientEnviroimages,err error)  {
-	err = service.PatientReadDB().Model(&enviroimages).Where("user_org_id = ? AND status = ?", orgid, 1).Order("sort").Find(&enviroimages).Error
+	err = service.PatientReadDB().Model(&enviroimages).Where("user_org_id = ? AND status = ? AND imgshow = ? ", orgid,1,1).Order("sort").Find(&enviroimages).Error
 	return enviroimages,err
 }
 
 func UpdateImages(orgid int64,ids [] int64,enviroimages models.SgjPatientEnviroimages)(err error) {
 	if(len(ids)==1){
-		err = service.PatientWriteDB().Model(&models.SgjPatientEnviroimages{}).Where("id = ? AND user_org_id = ?", ids[0], orgid).Update(map[string]interface{}{"modeid": enviroimages.Modeid, "status": 1, "mtime": time.Now().Unix()}).Error
+		err = service.PatientWriteDB().Model(&models.SgjPatientEnviroimages{}).Where("id = ? AND user_org_id = ? ", ids[0], orgid).Update(map[string]interface{}{"modeid": enviroimages.Modeid, "status": 1,"imgshow":0, "mtime": time.Now().Unix()}).Error
 	}else {
-		err = service.PatientWriteDB().Model(&models.SgjPatientEnviroimages{}).Where("id IN(?) and user_org_id = ?", ids, orgid).Update(map[string]interface{}{"modeid": enviroimages.Modeid, "status": 1, "mtime": time.Now().Unix()}).Error
+		err = service.PatientWriteDB().Model(&models.SgjPatientEnviroimages{}).Where("id IN(?) and user_org_id = ? ", ids, orgid).Update(map[string]interface{}{"modeid": enviroimages.Modeid, "status": 1,"imgshow":0, "mtime": time.Now().Unix()}).Error
 	}
 	return
 }
@@ -510,7 +525,7 @@ func AddMarginChart(macnavigation *models.SgjPatientMacnavigation) error  {
 }
 
 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
+	err := service.PatientWriteDB().Model(models.SgjPatientEditpiclink{}).Where("id = ? AND user_org_id = ? ", id, orgid).Update(map[string]interface{}{"status": 0,"img_show":0, "mtime": time.Now().Unix()}).Error
 	return  err
 }
 
@@ -537,11 +552,11 @@ func UpdateNavtion(id int64,orgid int64,navigation models.SgjPatientNavigation)
 }
 
 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
+	err := service.PatientWriteDB().Model(models.SgjPatientConrotation{}).Where("id = ? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"status": 0,"modeid":0,"img_show":0,"mtime": time.Now().Unix()}).Error
 	return err
 }
 func DeleteSingleImages(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
+	err := service.PatientWriteDB().Model(models.SgjPatientEditpiclink{}).Where("id = ? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"status": 0,"modeid":0,"img_show":0, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -568,9 +583,9 @@ func DeleteMargin(id int64,orgid int64)(error)  {
 	return  err
 }
 
-func GetEditRotationImages(id int64,orgid int64)(models.SgjPatientOldrotation,error)  {
-	oldrotation := models.SgjPatientOldrotation{}
-	err := service.PatientReadDB().Model(oldrotation).Where("mode_id = ? AND user_org_id = ?", id, orgid).Find(&oldrotation).Error
+func GetEditRotationImages(id int64,orgid int64)(models.SgjPatientOrdmodel,error)  {
+	oldrotation := models.SgjPatientOrdmodel{}
+	err := service.PatientReadDB().Model(oldrotation).Where("id = ? AND user_org_id = ?", id, orgid).Find(&oldrotation).Error
 	return oldrotation,err
 }
 
@@ -610,9 +625,15 @@ func QueryOldrotion(id int64,orgid int64)(models.SgjPatientOldrotation,error) {
 	conrotation := models.SgjPatientOldrotation{}
 	err := service.PatientReadDB().Model(conrotation).Where("id = ? AND user_org_id = ? ", id, orgid).Find(&conrotation).Error
 	return conrotation,err
+}
 
+func QueryConRotation(mid int64,orgid int64)(conrotation []models.SgjPatientConrotation,err error)  {
+	err = service.PatientReadDB().Model(conrotation).Where("modeid = ? AND user_org_id = ? AND status = ?", mid, orgid, 1).Order("sort").Find(&conrotation).Error
+	return conrotation,err
 }
 
+
+
 func UpdateConrotaionById(id int64,orgid int64,oldrotation models.SgjPatientOldrotation)(error)  {
 
 	err := service.PatientWriteDB().Model(oldrotation).Where("id = ? AND user_org_id =? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"title": oldrotation.Title, "sort": oldrotation.Sort, "rotation_images": oldrotation.RotationImages, "mtime": time.Now().Unix()}).Error
@@ -621,7 +642,7 @@ func UpdateConrotaionById(id int64,orgid int64,oldrotation models.SgjPatientOldr
 
 func GetPatientRotaion(id int64,orgid int64)(models.SgjPatientRotation,error)  {
 	rotation := models.SgjPatientRotation{}
-	err := service.PatientReadDB().Model(&rotation).Where("model_id = ? AND user_org_id = ?", id, orgid).Find(&rotation).Error
+	err := service.PatientReadDB().Model(&rotation).Where("model_id = ? AND user_org_id = ?", id, orgid).Order("sort").Find(&rotation).Error
 	return rotation,err
 }
 
@@ -632,18 +653,20 @@ func GetPatientRotationById(id int64,orgid int64)(models.SgjPatientRotation,erro
 }
 
 func QueryEditpiclink(id int64,orgid int64)(editpiclink []models.SgjPatientEditpiclink,err error)  {
-	err = service.PatientReadDB().Model(editpiclink).Where("modeid = ? AND user_org_id = ?", id, orgid).Find(&editpiclink).Error
+	err = service.PatientReadDB().Model(editpiclink).Where("modeid = ? AND user_org_id = ? AND status = ?", id, orgid,1).Order("sort").Find(&editpiclink).Error
 	return editpiclink,err
 }
 
+
+
 func GetEditSingleVisible(id int64,orgid int64)(models.SgjPatientEditpiclink,error)  {
 	editpiclink := models.SgjPatientEditpiclink{}
 	err := service.PatientReadDB().Model(&editpiclink).Where("id = ? AND user_org_id = ?", id, orgid).Find(&editpiclink).Error
 	return editpiclink,err
 }
 
-func GetQueryEditpiclink(id int64,orgid int64)(editpiclink []models.SgjPatientEditpiclink,err error)  {
-	err = service.PatientReadDB().Model(&editpiclink).Where("id=? AND user_org_id = ?", id, orgid).Find(&editpiclink).Error
+func GetQueryEditpiclink(modeid int64,orgid int64)(editpiclink []models.SgjPatientEditpiclink,err error)  {
+	err = service.PatientReadDB().Model(&editpiclink).Where("modeid=? AND user_org_id = ? AND status = ?", modeid, orgid,1).Order("sort").Find(&editpiclink).Error
 	return editpiclink,err
 
 }
@@ -773,8 +796,13 @@ func UpdateOfficeTwo(orgid int64,id int64,enviroimages models.SgjPatientEnviroim
 	return err
 }
 
+func GetQueryEnviroimage(orgid int64,mid int64)(enviroimages []models.SgjPatientEnviroimages,err error)  {
+	err = service.PatientReadDB().Where("user_org_id = ? AND modeid = ? AND status = ?", orgid, mid,1).Find(&enviroimages).Error
+	return enviroimages,err
+}
+
 func DeleteOfficeById(id int64,orgid int64)(error)  {
-	err := service.PatientWriteDB().Model(models.SgjPatientEnviroimages{}).Where("id = ? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err := service.PatientWriteDB().Model(models.SgjPatientEnviroimages{}).Where("id = ? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"status": 0,"modeid":0, "mtime": time.Now().Unix()}).Error
 	return  err
 }
 
@@ -881,12 +909,12 @@ func UpdatePicFformThree(orgid int64,id int64,conlinkaddress models.SgjPatientCo
 }
 
 func GetEnImagesTwo(orgid int64)(editpiclink []models.SgjPatientEditpiclink,err error)  {
-	err = service.PatientReadDB().Model(&editpiclink).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&editpiclink).Error
+	err = service.PatientReadDB().Model(&editpiclink).Where("user_org_id = ? AND status = ?", orgid, 1).Order("sort").Find(&editpiclink).Error
 	return editpiclink,err
 }
 
 func GetEnImagesThree(orgid int64)(conrotation []models.SgjPatientConrotation,err error)  {
-	err = service.PatientReadDB().Model(&conrotation).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&conrotation).Error
+	err = service.PatientReadDB().Model(&conrotation).Where("user_org_id = ? AND status = ?", orgid, 1).Order("sort").Find(&conrotation).Error
 	return conrotation,err
 }
 
@@ -964,4 +992,49 @@ func GetPatientLinkAddress(id int64,orgid int64)(models.SgjPatientLinkaddress,er
 	linkaddress := models.SgjPatientLinkaddress{}
 	err := service.PatientReadDB().Where(" id = ? AND user_org_id = ?", id, orgid).Find(&linkaddress).Error
 	return  linkaddress,err
+}
+
+func GetCountImages(orgid int64)(edipiclink []models.SgjPatientEditpiclink,total int64,err error)  {
+	err = service.PatientReadDB().Where("user_org_id = ? AND img_show = ? AND status = ?", orgid,1,1).Find(&edipiclink).Count(&total).Error
+	return edipiclink,total,err
+
+}
+
+func GetTotalCount(orgid int64)(conrotation []models.SgjPatientConrotation,total int64,err error)  {
+	err = service.PatientReadDB().Where("user_org_id = ? AND img_show = ? AND status = ?", orgid, 1, 1).Find(&conrotation).Count(&total).Error
+	return conrotation,total,err
+}
+
+func GetCountPicImages(orgid int64,modeid int64)(edipiclink []models.SgjPatientEditpiclink,total int64,err error)  {
+	err = service.PatientReadDB().Where("user_org_id = ? AND modeid = ? AND status = ?", orgid, modeid, 1).Find(&edipiclink).Count(&total).Error
+	return edipiclink,total,err
+}
+
+func QueryEditpiclinkCount(mid int64,orgid int64)(editpiclink []models.SgjPatientEditpiclink,total int64,err error)  {
+	err= service.PatientWriteDB().Where("modeid = ? AND user_org_id =? AND status = ?", mid, orgid, 1).Find(&editpiclink).Count(&total).Error
+	return editpiclink,total,err
+}
+
+func AddNavgationlink(navgationlink *models.SgjPatientNavgationlink)error  {
+	err := service.PatientWriteDB().Create(&navgationlink).Error
+	return err
+}
+
+func GetNavgationlinkLastData(orgid int64)(models.SgjPatientNavgationlink,error)  {
+	navgationlink := models.SgjPatientNavgationlink{}
+	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{}
+	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 {
+
+	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
+	return err
 }