Merge branch 'master' of http://git.shengws.com/csx/XT_New

conf/app.conf

@@ -8,7 +8,7 @@ sessionon = true
 sessiongcmaxlifetime = 64800
 
 tokencookiemaxlifetime = 7200
-mobile_token_expiration_second = 86400
+mobile_token_expiration_second = 300
 enablexsrf = false
 xsrfkey = 61oETzKXQAGaYdkL5gEmGeJJFuYh7EQnp2XdTP1o
 xsrfexpire = 3600

controllers/base_api_controller.go

@@ -2,8 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
 )
 
 type BaseAPIController struct {
@@ -178,33 +176,33 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 380
-		userAdmin.Mobile = "13532250447"
-		userAdmin.IsSuperAdmin = true
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 4
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 4
-		adminUserInfo.CurrentAppId = 5
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 380
+		//userAdmin.Mobile = "13532250447"
+		//userAdmin.IsSuperAdmin = true
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 4
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 4
+		//adminUserInfo.CurrentAppId = 5
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 }
 

controllers/dialysis_api_controller.go

@@ -3902,7 +3902,7 @@ func (this *DialysisApiController) DelMonitor() {
 		}
 	}
 
-	err := service.DisableMonitor(adminInfo.CurrentOrgId, patientID, recordID)
+	err := service.DisableMonitor(adminInfo.CurrentOrgId, patientID, recordID, adminInfo.AdminUser.Id)
 	if err != nil {
 		this.ErrorLog("删除透析监测记录失败：%v", err)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBDelete)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -494,16 +494,16 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 			"summary": summary,
 		})
 	} else { //修改
-		if treatmentSummary.Creater != adminUserInfo.AdminUser.Id {
-			headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-			if getPermissionErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			} else if headNursePermission == nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-				return
-			}
-		}
+		//if treatmentSummary.Creater != adminUserInfo.AdminUser.Id {
+		//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+		//	if getPermissionErr != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//		return
+		//	} else if headNursePermission == nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+		//		return
+		//	}
+		//}
 
 		summary.Creater = treatmentSummary.Creater
 		summary.CreatedTime = treatmentSummary.CreatedTime
@@ -707,16 +707,16 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 		}
 
 	} else { //修改
-		if receiveTreatment.Creater != adminUserInfo.AdminUser.Id {
-			headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-			if getPermissionErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			} else if headNursePermission == nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-				return
-			}
-		}
+		//if receiveTreatment.Creater != adminUserInfo.AdminUser.Id {
+		//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+		//	if getPermissionErr != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//		return
+		//	} else if headNursePermission == nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+		//		return
+		//	}
+		//}
 
 		receiveTreatmentAsses.Creater = receiveTreatment.Creater
 		receiveTreatmentAsses.CreatedTime = receiveTreatment.CreatedTime
@@ -872,18 +872,18 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		IsEat:                        is_eat,
 	}
 
-	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	_, assessmentAfter := service.FindAssessmentAfterDislysisByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	if assessmentAfter.ID == 0 { //新增
-		if appRole.UserType == 2 || appRole.UserType == 1 {
-			assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
-			assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
+		//if appRole.UserType == 2 || appRole.UserType == 1 {
+		assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
+		assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
 
-		} else {
-			assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
+		//} else {
+		assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
 
-		}
+		//}
 
 		err := service.AddSigleAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 		if err == nil {
@@ -892,28 +892,29 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 			})
 		}
 	} else { //修改
-		if appRole.UserType == 3 {
-			if assessmentAfter.Creater != adminUserInfo.AdminUser.Id && assessmentAfter.Creater != 0 {
-				headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-				if getPermissionErr != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				} else if headNursePermission == nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-					return
-				}
-			}
-		}
+		//if appRole.UserType == 3 {
+		//	if assessmentAfter.Creater != adminUserInfo.AdminUser.Id && assessmentAfter.Creater != 0 {
+		//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+		//		if getPermissionErr != nil {
+		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//			return
+		//		} else if headNursePermission == nil {
+		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+		//			return
+		//		}
+		//	}
+		//}
 
-		if appRole.UserType == 2 || appRole.UserType == 1 {
-			assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
-			assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
-		} else {
-			assessmentAfterDislysis.Modifier = adminUserInfo.AdminUser.Id
-			if assessmentAfterDislysis.Creater == 0 {
-				assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
-			}
+		//TODO 根据角色判断
+		//if appRole.UserType == 2 || appRole.UserType == 1 {
+		assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
+		assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
+		//} else {
+		assessmentAfterDislysis.Modifier = adminUserInfo.AdminUser.Id
+		if assessmentAfterDislysis.Creater == 0 {
+			assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
 		}
+		//}
 
 		assessmentAfterDislysis.CreatedTime = assessmentAfter.CreatedTime
 		assessmentAfterDislysis.ID = assessmentAfter.ID
@@ -1012,27 +1013,28 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	safe_package, _ := c.GetInt64("package", 0)
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
 
-	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
-
-	if template.TemplateId == 2 || template.TemplateId == 6 {
-		if appRole.UserType == 3 {
-			headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-			if getPermissionErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			} else if headNursePermission == nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescriptionPermissionDeniedModify)
-				return
-			}
-		}
-	}
-
-	if appRole.UserType == 2 || appRole.UserType == 1 {
-		prescription_doctor = appRole.AdminUserId
-	} else {
-		prescription_doctor = 0
-	}
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
+	//
+	//if template.TemplateId == 2 || template.TemplateId == 6 {
+	//	if appRole.UserType == 3 {
+	//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//		if getPermissionErr != nil {
+	//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//			return
+	//		} else if headNursePermission == nil {
+	//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescriptionPermissionDeniedModify)
+	//			return
+	//		}
+	//	}
+	//}
+
+	//TODO 需要根据角色去判断
+	//if appRole.UserType == 2 || appRole.UserType == 1 {
+	//	prescription_doctor = appRole.AdminUserId
+	//} else {
+	//	prescription_doctor = 0
+	//}
 
 	prescription := models.DialysisPrescription{
 
@@ -1120,18 +1122,18 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		//if mode_id > 0 {
 		//	service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 		//}
-		if template.TemplateId == 1 {
-			if dialysisPrescription.Creater != adminUserInfo.AdminUser.Id && dialysisPrescription.Creater != 0 {
-				headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-				if getPermissionErr != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				} else if headNursePermission == nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescriptionPermissionDeniedModify)
-					return
-				}
-			}
-		}
+		//if template.TemplateId == 1 {
+		//	if dialysisPrescription.Creater != adminUserInfo.AdminUser.Id && dialysisPrescription.Creater != 0 {
+		//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+		//		if getPermissionErr != nil {
+		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//			return
+		//		} else if headNursePermission == nil {
+		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescriptionPermissionDeniedModify)
+		//			return
+		//		}
+		//	}
+		//}
 
 		_, record := service.FindAutomaticReduceRecordByOrgId(adminUserInfo.Org.Id)
 		if record.IsOpen == 1 {
@@ -4136,28 +4138,28 @@ func (c *DialysisAPIController) PostSolution() {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
 
-	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-
-	if appRole.UserType == 2 || appRole.UserType == 1 {
-		prescription_doctor = appRole.AdminUserId
-	} else {
-		prescription_doctor = 0
-	}
-
-	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
-
-	if template.TemplateId == 2 || template.TemplateId == 6 {
-		if appRole.UserType == 3 {
-			headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-			if getPermissionErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			} else if headNursePermission == nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-				return
-			}
-		}
-	}
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	//
+	//if appRole.UserType == 2 || appRole.UserType == 1 {
+	//	prescription_doctor = appRole.AdminUserId
+	//} else {
+	//	prescription_doctor = 0
+	//}
+
+	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
+	//
+	//if template.TemplateId == 2 || template.TemplateId == 6 {
+	//	if appRole.UserType == 3 {
+	//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//		if getPermissionErr != nil {
+	//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//			return
+	//		} else if headNursePermission == nil {
+	//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//			return
+	//		}
+	//	}
+	//}
 
 	prescription := models.DialysisPrescription{
 
@@ -5576,17 +5578,17 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	}
 
 	_, tempDialysisRecord := service.FindDialysisOrderById(record_id)
