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

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -143,23 +143,6 @@ func (this *HomeController) ChangeOrg() {
 		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: 3,
-				AppType:     int8(3),
-				CreateTime:  time.Now().Unix(),
-			}
-			if insertErr := service.InsertLoginLog(loginLog); insertErr != nil {
-				utils.ErrorLog("为手机号为%v的用户插入一条登录记录失败：%v", mobile, insertErr)
-			}
-		}
-
 		templateInfo, _ := service.GetOrgInfoTemplate(org.Id)
 
 		mobileAdminUserInfo := &mobile_api_controllers.MobileAdminUserInfo{
@@ -224,15 +207,15 @@ func (this *HomeController) CreateOrg() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	adminUser := adminUserInfo.AdminUser
 
-	if didCreateOrg, checkCreateOrgErr := service.DidAdminUserCreateOrg(adminUser.Id); checkCreateOrgErr != nil {
-		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		this.ServeJSON()
-		return
-	} else if didCreateOrg {
-		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeRepeatCreateOrg)
-		this.ServeJSON()
-		return
-	}
+	//if didCreateOrg, checkCreateOrgErr := service.DidAdminUserCreateOrg(adminUser.Id); checkCreateOrgErr != nil {
+	//	this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	this.ServeJSON()
+	//	return
+	//} else if didCreateOrg {
+	//	this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeRepeatCreateOrg)
+	//	this.ServeJSON()
+	//	return
+	//}
 
 	name := this.GetString("org_name")
 	shortName := name

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -125,15 +125,15 @@ func (this *MobileRegistController) CreateOrg() {
 	}
 	adminUser := adminUserObj.(*models.AdminUser)
 
-	if didCreateOrg, checkCreateOrgErr := service.DidAdminUserCreateOrg(adminUser.Id); checkCreateOrgErr != nil {
-		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		this.ServeJSON()
-		return
-	} else if didCreateOrg {
-		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeRepeatCreateOrg)
-		this.ServeJSON()
-		return
-	}
+	//if didCreateOrg, checkCreateOrgErr := service.DidAdminUserCreateOrg(adminUser.Id); checkCreateOrgErr != nil {
+	//	this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	this.ServeJSON()
+	//	return
+	//} else if didCreateOrg {
+	//	this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeRepeatCreateOrg)
+	//	this.ServeJSON()
+	//	return
+	//}
 
 	name := this.GetString("org_name")
 	shortName := name
@@ -588,7 +588,7 @@ func InitPatientAndSchedule(org *models.Org) {
 
 	//创建两个虚拟病人本周的排班
 	//stime, _ := time.Parse("2006-01-02", time.Now().Format("2006-01-02"))
-	for _, date := range dates {
+	for week_type, date := range dates {
 		for index, id := range ids {
 			if index == 0 {
 				sch := &models.VMSchedule{
@@ -598,7 +598,7 @@ func InitPatientAndSchedule(org *models.Org) {
 					PatientId:    id,
 					ScheduleDate: date,
 					ScheduleType: 1,
-					ScheduleWeek: int64(time.Now().Weekday()),
+					ScheduleWeek: int64(week_type + 1),
 					ModeId:       1,
 					Status:       1,
 					CreatedTime:  time.Now().Unix(),
@@ -616,7 +616,7 @@ func InitPatientAndSchedule(org *models.Org) {
 					PatientId:    id,
 					ScheduleDate: date,
 					ScheduleType: 2,
-					ScheduleWeek: int64(time.Now().Weekday()),
+					ScheduleWeek: int64(week_type + 1),
 					ModeId:       1,
 					Status:       1,
 					CreatedTime:  time.Now().Unix(),
@@ -662,12 +662,19 @@ func InitPatientAndSchedule(org *models.Org) {
 			item.TemplateId = templaeIdOne.ID
 			item.DeviceNumberId = vmDeviceNumber1.ID
 			item.PatientId = ids[0]
+			item.Status = 1
+			item.Ctime = time.Now().Unix()
+			item.Mtime = time.Now().Unix()
 
 		} else if item.TimeType == 2 {
 			item.OrgId = org.Id
 			item.TemplateId = templaeIdOne.ID
 			item.DeviceNumberId = vmDeviceNumber2.ID
 			item.PatientId = ids[1]
+			item.Status = 1
+			item.Ctime = time.Now().Unix()
+			item.Mtime = time.Now().Unix()
+
 		}
 
 		service.CreateVMSchTemplate(item)

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -33,6 +33,13 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/changeorg", &HomeController{}, "post:ChangeOrg")
 	beego.Router("/m/api/createOrg", &HomeController{}, "post:CreateOrg")
 
+	beego.Router("/m/api/staff", &NewRoleApiController{}, "get:GetAllOrgUser")
+	//beego.Router("/m/api/staff/edit", &NewRoleApiController{}, "post:EditAdmin")
+	//beego.Router("/m/api/staff/init", &NewRoleApiController{}, "get:GetEditAdminInitData")
+	//beego.Router("/m/api/staff/get", &NewRoleApiController{}, "get:GetAdminUserInfo")
+	//beego.Router("/m/api/staff/stop", &NewRoleApiController{}, "post:StopAdminUser")
+	//beego.Router("/m/api/staff/create", &NewRoleApiController{}, "post:CreateAdminUser")
+
 	beego.Router("/m/api/patient/getbloodpatientinfo", &NewDialysisApiController{}, "Get:GetBloodPatientInfo")
 	beego.Router("/m/api/patient/getslowpatientinfo", &NewDialysisApiController{}, "Get:GetSlowPatientInfo")
 	beego.Router("/m/api/patient/getmemberpatientinfo", &NewDialysisApiController{}, "Get:GetMemberpatientInfo")

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -16,15 +16,51 @@ func (this *NewRoleApiController) GetAllOrgUser() {
 	})
 
 }
-func (this *NewRoleApiController) CreateOrgUser() {
 
-}
-func (this *NewRoleApiController) ModifyOrgUser() {
-
-}
-func (this *NewRoleApiController) GetOrgRole() {
-
-}
-func (this *NewRoleApiController) CreateOrgRole() {
-
-}
+//func (this *NewRoleApiController) EditAdmin() {
+//	adminUserInfo := this.GetMobileAdminUserInfo()
+//	adminUserId, _ := this.GetInt64("uid")
+//	name := this.GetString("name")
+//	userTitle := this.GetString("title")
+//	roleIds  := this.GetString("role_ids")
+//
+//	if adminUserId <= 0 || len(name) == 0   || len(roleIds) <= 0 {
+//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//		return
+//	}
+//
+//	appRole, getAppRoleErr := service.GetAppRole(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserId)
+//	if getAppRoleErr != nil {
+//		//beego.Error("查询管理员信息时失败:", getAppRoleErr)
+//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//
+//	if appRole == nil {
+//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserNotExist)
+//		return
+//	}
+//
+//	appRole.UserName = name
+//	appRole.UserType = int8(userType)
+//	appRole.UserTitle = int8(userTitle)
+//	appRole.RoleId = roleId
+//	appRole.Intro = intro
+//	appRole.ModifyTime = time.Now().Unix()
+//	saveErr := service.SaveAppRole(appRole)
+//	if saveErr != nil {
+//		//beego.Error("修改App_Role失败:", saveErr)
+//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
+//
+//	} else {
+//		this.ServeSuccessJSON(nil)
+//	}
+//
+//
+//
+//
+//
+//
+//
+//
+//}

controllers/new_mobile_api_controllers/system_dialysis_prescription.json

@@ -39,6 +39,19 @@
       "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
     }
   ]
 }