.....

conf/app.conf

@@ -72,6 +72,19 @@ writeuseruser = syh
 writeuserpass = xhPECP2nFObR8aUK
 writeusername = sgj_users
 
+readsqlhost = shengws1.mysql.rds.aliyuncs.com
+readsqlport = 3306
+readsqluser = syh
+readsqlpass = xhPECP2nFObR8aUK
+readsqlname = sgj_xt
+
+writesqlhost = shengws1.mysql.rds.aliyuncs.com
+writesqlport = 3306
+writesqluser = syh
+writesqlpass = xhPECP2nFObR8aUK
+writesqlname = sgj_xt
+
+
 qiniu_accesskey = -l_Pcc1YJs0gh3w0YwN2uoaZO_5fY5J9SIYnSjg0
 qiniu_secretkey = DmZSp_Bmnp-9aUB7xUvoyViZpzmx1Rs2RL69GvlW
 qiniu_domain = https://images.shengws.com/
@@ -87,7 +100,7 @@ redisdb = 0
 # submodule_domain_mall_manage = "http://mall.kuyicloud.com"
 # submodule_domain_cdm_manage = "http://cdm.kuyicloud.com"
 submodule_domain_patient_manage = "https://test1.sgjyun.com"
-submodule_domain_dialysis_manage = "https://xt.test.sgjyun.com"
+submodule_domain_dialysis_manage = "http://xt.test.sgjyun.com"
 submodule_domain_mall_manage = "https://mall.test.sgjyun.com"
 submodule_domain_cdm_manage = "https://cdm.test.sgjyun.com"
 
@@ -121,11 +134,25 @@ writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
 writeusername = sgj_users
 
+readsqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
+readsqlport = 3306
+readsqluser = root
+readsqlpass = 1Q2W3e4r!@#$
+readsqlname = sgj_xt
+
+writesqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
+writesqlport = 3306
+writesqluser = root
+writesqlpass = 1Q2W3e4r!@#$
+writesqlname = sgj_xt
+
+
+
 qiniu_accesskey = -l_Pcc1YJs0gh3w0YwN2uoaZO_5fY5J9SIYnSjg0
 qiniu_secretkey = DmZSp_Bmnp-9aUB7xUvoyViZpzmx1Rs2RL69GvlW
 qiniu_domain = https://images.shengws.com/
 
-redishost = 120.77.235.13
+redishost = 127.0.0.1
 redisport = 6379
 redispasswrod = syh@#$%123456!
 redisdb = 0

controllers/login_controller.go

@@ -35,7 +35,6 @@ func (this *LoginController) PwdLogin() {
 		returnURL = ""
 	}
 	utils.TraceLog("login token: %v", token)