-
-	if tempDialysisRecord.Creator != adminUserInfo.AdminUser.Id {
-		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		if getPermissionErr != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		} else if headNursePermission == nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-			return
-		}
-	}
+	//
+	//if tempDialysisRecord.Creator != adminUserInfo.AdminUser.Id {
+	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//	if getPermissionErr != nil {
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//		return
+	//	} else if headNursePermission == nil {
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//		return
+	//	}
+	//}
 
 	scheduleDateStart := startDate.Format("2006-01-02") + " 00:00:00"
 	scheduleDateEnd := startDate.Format("2006-01-02") + " 23:59:59"
@@ -5715,16 +5717,16 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 	}
 	_, tempDialysisRecords := service.FindDialysisOrderById(record_id)
 
-	if tempDialysisRecords.FinishCreator != adminUserInfo.AdminUser.Id {
-		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		if getPermissionErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		} else if headNursePermission == nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-			return
-		}
-	}
+	//if tempDialysisRecords.FinishCreator != adminUserInfo.AdminUser.Id {
+	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//	if getPermissionErr != nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//		return
+	//	} else if headNursePermission == nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//		return
+	//	}
+	//}
 
 	dialysisRecord := &models.DialysisOrder{
 		ID:             record_id,

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -134,6 +134,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		Conductivity:              conductivity,
 		DisplacementFlowQuantity:  displacement_flow_quantity,
 		BloodOxygenSaturation:     blood_oxygen_saturation,
+		Creator:                   adminInfo.AdminUser.Id,
+		Modify:                    0,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -276,6 +278,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.UpdatedTime = time.Now().Unix()
 	monitor.DisplacementFlowQuantity = displacement_flow_quantity
 	monitor.BloodOxygenSaturation = blood_oxygen_saturation
+	monitor.Modify = adminInfo.AdminUser.Id
+
 	err = service.UpdateMonitor(monitor)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorUpdate)
@@ -313,20 +317,20 @@ func (this *DialysisAPIController) DeleteMonitor() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	if monitor != nil {
-		if monitor.MonitoringNurse != adminInfo.AdminUser.Id {
-			headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminInfo.Org.Id, adminInfo.App.Id, adminInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-			if getPermissionErr != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			} else if headNursePermission == nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-				return
-			}
-		}
-	}
+	//if monitor != nil {
+	//	if monitor.MonitoringNurse != adminInfo.AdminUser.Id {
+	//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminInfo.Org.Id, adminInfo.App.Id, adminInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//		if getPermissionErr != nil {
+	//			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//			return
+	//		} else if headNursePermission == nil {
+	//			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//			return
+	//		}
+	//	}
+	//}
 
-	err := service.DisableMonitor(adminInfo.Org.Id, patientID, recordID)
+	err := service.DisableMonitor(adminInfo.Org.Id, patientID, recordID, adminInfo.AdminUser.Id)
 	if err != nil {
 		this.ErrorLog("删除透析监测记录失败：%v", err)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBDelete)

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -46,12 +46,15 @@ type MobileBaseAPIAuthController struct {
 }
 
 func (this *MobileBaseAPIAuthController) Prepare() {
+	token := this.Ctx.GetCookie("token_cookie")
+	//if len(token) == 0{
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+	//	this.StopRun()
+	//}
 	this.MobileBaseAPIController.Prepare()
-
 	adminUserInfo := this.GetMobileAdminUserInfo()
-	fmt.Println(adminUserInfo)
 
-	if adminUserInfo == nil {
+	if adminUserInfo == nil || len(token) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		this.StopRun()
 	}
@@ -75,6 +78,7 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 		} else {
 			roles = strings.Split(role.RoleIds, ",")
 		}
+		fmt.Println(roles)
 
 		//获取该用户下所有角色的权限总集
 		var userRolePurviews string
@@ -82,21 +86,31 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 		for _, item := range roles {
 			role_id, _ := strconv.ParseInt(item, 10, 64)
 			purviews, _ := service.GetRoleFuncPurviewIds(role_id)
-			userRolePurviews = userRolePurviews + purviews
+			if len(userRolePurviews) == 0 {
+				userRolePurviews = purviews
+			} else {
+				userRolePurviews = userRolePurviews + "," + purviews
+			}
 		}
 		//该用户所拥有角色的权限的总集
 		userRolePurviewsArr = RemoveRepeatedPurviewElement(strings.Split(userRolePurviews, ","))
+		fmt.Println(userRolePurviewsArr)
 		//系统所记录的权限列表
 		allPermission, _ := service.GetAllFunctionPurview()
 
