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

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -17,7 +17,7 @@ type HomeController struct {
 
 func (this *HomeController) GetHomeData() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
-	if adminUserInfo.Org != nil {
+	if adminUserInfo.Org != nil && adminUserInfo.Org.Id != 0 {
 		//获取该管理员所有机构列表
 		var orgs []*models.Org
 		adminUser, err := service.GetHomeData(adminUserInfo.AdminUser.Id)
@@ -54,8 +54,21 @@ func (this *HomeController) GetHomeData() {
 			"isCreateOrg": true,
 		})
 	} else {
+		apps, err := service.GetAllApp(0)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		banners, err := service.GetSystemBanner()
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+
 		this.ServeSuccessJSON(map[string]interface{}{
 			"isCreateOrg": false,
+			"apps":        apps,
+			"banners":     banners,
 		})
 	}
 

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -234,7 +234,7 @@ func (this *MobileRegistController) CreateOrg() {
 		//初始化透析方案
 		InitSystemPrescrption(org)
 		//初始化医嘱模版
-		InitAdviceTemplate(org)
+		//InitAdviceTemplate(org)
 		//初始化角色和权限
 
 		//初始化设备管理
@@ -655,7 +655,7 @@ func InitPatientAndSchedule(org *models.Org) {
 	}
 	service.CreateVMSchTemplateId(templaeIdTwo)
 	//3.创建单周排班模版
-	items := LoadSchTemplateConfig("./schedule_template.json").ScheduleTemplateItem
+	items := LoadSchTemplateConfig("./schedule_template.json").Item
 	for _, item := range items {
 		if item.TimeType == 1 {
 			item.OrgId = org.Id
@@ -739,7 +739,7 @@ type PatientConfig struct {
 }
 
 type SchTemplateConfig struct {
-	ScheduleTemplateItem []*models.VMPatientScheduleTemplateItem "json:item"
+	Item []*models.VMPatientScheduleTemplateItem "json:item"
 }
 
 type PrescriptionConfig struct {

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -22,7 +22,6 @@ type NewLoginApiController struct {
 }
 
 func (this *NewLoginApiController) GetLogin() {
-
 	token_cookie := this.Ctx.GetCookie("token_cookie")
 	if len(token_cookie) == 0 {
 		this.ServeSuccessJSON(map[string]interface{}{
@@ -316,6 +315,7 @@ func (this *NewLoginApiController) LoginByCs() {
 					"city":           org.City,
 					"district":       org.District,
 					"address":        org.Address,
+					"creator":        org.Creator,
 				},
 				"subscibe": map[string]interface{}{
 					"id":           subscibe.ID,
@@ -487,6 +487,7 @@ func (this *NewLoginApiController) LoginByCs() {
 							"city":           org.City,
 							"district":       org.District,
 							"address":        org.Address,
+							"creator":        org.Creator,
 						},
 						"subscibe": map[string]interface{}{
 							"id":           subscibe.ID,
@@ -511,6 +512,8 @@ func (this *NewLoginApiController) LoginByCs() {
 func (this *NewLoginApiController) GetCode() {
 	mobile := this.GetString("phone")
 	aespass := this.GetString("aespass")
+	types, _ := this.GetInt("type", 0)
+
 	utils.TraceLog("mobile:%v aespass:%v", mobile, aespass)
 	if utils.CellPhoneRegexp().MatchString(mobile) == false {
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeMobileFormat)
@@ -518,11 +521,13 @@ func (this *NewLoginApiController) GetCode() {
 		return
 	}
 
-	adminUser, _ := service.GetValidAdminUserByMobileReturnErr(mobile)
-	if adminUser != nil {
-		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeRegisterExist)
-		this.ServeJSON()
-		return
+	if types == 1 {
+		adminUser, _ := service.GetValidAdminUserByMobileReturnErr(mobile)
+		if adminUser != nil {
+			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeRegisterExist)
+			this.ServeJSON()
+			return
+		}
 	}
 	//this.Data["json"] = enums.MakeSuccessResponseJSON(map[string]interface{}{
 	//	"msg": "短信发送成功,有效期为10分钟",

models/vm_models.go

@@ -215,7 +215,7 @@ type VMPatientScheduleTemplateItem struct {
 }
 
 func (VMPatientScheduleTemplateItem) TableName() string {
-	return "xt_patient_schedule_template_id"
+	return "xt_patient_schedule_template_item"
 }
 
 type VMPatientScheduleTemplateMode struct {
@@ -229,5 +229,5 @@ type VMPatientScheduleTemplateMode struct {
 }
 
 func (VMPatientScheduleTemplateMode) TableName() string {
-	return "xt_patient_schedule_template_id"
+	return "xt_patient_schedule_template_mode"
 }

service/orginfo_service.go

@@ -115,7 +115,7 @@ func createOrgApp(tx *gorm.DB, superAdminRole *models.Role, userName string, app
 			ModifyTime: now,
 			Name:       item.Name,
 			Url:        item.Url,
-			Order:      item.Order,
+			Number:     item.Number,
 			Pid:        0,
 		}
 		writeUserDb.Create(&app)
@@ -135,7 +135,7 @@ func createOrgApp(tx *gorm.DB, superAdminRole *models.Role, userName string, app
 				ModifyTime: now,
 				Name:       subItem.Name,
 				Url:        subItem.Url,
-				Order:      subItem.Order,
+				Number:     subItem.Number,
 				Pid:        app.ID,
 			}
 			writeUserDb.Create(&app)
@@ -179,7 +179,7 @@ type VMOrgApp struct {
 	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"`
-	Order      int64       `gorm:"column:order" json:"order" form:"order"`
+	Number     int64       `gorm:"column:number" json:"order" form:"number"`
 	VMOrgApp   []*VMOrgApp `gorm:"ForeignKey:Pid;AssociationForeignKey:Id" `
 }