-
 	if len(token) == 0 {
 		this.Data["app_type"] = appType
 		this.Data["return_url"] = returnURL
@@ -236,29 +235,19 @@ func (this *LoginController) getRedirectURL(app_type int, mobile string, returnU
 	admin := service.GetAdminUserWithMobile(mobile)
 	if admin != nil {
 		if admin.IsSuperAdmin { // 如果是超级管理员用户
-			// 那么需要检查是否创建了机构和应用，如未创建，则前往创建
+			// 那么需要检查是否创建了机构，如未创建，则前往创建
 			// 如果都创建了，那么和普通管理员用户一样，需要经过其他判断得出下一步跳转的链接
 			if didCreateOrg, findOrgErr := service.DidAdminUserCreateOrg(admin.Id); findOrgErr != nil {
 				utils.ErrorLog("数据错误：查找mobile = %v的用户创建的机构时错误：%v", mobile, findOrgErr)
 				return "", &enums.SGJError{Code: enums.ErrorCodeDataException}, nil
 			} else {
-				if didCreateOrg {
-					if didCreateApp, findAppErr := service.DidAdminUserOrgCreateApp(admin.Id, app_type); findAppErr != nil {
-						utils.ErrorLog("数据错误：查找mobile = %v的用户创建的应用时错误：%v", mobile, findOrgErr)
-						return "", &enums.SGJError{Code: enums.ErrorCodeDataException}, nil
-					} else {
-						if !didCreateApp {
-							url := this.appendTokenParamToReturnURL(beego.URLFor("OrgController.ViewApps"), token)
-							return url, nil, admin
-						}
-					}
-
-				} else {
+				if !didCreateOrg {
 					url := this.appendTokenParamToReturnURL(beego.URLFor("OrgController.Create"), token) // 前往创建机构的 url
 					return url, nil, admin
 				}
 			}
 		}
+
 		if len(returnURL) != 0 {
 			url := this.appendTokenParamToReturnURL(returnURL, token)
 			return url, nil, admin

controllers/mobile_login_controller.go

@@ -37,7 +37,7 @@ func (this *MobileLoginController) LoginByPwd() {
 
 	if service.IsPasswordRight(mobile, password) {
 		// 只取最近被创建的 admin_role
-		adminUser, getAdminErr := service.GetValidAdminUserByMobileReturnErr(mobile)
+		adminUser, getAdminErr := service.GetValidAdminUserByMobileReturnErr(mobile) //账号信息唯一值
 		if getAdminErr != nil {
 			utils.ErrorLog("获取管理员失败：%v", getAdminErr)
 			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -49,75 +49,259 @@ func (this *MobileLoginController) LoginByPwd() {
 			this.ServeJSON()
 			return
 		} else {
-			appRole, getAppRoleErr := service.GetLastXTAdminRole(adminUser.Id, appType)
+
+			//优先获取最近登录的数据，没有登录的话获取被邀请的用户数据，如果既没有登录信息，也没有用户信息则属于全新用户，
+
+			loginLogs, _ := service.GetLastXTAdminRoleLoginRole(adminUser.Id, appType)
+			var appRole *models.App_Role
+			var org *models.Org
+			var subscibe *models.ServeSubscibe
+			var app *models.OrgApp
+
+			if loginLogs == nil { //登录信息不存在,获取被邀请的用户
+				tempAppRole, getAppRoleErr := service.GetLastXTAdminRole(adminUser.Id, appType)
+				if getAppRoleErr != nil {
+					utils.ErrorLog("获取 app_role 失败：%v", getAppRoleErr)
+					this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					this.ServeJSON()
+					return
+				}
+				appRole = tempAppRole
+
+				if appRole == nil { //如果用户信息不存在，说明没有创建机构和用户信息
+					org = nil
+					subscibe = nil
+					app = nil
+
+				} else { //用户信息存在则可能属于被邀请的
+
+					tempOrg, getOrgErr := service.GetOrgById(appRole.OrgId)
+					if getOrgErr != nil {
+						utils.ErrorLog("获取机构失败:%v", getOrgErr)
+						this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						this.ServeJSON()
+						return
+					}
+
+					tempSubscibe, getSubscibeErr := service.GetOrgServeSubscibe(tempOrg.Id)
+					if getSubscibeErr != nil {
+						utils.ErrorLog("获取机构订阅信息失败：%v", getSubscibeErr)
+						this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						this.ServeJSON()
+						return
+					}
+
+					tempApp, getAppErr := service.GetOrgApp(tempOrg.Id, appType)
+					if getAppErr != nil {
+						utils.ErrorLog("获取应用失败：%v", getAppErr)
+						this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						this.ServeJSON()
+						return
+					}
+
+					subscibe = tempSubscibe
+					org = tempOrg
+					app = tempApp
+				}
+
+			} else {
+				//根据登录信息的机构和用户id，去获取对应用户信息和机构信息
+				tempApp, _ := service.GetOrgApp(loginLogs.OrgId, appType)
+				tempRole, _ := service.GetAppRole(adminUser.Id, loginLogs.OrgId, tempApp.Id)
+				if tempRole.Status != 1 {
+					admin_user_info, _ := service.GetLastUserRole(int64(loginLogs.OrgId), int64(adminUser.Id))
+					tempRole = admin_user_info
+					app, _ := service.GetOrgApp(tempRole.OrgId, 3)
+					tempApp = app
+
+					tempOrg, getOrgErr := service.GetOrgById(tempRole.OrgId)
+					if getOrgErr != nil {
+						utils.ErrorLog("获取机构失败:%v", getOrgErr)
+						this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						this.ServeJSON()
+						return
+					}
+					tempSubscibe, getSubscibeErr := service.GetOrgServeSubscibe(tempOrg.Id)
+					if getSubscibeErr != nil {
+						utils.ErrorLog("获取机构订阅信息失败：%v", getSubscibeErr)
+						this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						this.ServeJSON()
+						return
+					}
+
+					subscibe = tempSubscibe
+					org = tempOrg
+					appRole = tempRole
+					app = tempApp
+
+				} else {
+					tempOrg, getOrgErr := service.GetOrgById(loginLogs.OrgId)
+					if getOrgErr != nil {
+						utils.ErrorLog("获取机构失败:%v", getOrgErr)
+						this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						this.ServeJSON()
+						return
+					}
+					tempSubscibe, getSubscibeErr := service.GetOrgServeSubscibe(tempOrg.Id)
+					if getSubscibeErr != nil {
+						utils.ErrorLog("获取机构订阅信息失败：%v", getSubscibeErr)
+						this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						this.ServeJSON()
+						return
+					}
+					subscibe = tempSubscibe
+					org = tempOrg
+					appRole = tempRole
+					app = tempApp
+				}
+			}
+
+			if org != nil && appRole != nil {
+				// 插入一条登录记录
+				ip := this.GetString("ip")
+				loginLog := &models.AdminUserLoginLog{
+					AdminUserId: adminUser.Id,
+					OrgId:       org.Id,
+					AppId:       appRole.AppId,
+					IP:          ip,
+					OperateType: 1,
+					AppType:     int8(appType),
+					CreateTime:  time.Now().Unix(),
+				}
+				if insertErr := service.InsertLoginLog(loginLog); insertErr != nil {
+					utils.ErrorLog("为手机号为%v的用户插入一条登录记录失败：%v", mobile, insertErr)
+				}
+			}
+
+			this.Data["json"] = enums.MakeSuccessResponseJSON(map[string]interface{}{
+				"admin":    adminUser,
+				"org":      org,
+				"app":      app,
+				"app_role": appRole,
+				"subscibe": subscibe,
+			})
+			this.ServeJSON()
+		}
+
+	} else {
+		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeAccountOrPasswordWrong)
+		this.ServeJSON()
+	}
+}
+
+func (this *MobileLoginController) LoginByCode() {
+	appType, _ := this.GetInt("app_type")
+	if appType != 3 { // 暂时只支持血透系统
+		appType = 3
+	}
+	mobile := this.GetString("mobile")
+	if len(mobile) == 0 {
+		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeAccountOrPasswordWrong)
+		this.ServeJSON()
+		return
+	}
+
+	// 只取最近被创建的 admin_role
+	adminUser, getAdminErr := service.GetValidAdminUserByMobileReturnErr(mobile) //账号信息唯一值
+	if getAdminErr != nil {
+		utils.ErrorLog("获取管理员失败：%v", getAdminErr)
+		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		this.ServeJSON()
+		return
+	} else if adminUser == nil {
+		utils.ErrorLog("查找不到 mobile = %v 的用户", mobile)
+		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeAccountOrPasswordWrong)
+		this.ServeJSON()
+		return
+	} else {
+
+		//优先获取最近登录的数据，没有登录的话获取被邀请的用户数据，如果既没有登录信息，也没有用户信息则属于全新用户，
+
+		loginLogs, _ := service.GetLastXTAdminRoleLoginRole(adminUser.Id, appType)
+		var appRole *models.App_Role
+		var org *models.Org
+		var subscibe *models.ServeSubscibe
+		var app *models.OrgApp
+
+		if loginLogs == nil { //登录信息不存在,获取被邀请的用户
+			tempAppRole, getAppRoleErr := service.GetLastXTAdminRole(adminUser.Id, appType)
 			if getAppRoleErr != nil {
 				utils.ErrorLog("获取 app_role 失败：%v", getAppRoleErr)
 				this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				this.ServeJSON()
 				return
-			} else if appRole == nil {
-				utils.ErrorLog("该管理员没有开通或被授权 app_type = %v 的应用", appType)
-				this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				this.ServeJSON()
-				return
 			}
-			org, getOrgErr := service.GetOrgById(appRole.OrgId)
+			appRole = tempAppRole
+
+			if appRole == nil { //如果用户信息不存在，说明没有创建机构和用户信息
+				org = nil
+				subscibe = nil
+				app = nil
+
+			} else { //用户信息存在则可能属于被邀请的
+
+				tempOrg, getOrgErr := service.GetOrgById(appRole.OrgId)
+				if getOrgErr != nil {
+					utils.ErrorLog("获取机构失败:%v", getOrgErr)
+					this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					this.ServeJSON()
+					return
+				}
+
+				tempSubscibe, getSubscibeErr := service.GetOrgServeSubscibe(tempOrg.Id)
+				if getSubscibeErr != nil {
+					utils.ErrorLog("获取机构订阅信息失败：%v", getSubscibeErr)
+					this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					this.ServeJSON()
+					return
+				}
+
+				tempApp, getAppErr := service.GetOrgApp(tempOrg.Id, appType)
+				if getAppErr != nil {
+					utils.ErrorLog("获取应用失败：%v", getAppErr)
+					this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					this.ServeJSON()
+					return
+				}
+
+				subscibe = tempSubscibe
+				org = tempOrg
+				app = tempApp
+			}
+
+		} else {
+			//根据登录信息的机构和用户id，去获取对应用户信息和机构信息
+			tempApp, _ := service.GetOrgApp(loginLogs.OrgId, appType)
+			tempRole, _ := service.GetAppRole(adminUser.Id, loginLogs.OrgId, tempApp.Id)
+
+			tempOrg, getOrgErr := service.GetOrgById(loginLogs.OrgId)
 			if getOrgErr != nil {
 				utils.ErrorLog("获取机构失败:%v", getOrgErr)
 				this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				this.ServeJSON()
 				return
-			} else if org == nil {
-				utils.ErrorLog("该机构不存在或被删除")
-				this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				this.ServeJSON()
-				return
-			}
-			app, getAppErr := service.GetAppById(appRole.AppId)
-			if getAppErr != nil {
-				utils.ErrorLog("获取应用失败:%v", getAppErr)
-				this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				this.ServeJSON()
-				return
-			} else if app == nil {
-				utils.ErrorLog("该应用不存在或被删除")
-				this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				this.ServeJSON()
-				return
 			}
-			subscibe, getSubscibeErr := service.GetOrgServeSubscibe(org.Id)
+			tempSubscibe, getSubscibeErr := service.GetOrgServeSubscibe(tempOrg.Id)
 			if getSubscibeErr != nil {
 				utils.ErrorLog("获取机构订阅信息失败：%v", getSubscibeErr)
 				this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				this.ServeJSON()
 				return
-			} else if subscibe == nil {
-				now := time.Now()
-				nextMonthDate := now.AddDate(0, 0, 30)
-				subscibe = &models.ServeSubscibe{
-					OrgId:       int64(org.Id),
-					PeriodStart: now.Unix(),
-					PeriodEnd:   nextMonthDate.Unix(),
-					Status:      1,
-					CreatedTime: now.Unix(),
-					UpdatedTime: now.Unix(),
-					State:       2,
-				}
-				createErr := service.CreateOrgServeSubscibe(subscibe)
-				if createErr != nil {
-					utils.ErrorLog("创建机构订阅信息失败：%v", createErr)
-					this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					this.ServeJSON()
-					return
-				}
 			}
 
+			subscibe = tempSubscibe
+			org = tempOrg
+			appRole = tempRole
+			app = tempApp
+		}
+
+		if org != nil && appRole != nil {
 			// 插入一条登录记录
 			ip := this.GetString("ip")
 			loginLog := &models.AdminUserLoginLog{
 				AdminUserId: adminUser.Id,
 				OrgId:       org.Id,
-				AppId:       app.Id,
+				AppId:       appRole.AppId,
 				IP:          ip,
 				OperateType: 1,
 				AppType:     int8(appType),
@@ -126,19 +310,15 @@ func (this *MobileLoginController) LoginByPwd() {
 			if insertErr := service.InsertLoginLog(loginLog); insertErr != nil {
 				utils.ErrorLog("为手机号为%v的用户插入一条登录记录失败：%v", mobile, insertErr)
 			}
-
-			this.Data["json"] = enums.MakeSuccessResponseJSON(map[string]interface{}{
-				"admin":    adminUser,
-				"org":      org,
-				"app":      app,
-				"app_role": appRole,
-				"subscibe": subscibe,
-			})
-			this.ServeJSON()
 		}
 
-	} else {
-		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeAccountOrPasswordWrong)
+		this.Data["json"] = enums.MakeSuccessResponseJSON(map[string]interface{}{
+			"admin":    adminUser,
+			"org":      org,
+			"app":      app,
+			"app_role": appRole,
+			"subscibe": subscibe,
+		})
 		this.ServeJSON()
 	}
 }

controllers/mobile_regist_controller.go

@@ -165,6 +165,7 @@ func (this *MobileRegistController) CreateOrgSubmit() {
 		this.ServeJSON()
 		return
 	}
+	user_name := this.GetString("user_name")
 
 	name := this.GetString("name")
 	shortName := name
@@ -243,7 +244,7 @@ func (this *MobileRegistController) CreateOrgSubmit() {
 		ModifyTime:   time.Now().Unix(),
 	}
 
-	createErr := service.CreateOrg(&org, adminUser.Mobile, openXT, openCDM, openSCRM, openMall) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
+	createErr := service.CreateOrg(&org, adminUser.Mobile, openXT, openCDM, openSCRM, openMall, user_name) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
 	if createErr != nil {
 		utils.ErrorLog("mobile=%v的超级管理员创建机构失败：%v", adminUser.Mobile, createErr)
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)

controllers/patient.json

@@ -0,0 +1,163 @@
+{
+  "patients": [
+    {
+      "avatar": "https://images.shengws.com/201809182128111.png",
+      "patient_type": 1,
+      "dialysis_no": "001",
+      "admission_number": "",
+      "source": 1,
+      "lapseto": 1,
+      "partition_id": 0,
+      "bed_id": 0,
+      "name": "演示患者一",
+      "alias": "",
+      "gender": 1,
+      "nation": "汉",
+      "native_place": "广东深圳",
+      "marital_status": 1,
+      "id_card_no": "431230199808081111",
+      "birthday": -312537600,
+      "reimbursement_way_id": 7,
+      "health_care_type": 0,
+      "health_care_no": "604324517",
+      "health_care_due_date": 0,
+      "height": 158,
+      "blood_type": 0,
+      "rh": 0,
+      "health_care_due_alert_date": 0,
+      "education_level": 5,
+      "profession": 10,
+      "phone": "13800000001",
+      "home_telephone": "",
+      "relative_phone": "",
+      "relative_relations": "",
+      "home_address": "深圳市罗湖区鸿翔花园",
+      "work_unit": "无",
+      "unit_address": "无",
+      "children": 2,
+      "receiving_date": 0,
+      "is_hospital_first_dialysis": 1,
+      "first_dialysis_date": 1110816000,
+      "first_dialysis_hospital": "深圳市人民医院",
+      "predialysis_condition": "",
+      "pre_hospital_dialysis_frequency": "每周3次",
+      "pre_hospital_dialysis_times": 1820,
+      "hospital_first_dialysis_date": 1511366400,
+      "induction_period": 0,
+      "initial_dialysis": 0,
+      "total_dialysis": 14,
+      "attending_doctor_id": 0,
+      "head_nurse_id": 0,
+      "evaluate": "",
+      "diagnose": "慢病肾功能不全（尿毒症期）",
+      "remark": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "registrars_id": 185,
+      "registrars": "",
+      "qr_code": "",
+      "binding_state": 2,
+      "patient_complains": "慢病肾功能不全（尿毒症期）",
+      "present_history": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "past_history": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "temperature": 39,
+      "pulse": 60,
+      "respiratory": 100,
+      "sbp": 0,
+      "dbp": 0,
+      "status": 1,
+      "created_time": 1537347970,
+      "updated_time": 1584343696,
+      "solutions": null,
+      "age": 60,
+      "schedules": null,
+      "contagions": null,
+      "diseases": null,
+      "response_result": "",
+      "is_open_remind": 1,
+      "dialysis_age": 0,
+      "expense_kind": 3,
+      "tell_phone": "21212",
+      "first_treatment_date": 1582560000,
+      "contact_name": "21221"
+    },
+    {
+      "avatar": "https://images.shengws.com/201809182128111.png",
+      "patient_type": 1,
+      "dialysis_no": "002",
+      "admission_number": "",
+      "source": 1,
+      "lapseto": 1,
+      "partition_id": 0,
+      "bed_id": 0,
+      "name": "演示患者二",
+      "alias": "",
+      "gender": 2,
+      "nation": "汉",
+      "native_place": "广东深圳",
+      "marital_status": 1,
+      "id_card_no": "4312301999090952222",
+      "birthday": -312537600,
+      "reimbursement_way_id": 7,
+      "health_care_type": 0,
+      "health_care_no": "604324517",
+      "health_care_due_date": 0,
+      "height": 158,
+      "blood_type": 0,
+      "rh": 0,
+      "health_care_due_alert_date": 0,
+      "education_level": 5,
+      "profession": 10,
+      "phone": "13800000001",
+      "home_telephone": "",
+      "relative_phone": "",
+      "relative_relations": "哥哥",
+      "home_address": "深圳市罗湖区鸿翔花园",
+      "work_unit": "无",
+      "unit_address": "无",
+      "children": 2,
+      "receiving_date": 0,
+      "is_hospital_first_dialysis": 1,
+      "first_dialysis_date": 1110816000,
+      "first_dialysis_hospital": "深圳市人民医院",
+      "predialysis_condition": "",
+      "pre_hospital_dialysis_frequency": "每周3次",
+      "pre_hospital_dialysis_times": 1820,
+      "hospital_first_dialysis_date": 1511366400,
+      "induction_period": 0,
+      "initial_dialysis": 0,
+      "total_dialysis": 14,
+      "attending_doctor_id": 0,
+      "head_nurse_id": 0,
+      "evaluate": "",
+      "diagnose": "慢病肾功能不全（尿毒症期）",
+      "remark": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "registrars_id": 185,
+      "registrars": "",
+      "qr_code": "",
+      "binding_state": 2,
+      "patient_complains": "慢病肾功能不全（尿毒症期）",
+      "present_history": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "past_history": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "temperature": 39,
+      "pulse": 60,
+      "respiratory": 100,
+      "sbp": 0,
+      "dbp": 0,
+      "status": 1,
+      "created_time": 1537347970,
+      "updated_time": 1584343696,
+      "solutions": null,
+      "age": 60,
+      "schedules": null,
+      "contagions": null,
+      "diseases": null,
+      "response_result": "",
+      "is_open_remind": 1,
+      "dialysis_age": 0,
+      "expense_kind": 3,
+      "tell_phone": "21212",
+      "first_treatment_date": 1582560000,
+      "contact_name": "21221"
+    }
+  ]
+}
+

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": "49,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,81,82,83,104,106,107,108,149,154,190,191",
+      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20024,20025,20026,20027,20028,20029,20030,20031,20032,20033,20034,20035,20036,20037,20038,20039,20040,20041,20042,20043,20044,20045"
+    },
+    {
+      "role_name": "医生",
+      "role_introduction": "医生角色能够进行建立患者档案，制定和调整患者透析治疗方案，定期评价病人的透析质量等",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 2,
+      "number": 9998,
+      "purview_ids": "49,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": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20024,20025,20026,20027,20028,20029,20030,20031,20032,20033"
+
+
+    },
+    {
+      "role_name": "护士",
+      "role_introduction": "护士角色能够进行病人透析管理，以及医院的感染控制与消毒记录等",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 3,
+      "number": 9997,
+      "purview_ids": "49,74,75,73,48,52,110,93,121,122,124,125,120",
+      "func_ids": "20007,20008,20010,20011,20012,20013,20014,20016,20017,20019,20021,20022,20024,20025,20027,20028"
+
+
+
+    },
+    {
+      "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,191",
+      "func_ids": ""
+
+
+    },
+    {
+      "role_name": "院长",
+      "role_introduction": "院长角色了解血透患者血液透析质量和相关的大数据，以及掌握透析中心整体运营情况",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 0,
+      "number": 9993,
+      "purview_ids": "49,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": ""
+
+
+    }
+  ]
+}

controllers/schedule_template.json

@@ -0,0 +1,86 @@
+{
+  "item": [
+    {
+      "treat_mode": 1,
+      "weekday": 1,
+      "time_type": 1
+    },
+    {
+      "treat_mode": 1,
+      "weekday": 1,
+      "time_type": 2
+    },
+    {
+
+      "treat_mode": 1,
+      "weekday": 2,
+      "time_type": 1
+    },
+
+    {
+
+      "treat_mode": 1,
+      "weekday": 2,
+      "time_type": 2
+    },
+    {
+
+      "treat_mode": 1,
+      "weekday": 3,
+      "time_type": 1
+    },
+    {
+
+      "treat_mode": 1,
+      "weekday": 3,
+      "time_type": 2
+    },
+    {
+
+      "treat_mode": 1,
+      "weekday": 4,
+      "time_type": 1
+    },
+    {
+
+      "treat_mode": 1,
+      "weekday": 4,
+      "time_type": 2
+    },
+    {
+
+      "treat_mode": 1,
+      "weekday": 5,
+      "time_type": 1
+    },
+    {
+
+      "treat_mode": 1,
+      "weekday": 5,
+      "time_type": 2
+    },
+    {
+
+      "treat_mode": 1,
+      "weekday": 6,
+      "time_type": 1
+    },
+    {
+
+      "treat_mode": 1,
+      "weekday": 6,
+      "time_type": 2
+    },
+    {
+
+      "treat_mode": 1,
+      "weekday": 7,
+      "time_type": 1
+    },
+    {
+      "treat_mode": 1,
+      "weekday": 7,
+      "time_type": 2
+    }
+  ]
+}

controllers/system_dialysis_prescription.json

@@ -0,0 +1,57 @@
+{
+  "prescription": [
+    {
+      "anticoagulant": 3,
+      "anticoagulant_shouji": 4000,
+      "anticoagulant_weichi": 0,
+      "anticoagulant_zongliang": 4000,
+      "mode_id": 1,
+      "blood_flow_volume": 250,
+      "kalium": 2,
+      "sodium": 135,
+      "calcium": 1.5,
+      "status": 1,
+      "dialysis_duration_hour": 4,
+      "dialysis_duration_minute": 0
+    },{
+      "anticoagulant": 3,
+      "anticoagulant_shouji": 4000,
+      "anticoagulant_weichi": 0,
+      "anticoagulant_zongliang": 4000,
+      "mode_id": 2,
+      "blood_flow_volume": 250,
+      "kalium": 2,
+      "sodium": 135,
+      "calcium": 1.5,
+      "status": 1,
+      "dialysis_duration_hour": 4,
+      "dialysis_duration_minute": 0
+    },{
+      "anticoagulant": 3,
+      "anticoagulant_shouji": 4000,
+      "anticoagulant_weichi": 0,
+      "anticoagulant_zongliang": 4000,
+      "mode_id": 3,
+      "blood_flow_volume": 200,
+      "kalium": 2,
+      "sodium": 135,
+      "calcium": 1.5,
+      "status": 1,
+      "dialysis_duration_hour": 4,
+      "dialysis_duration_minute": 0
+    },{
+      "anticoagulant": 3,
+      "anticoagulant_shouji": 4000,
+      "anticoagulant_weichi": 0,
+      "anticoagulant_zongliang": 4000,
+      "mode_id": 12,
+      "blood_flow_volume": 200,
+      "kalium": 2,
+      "sodium": 135,
+      "calcium": 1.5,
+      "status": 1,
+      "dialysis_duration_hour": 4,
+      "dialysis_duration_minute": 0
+    }
+  ]
+}

controllers/verify_token_controller.go

@@ -35,6 +35,7 @@ func (this *VerifyTokenController) VerifyToken() {
 	// 	this.ServeJSON()
 	// 	return
 	// }
+	app_type = 3
 	if url := service.GetAppURLWithAppType(app_type); len(url) == 0 {
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		this.ServeJSON()
@@ -71,6 +72,7 @@ func (this *VerifyTokenController) VerifyToken() {
 			utils.TraceLog("%v data is from operation", "sso_admin_user_info_"+mobile)
 			isUserInfoFromRedis = false
 			info, getInfoErr := this.GetAdminUserAllInfo(mobile)
+
 			if getInfoErr != nil {
 				this.Data["json"] = enums.MakeFailResponseJSONWithSGJError(getInfoErr)
 				this.ServeJSON()
@@ -101,52 +103,55 @@ func (this *VerifyTokenController) VerifyToken() {
 			currentAppId = lastLoginLog.AppId
 		} else {
 			if isUserInfoFromRedis {
-				orgIds := userInfo["org_ids"].([]interface{})
-				for _, oid := range orgIds {
-					orgApps := userInfo["org_apps"].(map[string]interface{})[oid.(string)]
-					for _, appMapJSON := range orgApps.(map[string]interface{}) {
-						var appMap map[string]interface{}
-						json.Unmarshal([]byte(appMapJSON.(string)), &appMap)
 
-						a_t := int(appMap["app_type"].(float64))
-						if a_t == app_type {
-							currentOrgId = int(appMap["org_id"].(float64))
-							currentAppId = int(appMap["id"].(float64))
-							break
-						}
-					}
-					if currentOrgId != 0 && currentAppId != 0 {
-						break
-					}
-				}
+				role, _ := service.GetLastXTAdminRole(adminUser.Id, app_type)
+				currentAppId = role.AppId
+				currentOrgId = role.OrgId
 
-			} else {
-				orgIds := userInfo["org_ids"].([]string)
-				for _, oid := range orgIds {
-					orgApps := userInfo["org_apps"].(map[string]interface{})[oid]
-					for _, appMapJSON := range orgApps.(map[string]string) {
-						var appMap map[string]interface{}
-						json.Unmarshal([]byte(appMapJSON), &appMap)
+				//orgIds := userInfo["org_ids"].([]interface{})
+				//for _, oid := range orgIds {
+				//	orgApps := userInfo["org_apps"].(map[string]interface{})[oid.(string)]
+				//	for _, appMapJSON := range orgApps.(map[string]interface{}) {
+				//		var appMap map[string]interface{}
+				//		json.Unmarshal([]byte(appMapJSON.(string)), &appMap)
+				//
+				//		a_t := int(appMap["app_type"].(float64))
+				//		if a_t == app_type {
+				//			currentOrgId = int(appMap["org_id"].(float64))
+				//			currentAppId = int(appMap["id"].(float64))
+				//			break
+				//		}
+				//	}
+				//	if currentOrgId != 0 && currentAppId != 0 {
+				//		break
+				//	}
+				//}
 
-						a_t := int(appMap["app_type"].(float64))
-						if a_t == app_type {
-							currentOrgId = int(appMap["org_id"].(float64))
-							currentAppId = int(appMap["id"].(float64))
-							break
-						}
-					}
-					if currentOrgId != 0 && currentAppId != 0 {
-						break
-					}
-				}
+			} else {
+				role, _ := service.GetLastXTAdminRole(adminUser.Id, app_type)
+				currentAppId = role.AppId
+				currentOrgId = role.OrgId
+				//orgIds := userInfo["org_ids"].([]string)
+				//for _, oid := range orgIds {
+				//	orgApps := userInfo["org_apps"].(map[string]interface{})[oid]
+				//	for _, appMapJSON := range orgApps.(map[string]string) {
+				//		var appMap map[string]interface{}
+				//		json.Unmarshal([]byte(appMapJSON), &appMap)
+				//
+				//		a_t := int(appMap["app_type"].(float64))
+				//		if a_t == app_type {
+				//			currentOrgId = int(appMap["org_id"].(float64))
+				//			currentAppId = int(appMap["id"].(float64))
+				//			break
+				//		}
+				//	}
+				//	if currentOrgId != 0 && currentAppId != 0 {
+				//		break
+				//	}
+				//}
 			}
 		}
-		// for key, value := range userInfo {
-		// 	if key == "purviews" || key == "purview_urlfors" {
-		// 		continue
-		// 	}
-		// 	utils.TraceLog("%v: %v", key, value)
-		// }
+
 		utils.TraceLog("lastLoginLog : %v", lastLoginLog)
 		utils.TraceLog("currentOrgId : %v", currentOrgId)
 		utils.TraceLog("currentAppId : %v", currentAppId)
@@ -168,13 +173,11 @@ func (this *VerifyTokenController) VerifyToken() {
 		returnJSON["orgs"] = userInfo["orgs"]
 		returnJSON["org_app_ids"] = userInfo["org_app_ids"]
 		returnJSON["org_apps"] = userInfo["org_apps"]
-		returnJSON["app_to_org_ids"] = userInfo["app_to_org_ids"]
 		returnJSON["current_org_id"] = strconv.Itoa(currentOrgId)
 		returnJSON["current_app_id"] = strconv.Itoa(currentAppId)
 		returnJSON["purviews"] = userInfo["purviews"]
 		returnJSON["purview_urlfors"] = userInfo["purview_urlfors"]
 		returnJSON["app_roles"] = userInfo["app_roles"]
-		returnJSON["org_subscibes"] = userInfo["org_subscibes"]
 		this.Data["json"] = enums.MakeSuccessResponseJSON(returnJSON)
 		this.ServeJSON()
 
@@ -262,7 +265,10 @@ func (this *VerifyTokenController) GetAdminUserAllInfo(mobile string) (map[strin
 		utils.ErrorLog("数据错误：查找不到mobile = %v的用户", mobile)
 		return nil, &enums.SGJError{Code: enums.ErrorCodeDataException}
 	}
-	orgs, getOrgErr := service.GetAdminUserAllOrgWithUID(adminUser.Id, adminUser.IsSuperAdmin)
+	orgs, getOrgErr := service.GetAdminUserAllOrgWithUID(adminUser.Id)
+	//去重
+	orgs = RemoveRepeatedPurviewElement(orgs)
+
 	if getOrgErr != nil {
 		utils.ErrorLog("数据错误：查找不到mobile = %v的用户所属的机构：%v", mobile, getOrgErr)
 		return nil, &enums.SGJError{Code: enums.ErrorCodeDataException}
@@ -272,39 +278,40 @@ func (this *VerifyTokenController) GetAdminUserAllInfo(mobile string) (map[strin
 		return nil, &enums.SGJError{Code: enums.ErrorCodeDataException}
 	}
 	orgIds := make([]string, 0, len(orgs))
+
 	orgJSONs := make(map[string]string)
 	orgAppIds := make(map[string]interface{})
 	orgApps := make(map[string]interface{})
-	app_to_org_ids := make(map[string]string)
 	app_purviewJSONs := make(map[string]string)
 	app_purview_urls := make(map[string]string)
 	app_roles := make(map[string]string)
 	org_subscibes := make(map[string]string)
+
 	for _, org := range orgs {
 		apps, getAppsErr := service.GetAdminUserAllOrgApp(adminUser.Id, org.Id)
 		if getAppsErr != nil {
 			utils.ErrorLog("数据错误：查找mobile = %v的用户所属机构ID为%v下的应用时错误：%v", mobile, org.Id, getAppsErr)
 			return nil, &enums.SGJError{Code: enums.ErrorCodeDataException}
 		}
-		if adminUser.IsSuperAdmin {
-			didCreateNewApp, createAppErr := this._createAppIfNeeded(adminUser.Id, org.Id, apps)
-			if createAppErr != nil {
-				return nil, createAppErr
-			}
-			if didCreateNewApp {
-				apps, getAppsErr = service.GetAdminUserAllOrgApp(adminUser.Id, org.Id)
-				if getAppsErr != nil {
-					utils.ErrorLog("数据错误：查找mobile = %v的用户所属机构ID为%v下的应用时错误：%v", mobile, org.Id, getAppsErr)
-					return nil, &enums.SGJError{Code: enums.ErrorCodeDataException}
-				}
-			}
-
-		} else {
-			if len(apps) == 0 {
-				continue
-			}
-		}
-
+		//if adminUser.IsSuperAdmin {
+		//	didCreateNewApp, createAppErr := this._createAppIfNeeded(adminUser.Id, org.Id, apps)
+		//	if createAppErr != nil {
+		//		return nil, createAppErr
+		//	}
+		//	if didCreateNewApp {
+		//		apps, getAppsErr = service.GetAdminUserAllOrgApp(org.Id)
+		//		if getAppsErr != nil {
+		//			utils.ErrorLog("数据错误：查找mobile = %v的用户所属机构ID为%v下的应用时错误：%v", mobile, org.Id, getAppsErr)
+		//			return nil, &enums.SGJError{Code: enums.ErrorCodeDataException}
+		//		}
+		//	}
+		//
+		//} else {
+		//	if len(apps) == 0 {
+		//		continue
+		//	}
+		//}
+		//
 		subscibe, getSubscibeErr := service.GetOrgServeSubscibe(org.Id)
 		if getSubscibeErr != nil {
 			utils.ErrorLog("获取机构订阅信息失败：%v", getSubscibeErr)
@@ -339,11 +346,11 @@ func (this *VerifyTokenController) GetAdminUserAllInfo(mobile string) (map[strin
 		appIds := make([]string, 0, len(apps))
 		appJSONs := make(map[string]string)
 		for _, app := range apps {
-			appJSON_b, _ := json.Marshal(app)
-			appJSONStr := string(appJSON_b)
-			appJSONs[strconv.Itoa(app.Id)] = appJSONStr
-			appIds = append(appIds, strconv.Itoa(app.Id))
-			app_to_org_ids[strconv.Itoa(app.Id)] = strconv.Itoa(org.Id)
+			//appJSON_b, _ := json.Marshal(app)
+			//appJSONStr := string(appJSON_b)
+			//appJSONs[strconv.Itoa(app.Id)] = appJSONStr
+			//appIds = append(appIds, strconv.Itoa(app.Id))
+			//app_to_org_ids[strconv.Itoa(app.Id)] = strconv.Itoa(org.Id)
 
 			if adminUser.IsSuperAdmin {
 				urlfors, purviews, getPurviewErr := service.GetSuperAdminUsersPurviewTreeAndUrlfors(app.AppType)
@@ -369,13 +376,16 @@ func (this *VerifyTokenController) GetAdminUserAllInfo(mobile string) (map[strin
 				}
 			}
 
-			appRole, getAppRoleErr := service.GetAppRole(adminUser.Id, org.Id, app.Id)
-			if getAppRoleErr != nil {
-				utils.ErrorLog("数据错误：查找id=%v,orgid=%v,appid=%v的用户信息时失败：%v", adminUser.Id, org.Id, app.Id, getAppRoleErr)
-				return nil, &enums.SGJError{Code: enums.ErrorCodeDataException}
+			appRole, _ := service.GetAppRole(adminUser.Id, org.Id, app.Id)
+			//if getAppRoleErr != nil {
+			//	utils.ErrorLog("数据错误：查找id=%v,orgid=%v,appid=%v的用户信息时失败：%v", adminUser.Id, org.Id, app.Id, getAppRoleErr)
+			//	return nil, &enums.SGJError{Code: enums.ErrorCodeDataException}
+			//}
+			var appRoleJSON_b []byte
+			if appRole != nil {
+				appRoleJSON_b, _ = json.Marshal(appRole)
+				app_roles[strconv.Itoa(app.Id)] = string(appRoleJSON_b)
 			}
-			appRoleJSON_b, _ := json.Marshal(appRole)
-			app_roles[strconv.Itoa(app.Id)] = string(appRoleJSON_b)
 		}
 		orgAppIds[strconv.Itoa(org.Id)] = appIds
 		orgApps[strconv.Itoa(org.Id)] = appJSONs
@@ -388,65 +398,80 @@ func (this *VerifyTokenController) GetAdminUserAllInfo(mobile string) (map[strin
 	info["orgs"] = orgJSONs
 	info["org_app_ids"] = orgAppIds
 	info["org_apps"] = orgApps
-	info["app_to_org_ids"] = app_to_org_ids
 	info["app_roles"] = app_roles
 	info["purviews"] = app_purviewJSONs
 	info["purview_urlfors"] = app_purview_urls
-	info["org_subscibes"] = org_subscibes
 	return info, nil
 }
 
-func (this *VerifyTokenController) _createAppIfNeeded(adminUserID int, orgID int, didCreatedApps []*models.OrgApp) (bool, *enums.SGJError) {
-	// 已创建的应用的信息
-	did_patient_manage_create := false
-	did_dialysis_manage_create := false
-	did_cdm_manage_create := false
-	did_mall_manage_create := false
-	for _, app := range didCreatedApps {
-		if app.AppType == 1 {
-			did_patient_manage_create = true
-		} else if app.AppType == 3 {
-			did_dialysis_manage_create = true
-		} else if app.AppType == 4 {
-			did_cdm_manage_create = true
-		} else if app.AppType == 5 {
-			did_mall_manage_create = true
-		}
-	}
+//func (this *VerifyTokenController) _createAppIfNeeded(adminUserID int, orgID int, didCreatedApps []*models.OrgApp) (bool, *enums.SGJError) {
+//	// 已创建的应用的信息
+//	//did_patient_manage_create := false
+//	//did_dialysis_manage_create := false
+//	//did_cdm_manage_create := false
+//	//did_mall_manage_create := false
+//	//for _, app := range didCreatedApps {
+//	//	if app.AppType == 1 {
+//	//		did_patient_manage_create = true
+//	//	} else if app.AppType == 3 {
+//	//		did_dialysis_manage_create = true
+//	//	} else if app.AppType == 4 {
+//	//		did_cdm_manage_create = true
+//	//	} else if app.AppType == 5 {
+//	//		did_mall_manage_create = true
+//	//	}
+//	//}
+//
+//	//// 自动创建所有应用
+//	//didCreateNew := false
+//	//if did_dialysis_manage_create == false {
+//	//	err := service.CreateOrgApp(adminUserID, orgID, 3, false)
+//	//	if err != nil {
+//	//		utils.ErrorLog("自动创建透析管理应用失败:%v", err)
+//	//		return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
+//	//	}
+//	//	didCreateNew = true
+//	//}
+//	//if did_cdm_manage_create == false {
+//	//	err := service.CreateOrgApp(adminUserID, orgID, 4, false)
+//	//	if err != nil {
+//	//		utils.ErrorLog("自动创建慢病管理应用失败:%v", err)
+//	//		return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
+//	//	}
+//	//	didCreateNew = true
+//	//}
+//	//if did_patient_manage_create == false {
+//	//	err := service.CreateOrgApp(adminUserID, orgID, 1, false)
+//	//	if err != nil {
+//	//		utils.ErrorLog("自动创建酷医聚客应用失败:%v", err)
+//	//		return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
+//	//	}
+//	//	didCreateNew = true
+//	//}
+//	//if did_mall_manage_create == false {
+//	//	err := service.CreateOrgApp(adminUserID, orgID, 5, false)
+//	//	if err != nil {
+//	//		utils.ErrorLog("自动创建微商城应用失败:%v", err)
+//	//		return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
+//	//	}
+//	//	didCreateNew = true
+//	//}
+//	return true, nil
+//}
 
-	// 自动创建所有应用
-	didCreateNew := false
-	if did_dialysis_manage_create == false {
-		err := service.CreateOrgApp(adminUserID, orgID, 3, false)
-		if err != nil {
-			utils.ErrorLog("自动创建透析管理应用失败:%v", err)
-			return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
-		}
-		didCreateNew = true
-	}
-	if did_cdm_manage_create == false {
-		err := service.CreateOrgApp(adminUserID, orgID, 4, false)
-		if err != nil {
-			utils.ErrorLog("自动创建慢病管理应用失败:%v", err)
-			return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
-		}
-		didCreateNew = true
-	}
-	if did_patient_manage_create == false {
-		err := service.CreateOrgApp(adminUserID, orgID, 1, false)
-		if err != nil {
-			utils.ErrorLog("自动创建酷医聚客应用失败:%v", err)
-			return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
+func RemoveRepeatedPurviewElement(org []*models.Org) (orgs []*models.Org) {
+	orgs = make([]*models.Org, 0)
+	for i := 0; i < len(org); i++ {
+		repeat := false
+		for j := i + 1; j < len(org); j++ {
+			if org[i].Id == org[j].Id {
+				repeat = true
+				break
+			}
 		}
-		didCreateNew = true
-	}
-	if did_mall_manage_create == false {
-		err := service.CreateOrgApp(adminUserID, orgID, 5, false)
-		if err != nil {
-			utils.ErrorLog("自动创建微商城应用失败:%v", err)
-			return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
+		if !repeat {
+			orgs = append(orgs, org[i])
 		}
-		didCreateNew = true
 	}
-	return didCreateNew, nil
+	return
 }

models/admin_user_models.go

@@ -8,6 +8,7 @@ type AdminUser struct {
 	Status       int8   `json:"status"`                                      // 状态 0.无效 1.有效
 	CreateTime   int64  `gorm:"column:ctime" json:"ctime"`                   // 创建时间
 	ModifyTime   int64  `gorm:"column:mtime" json:"mtime"`                   // 修改时间
+	Name         string `gorm:"column:name" json:"name" form:"name"`
 }
 
 func (AdminUser) TableName() string {

models/associative_table_models.go

@@ -14,6 +14,7 @@ type App_Role struct {
 	Status      int8   // 状态 0.无效 1.有效
 	CreateTime  int64  `gorm:"column:ctime" json:"ctime"` // 创建时间
 	ModifyTime  int64  `gorm:"column:mtime" json:"mtime"` // 修改时间
+	RoleIds     string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
 }
 
 func (App_Role) TableName() string {

models/role_models.go

@@ -11,6 +11,8 @@ type Role struct {
 	Status       int8  // 状态 0.无效 1.有效 2.禁用
 	CreateTime   int64 `gorm:"column:ctime"` // 创建时间
 	ModifyTime   int64 `gorm:"column:mtime"` // 修改时间
+	Number       int64 `gorm:"number" json:"number"`
+	IsSystem     int64 `gorm:"column:is_system" json:"is_system" form:"is_system"`
 }
 
 func (Role) TableName() string {
@@ -51,3 +53,18 @@ type RolePurview struct {
 func (RolePurview) TableName() string {
 	return "sgj_user_role_purview"
 }
+
+type SgjUserRoleFuncPurview struct {
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId      int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId     int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	PurviewIds string `gorm:"column:purview_ids" json:"purview_ids" form:"purview_ids"`
+	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"`
+}
+
+func (SgjUserRoleFuncPurview) TableName() string {
+	return "sgj_user_role_func_purview"
+}

models/vm_models.go

@@ -0,0 +1,315 @@
+package models
+
+type VMOrgPatients struct {
+	ID                           int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId                       int64   `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar                       string  `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType                  int64   `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	DialysisNo                   string  `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber              string  `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source                       int64   `gorm:"column:source" json:"source" form:"source"`
+	Lapseto                      int64   `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PartitionId                  int64   `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                        int64   `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name                         string  `gorm:"column:name" json:"name" form:"name"`
+	Alias                        string  `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender                       int64   `gorm:"column:gender" json:"gender" form:"gender"`
+	Nation                       string  `gorm:"column:nation" json:"nation" form:"nation"`
+	NativePlace                  string  `gorm:"column:native_place" json:"native_place" form:"native_place"`
+	MaritalStatus                int64   `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
+	IdCardNo                     string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday                     int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	ReimbursementWayId           int64   `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
+	HealthCareType               int64   `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
+	HealthCareNo                 string  `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
+	HealthCareDueDate            int64   `gorm:"column:health_care_due_date" json:"health_care_due_date" form:"health_care_due_date"`
+	Height                       int64   `gorm:"column:height" json:"height" form:"height"`
+	BloodType                    int64   `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
+	Rh                           int64   `gorm:"column:rh" json:"rh" form:"rh"`
+	HealthCareDueAlertDate       int64   `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
+	EducationLevel               int64   `gorm:"column:education_level" json:"education_level" form:"education_level"`
+	Profession                   int64   `gorm:"column:profession" json:"profession" form:"profession"`
+	Phone                        string  `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone                string  `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone                string  `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations            string  `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress                  string  `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit                     string  `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress                  string  `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	Children                     int64   `gorm:"column:children" json:"children" form:"children"`
+	ReceivingDate                int64   `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
+	IsHospitalFirstDialysis      int64   `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
+	FirstDialysisDate            int64   `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
+	FirstDialysisHospital        string  `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
+	PredialysisCondition         string  `gorm:"column:predialysis_condition" json:"predialysis_condition" form:"predialysis_condition"`
+	PreHospitalDialysisFrequency string  `gorm:"column:pre_hospital_dialysis_frequency" json:"pre_hospital_dialysis_frequency" form:"pre_hospital_dialysis_frequency"`
+	PreHospitalDialysisTimes     int64   `gorm:"column:pre_hospital_dialysis_times" json:"pre_hospital_dialysis_times" form:"pre_hospital_dialysis_times"`
+	HospitalFirstDialysisDate    int64   `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
+	InductionPeriod              int64   `gorm:"column:induction_period" json:"induction_period" form:"induction_period"`
+	InitialDialysis              int64   `gorm:"column:initial_dialysis" json:"initial_dialysis" form:"initial_dialysis"`
+	TotalDialysis                int64   `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	AttendingDoctorId            int64   `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
+	HeadNurseId                  int64   `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
+	Evaluate                     string  `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
+	Diagnose                     string  `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark                       string  `gorm:"column:remark" json:"remark" form:"remark"`
+	RegistrarsId                 int64   `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	Registrars                   string  `gorm:"column:registrars" json:"registrars" form:"registrars"`
+	QrCode                       string  `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
+	BindingState                 int64   `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
+	PatientComplains             string  `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
+	PresentHistory               string  `gorm:"column:present_history" json:"present_history"`     // 现病史
+	PastHistory                  string  `gorm:"column:past_history" json:"past_history"`           // 既往史
+	Temperature                  float64 `gorm:"column:temperature" json:"temperature"`             // 体格检查-体温
+	Pulse                        int64   `gorm:"column:pulse" json:"pulse"`                         // 体格检查-脉搏
+	Respiratory                  int64   `gorm:"column:respiratory" json:"respiratory"`             // 体格检查-呼吸频率
+	SBP                          int64   `gorm:"column:sbp" json:"sbp"`                             // 体格检查-收缩压
+	DBP                          int64   `gorm:"column:dbp" json:"dbp"`                             // 体格检查-舒张压
+	Status                       int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                  int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                  int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Age                          int64   `gorm:"column:age" json:"age"`
+
+	InfectiousNextRecordTime int64  `gorm:"column:infectious_next_record_time" json:"infectious_next_record_time"`
+	IsInfectious             int64  `gorm:"column:is_infectious" json:"is_infectious"`
+	RemindCycle              int64  `gorm:"column:remind_cycle" json:"remind_cycle"`
+	ResponseResult           string `gorm:"column:response_result" json:"response_result"`
+	IsOpenRemind             int64  `gorm:"column:is_open_remind" json:"is_open_remind"`
+	DialysisAge              int64  `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
+	ExpenseKind              int64  `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
+	TellPhone                string `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	FirstTreatmentDate       int64  `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	ContactName              string `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
+}
+
+func (VMOrgPatients) TableName() string {
+	return "xt_patients"
+}
+
+type VMDeviceGroup struct {
+	ID     int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId  int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Name   string `gorm:"column:name" json:"name" form:"name"`
+	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"`
+}
+
+func (VMDeviceGroup) TableName() string {
+	return "xt_device_group"
+}
+
+type VMDeviceZone struct {
+	ID     int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId  int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Name   string `gorm:"column:name" json:"name" form:"name"`
+	Type   int64  `gorm:"column:type" json:"type" form:"type"`
+	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"`
+}
+
+func (VMDeviceZone) TableName() string {
+	return "xt_device_zone"
+}
+
+type VMDeviceNumber struct {
+	ID      int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number  string `gorm:"column:number" json:"number" form:"number"`
+	GroupId int64  `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	ZoneId  int64  `gorm:"column:zone_id" json:"zone_id" form:"zone_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"`
+}
+
+func (VMDeviceNumber) TableName() string {
+	return "xt_device_number"
+}
+
+type VMSchedule struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+}
+
+func (VMSchedule) TableName() string {
+	return "xt_schedule"
+}
+
+type VMApp_Role struct {
+	Id          int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id"`
+	OrgId       int64  `gorm:"column:org_id" json:"org_id"`
+	Org         []*Org `gorm:"ForeignKey:ID;AssociationForeignKey:OrgId" json:"orgs"`
+}
+
+func (VMApp_Role) TableName() string {
+	return "sgj_user_admin_role"
+}
+
+type VMAdminUser struct {
+	ID         int64         `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"` // 管理员用户 ID
+	Org        []*Org        `gorm:"ForeignKey:Creator;AssociationForeignKey:ID" json:"orgs"`
+	VMApp_Role []*VMApp_Role `gorm:"ForeignKey:AdminUserId;AssociationForeignKey:ID" json:"roles"`
+}
+
+func (VMAdminUser) TableName() string {
+	return "sgj_user_admin"
+}
+
+type VMAdminBanner struct {
+	ID     int64  `gorm:"column:id" json:"id" form:"id"`
+	Thumb  string `gorm:"column:thumb" json:"thumb" form:"thumb"`
+	Url    string `gorm:"column:url" json:"url" form:"url"`
+	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"`
+	Title  string `gorm:"column:title" json:"title" form:"title"`
+	Desc   string `gorm:"column:desc" json:"desc" form:"desc"`
+}
+
+func (VMAdminBanner) TableName() string {
+	return "sgj_admin_banner"
+}
+
+type VMPatientScheduleTemplateId struct {
+	ID     int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId  int64 `gorm:"column:org_id" json:"org_id" form:"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"`
+}
+
+func (VMPatientScheduleTemplateId) TableName() string {
+	return "xt_patient_schedule_template_id"
+}
+
+type VMPatientScheduleTemplateItem struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId          int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	TemplateId     int64 `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	DeviceNumberId int64 `gorm:"column:device_number_id" json:"device_number_id" form:"device_number_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	TreatMode      int64 `gorm:"column:treat_mode" json:"treat_mode" form:"treat_mode"`
+	Weekday        int64 `gorm:"column:weekday" json:"weekday" form:"weekday"`
+	TimeType       int64 `gorm:"column:time_type" json:"time_type" form:"time_type"`
+	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"`
+}
+
+func (VMPatientScheduleTemplateItem) TableName() string {
+	return "xt_patient_schedule_template_item"
+}
+
+type VMPatientScheduleTemplateMode struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId        int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Mode         int64 `gorm:"column:mode" json:"mode" form:"mode"`
+	ExecuteTimes int64 `gorm:"column:execute_times" json:"execute_times" form:"execute_times"`
+	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"`
+}
+
+func (VMPatientScheduleTemplateMode) TableName() string {
+	return "xt_patient_schedule_template_mode"
+}
+
+type VMDeviceMode struct {
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	DeviceMode string `gorm:"column:device_mode" json:"device_mode" form:"device_mode"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime      int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (VMDeviceMode) TableName() string {
+	return "xt_device_mode"
+}
+
+type VmDeviceAddmacher struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	SerialNumber        string `gorm:"column:serial_number" json:"serial_number" form:"serial_number"`
+	DeviceType          int64  `gorm:"column:device_type" json:"device_type" form:"device_type"`
+	BedNumber           string `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	DeviceName          string `gorm:"column:device_name" json:"device_name" form:"device_name"`
+	ManufactureFactory  string `gorm:"column:manufacture_factory" json:"manufacture_factory" form:"manufacture_factory"`
+	ServiceManufacturer string `gorm:"column:service_manufacturer" json:"service_manufacturer" form:"service_manufacturer"`
+	UnitType            int64  `gorm:"column:unit_type" json:"unit_type" form:"unit_type"`
+	UseSection          string `gorm:"column:use_section" json:"use_section" form:"use_section"`
+	SectionNumber       string `gorm:"column:section_number" json:"section_number" form:"section_number"`
+	BuyDate             int64  `gorm:"column:buy_date" json:"buy_date" form:"buy_date"`
+	InstallDate         int64  `gorm:"column:install_date" json:"install_date" form:"install_date"`
+	StartDate           int64  `gorm:"column:start_date" json:"start_date" form:"start_date"`
+	MaintenaceEngineer  string `gorm:"column:maintenace_engineer" json:"maintenace_engineer" form:"maintenace_engineer"`
+	Telephone           string `gorm:"column:telephone" json:"telephone" form:"telephone"`
+	GuaranteeDate       string `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
+	MachineStatus       int64  `gorm:"column:machine_status" json:"machine_status" form:"machine_status"`
+	UserTotal           string `gorm:"column:user_total" json:"user_total" form:"user_total"`
+	DisinfectionMode    int64  `gorm:"column:disinfection_mode" json:"disinfection_mode" form:"disinfection_mode"`
+	Remarks             string `gorm:"column:remarks" json:"remarks" form:"remarks"`
+	RubbishDate         int64  `gorm:"column:rubbish_date" json:"rubbish_date" form:"rubbish_date"`
+	RubbishReason       int64  `gorm:"column:rubbish_reason" json:"rubbish_reason" form:"rubbish_reason"`
+	UserYear            string `gorm:"column:user_year" json:"user_year" form:"user_year"`
+	WorkTime            string `gorm:"column:work_time" json:"work_time" form:"work_time"`
+	ReversMode          int64  `gorm:"column:revers_mode" json:"revers_mode" form:"revers_mode"`
+	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"`
+	ZoneId              int64  `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	BedId               int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+}
+
+func (VmDeviceAddmacher) TableName() string {
+	return "xt_device_addmacher"
+}
+
+type VmDeviceTreatmentmode struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	MachineId  int64 `gorm:"column:machine_id" json:"machine_id" form:"machine_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"`
+	UserOrgId  int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	TreateMode int64 `gorm:"column:treate_mode" json:"treate_mode" form:"treate_mode"`
+}
+
+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"
+}

models/xt_models.go

@@ -0,0 +1,159 @@
+package models
+
+type SystemPrescription struct {
+	ID                         int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                  int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Anticoagulant              int64   `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	AnticoagulantShouji        float64 `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
+	AnticoagulantWeichi        float64 `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
+	AnticoagulantZongliang     float64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
+	AnticoagulantGaimingcheng  string  `gorm:"column:anticoagulant_gaimingcheng" json:"anticoagulant_gaimingcheng" form:"anticoagulant_gaimingcheng"`
+	AnticoagulantGaijiliang    string  `gorm:"column:anticoagulant_gaijiliang" json:"anticoagulant_gaijiliang" form:"anticoagulant_gaijiliang"`
+	ModeId                     int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	DialysisDuration           float64 `gorm:"column:dialysis_duration" json:"dialysis_duration" form:"dialysis_duration"`
+	ReplacementWay             int64   `gorm:"column:replacement_way" json:"replacement_way" form:"replacement_way"`
+	HemodialysisMachine        int64   `gorm:"column:hemodialysis_machine" json:"hemodialysis_machine" form:"hemodialysis_machine"`
+	BloodFilter                int64   `gorm:"column:blood_filter" json:"blood_filter" form:"blood_filter"`
+	PerfusionApparatus         int64   `gorm:"column:perfusion_apparatus" json:"perfusion_apparatus" form:"perfusion_apparatus"`
+	BloodFlowVolume            float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
+	Dewater                    float64 `gorm:"column:dewater" json:"dewater" form:"dewater"`
+	DisplaceLiqui              float64 `gorm:"column:displace_liqui" json:"displace_liqui" form:"displace_liqui"`
+	Glucose                    float64 `gorm:"column:glucose" json:"glucose" form:"glucose"`
+	DryWeight                  float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	DialysateFlow              float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	Kalium                     float64 `gorm:"column:kalium" json:"kalium" form:"kalium"`
+	Sodium                     float64 `gorm:"column:sodium" json:"sodium" form:"sodium"`
+	Calcium                    float64 `gorm:"column:calcium" json:"calcium" form:"calcium"`
+	Bicarbonate                float64 `gorm:"column:bicarbonate" json:"bicarbonate" form:"bicarbonate"`
+	Doctor                     int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	FirstDialysis              int64   `gorm:"column:first_dialysis" json:"first_dialysis" form:"first_dialysis"`
+	Remark                     string  `gorm:"column:remark" json:"remark" form:"remark"`
+	InitiateMode               int64   `gorm:"column:initiate_mode" json:"initiate_mode" form:"initiate_mode"`
+	AffirmState                int64   `gorm:"column:affirm_state" json:"affirm_state" form:"affirm_state"`
+	UseState                   int64   `gorm:"column:use_state" json:"use_state" form:"use_state"`
+	Status                     int64   `gorm:"column:status" json:"status" form:"status"`
+	RegistrarsId               int64   `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	CreatedTime                int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	SolutionType               int64   `gorm:"column:solution_type" json:"solution_type" form:"solution_type"`
+	DialysateTemperature       float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature" form:"dialysate_temperature"`
+	Conductivity               float64 `gorm:"column:conductivity" json:"conductivity" form:"conductivity"`
+	DialysisDurationHour       int64   `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour" form:"dialysis_duration_hour"`
+	DialysisDurationMinute     int64   `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute" form:"dialysis_duration_minute"`
+	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration" form:"target_ultrafiltration"`
+	DialysateFormulation       int64   `gorm:"column:dialysate_formulation" json:"dialysate_formulation" form:"dialysate_formulation"`
+	Dialyzer                   int64   `gorm:"column:dialyzer" json:"dialyzer" form:"dialyzer"`
+	ReplacementTotal           float64 `gorm:"column:replacement_total" json:"replacement_total" form:"replacement_total"`
+	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+	BodyFluid                  int64   `gorm:"column:body_fluid" json:"body_fluid" form:"body_fluid"`
+	SpecialMedicine            int64   `gorm:"column:special_medicine" json:"special_medicine" form:"special_medicine"`
+	SpecialMedicineOther       string  `gorm:"column:special_medicine_other" json:"special_medicine_other" form:"special_medicine_other"`
+	DisplaceLiquiPart          int64   `gorm:"column:displace_liqui_part" json:"displace_liqui_part" form:"displace_liqui_part"`
+	DisplaceLiquiValue         float64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
+	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access" form:"blood_access"`
+	Ultrafiltration            float64 `gorm:"column:ultrafiltration" json:"ultrafiltration" form:"ultrafiltration"`
+	BodyFluidOther             string  `gorm:"column:body_fluid_other" json:"body_fluid_other" form:"body_fluid_other"`
+	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv" form:"target_ktv"`
+}
+
+func (SystemPrescription) TableName() string {
+	return "xt_system_prescription"
+}
+
+type XtPatientsNew struct {
+	ID                           int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId                       int64   `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar                       string  `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType                  int64   `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	DialysisNo                   string  `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber              string  `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source                       int64   `gorm:"column:source" json:"source" form:"source"`
+	Lapseto                      int64   `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PartitionId                  int64   `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                        int64   `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name                         string  `gorm:"column:name" json:"name" form:"name"`
+	Alias                        string  `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender                       int64   `gorm:"column:gender" json:"gender" form:"gender"`
+	MaritalStatus                int64   `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
+	IdCardNo                     string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday                     int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	ReimbursementWayId           int64   `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
+	HealthCareType               int64   `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
+	HealthCareNo                 string  `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
+	HealthCareDueDate            int64   `gorm:"column:health_care_due_date" json:"health_care_due_date" form:"health_care_due_date"`
+	Height                       int64   `gorm:"column:height" json:"height" form:"height"`
+	BloodType                    int64   `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
+	Rh                           int64   `gorm:"column:rh" json:"rh" form:"rh"`
+	HealthCareDueAlertDate       int64   `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
+	EducationLevel               int64   `gorm:"column:education_level" json:"education_level" form:"education_level"`
+	Profession                   int64   `gorm:"column:profession" json:"profession" form:"profession"`
+	Phone                        string  `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone                string  `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone                string  `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations            string  `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress                  string  `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit                     string  `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress                  string  `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	Children                     int64   `gorm:"column:children" json:"children" form:"children"`
+	ReceivingDate                int64   `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
+	IsHospitalFirstDialysis      int64   `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
+	FirstDialysisDate            int64   `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
+	FirstDialysisHospital        string  `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
+	PredialysisCondition         string  `gorm:"column:predialysis_condition" json:"predialysis_condition" form:"predialysis_condition"`
+	PreHospitalDialysisFrequency string  `gorm:"column:pre_hospital_dialysis_frequency" json:"pre_hospital_dialysis_frequency" form:"pre_hospital_dialysis_frequency"`
+	PreHospitalDialysisTimes     int64   `gorm:"column:pre_hospital_dialysis_times" json:"pre_hospital_dialysis_times" form:"pre_hospital_dialysis_times"`
+	HospitalFirstDialysisDate    int64   `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
+	InductionPeriod              int64   `gorm:"column:induction_period" json:"induction_period" form:"induction_period"`
+	InitialDialysis              int64   `gorm:"column:initial_dialysis" json:"initial_dialysis" form:"initial_dialysis"`
+	TotalDialysis                int64   `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	AttendingDoctorId            int64   `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
+	HeadNurseId                  int64   `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
+	Evaluate                     string  `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
+	Diagnose                     string  `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark                       string  `gorm:"column:remark" json:"remark" form:"remark"`
+	RegistrarsId                 int64   `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	Registrars                   string  `gorm:"column:registrars" json:"registrars" form:"registrars"`
+	QrCode                       string  `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
+	BindingState                 int64   `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
+	PatientComplains             string  `gorm:"column:patient_complains" json:"patient_complains" form:"patient_complains"`
+	PresentHistory               string  `gorm:"column:present_history" json:"present_history" form:"present_history"`
+	PastHistory                  string  `gorm:"column:past_history" json:"past_history" form:"past_history"`
+	Temperature                  float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
+	Pulse                        int64   `gorm:"column:pulse" json:"pulse" form:"pulse"`
+	Respiratory                  int64   `gorm:"column:respiratory" json:"respiratory" form:"respiratory"`
+	Sbp                          int64   `gorm:"column:sbp" json:"sbp" form:"sbp"`
+	Dbp                          int64   `gorm:"column:dbp" json:"dbp" form:"dbp"`
+	Status                       int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                  int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                  int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Nation                       string  `gorm:"column:nation" json:"nation" form:"nation"`
+	NativePlace                  string  `gorm:"column:native_place" json:"native_place" form:"native_place"`
+	Age                          int64   `gorm:"column:age" json:"age" form:"age"`
+	InfectiousNextRecordTime     int64   `gorm:"column:infectious_next_record_time" json:"infectious_next_record_time" form:"infectious_next_record_time"`
+	IsInfectious                 int64   `gorm:"column:is_infectious" json:"is_infectious" form:"is_infectious"`
+	RemindCycle                  int64   `gorm:"column:remind_cycle" json:"remind_cycle" form:"remind_cycle"`
+	ResponseResult               string  `gorm:"column:response_result" json:"response_result" form:"response_result"`
+	IsOpenRemind                 int64   `gorm:"column:is_open_remind" json:"is_open_remind" form:"is_open_remind"`
+	FirstTreatmentDate           int64   `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	DialysisAge                  int64   `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
+	ExpenseKind                  int64   `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
+	TellPhone                    string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	ContactName                  string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
+	BloodPatients                int64   `gorm:"column:blood_patients" json:"blood_patients" form:"blood_patients"`
+	SlowPatients                 int64   `gorm:"column:slow_patients" json:"slow_patients" form:"slow_patients"`
+	MemberPatients               int64   `gorm:"column:member_patients" json:"member_patients" form:"member_patients"`
+	EcommerPatients              string  `gorm:"column:ecommer_patients" json:"ecommer_patients" form:"ecommer_patients"`
+	BloodId                      int64   `gorm:"column:blood_id" json:"blood_id" form:"blood_id"`
+	SlowId                       int64   `gorm:"column:slow_id" json:"slow_id" form:"slow_id"`
+	MemberId                     int64   `gorm:"column:member_id" json:"member_id" form:"member_id"`
+	MemberFistdate               int64   `gorm:"column:member_fistdate" json:"member_fistdate" form:"member_fistdate"`
+	MemberPatienttype            int64   `gorm:"column:member_patienttype" json:"member_patienttype" form:"member_patienttype"`
+	MemberTreatement             int64   `gorm:"column:member_treatement" json:"member_treatement" form:"member_treatement"`
+	EquitmentId                  string  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+}
+
+func (XtPatientsNew) TableName() string {
+	return "xt_patients_new"
+}

routers/router.go

@@ -43,7 +43,7 @@ func init() {
 
 	beego.Router("/org/create", &controllers.OrgController{}, "get:Create")
 	beego.Router("/org/create/submit", &controllers.OrgController{}, "post:CreateSubmit")
-	beego.Router("/org/admin/apps", &controllers.OrgController{}, "get:ViewApps")
+	//beego.Router("/org/admin/apps", &controllers.OrgController{}, "get:ViewApps")
 	beego.Router("/org/app/create", &controllers.OrgController{}, "get:CreateApp")
 	// beego.Router("/org/app/create/submit", &controllers.OrgController{}, "post:CreateAppSubmit")
 	beego.Router("/app/open", &controllers.OrgController{}, "post:OpenAppSubmit")
@@ -63,6 +63,7 @@ func init() {
 	})
 
 	beego.Router("/m/login/pwd", &controllers.MobileLoginController{}, "post:LoginByPwd")
+	beego.Router("/m/login/code", &controllers.MobileLoginController{}, "post:LoginByCode")
 
 	beego.Router("/mobile/regist", &controllers.MobileRegistController{}, "get:Register")
 	beego.Router("/mobile/regist/submit", &controllers.MobileRegistController{}, "post:RegistSubmit")

service/db.go

@@ -28,6 +28,8 @@ var readDb *gorm.DB
 var writeDb *gorm.DB
 var readUserDb *gorm.DB
 var writeUserDb *gorm.DB
+var readXTDb *gorm.DB
+var writeXTDb *gorm.DB
 var err error
 
 // var gormDb *gorm.DB
@@ -57,6 +59,21 @@ func ConnectDB() {
 	writeUserPass := beego.AppConfig.String("writeuserpass")
 	writeUserName := beego.AppConfig.String("writeusername")
 
+	readXTHost := beego.AppConfig.String("readsqlhost")
+	readXTPort := beego.AppConfig.String("readsqlport")
+	readXTUser := beego.AppConfig.String("readsqluser")
+	readXTPass := beego.AppConfig.String("readsqlpass")
+	readXTName := beego.AppConfig.String("readsqlname")
+
+	writeXTHost := beego.AppConfig.String("writesqlhost")
+	writeXTPort := beego.AppConfig.String("writesqlport")
+	writeXTUser := beego.AppConfig.String("writesqluser")
+	writeXTPass := beego.AppConfig.String("writesqlpass")
+	writeXTName := beego.AppConfig.String("writesqlname")
+
+	rxdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readXTUser, readXTPass, readXTHost, readXTPort, readXTName)
+	wxdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeXTUser, writeXTPass, writeXTHost, writeXTPort, writeXTName)
+
 	rdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser, readPass, readHost, readPort, readName)
 	wdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUser, writePass, writeHost, writePort, writeName)
 
@@ -95,6 +112,22 @@ func ConnectDB() {
 	writeUserDb.DB().SetMaxOpenConns(100)
 	writeUserDb.LogMode(true)
 
+	readXTDb, err = gorm.Open("mysql", rxdsn)
+	if err != nil {
+		beego.Error(err)
+	}
+	readXTDb.DB().SetMaxIdleConns(10)
+	readXTDb.DB().SetMaxOpenConns(100)
+	readXTDb.LogMode(true)
+
+	writeXTDb, err = gorm.Open("mysql", wxdsn)
+	if err != nil {
+		beego.Error(err)
+	}
+	writeXTDb.DB().SetMaxIdleConns(10)
+	writeXTDb.DB().SetMaxOpenConns(100)
+	writeXTDb.LogMode(true)
+
 	// gormDb,err = gorm.Open("mysql", "shenyh:syh@#$%123456!@tcp(112.74.16.180:3306)/sgj_patient?charset=utf8mb4&parseTime=true&loc=Local")
 	// gormDb.DB().SetMaxIdleConns(10)
 	// gormDb.DB().SetMaxOpenConns(100)

service/login_service.go

@@ -61,7 +61,7 @@ func GetAdminUserLastLoginLog(adminUserID int, appType int) (*models.AdminUserLo
 	var record models.AdminUserLoginLog
 	var err error
 	if appType > 0 {
-		err = readUserDb.Last(&record, "admin_user_id = ? AND operate_type <> 2 AND app_type = ?", adminUserID, appType).Error
+		err = readUserDb.Last(&record, "admin_user_id = ? AND operate_type <> 2 AND app_type = 3", adminUserID).Error
 	} else {
 		err = readUserDb.Last(&record, "admin_user_id = ? AND operate_type <> 2", adminUserID).Error
 	}
@@ -88,36 +88,33 @@ func GetAdminUserPrioritizedAppType(adminUserID int) (int8, error) {
 	}
 }
 
-func GetAdminUserAllOrgWithUID(adminUserID int, isSuperAdmin bool) ([]*models.Org, error) {
-	if isSuperAdmin {
-		var org models.Org
-		err := readUserDb.Preload("OrgGallery", "status = 1").Where("creator = ? AND status <> 0", adminUserID).First(&org).Error
-		if err != nil {
-			return nil, err
-		}
-		return []*models.Org{&org}, nil
+func GetAdminUserAllOrgWithUID(adminUserID int) ([]*models.Org, error) {
+	//var org []*models.Org
+
+	orgs := make([]*models.Org, 0)
+	//
+	//var org []*models.Org
+	//err := readUserDb.Preload("OrgGallery", "status = 1").Where("creator = ? AND status <> 0", adminUserID).Find(&org).Error
 
+	//orgs = append(orgs, org...)
+	rows, err := readUserDb.Raw("SELECT org.*, COUNT(DISTINCT org.id) FROM sgj_user_admin_role AS u_r, sgj_user_org AS org WHERE u_r.admin_user_id = ? AND u_r.org_id = org.id AND u_r.status = 1 AND org.status <> 0 GROUP BY org.id ORDER BY org.id;", adminUserID).Rows()
+	defer rows.Close()
+	if err != nil {
+		return nil, err
 	} else {
-		rows, err := readUserDb.Raw("SELECT org.*, COUNT(DISTINCT org.id) FROM sgj_user_admin_role AS u_r, sgj_user_org AS org WHERE u_r.admin_user_id = ? AND u_r.org_id = org.id AND u_r.status = 1 AND org.status <> 0 GROUP BY org.id ORDER BY org.id;", adminUserID).Rows()
-		defer rows.Close()
-		if err != nil {
-			return nil, err
-		} else {
-			orgs := make([]*models.Org, 0)
-			for rows.Next() {
-				var org models.Org
-				if scanErr := readUserDb.Preload("OrgGallery", "status = 1").ScanRows(rows, &org); scanErr != nil {
-					return nil, scanErr
-
-				} else {
-					orgs = append(orgs, &org)
-				}
+		for rows.Next() {
+			var org models.Org
+			if scanErr := readUserDb.Preload("OrgGallery", "status = 1").ScanRows(rows, &org); scanErr != nil {
+				return nil, scanErr
+
+			} else {
+				orgs = append(orgs, &org)
 			}
-			return orgs, nil
 		}
+		return orgs, nil
 	}
-}
 
+}
 func GetAdminUserAllOrgApp(adminUserID int, orgID int) ([]*models.OrgApp, error) {
 	rows, err := readUserDb.Raw("SELECT app.* from sgj_user_admin_role AS u_r, sgj_user_org_app AS app WHERE u_r.admin_user_id = ? AND u_r.org_id = ? AND u_r.app_id = app.id AND u_r.status = 1 AND app.status = 1 ORDER BY app_type ASC;", adminUserID, orgID).Rows()
 	defer rows.Close()
@@ -148,7 +145,7 @@ func InsertLoginLog(loginLog *models.AdminUserLoginLog) error {
 
 func GetAppRole(adminUserID int, orgID int, appID int) (*models.App_Role, error) {
 	var appRole models.App_Role
-	err := readUserDb.Where("admin_user_id = ? AND org_id = ? AND app_id = ? AND status = 1", adminUserID, orgID, appID).First(&appRole).Error
+	err := readUserDb.Where("admin_user_id = ? AND org_id = ? AND app_id = ?", adminUserID, orgID, appID).First(&appRole).Error
 	if err != nil {
 		return nil, err
 	}
@@ -166,7 +163,7 @@ func GetLastXTAdminRole(adminUserID int, appType int) (*models.App_Role, error)
 		Select("sgj_user_admin_role.*").
 		Joins("join sgj_user_admin as a on a.id = sgj_user_admin_role.admin_user_id").
 		Joins("join sgj_user_org_app as app on app.id = sgj_user_admin_role.app_id and app.status = 1 and app.app_type = ?", appType).
-		Where("sgj_user_admin_role.status = 1 and sgj_user_admin_role.admin_user_id = ?", adminUserID).
+		Where("sgj_user_admin_role.admin_user_id = ?", adminUserID).
 		Order("sgj_user_admin_role.id desc").
 		First(&appRole).
 		Error
@@ -205,3 +202,43 @@ func GetAppById(appID int) (*models.OrgApp, error) {
 	}
 	return &app, nil
 }
+
+// 获取最后登录的信息（AppType为3）
+func GetLastXTAdminRoleLoginRole(adminUserID int, appType int) (*models.AdminUserLoginLog, error) {
+	var log models.AdminUserLoginLog
+
+	err := readUserDb.Table("sgj_user_admin_login_log").
+		Select("sgj_user_admin_login_log.*").
+		Where("sgj_user_admin_login_log.admin_user_id = ? AND sgj_user_admin_login_log.app_type = 3  AND (sgj_user_admin_login_log.operate_type = 1 OR sgj_user_admin_login_log.operate_type = 3)", adminUserID).
+		Order("sgj_user_admin_login_log.id desc").
+		First(&log).
+		Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &log, nil
+}
+
+func GetOrgApp(orgID int, app_type int) (*models.OrgApp, error) {
+	var apps models.OrgApp
+	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
+	if err != nil {
+		return nil, err
+	}
+	return &apps, nil
+}
+
+//
+
+func GetLastUserRole(org_id int64, admin_user_id int64) (*models.App_Role, error) {
+	var admin_user models.App_Role
+	err := readUserDb.Where("org_id != ? AND status = 1 AND admin_user_id = ?", org_id, admin_user_id).First(&admin_user).Error
+	if err != nil {
+		return nil, err
+	}
+	return &admin_user, nil
+}

service/org_service.go

@@ -2,12 +2,13 @@ package service
 
 import (
 	"SSO/models"
+	"strconv"
 	"time"
 
 	"github.com/jinzhu/gorm"
 )
 
-func CreateOrg(org *models.Org, mobile string, openXT bool, openCDM bool, openSCRM bool, openMall bool) error {
+func CreateOrg(org *models.Org, mobile string, openXT bool, openCDM bool, openSCRM bool, openMall bool, user_name string) error {
 	now := time.Now()
 	tx_admin := writeUserDb.Begin()
 	if err := tx_admin.Create(org).Error; err != nil {
@@ -31,19 +32,7 @@ func CreateOrg(org *models.Org, mobile string, openXT bool, openCDM bool, openSC
 	}
 
 	// app 的创建顺序也决定了登录后前往 app 的优先级
-	if err := createOrgApp(tx_admin, &role, mobile, 3, openXT); err != nil {
-		tx_admin.Rollback()
-		return err
-	}
-	if err := createOrgApp(tx_admin, &role, mobile, 4, openCDM); err != nil {
-		tx_admin.Rollback()
-		return err
-	}
-	if err := createOrgApp(tx_admin, &role, mobile, 1, openSCRM); err != nil {
-		tx_admin.Rollback()
-		return err
-	}
-	if err := createOrgApp(tx_admin, &role, mobile, 5, openMall); err != nil {
+	if err := createOrgApp(tx_admin, &role, user_name, 3, openXT); err != nil {
 		tx_admin.Rollback()
 		return err
 	}
@@ -178,29 +167,55 @@ func CreateOrgApp(adminUserID int, orgID int, appType int, open bool) error {
 
 //  如果出错，没有 rollback，需自行 rollback
 func createOrgApp(tx *gorm.DB, superAdminRole *models.Role, userName string, appType int, open bool) error {
-	openStatus := 0
-	if open {
-		openStatus = 1
-	}
+	//创建应用
 	now := time.Now().Unix()
-	app := models.OrgApp{
-		Creator:    superAdminRole.Creator,
-		OrgId:      superAdminRole.OrgId,
-		AppType:    appType,
-		OpenStatus: openStatus,
-		Status:     1,
-		CreateTime: now,
-		ModifyTime: now,
-	}
-	if createAppErr := tx.Create(&app).Error; createAppErr != nil {
-		return createAppErr
+	var app_id int64
+	apps, _ := FindSystemOrgApp()
+	for _, item := range apps {
+		app := &VMOrgApp{
+			AppType:    item.AppType,
+			Creator:    int(superAdminRole.Creator),
+			OrgId:      int(superAdminRole.OrgId),
+			OpenStatus: item.OpenStatus,
+			Status:     1,
+			CreateTime: now,
+			ModifyTime: now,
+			Name:       item.Name,
+			Url:        item.Url,
+			Number:     item.Number,
+			Pid:        0,
+		}
+		writeUserDb.Create(&app)
+		if app.AppType == 3 {
+			app_id = app.ID
+
+		}
+
+		for _, subItem := range item.VMOrgApp {
+			app := &VMOrgApp{
+				AppType:    subItem.AppType,
+				Creator:    int(superAdminRole.Creator),
+				OrgId:      int(superAdminRole.OrgId),
+				OpenStatus: subItem.OpenStatus,
+				Status:     1,
+				CreateTime: now,
+				ModifyTime: now,
+				Name:       subItem.Name,
+				Url:        subItem.Url,
+				Number:     subItem.Number,
+				Pid:        app.ID,
+			}
+			writeUserDb.Create(&app)
+		}
 	}
+
 	app_role := models.App_Role{
 		AdminUserId: superAdminRole.Creator,
 		OrgId:       superAdminRole.OrgId,
-		AppId:       app.Id,
+		AppId:       int(app_id),
 		RoleId:      superAdminRole.Id,
 		Avatar:      "",
+		RoleIds:     strconv.Itoa(superAdminRole.Id),
 		UserName:    userName,
 		Intro:       "",
 		UserType:    1,
@@ -269,3 +284,28 @@ func GetOrgAppWithType(adminUserID int, orgID int, appType int) (*models.OrgApp,
 func SaveOrgApp(app *models.OrgApp) error {
 	return writeUserDb.Save(app).Error
 }
+
+type VMOrgApp struct {
+	ID         int64       `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"` // ID
+	AppType    int         `gorm:"column:app_type" json:"app_type"`
+	Creator    int         `json:"creator"` // 创建者，即管理员用户的 id
+	OrgId      int         `gorm:"column:org_id" json:"org_id"`
+	OpenStatus int         `gorm:"column:open_status" json:"open_status"`
+	Status     int8        `json:"status"`                    // 状态 0.无效 1.有效 2.禁用
+	CreateTime int64       `gorm:"column:ctime" json:"ctime"` // 创建时间
+	ModifyTime int64       `gorm:"column:mtime" json:"mtime"` // 修改时间
+	Name       string      `gorm:"column:name" json:"name" form:"name"`
+	Url        string      `gorm:"column:url" json:"url" form:"url"`
+	Pid        int64       `gorm:"column:pid" json:"pid" form:"pid"`
+	Number     int64       `gorm:"column:number" json:"order" form:"number"`
+	VMOrgApp   []*VMOrgApp `gorm:"ForeignKey:Pid;AssociationForeignKey:Id" `
+}
+
+func (VMOrgApp) TableName() string {
+	return "sgj_user_org_app"
+}
+
+func FindSystemOrgApp() (app []*VMOrgApp, err error) {
+	err = readUserDb.Model(&VMOrgApp{}).Preload("VMOrgApp", "org_id = 0 AND status =1 AND pid > 0").Where("status = 1 AND org_id = 0 AND pid = 0").Find(&app).Error
+	return
+}

service/purview_service.go

@@ -20,41 +20,6 @@ func getAllOriginPurviews(appType int) ([]*models.Purview, error) {
 	return purviews, nil
 }
 
-func GetAllPurviewsProcessed(appType int) ([]*models.Purview, error) {
-	originPurviews, getPurviewErr := getAllOriginPurviews(appType)
-	if getPurviewErr != nil {
-		return nil, getPurviewErr
-	}
-	return processPurviews2Tree(originPurviews), nil
-}
-
-// 加工这些规则：树形化
-// 正确结果的前提是 originPurviews 以 parentid asc 排好序了的
-func processPurviews2Tree(originPurviews []*models.Purview) []*models.Purview {
-	processedPurviews := make([]*models.Purview, 0)
-	pid_childs := make(map[int][]*models.Purview)
-	for _, purview := range originPurviews {
-		// warning：下面这个算法只适用最多两层树形结构的菜单，对于两层以上的会丢失掉第三层及其以下的节点
-		// 因为取出 originPurviews 的时候已经排过序了，所以顶级节点肯定最先处理，不需要担心子节点比父节点先处理
-		if purview.Parentid == 0 {
-			processedPurviews = append(processedPurviews, purview)
-		} else {
-			childs := pid_childs[purview.Parentid]
-			if pid_childs[purview.Parentid] == nil {
-				childs = make([]*models.Purview, 0)
-			}
-			childs = append(childs, purview)
-			pid_childs[purview.Parentid] = childs
-		}
-	}
-
-	for _, proPurview := range processedPurviews {
-		proPurview.Childs = pid_childs[proPurview.Id]
-	}
-
-	return processedPurviews
-}
-
 func GetSuperAdminUsersPurviewTreeAndUrlfors(appType int) ([]string, []*models.Purview, error) {
 	originPurviews, getPurviewErr := getAllOriginPurviews(appType)
 	if getPurviewErr != nil {
@@ -65,6 +30,8 @@ func GetSuperAdminUsersPurviewTreeAndUrlfors(appType int) ([]string, []*models.P
 }
 
 func GetGeneralAdminUsersPurviewTreeAndUrlfors(adminUserID int, appId int) ([]string, []*models.Purview, error) {
+	//查出该用户所有角色的权限全集
+
 	rows, err := readUserDb.Raw("SELECT p.purview_ids AS pids FROM sgj_user_admin_role AS a_r, sgj_user_role_purview AS p WHERE a_r.admin_user_id = ? AND  a_r.app_id = ? AND a_r.role_id = p.role_id AND a_r.status = 1 AND p.`status` = 1;", adminUserID, appId).Rows()
 	defer rows.Close()
 	if err != nil {
@@ -74,6 +41,7 @@ func GetGeneralAdminUsersPurviewTreeAndUrlfors(adminUserID int, appId int) ([]st
 			return nil, nil, err
 		}
 	}
+
 	pids := ""
 	if rows.Next() {
 		rows.Scan(&pids)

service/vm_service.go

@@ -0,0 +1,105 @@
+package service
+
+import (
+	"SSO/models"
+)
+
+func CreateVMOrgPatient(patients *models.VMOrgPatients) {
+	writeXTDb.Model(&models.VMOrgPatients{}).Create(&patients)
+}
+
+func CreateVMOrgNewPatient(patientsNew *models.XtPatientsNew) {
+	writeXTDb.Model(&models.XtPatientsNew{}).Create(&patientsNew)
+}
+
+func CreateVMZone(zone *models.VMDeviceZone) {
+	writeXTDb.Model(&models.VMDeviceZone{}).Create(&zone)
+}
+
+func CreateVMGroup(group *models.VMDeviceGroup) {
+	writeXTDb.Model(&models.VMDeviceGroup{}).Create(&group)
+}
+
+func CreateVMDeviceNumber(number *models.VMDeviceNumber) {
+	writeXTDb.Model(&models.VMDeviceNumber{}).Create(&number)
+}
+
+func CreateVMSch(sch *models.VMSchedule) {
+	writeXTDb.Model(&models.VMSchedule{}).Create(&sch)
+}
+
+func CreateVMSchMode(schMode *models.VMPatientScheduleTemplateMode) {
+	writeXTDb.Model(&models.VMPatientScheduleTemplateMode{}).Create(&schMode)
+}
+
+func CreateVMSchTemplateId(schTemplateId *models.VMPatientScheduleTemplateId) {
+	writeXTDb.Model(&models.VMPatientScheduleTemplateId{}).Create(&schTemplateId)
+}
+
+func CreateVMSchTemplate(schTemplate *models.VMPatientScheduleTemplateItem) {
+	writeXTDb.Model(&models.VMPatientScheduleTemplateItem{}).Create(&schTemplate)
+}
+
+func CreateVMPrescription(sys *models.SystemPrescription) {
+	writeXTDb.Model(&models.SystemPrescription{}).Create(&sys)
+}
+
+func CreatedDeviceMode(mode *models.VMDeviceMode) {
+	writeUserDb.Model(&models.VMDeviceMode{}).Create(&mode)
+}
+
+func GetFirstDeviceMode(orgid int64) (models.VMDeviceMode, error) {
+	mode := models.VMDeviceMode{}
+	err = readUserDb.Where("user_org_id = ? and status =1", orgid).First(&mode).Error
+	return mode, err
+}
+
+func GetFirstBedNumber(orgid int64) (models.VMDeviceNumber, error) {
+	number := models.VMDeviceNumber{}
+	err := readXTDb.Where("org_id = ? and status =1", orgid).First(&number).Error
+	return number, err
+}
+
+func CreateDeviceAddMacher(addmacher *models.VmDeviceAddmacher) {
+	writeUserDb.Model(&models.VmDeviceAddmacher{}).Create(&addmacher)
+}
+
+func GetLastMacher(orgid int64) (models.VmDeviceAddmacher, error) {
+	addmacher := models.VmDeviceAddmacher{}
+	err := readUserDb.Where("user_org_id = ? and status =1", orgid).First(&addmacher).Error
+	return addmacher, err
+}
+
+func CreatedTreateMode(treatmentmode *models.VmDeviceTreatmentmode) {
+	writeXTDb.Model(&models.VmDeviceTreatmentmode{}).Create(&treatmentmode)
+
+}
+
+func CreateOrgRole(role *models.Role) (err error) {
+	err = writeUserDb.Create(&role).Error
+	return
+}
+
+func GetRolePurview(roleID int64) (models.RolePurview, error) {
+	var rolePurviews models.RolePurview
+	var err error
+	err = readUserDb.Where("role_id = ?", roleID).First(&rolePurviews).Error
+	return rolePurviews, err
+}
+
+func GetFuncRolePurview(roleID int64) (models.SgjUserRoleFuncPurview, error) {
+	var rolePurviews models.SgjUserRoleFuncPurview
+	var err error
+	err = readUserDb.Where("role_id = ?", roleID).First(&rolePurviews).Error
+	return rolePurviews, err
+}
+
+func CreateRolePurview(purview *models.RolePurview) (err error) {
+	err = writeUserDb.Create(&purview).Error
+	return
+}
+
+func CreateFuncRolePurview(purview *models.SgjUserRoleFuncPurview) (err error) {
+	err = writeUserDb.Create(&purview).Error
+	return
+}

static/js/create_org.js

@@ -1,6 +1,6 @@
 $(function() {
     $("#open_3").attr("checked", "checked");
-    
+
     $("#province_select").change(function() {
         $("#city_select option").remove();
         $("#district_select option").remove();
@@ -36,7 +36,7 @@ $(function() {
     });
 
     $("#city_select").change(function() {
-        
+
         $("#district_select option").remove();
         $("#district_select").append("<option value='0'>区/县</option>");
         var city = $("#city_select option:selected").val();
@@ -141,6 +141,8 @@ $(function() {
         }
 
         var postData = {
+            user_name:$("#user_name").val(),
+
             name: $("#org_name").val(),
             // short_name: $("#org_short_name").val(),
             contact_name: $("#contact_name").val(),
@@ -169,6 +171,9 @@ $(function() {
 });
 
 function checkInfoFull() {
+    if ($("#user_name").val().length == 0) {
+        return "请填写用户名字";
+    }
     if ($("#org_name").val().length == 0) {
         return "请填写机构名称";
     }
@@ -203,4 +208,4 @@ function checkInfoFull() {
 
 function doFail(res) {
     serverErrorMsg(res);
-}
+}

utils/tools.go

@@ -0,0 +1,231 @@
+package utils
+
+import (
+	"crypto/sha1"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"io"
+	"math/rand"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/astaxie/beego"
+)
+
+func TimeSub(t1, t2 time.Time) int {
+	t1 = time.Date(t1.Year(), t1.Month(), t1.Day(), 0, 0, 0, 0, time.Local)
+	t2 = time.Date(t2.Year(), t2.Month(), t2.Day(), 0, 0, 0, 0, time.Local)
+
+	return int(t1.Sub(t2).Hours() / 24)
+}
+
+func MarkBackUrl(backUrl, defaultUrl string) string {
+	if len(backUrl) == 0 {
+		backUrl = defaultUrl
+	} else {
+		backURLByte, err := base64.URLEncoding.DecodeString(backUrl)
+		if err != nil {
+			backUrl = backUrl
+		} else {
+			backUrl = string(backURLByte)
+		}
+	}
+	return backUrl
+}
+
+func CheckMobile(mobile string) (match bool) {
+
+	//过滤手机
+	match, _ = regexp.MatchString("^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$", mobile)
+	return
+}
+
+func RandCode(min, max int64) string {
+	if min >= max || min == 0 || max == 0 {
+		return strconv.FormatInt(max, 10)
+	}
+	rand.Seed(time.Now().UnixNano())
+	randNum := rand.Int63n(max-min) + min
+	return strconv.FormatInt(randNum, 10)
+}
+
+func TimeAgo(timeUnix int64) string {
+	timeUnixS := time.Unix(timeUnix, 0)
+	timeNow := time.Now()
+	timeSub := timeNow.Sub(timeUnixS)
+
+	if timeSub < time.Minute*1 {
+		return "刚刚"
+	} else if timeSub < time.Hour*1 {
+		return strconv.Itoa(int(timeSub.Minutes())) + "分钟前"
+	} else if timeSub < time.Hour*24 {
+		return strconv.Itoa(int(timeSub.Hours())) + "小时前"
+	} else if timeSub < time.Hour*24*7 {
+		return strconv.Itoa(int(timeSub.Hours()/24)) + "天前"
+	} else {
+		return timeUnixS.Format("2006-01-02 15:04")
+	}
+	return ""
+}
+
+//Signature sha1签名
+func Signature(params ...string) string {
+	sort.Strings(params)
+	h := sha1.New()
+	for _, s := range params {
+		io.WriteString(h, s)
+	}
+	return fmt.Sprintf("%x", h.Sum(nil))
+}
+
+//RandomStr 随机生成字符串
+func RandomStr(length int) string {
+	str := "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	bytes := []byte(str)
+	result := []byte{}
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	for i := 0; i < length; i++ {
+		result = append(result, bytes[r.Intn(len(bytes))])
+	}
+	return string(result)
+}
+
+//GetCurrTs return current timestamps
+func GetCurrTs() int64 {
+	return time.Now().Unix()
+}
+
+func SetThisRequestURI(uri string) string {
+	return fmt.Sprintf("%v%v", beego.AppConfig.String("httpdomain"), uri)
+}
+
+func SetThisBasr64RequestURI(uri string) string {
+	backUrl := fmt.Sprintf("%v%v", beego.AppConfig.String("httpdomain"), uri)
+	backUrl = base64.URLEncoding.EncodeToString([]byte(backUrl))
+
+	return backUrl
+}
+
+func TransNum2Str(read int64) (transRead string) {
+	if read < 0 {
+		transRead = "0"
+	} else if read < 10000 {
+		transRead = fmt.Sprintf("%v", read)
+	} else {
+		var c float64 = 10000
+		var rc float64 = float64(read)
+		transRead = fmt.Sprintf("%.2f万", rc/c)
+	}
+
+	return
+}
+
+func GenMobileToken(mobile string) (token string) {
+	st := strings.Split(mobile, "")
+
+	s := fmt.Sprintf("%s%v%v%v%v%v%v", mobile, st[0], st[1], st[3], st[7], st[6], st[9])
+
+	h := sha1.New()
+	h.Write([]byte(s))
+	bs := h.Sum(nil)
+
+	token = fmt.Sprintf("%x", bs)
+
+	return
+}
+
+func CheckMobileToken(mobile, token string) bool {
+	o := GenMobileToken(mobile)
+	if token == o {
+		return true
+	}
+
+	return false
+}
+
+type jSapiConfig struct {
+	AppID     string `json:"app_id"`
+	Timestamp int64  `json:"timestamp"`
+	NonceStr  string `json:"nonce_str"`
+	Signature string `json:"signature"`
+}
+
+//GetAJTConfig jsapi_ticket config
+func GetAJTConfig(jsapiTicket, uri string) (jSapiConfig, error) {
+	var config jSapiConfig
+	nonceStr := RandomStr(16)
+	timestamp := GetCurrTs()
+	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", jsapiTicket, nonceStr, timestamp, uri)
+	sigStr := Signature(str)
+
+	config.AppID = beego.AppConfig.String("wxappId")
+	config.NonceStr = nonceStr
+	config.Timestamp = timestamp
+	config.Signature = sigStr
+	return config, nil
+}
+
+func TrimHtml(src string) string {
+	//将HTML标签全转换成小写
+	re, _ := regexp.Compile("\\<[\\S\\s]+?\\>")
+	src = re.ReplaceAllStringFunc(src, strings.ToLower)
+	//去除STYLE
+	re, _ = regexp.Compile("\\<style[\\S\\s]+?\\</style\\>")
+	src = re.ReplaceAllString(src, "")
+	//去除SCRIPT
+	re, _ = regexp.Compile("\\<script[\\S\\s]+?\\</script\\>")
+	src = re.ReplaceAllString(src, "")
+	//去除所有尖括号内的HTML代码，并换成换行符
+	re, _ = regexp.Compile("\\<[\\S\\s]+?\\>")
+	src = re.ReplaceAllString(src, "\n")
+	//去除连续的换行符
+	re, _ = regexp.Compile("\\s{2,}")
+	src = re.ReplaceAllString(src, "\n")
+	return strings.TrimSpace(src)
+}
+
+func SubString(str string, begin, length int) string {
+	rs := []rune(str)
+	lth := len(rs)
+	if begin < 0 {
+		begin = 0
+	}
+	if begin >= lth {
+		begin = lth
+	}
+	end := begin + length
+
+	if end > lth {
+		end = lth
+	}
+	return string(rs[begin:end])
+}
+
+func ParseTimeStringToTime(layout string, timeStr string) (*time.Time, error) {
+	if len(layout) == 0 || len(timeStr) == 0 {
+		return nil, errors.New("layout 或 日期字符串 为空，无法解析")
+	}
+	loc, _ := time.LoadLocation("Local")
+	date, parseDateErr := time.ParseInLocation(layout, timeStr, loc)
+	return &date, parseDateErr
+}
+
+// 获取 date 所在周的周一和周日，以周一0点为一周的开始，周日24点为一周的结束
+func GetMondayAndSundayOfWeekDate(date *time.Time) (time.Time, time.Time) {
+	if date == nil {
+		now := time.Now()
+		date = &now
+	}
+	weekday := int(date.Weekday())
+	if weekday == 0 {
+		weekday = 7
+	}
+	loc, _ := time.LoadLocation("Local")
+	monday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 1-weekday).Format("2006-01-02")+" 00:00:00", loc)
+	sunday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 7-weekday).Format("2006-01-02")+" 23:59:59", loc)
+	return monday, sunday
+}

views/home/create_org.html

@@ -12,7 +12,7 @@
     <link href="/static/font-awesome/css/font-awesome.css?v=4.3.0" rel="stylesheet" />
     <link href="/static/css/old_style.css?v=1.0.0" rel="stylesheet">
     <link href="/static/iconfont/iconfont.css?v=4.0.0" rel="stylesheet">
-    
+
 </head>
 
 <body>
@@ -36,6 +36,16 @@
                 </div>
             </div>
         </div>
+        <div class="stewardMsg">
+            <h2 class="stewardMsg_tit">用户信息</h2>
+            <div class="steward_content">
+                <div class="cell clearfix">
+                    <label class="cell_tit fl">用户名字</label>
+                    <input id="user_name" type="text" class="cell_input" maxlength="10" />
+                </div>
+            </div>
+        </div>
+
         <!-- 完善机构信息 -->
         <div class="stewardMsg">
             <h2 class="stewardMsg_tit">机构信息</h2>
@@ -320,4 +330,4 @@
     <script src="/static/js/create_org.js?v=0.2.3"></script>
 </body>
 
-</html>
+</html>

views/new_main/create_org.html

@@ -12,7 +12,7 @@
     <link href="/static/font-awesome/css/font-awesome.css?v=4.3.0" rel="stylesheet" />
     <link href="/static/css/old_style.css?v=1.0.0" rel="stylesheet">
     <link href="/static/iconfont/iconfont.css?v=4.0.0" rel="stylesheet">
-    
+
 </head>
 
 <body>
@@ -23,7 +23,7 @@
                     <img src="/static/images/logo.png" alt="" />
                 </a>
             </div>
-            
+
             <div class="TheUser fr ">
                 <div class="userData fl">
                     <img src="{{.avatar}}" alt="头像" />
@@ -36,10 +36,16 @@
             </div>
         </div>
         <!-- 完善机构信息 -->
+
+
         <div class="stewardMsg">
             <h2 class="stewardMsg_tit">机构信息</h2>
             <div class="steward_content">
                 <p class="tips">请正确填写以下信息，后续可在账号设置中修改</p>
+                <div class="cell clearfix">
+                    <label class="cell_tit fl">用户名称</label>
+                    <input id="user_name" type="text" class="cell_input" maxlength="10" />
+                </div>
                 <div class="cell clearfix">
                     <label class="cell_tit fl">机构名称</label>
                     <input id="org_name" type="text" class="cell_input" maxlength="50" />
@@ -99,7 +105,7 @@
                     <label class="cell_tit fl">机构电话</label>
                     <input id="org_phone" type="text" class="cell_input" maxlength="50" />
                 </div>
-                <div class="cell clearfix">
+                <div class="cell clearfix" style="display: none">
                     <label class="cell_tit fl">选择启用的应用</label>
                     <div class="Checkbox fl">
                         <div class="opt">
@@ -141,7 +147,7 @@
     <script src="/static/js/layer.js"></script>
     <script src="/static/js/md5.js"></script>
     <script src="/static/js/common.js"></script>
-    <script src="/static/js/create_org.js?v=0.2.6"></script>
+    <script src="/static/js/create_org.js?v=0.2.8"></script>
 </body>
 
-</html>
+</html>