-		//fmt.Println(this.Ctx.Request.RequestURI[1])
-
 		for _, item := range allPermission {
+			fmt.Println(strings.Split(item.Urlfor, ",")[0])
+			fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
+
 			//判断当前路由是否在权限路由列表里面
 			if strings.Split(item.Urlfor, ",")[0] == strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode") {
+
 				//获取该角色的所有权限
 				for _, items := range userRolePurviewsArr {
 					id, _ := strconv.ParseInt(items, 10, 64)
+					fmt.Println(id)
+					fmt.Println(item.ID)
+
 					if id == item.ID {
 						isPermission = true
 					}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -39,7 +39,6 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/advice/stop", &PatientApiController{}, "Post:StopDoctorAdvice")
 	beego.Router("/m/api/advice/creategroup", &PatientApiController{}, "Post:CreateGroupAdvice")
 	beego.Router("/m/api/advice/group/modify_starttime", &PatientApiController{}, "Post:ModifyAdviceGroupStartTime")
-
 	beego.Router("/m/api/advice/delete", &PatientApiController{}, "Delete:DeleteDoctorAdvice")
 	beego.Router("/m/api/advice/exec", &PatientApiController{}, "Post:ExecDoctorAdvice")
 	beego.Router("/m/api/advice/exec/modify", &PatientApiController{}, "Post:ModifyExecDoctorAdvice")

controllers/mobile_api_controllers/patient_api_controller.go

@@ -183,18 +183,18 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 	//	return
 	//}
 
-	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-
-	if appRole.UserType == 3 {
-		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		if getPermissionErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		} else if headNursePermission == nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-			return
-		}
-	}
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	//
+	//if appRole.UserType == 3 {
+	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//	if getPermissionErr != nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//		return
+	//	} else if headNursePermission == nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//		return
+	//	}
+	//}
 
 	var advice models.DoctorAdvice
 	code := adviceFormData(&advice, c.Ctx.Input.RequestBody, "create")
@@ -259,18 +259,18 @@ func (c *PatientApiController) EditDoctorAdvice() {
 
 	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
-	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-
-	if appRole.UserType == 3 {
-		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		if getPermissionErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		} else if headNursePermission == nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-			return
-		}
-	}
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	//
+	//if appRole.UserType == 3 {
+	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//	if getPermissionErr != nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//		return
+	//	} else if headNursePermission == nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//		return
+	//	}
+	//}
 
 	advice, _ := service.FindDoctorAdvice(adminUserInfo.Org.Id, id)
 	if advice.ID == 0 {
@@ -278,11 +278,6 @@ func (c *PatientApiController) EditDoctorAdvice() {
 		return
 	}
 
-	if advice.AdviceDoctor != adminUserInfo.AdminUser.Id {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCanotEditOtherAdvice)
-		return
-	}
-
 	code := adviceFormData(&advice, c.Ctx.Input.RequestBody, "update")
 	if code > 0 {
 		c.ServeFailJSONWithSGJErrorCode(code)
@@ -381,18 +376,18 @@ func (c *PatientApiController) StopDoctorAdvice() {
 	//	return
 	//}
 
-	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-
-	if appRole.UserType == 3 {
-		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		if getPermissionErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		} else if headNursePermission == nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-			return
-		}
-	}
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	//
+	//if appRole.UserType == 3 {
+	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//	if getPermissionErr != nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//		return
+	//	} else if headNursePermission == nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//		return
+	//	}
+	//}
 
 	if advice.StopState == 1 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceStoped)
@@ -480,18 +475,18 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 	//	return
 	//}
 
-	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-
-	if appRole.UserType == 3 {
-		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		if getPermissionErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		} else if headNursePermission == nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-			return
-		}
-	}
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	//
+	//if appRole.UserType == 3 {
+	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//	if getPermissionErr != nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//		return
+	//	} else if headNursePermission == nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//		return
+	//	}
+	//}
 
 	advice.UpdatedTime = time.Now().Unix()
 	advice.Status = 0
@@ -540,18 +535,18 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
-	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-
-	if appRole.UserType == 2 || appRole.UserType == 1 {
-		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		if getPermissionErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		} else if headNursePermission == nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-			return
-		}
-	}
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	//
+	//if appRole.UserType == 2 || appRole.UserType == 1 {
+	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//	if getPermissionErr != nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//		return
+	//	} else if headNursePermission == nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//		return
+	//	}
+	//}
 
 	var advice models.DoctorAdvice
 
@@ -673,16 +668,16 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 		}
 	}
 
-	if advice.ExecutionStaff != adminUserInfo.AdminUser.Id {
-		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		if getPermissionErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		} else if headNursePermission == nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-			return
-		}
-	}
+	//if advice.ExecutionStaff != adminUserInfo.AdminUser.Id {
+	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//	if getPermissionErr != nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//		return
+	//	} else if headNursePermission == nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//		return
+	//	}
+	//}
 
 	if advice.StartTime > theTime.Unix() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
@@ -732,18 +727,18 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 	}
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
-
-	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-	if appRole.UserType != 3 {
-		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		if getPermissionErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		} else if headNursePermission == nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-			return
-		}
-	}
+	//
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	//if appRole.UserType != 3 {
+	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//	if getPermissionErr != nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//		return
+	//	} else if headNursePermission == nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//		return
+	//	}
+	//}
 
 	var advice models.DoctorAdvice
 
@@ -848,27 +843,27 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		return
 	}
 	//templateInfo,_ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
-	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	var evaluation models.PredialysisEvaluation
 	if theEvaluation != nil {
-		if appRole.UserType == 2 || appRole.UserType == 1 {
-
-			evaluation = *theEvaluation
-
-		} else {
-			if theEvaluation.Creater != adminUserInfo.AdminUser.Id && theEvaluation.Creater != 0 {
-				headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-				if getPermissionErr != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				} else if headNursePermission == nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-					return
-				}
-			} else {
-				evaluation = *theEvaluation
-			}
-		}
+		//if appRole.UserType == 2 || appRole.UserType == 1 {
+
+		evaluation = *theEvaluation
+
+		//} else {
+		//	if theEvaluation.Creater != adminUserInfo.AdminUser.Id && theEvaluation.Creater != 0 {
+		//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+		//		if getPermissionErr != nil {
+		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//			return
+		//		} else if headNursePermission == nil {
+		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+		//			return
+		//		}
+		//	} else {
+		//		evaluation = *theEvaluation
+		//	}
+		//}
 	}
 
 	code := predialysisEvaluationFormData(&evaluation, c.Ctx.Input.RequestBody)
@@ -884,24 +879,24 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		evaluation.AssessmentDate = theAssessmentDateTime
 		evaluation.PatientId = id
 		evaluation.UserOrgId = adminUserInfo.Org.Id
-		if appRole.UserType == 2 || appRole.UserType == 1 {
-			evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
-			evaluation.AssessmentTime = time.Now().Unix()
-		} else {
-			evaluation.Creater = adminUserInfo.AdminUser.Id
-		}
+		//if appRole.UserType == 2 || appRole.UserType == 1 {
+		//	evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
+		//	evaluation.AssessmentTime = time.Now().Unix()
+		//} else {
+		evaluation.Creater = adminUserInfo.AdminUser.Id
+		//}
 	} else {
 		evaluation.UpdatedTime = time.Now().Unix()
 		evaluation.Evaluator = adminUserInfo.AdminUser.Id
-		if appRole.UserType == 2 || appRole.UserType == 1 {
-			evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
-			evaluation.AssessmentTime = time.Now().Unix()
-		} else {
-			evaluation.Modifier = adminUserInfo.AdminUser.Id
-			if evaluation.Creater == 0 {
-				evaluation.Creater = adminUserInfo.AdminUser.Id
-			}
+		//if appRole.UserType == 2 || appRole.UserType == 1 {
+		//	evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
+		//	evaluation.AssessmentTime = time.Now().Unix()
+		//} else {
+		evaluation.Modifier = adminUserInfo.AdminUser.Id
+		if evaluation.Creater == 0 {
+			evaluation.Creater = adminUserInfo.AdminUser.Id
 		}
+		//}
 	}
 
 	//新增逻辑
@@ -2439,27 +2434,13 @@ func (c *PatientApiController) setAdviceWithJSON(advice *models.GroupAdvice, jso
 
 func (c *PatientApiController) DelDoctorAdvice() {
 	groupno, _ := c.GetInt64("groupno", -1)
+	is_sub, _ := c.GetInt64("is_sub", -1) //是否子药
 
-	var ids []string
-	if groupno == 0 {
-		advice_id := c.GetString("advice_id")
-		ids = strings.Split(advice_id, ",")
-		if len(ids) <= 0 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			return
-		}
-	}
-	if groupno < 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-
-	adminUserInfo := c.GetMobileAdminUserInfo()
+	if is_sub == 1 { //是
 
-	var advice models.DoctorAdvice
-
-	if groupno > 0 {
-		advice, _ = service.FindDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+		advice_id, _ := c.GetInt64("advice_id")
+		adminUserInfo := c.GetMobileAdminUserInfo()
+		advice, _ := service.FindOldDoctorAdvice(adminUserInfo.Org.Id, advice_id)
 		if advice.ID == 0 {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
 			return
@@ -2468,40 +2449,80 @@ func (c *PatientApiController) DelDoctorAdvice() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
 			return
 		}
-	} else {
-		advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
-		for _, item := range advices {
-			if item.ID == 0 {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
+
+		advice.Status = 0
+		advice.UpdatedTime = time.Now().Unix()
+		advice.Modifier = adminUserInfo.AdminUser.Id
+
+		err := service.DeleteDoctorAdvice(&advice)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteAdviceFail)
+			return
+		}
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "ok",
+		})
+
+		return
+
+	} else { //
+
+		var ids []string
+		if groupno == 0 {
+			advice_id := c.GetString("advice_id")
+			ids = strings.Split(advice_id, ",")
+			if len(ids) <= 0 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 				return
 			}
-			if !adminUserInfo.AdminUser.IsSuperAdmin && item.AdviceDoctor != adminUserInfo.AdminUser.Id {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+		}
+		if groupno < 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+
+		adminUserInfo := c.GetMobileAdminUserInfo()
+		var advice models.DoctorAdvice
+		if groupno > 0 {
+			advice, _ = service.FindDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			if advice.ID == 0 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
 				return
 			}
+		} else {
+			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			for _, item := range advices {
+				if item.ID == 0 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
+					return
+				}
+			}
 		}
-	}
 
-	advice.UpdatedTime = time.Now().Unix()
-	advice.Status = 0
-	advice.GroupNo = groupno
+		advice.UpdatedTime = time.Now().Unix()
+		advice.Status = 0
+		advice.GroupNo = groupno
 
-	var err error
-	if groupno > 0 {
-		err = service.DeleteDoctorAdviceByGroupNo(&advice)
-	} else {
-		err = service.BatchDeleteDoctorAdvice(ids)
-	}
+		var err error
+		if groupno > 0 {
+			err = service.DeleteDoctorAdviceByGroupNo(&advice)
+		} else {
+			err = service.BatchDeleteDoctorAdvice(ids)
+		}
 
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteAdviceFail)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteAdviceFail)
+			return
+		}
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "ok",
+		})
 		return
+
 	}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "ok",
-	})
-	return
 }
 
 // /m/api/advice/group/modify_starttime [post]

controllers/new_mobile_api_controllers/forget_password_controller.go

@@ -20,13 +20,13 @@ type ForgetPwdController struct {
 
 func (this *ForgetPwdController) ModifyPassword() {
 	mobile := this.GetString("mobile")
-	//code := this.GetString("code")
+	code := this.GetString("code")
 	password := this.GetString("password")
-	//checkErr := this.checkParams(mobile, code, password)
-	//if checkErr != nil {
-	//	this.ServeFailJSONWithSGJErrorCode(checkErr.Code)
-	//	return
-	//}
+	checkErr := this.checkParams(mobile, code, password)
+	if checkErr != nil {
+		this.ServeFailJSONWithSGJErrorCode(checkErr.Code)
+		return
+	}
 
 	adminUser, _ := service.GetValidAdminUserByMobileReturnErr(mobile)
 
@@ -37,9 +37,9 @@ func (this *ForgetPwdController) ModifyPassword() {
 		return
 	} else {
 		// 修改成功后验证码就要使其失效
-		//redisClient := service.RedisClient()
-		//defer redisClient.Close()
-		//redisClient.Del("code_msg_" + mobile)
+		redisClient := service.RedisClient()
+		defer redisClient.Close()
+		redisClient.Del("code_msg_" + mobile)
 
 		ip := utils.GetIP(this.Ctx.Request)
 		ssoDomain := beego.AppConfig.String("sso_domain")

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -350,8 +350,9 @@ func (this *HomeController) CreateOrg() {
 		//初始化医嘱模版
 		InitAdviceTemplate(org)
 		//初始化角色和权限
-
+		InitRoleAndPurviews(org)
 		//初始化设备管理
+		InitEquitMentInformation(org)
 
 		//初始化显示配置
 
@@ -523,3 +524,52 @@ func (this *HomeController) CreateOrg() {
 	}
 
 }
+
+func (this *HomeController) ModifyPsw() {
+	mobile := this.GetString("mobile")
+	code := this.GetString("code")
+	password := this.GetString("password")
+	checkErr := this.checkParam(mobile, code, password)
+	if checkErr != nil {
+		this.ServeFailJSONWithSGJErrorCode(checkErr.Code)
+		return
+	}
+	adminUser, _ := service.GetValidAdminUserByMobileReturnErr(mobile)
+	modifyErr := service.ModifyPassword(adminUser.Id, password)
+	if modifyErr != nil {
+		utils.ErrorLog("修改mobile=%v的用户的密码时失败: %v", mobile, modifyErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
+		return
+	} else {
+		// 修改成功后验证码就要使其失效
+		redisClient := service.RedisClient()
+		defer redisClient.Close()
+		redisClient.Del("code_msg_" + mobile)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"admin": adminUser,
+		})
+		return
+	}
+}
+
+func (this *HomeController) checkParam(mobile string, code string, password string) *enums.SGJError {
+	if utils.CellPhoneRegexp().MatchString(mobile) == false {
+		return &enums.SGJError{Code: enums.ErrorCodeMobileFormat}
+	}
+	if len(code) == 0 {
+		return &enums.SGJError{Code: enums.ErrorCodeVerificationCodeWrong}
+	}
+	if len(password) == 0 {
+		return &enums.SGJError{Code: enums.ErrorCodePasswordEmpty}
+	}
+	if service.IsMobileRegister(mobile) == false {
+		return &enums.SGJError{Code: enums.ErrorCodeMobileNotExit}
+	}
+	redisClient := service.RedisClient()
+	defer redisClient.Close()
+	cache_code, _ := redisClient.Get("code_msg_" + mobile).Result()
+	if cache_code != code {
+		return &enums.SGJError{Code: enums.ErrorCodeVerificationCodeWrong}
+	}
+	return nil
+}

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -236,8 +236,8 @@ func (this *MobileRegistController) CreateOrg() {
 		//初始化医嘱模版
 		//InitAdviceTemplate(org)
 		//初始化角色和权限
-
-		//初始化设备管理
+		InitRoleAndPurviews(org)
+		//初始化设备管理org
 		InitEquitMentInformation(org)
 		//初始化显示配置
 
@@ -736,6 +736,50 @@ func InitPatientAndSchedule(org *models.Org) {
 
 }
 
+func InitRoleAndPurviews(org *models.Org) {
+	roles := LoadRoleConfig("./role.json").Roles
+	app, _ := service.GetOrgApp(org.Id, 3)
+	for _, item := range roles {
+		role := &models.Role{
+			RoleName:     item.RoleName,
+			RoleIntro:    item.RoleIntroduction,
+			Creator:      0,
+			OrgId:        org.Id,
+			AppId:        app.Id,
+			IsSuperAdmin: false,
+			Status:       1,
+			CreateTime:   time.Now().Unix(),
+			ModifyTime:   time.Now().Unix(),
+			Number:       item.Number,
+			IsSystem:     item.IsSystem,
+		}
+		err := service.CreateOrgRole(role)
+		if err == nil {
+			purview := &models.RolePurview{
+				RoleId:     role.Id,
+				OrgId:      org.Id,
+				AppId:      role.AppId,
+				PurviewIds: item.PurviewIds,
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				ModifyTime: time.Now().Unix(),
+			}
+			func_purview := &models.SgjUserRoleFuncPurview{
+				RoleId:     role.Id,
+				OrgId:      org.Id,
+				AppId:      role.AppId,
+				PurviewIds: item.FuncIds,
+				Status:     1,
+				Ctime:      time.Now().Unix(),
+				Mtime:      time.Now().Unix(),
+			}
+
+			service.CreateRolePurview(purview)
+			service.CreateFuncRolePurview(func_purview)
+		}
+	}
+}
+
 func (this *MobileRegistController) ModifyName() {
 	name := this.GetString("name")
 	adminUserObj := this.GetSession("mobile_admin_user")
@@ -795,6 +839,10 @@ func (this *MobileRegistController) Login() {
 
 }
 
+type RoleConfig struct {
+	Roles []*models.VMUserRoleAndPurview "json:roles"
+}
+
 type PatientConfig struct {
 	Patients []*models.VMOrgPatients "json:patients"
 }
@@ -807,6 +855,36 @@ type PrescriptionConfig struct {
 	Prescription []*models.SystemPrescription "json:prescription"
 }
 
+func LoadRoleConfig(dataFile string) *RoleConfig {
+	var config RoleConfig
+	_, filename, _, _ := runtime.Caller(1)
+	datapath := path.Join(path.Dir(filename), dataFile)
+	config_file, err := os.Open(datapath)
+	if err != nil {
+		emit("Failed to open config file '%s': %s\n", datapath, err)
+		return &config
+	}
+
+	fi, _ := config_file.Stat()
+
+	buffer := make([]byte, fi.Size())
+	_, err = config_file.Read(buffer)
+
+	buffer, err = StripComments(buffer) //去掉注释
+	if err != nil {
+		emit("Failed to strip comments from json: %s\n", err)
+		return &config
+	}
+
+	buffer = []byte(os.ExpandEnv(string(buffer))) //特殊
+	err = json.Unmarshal(buffer, &config)         //解析json格式数据
+	if err != nil {
+		emit("Failed unmarshalling json: %s\n", err)
+		return &config
+	}
+	return &config
+}
+
 func LoadPatientConfig(dataFile string) *PatientConfig {
 	var config PatientConfig
 	_, filename, _, _ := runtime.Caller(1)

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -513,7 +513,6 @@ func (this *NewLoginApiController) GetCode() {
 	mobile := this.GetString("phone")
 	aespass := this.GetString("aespass")
 	types, _ := this.GetInt("type", 0)
-
 	utils.TraceLog("mobile:%v aespass:%v", mobile, aespass)
 	if utils.CellPhoneRegexp().MatchString(mobile) == false {
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeMobileFormat)
@@ -529,10 +528,6 @@ func (this *NewLoginApiController) GetCode() {
 			return
 		}
 	}
-	//this.Data["json"] = enums.MakeSuccessResponseJSON(map[string]interface{}{
-	//	"msg": "短信发送成功,有效期为10分钟",
-	//})
-	//this.ServeJSON()
 
 	if err := service.SendVerificationCodeSMS(mobile, aespass); err != nil {
 		this.Data["json"] = enums.MakeFailResponseJSON(err.Error(), 600)

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -33,6 +33,8 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/changeorg", &HomeController{}, "post:ChangeOrg")
 	beego.Router("/m/api/createOrg", &HomeController{}, "post:CreateOrg")
 
+	beego.Router("/m/api/modifypsw", &HomeController{}, "post:ModifyPsw")
+
 	beego.Router("/m/api/staff", &NewRoleApiController{}, "get:GetAllOrgUser")
 
 	beego.Router("/m/api/staff/edit", &NewRoleApiController{}, "post:EditAdmin")

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -314,10 +314,13 @@ func (this *NewRoleApiController) GetRolePurviews() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	role_id, _ := this.GetInt64("id", 0)
 	rolePurview, _ := service.GetRoleAndPurviewById(role_id, adminUserInfo.Org.Id, adminUserInfo.App.Id)
+	funRolePurview, _ := service.GetRoleFuncPurview(role_id)
+
 	role, _ := service.GetRoleByRoleID(role_id)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"role_purview": rolePurview,
 		"role":         role,
+		"func_purview": funRolePurview,
 	})
 }
 
@@ -458,8 +461,11 @@ func (this *NewRoleApiController) EditFunctionPermission() {
 	role_id, _ := this.GetInt64("id", 0)
 	purview_id := this.GetString("purview_id")
 	is_open, _ := this.GetInt64("type", 0)
+	is_all, _ := this.GetInt64("is_all", 0)
+	pid := this.GetString("pid")
 
-	permissions, err := service.GetRoleFuncPurviewIds(role_id)
+	func_permissions, err := service.GetRoleFuncPurviewIds(role_id)
+	permissions, _ := service.GetRolePurviewIds(role_id)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -467,17 +473,49 @@ func (this *NewRoleApiController) EditFunctionPermission() {
 	} else {
 
 		if is_open == 1 { //打开
-			purview, _ := service.GetFuncRolePurview(role_id)
-			if purview.ID == 0 { // 新建
+			//处理功能权限涉及到的菜单权限
 
-				purview.PurviewIds = purview_id
-				purview.Ctime = time.Now().Unix()
-				purview.Mtime = time.Now().Unix()
+			purview, _ := service.GetRolePurview(role_id)
+			if purview.Id == 0 { // 新建
+				purview.PurviewIds = pid
+				purview.CreateTime = time.Now().Unix()
+				purview.ModifyTime = time.Now().Unix()
 				purview.Status = 1
 				purview.RoleId = role_id
 				purview.OrgId = adminUser.Org.Id
 				purview.AppId = adminUser.App.Id
-				err := service.CreateFuncRolePurview(&purview)
+				service.CreateRolePurview(&purview)
+
+			} else { //修改
+				var permission_arr []string
+				purview, _ := service.GetRolePurview(role_id)
+				if len(permissions) > 0 {
+					permission_arr = strings.Split(permissions, ",")
+					if len(pid) > 0 {
+						permission_arr = append(permission_arr, strings.Split(pid, ",")...)
+					}
+				} else {
+					if len(pid) > 0 {
+						permission_arr = strings.Split(pid, ",")
+					}
+				}
+				permission_arr = RemoveRepeatedIDSElement(permission_arr)
+				permissions = strings.Join(permission_arr, ",")
+				purview.PurviewIds = permissions
+				service.SaveRolePurview(&purview)
+			}
+
+			func_purview, _ := service.GetFuncRolePurview(role_id)
+			if func_purview.ID == 0 { // 新建
+
+				func_purview.PurviewIds = purview_id
+				func_purview.Ctime = time.Now().Unix()
+				func_purview.Mtime = time.Now().Unix()
+				func_purview.Status = 1
+				func_purview.RoleId = role_id
+				func_purview.OrgId = adminUser.Org.Id
+				func_purview.AppId = adminUser.App.Id
+				err := service.CreateFuncRolePurview(&func_purview)
 				if err != nil {
 					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
@@ -488,9 +526,9 @@ func (this *NewRoleApiController) EditFunctionPermission() {
 				})
 			} else { //修改
 				var permission_arr []string
-				purview, _ := service.GetRoleFuncPurview(role_id)
-				if len(permissions) > 0 {
-					permission_arr = strings.Split(permissions, ",")
+				func_purview, _ := service.GetRoleFuncPurview(role_id)
+				if len(func_permissions) > 0 {
+					permission_arr = strings.Split(func_permissions, ",")
 					if len(purview_id) > 0 {
 						permission_arr = append(permission_arr, strings.Split(purview_id, ",")...)
 					}
@@ -500,10 +538,10 @@ func (this *NewRoleApiController) EditFunctionPermission() {
 					}
 				}
 				permission_arr = RemoveRepeatedIDSElement(permission_arr)
-				permissions = strings.Join(permission_arr, ",")
-				purview.PurviewIds = permissions
+				func_permissions = strings.Join(permission_arr, ",")
+				func_purview.PurviewIds = func_permissions
 
-				err := service.SaveRoleFuncPurview(&purview)
+				err := service.SaveRoleFuncPurview(&func_purview)
 				if err != nil {
 					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
@@ -513,27 +551,74 @@ func (this *NewRoleApiController) EditFunctionPermission() {
 				})
 			}
 		} else { //关闭
-			permission_arr := strings.Split(permissions, ",")
-			purview_arr := strings.Split(purview_id, ",")
 
-			for index, id := range permission_arr {
-				for _, pur_id := range purview_arr {
-					if id == pur_id {
-						permission_arr = append(permission_arr[:index], permission_arr[index+1:]...)
+			//处理功能权限涉及到的菜单权限,当关闭到只剩下一个的时候，在将菜单权限对应的权限id清除
+			func_permission_arr := strings.Split(func_permissions, ",")
+			if len(func_permission_arr) == 1 {
+				permission_arr := strings.Split(permissions, ",")
+				pid_arr := strings.Split(pid, ",")
+				for _, pur_id := range pid_arr {
+					for index, id := range permission_arr {
+						if id == pur_id {
+							permission_arr = append(permission_arr[:index], permission_arr[index+1:]...)
+						}
 					}
 				}
+				purview, _ := service.GetRolePurview(role_id)
+				purview.PurviewIds = strings.Join(permission_arr, ",")
+				service.SaveRolePurview(&purview)
 			}
-			purview, _ := service.GetRoleFuncPurview(role_id)
-			purview.PurviewIds = strings.Join(permission_arr, ",")
 
-			err := service.SaveRoleFuncPurview(&purview)
-			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+			if is_all == 1 {
+
+				permission_arr := strings.Split(permissions, ",")
+				pid_arr := strings.Split(pid, ",")
+				for _, pur_id := range pid_arr {
+					for index, id := range permission_arr {
+						if id == pur_id {
+							permission_arr = append(permission_arr[:index], permission_arr[index+1:]...)
+						}
+					}
+				}
+				purview, _ := service.GetRolePurview(role_id)
+				purview.PurviewIds = strings.Join(permission_arr, ",")
+				service.SaveRolePurview(&purview)
+
+				func_purview, _ := service.GetRoleFuncPurview(role_id)
+				func_purview.PurviewIds = ""
+				err := service.SaveRoleFuncPurview(&func_purview)
+				if err != nil {
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				this.ServeSuccessJSON(map[string]interface{}{
+					"is_open": 0,
+				})
+
+			} else {
+				permission_arr := strings.Split(func_permissions, ",")
+				purview_arr := strings.Split(purview_id, ",")
+				fmt.Println(permission_arr)
+				fmt.Println(purview_arr)
+				for index, id := range permission_arr {
+					for _, pur_id := range purview_arr {
+						if id == pur_id {
+							permission_arr = append(permission_arr[:index], permission_arr[index+1:]...)
+						}
+					}
+				}
+				func_purview, _ := service.GetRoleFuncPurview(role_id)
+				func_purview.PurviewIds = strings.Join(permission_arr, ",")
+
+				err := service.SaveRoleFuncPurview(&func_purview)
+				if err != nil {
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				this.ServeSuccessJSON(map[string]interface{}{
+					"is_open": 0,
+				})
 			}
-			this.ServeSuccessJSON(map[string]interface{}{
-				"is_open": 0,
-			})
 
 		}
 	}

controllers/new_mobile_api_controllers/patient.json

@@ -6,7 +6,7 @@
       "dialysis_no": "001",
       "admission_number": "",
       "source": 1,
-      "lapseto": 2,
+      "lapseto": 1,
       "partition_id": 0,
       "bed_id": 0,
       "name": "演示患者一",
@@ -85,7 +85,7 @@
       "dialysis_no": "002",
       "admission_number": "",
       "source": 1,
-      "lapseto": 2,
+      "lapseto": 1,
       "partition_id": 0,
       "bed_id": 0,
       "name": "演示患者二",

controllers/new_mobile_api_controllers/role.json

@@ -0,0 +1,87 @@
+{
+    "roles": [
+      {
+        "role_name": "子管理员",
+        "role_introduction": "子管理员角色具备平台全部功能的使用权限，请谨慎配置",
+        "is_super_admin": false,
+        "status": 1,
+        "is_system": 1,
+        "number": 9999,
+        "purview_ids": "71,72,70,74,75,73,127,128,48,52,110,94,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,76,156,157,158,159,155,82,83,108,149,154,190,81,101,100,102,161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192",
+        "func_ids": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55"
+      },
+      {
+        "role_name": "医生",
+        "role_introduction": "医生角色能够进行建立患者档案，制定和调整患者透析治疗方案，定期评价病人的透析质量等",
+        "is_super_admin": false,
+        "status": 1,
+        "is_system": 1,
+        "number": 9998,
+        "purview_ids": "71,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,15571,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,155",
+        "func_ids": ""
+
+
+      },
+      {
+        "role_name": "护士",
+        "role_introduction": "护士角色能够进行病人透析管理，以及医院的感染控制与消毒记录等",
+        "is_super_admin": false,
+        "status": 1,
+        "is_system": 1,
+        "number": 9997,
+        "purview_ids": "74,75,73,48,52,110,93,121,122,124,125,120",
+        "func_ids": ""
+
+
+
+      },
+      {
+        "role_name": "库存",
+        "role_introduction": "库存角色负责透析耗材的日常管理，对耗材的入库、出库、退库的登记操作",
+        "is_super_admin": false,
+        "status": 1,
+        "is_system": 0,
+        "number": 9996,
+        "purview_ids": "94,111,112,113,114,115,116,117,118,119,129,84",
+        "func_ids": ""
+
+
+
+      },{
+        "role_name": "运营",
+        "role_introduction": "运营角色能够在SCRM中管理微网站、使用营销工具、做会员管理和分销商品经营的操作",
+        "is_super_admin": false,
+        "status": 1,
+        "is_system": 0,
+        "number": 9995,
+        "purview_ids": "161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192",
+        "func_ids": ""
+
+
+
+      },{
+        "role_name": "技师",
+        "role_introduction": "技师角色能够进行设备的管理，日常维护维修记录等",
+        "is_super_admin": false,
+        "status": 1,
+        "is_system": 0,
+        "number": 9994,
+        "purview_ids": "77,78,79,80,76",
+        "func_ids": ""
+
+
+      },
+      {
+        "role_name": "院长",
+        "role_introduction": "院长角色了解血透患者血液透析质量和相关的大数据，以及掌握透析中心整体运营情况",
+        "is_super_admin": false,
+        "status": 1,
+        "is_system": 0,
+        "number": 9993,
+        "purview_ids": "",
+        "func_ids": ""
+
+
+      }
+    ]
+}

controllers/verify_login_controller.go

@@ -1,13 +1,14 @@
 package controllers
 
 import (
-	"XT_New/models"
-	"fmt"
-	"net/url"
-
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"fmt"
+	"net/url"
+	"strconv"
+	"strings"
 
 	"github.com/astaxie/beego"
 )
@@ -166,8 +167,56 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 			//	return
 			//}
 
+			//fmt.Println(appRole.RoleIds)
+			//
+
+			//role_arr := strings.Split(appRole.RoleIds, ",")
+			//var ids string
+			//for _, role_id := range role_arr{
+			//	id, _ := strconv.ParseInt(role_id, 10, 64)
+			//	purview_ids,_  := service.GetRolePurviewIds(id)
+			//	if len(ids) == 0{
+			//		ids = purview_ids
+			//	}else{
+			//		ids = ids +","+purview_ids
+			//	}
+			//}
+			//
+			//pruviews ,_ := service.GetPurviewById(ids)
+			//
+			//var curAppUrlfors []string
+			//for _, item :=range pruviews{
+			//	curAppUrlfors = append(curAppUrlfors, item.Urlfor)
+			//
+			//}
+
+			//var urls []string
 			curAppUrlfors := adminUserInfo.AppUrlfors[adminUserInfo.CurrentAppId]
 
+			if len(curAppUrlfors) == 0 {
+				appRole, _ := service.FindAdminUserIDA(appRole.Id)
+				role_arr := strings.Split(appRole.RoleIds, ",")
+				var ids string
+				for _, role_id := range role_arr {
+					id, _ := strconv.ParseInt(role_id, 10, 64)
+					purview_ids, _ := service.GetRolePurviewIds(id)
+					if len(ids) == 0 {
+						ids = purview_ids
+					} else {
+						ids = ids + "," + purview_ids
+					}
+				}
+
+				pruviews, _ := service.GetPurviewById(ids)
+
+				for _, item := range pruviews {
+					if item.Module == 3 && item.Parentid > 0 {
+						fmt.Println(item.Urlfor)
+						curAppUrlfors = append(curAppUrlfors, item.Urlfor)
+					}
+				}
+			}
+
 			//subscibe := adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId]
 			//fmt.Println("subscibe", subscibe)
 			//if err := service.GetOrgSubscibeState(subscibe); err != nil {
@@ -191,7 +240,7 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 			//		didRegistedForMall = true
 			//	}
 			//}
-			//service.GetOrgSub
+			subscibe, _ := service.GetOrgSubscibe(adminUserInfo.CurrentOrgId)
 
 			this.SetSession("admin_user_info", adminUserInfo)
 
@@ -201,7 +250,7 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 				"urlfors":        curAppUrlfors,
 				"current_org_id": adminUserInfo.CurrentOrgId,
 				"current_app_id": adminUserInfo.CurrentAppId,
-				//"subscibe":        subscibe,
+				"subscibe":       subscibe,
 				//"scrm_role_exist": didRegistedForSCRM,
 				//"cdm_role_exist":  didRegistedForCDM,
 				//"mall_role_exist": didRegistedForMall,

models/dialysis.go

@@ -636,6 +636,8 @@ type MonitoringRecord struct {
 	Conductivity              float64 `gorm:"column:conductivity" json:"conductivity"`
 	DisplacementFlowQuantity  float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
 	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
 }
 
 func (MonitoringRecord) TableName() string {

models/intergration_models.go

@@ -265,6 +265,8 @@ type VMUserRole struct {
 	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"`
+	Number           int64  `gorm:"column:number" json:"number" form:"number"`
+	IsSystem         int64  `gorm:"column:is_system" json:"is_system" form:"is_system"`
 }
 
 func (VMUserRole) TableName() string {

models/purview_models.go

@@ -32,8 +32,7 @@ type RolePurview struct {
 	Status     int8   // 状态 0.无效 1.有效 2.禁用
 	CreateTime int64  `gorm:"column:ctime"` // 创建时间
 	ModifyTime int64  `gorm:"column:mtime"` // 修改时间
-
-	Role Role `gorm:"ForeignKey:RoleId;AssociationForeignKey:ID" json:"role_info"`
+	Role       Role   `gorm:"ForeignKey:RoleId;AssociationForeignKey:ID" json:"role_info"`
 }
 
 func (RolePurview) TableName() string {

models/role_models.go

@@ -12,6 +12,8 @@ type Role struct {
 	CreateTime   int64  `gorm:"column:ctime" json:"-"` // 创建时间
 	ModifyTime   int64  `gorm:"column:mtime" json:"-"` // 修改时间
 	StaffNumber  int64  `gorm:"-" json:"staff_number"`
+	Number       int64  `gorm:"number" json:"number"`
+	IsSystem     int64  `gorm:"column:is_system" json:"is_system" form:"is_system"`
 }
 
 func (Role) TableName() string {
@@ -111,6 +113,8 @@ type Roles struct {
 	CreateTime   int64  `gorm:"column:ctime" json:"-"` // 创建时间
 	ModifyTime   int64  `gorm:"column:mtime" json:"-"` // 修改时间
 	StaffNumber  int64  `gorm:"-" json:"staff_number"`
+	Number       int64  `gorm:"column:number" json:"number" form:"number"`
+	IsSystem     int64  `gorm:"column:is_system" json:"is_system" form:"is_system"`
 }
 
 func (Roles) TableName() string {

models/vm_models.go

@@ -296,3 +296,24 @@ type VmDeviceTreatmentmode struct {
 func (VmDeviceTreatmentmode) TableName() string {
 	return "xt_device_treatmentmode"
 }
+
+type VMUserRoleAndPurview struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	RoleName         string `gorm:"column:role_name" json:"role_name" form:"role_name"`
+	RoleIntroduction string `gorm:"column:role_introduction" json:"role_introduction" form:"role_introduction"`
+	Creator          int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId            int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	IsSuperAdmin     int64  `gorm:"column:is_super_admin" json:"is_super_admin" form:"is_super_admin"`
+	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"`
+	Number           int64  `gorm:"column:number" json:"number" form:"number"`
+	PurviewIds       string `gorm:"column:-" json:"purview_ids" form:"purview_ids"`
+	FuncIds          string `gorm:"column:-" json:"func_ids" form:"func_ids"`
+	IsSystem         int64  `gorm:"column:is_system" json:"is_system" form:"is_system"`
+}
+
+func (VMUserRoleAndPurview) TableName() string {
+	return "sgj_user_role"
+}

service/mobile_dialysis_service.go

@@ -613,11 +613,11 @@ func MobileGetPatientById(orgID int64, patientID int64) (*models.Patients, error
 	return &patient, nil
 }
 
-func DisableMonitor(orgID int64, patientID int64, recordID int64) error {
+func DisableMonitor(orgID int64, patientID int64, recordID int64, admin_user_id int64) error {
 	fmt.Println()
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.MonitoringRecord{}).Where("user_org_id = ? AND patient_id = ? AND id = ? AND status = 1 ", orgID, patientID, recordID).Updates(map[string]interface{}{"status": 0, "updated_time": updateTime}).Error
+	err := tx.Model(&models.MonitoringRecord{}).Where("user_org_id = ? AND patient_id = ? AND id = ? AND status = 1 ", orgID, patientID, recordID).Updates(map[string]interface{}{"status": 0, "updated_time": updateTime, "modify": admin_user_id}).Error
 	if err != nil {
 		tx.Rollback()
 		return err

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -481,6 +481,8 @@ type MonitoringRecordVM struct {
 	Conductivity              float64 `gorm:"column:conductivity" json:"conductivity"`
 	DisplacementFlowQuantity  float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
 	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
 }
 
 func (MonitoringRecordVM) TableName() string {

service/role_service.go

@@ -417,7 +417,7 @@ func GetAllOrgValidRoles(orgID int64) ([]*models.Role, error) {
 	var roles []*models.Role
 	err := readUserDb.Model(models.Role{}).
 		Where("org_id = ? AND status = 1", orgID).
-		Order("number asc,ctime").
+		Order("number desc,ctime").
 		Find(&roles).
 		Error
 	if err != nil {
@@ -496,7 +496,7 @@ func GetAllAdminUsersAndRole(orgID int64, appID int64, page int, count int) ([]*
 	var viewModels []*NewAdminUserModel = make([]*NewAdminUserModel, 0)
 	var rows *sql.Rows
 	var err error
-	rows, err = readUserDb.Raw("SELECT u_a_r.id, u_a_r.admin_user_id, u_a_r.user_name,  u_a_r.user_title, u_a_r.status,u_a_r.avatar,u_a_r.role_ids FROM sgj_user_admin_role AS u_a_r  WHERE org_id = ? AND app_id = ? AND user_type != 1  ORDER BY ctime DESC", orgID, appID).Rows()
+	rows, err = readUserDb.Raw("SELECT u_a_r.id, u_a_r.admin_user_id, u_a_r.user_name,  u_a_r.user_title, u_a_r.status,u_a_r.avatar,u_a_r.role_ids FROM sgj_user_admin_role AS u_a_r  WHERE org_id = ? AND app_id = ?  ORDER BY ctime DESC", orgID, appID).Rows()
 	defer rows.Close()
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {

service/subscibe_service.go

@@ -27,3 +27,8 @@ func GetOrgSubscibeState(subscibe *models.ServeSubscibe) (err error) {
 	return
 
 }
+
+func GetOrgSubscibe(org_id int64) (subscibe models.ServeSubscibe, err error) {
+	err = readUserDb.Model(&models.ServeSubscibe{}).Where("org_id = ? AND status = 1", org_id).First(&subscibe).Error
+	return
+}

service/verify_login_token_service.go

@@ -383,3 +383,14 @@ func ModifyPassword(adminID int64, password string) error {
 	err := writeUserDb.Model(&models.AdminUser{}).Where("id = ? AND status = 1", adminID).Updates(map[string]interface{}{"password": password, "mtime": time.Now().Unix()}).Error
 	return err
 }
+
+func GetPurviewById(ids string) ([]*models.Purview, error) {
+	var originPurviews []*models.Purview
+	getPurviewErr := readUserDb.Model(&models.Purview{}).Where(fmt.Sprintf("id in (%v) and status = 1", ids)).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
+	return originPurviews, getPurviewErr
+}
+
+func FindAdminUserIDA(id int64) (role models.App_Role, err error) {
+	err = readUserDb.Model(&models.App_Role{}).Where("id = ?", id).First(&role).Error
+	return
+}