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

conf/app.conf

@@ -148,25 +148,29 @@ readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = test_xt
+//readmysqlname = test_xt
+readmysqlname = sgj_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = test_xt
+//writemysqlname = test_xt
+writemysqlname = sgj_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
-readusername = test_users
+//readusername = test_users
+readusername = sgj_users
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
-writeusername = test_users
+//writeusername = test_users
+writeusername = sgj_users
 
 
 readmiddlehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com

controllers/dialysis_api_controller.go

@@ -3283,7 +3283,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			assessmentBeforeDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessmentBeforeDislysis.AssessmentTime = time.Now().Unix()
 		}
-		if assessmentBeforeDislysis.Creater == 0 {
+
+		if evaluation.Creater == 0 {
 			assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
 			assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
 		} else {

controllers/gobal_config_api_controller.go

@@ -187,7 +187,7 @@ func (c *GobalConfigApiController) PostPrintTemplate() {
 //		//	updateErr := service.UpdateFiledConfig(adminUserInfo.CurrentOrgId)
 //		//	if updateErr == nil {
 //		//		//查出该模版对应显示配置字段中所有隐藏的字段
-//		//		_, config := service.FindAllHideFiledConfig(template_id)
+//				_, config := service.FindAllHideFiledConfig(template_id)
 //		//
 //		//		var fileds []string
 //		//		for _, item := range config {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1013,7 +1013,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	safe_package, _ := c.GetInt64("package", 0)
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
 
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//
 	//if template.TemplateId == 2 || template.TemplateId == 6 {
@@ -1030,11 +1030,11 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	//}
 
 	//TODO 需要根据角色去判断
-	//if appRole.UserType == 2 || appRole.UserType == 1 {
-	//	prescription_doctor = appRole.AdminUserId
-	//} else {
-	//	prescription_doctor = 0
-	//}
+	if appRole.UserType == 2 || appRole.UserType == 1 {
+		prescription_doctor = appRole.AdminUserId
+	} else {
+		prescription_doctor = 0
+	}
 
 	prescription := models.DialysisPrescription{
 
@@ -2248,9 +2248,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		prescription.CreatedTime = dialysisPrescription.CreatedTime
 		prescription.Modifier = adminUserInfo.AdminUser.Id
-		prescription.Creater = adminUserInfo.AdminUser.Id
 		prescription.PrescriptionDoctor = adminUserInfo.AdminUser.Id
-
 		prescription.ID = dialysisPrescription.ID
 		err := service.UpDateDialysisPrescription(&prescription)
 		if err == nil {

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -47,6 +47,8 @@ type MobileBaseAPIAuthController struct {
 
 func (this *MobileBaseAPIAuthController) Prepare() {
 	token := this.Ctx.GetCookie("token_cookie")
+	//logout_cookie := this.Ctx.GetCookie("logout_cookie")
+
 	//if len(token) == 0{
 	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 	//	this.StopRun()
@@ -61,6 +63,7 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 	}
 
 	if len(token) == 0 {
+
 		this.DelSession("mobile_admin_user_info")
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeLoginTimeout)
 		this.StopRun()

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -160,14 +160,14 @@ func (this *MobileRegistController) CreateOrg() {
 		return
 	}
 	orgPhone := this.GetString("telephone")
-
-	if len(orgPhone) > 0 {
-		if utils.PhoneRegexp().MatchString(orgPhone) == false {
-			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			this.ServeJSON()
-			return
-		}
-	}
+	//
+	//if len(orgPhone) > 0 {
+	//	if utils.PhoneRegexp().MatchString(orgPhone) == false {
+	//		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodePhone)
+	//		this.ServeJSON()
+	//		return
+	//	}
+	//}
 
 	provinceID := 0
 	cityID := 0
@@ -221,7 +221,9 @@ func (this *MobileRegistController) CreateOrg() {
 		ModifyTime:   time.Now().Unix(),
 	}
 
-	createErr := service.CreateOrg(org, adminUser.Mobile, openXT, openCDM, openSCRM, openMall) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
+	adminUsers, _ := service.GetAdminUserByUserID(adminUser.Id)
+
+	createErr := service.CreateOrg(org, adminUsers.Name, openXT, openCDM, openSCRM, openMall) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
 
 	if createErr != nil {
 		utils.ErrorLog("mobile=%v的超级管理员创建机构失败：%v", adminUser.Mobile, createErr)
@@ -240,6 +242,7 @@ func (this *MobileRegistController) CreateOrg() {
 		//初始化设备管理org
 		InitEquitMentInformation(org)
 		//初始化显示配置
+		//InitShowConfig(org)
 
 		//创建完机构后进行登录验证操作
 		ip := utils.GetIP(this.Ctx.Request)
@@ -555,7 +558,9 @@ func InitPatientAndSchedule(org *models.Org) {
 			TellPhone:               it.TellPhone,
 			FirstTreatmentDate:      it.FirstTreatmentDate,
 			ContactName:             it.ContactName,
+			IsInfectious:            it.IsInfectious,
 		}
+
 		service.CreateVMOrgNewPatient(&patientsNew)
 	}
 	//创建1个分组
@@ -1168,3 +1173,7 @@ func InitEquitMentInformation(org *models.Org) {
 	}
 	service.CreatedTreateMode(&treatmentmodefive)
 }
+
+func InitShowConfig(org *models.Org) {
+	service.BatchInsertFiledSystemConfig(org.Id)
+}

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1989,8 +1989,8 @@ func (this *NewDialysisApiController) DeleteBed() {
 func (this *NewDialysisApiController) LoginOut() {
 
 	this.DelSession("mobile_admin_user_info")
-	this.Ctx.SetCookie("token_cookie", "")
 	this.Ctx.SetCookie("logout_cookie", "1")
+	this.Ctx.SetCookie("token_cookie", "")
 	id, _ := this.GetInt64("id")
 	fmt.Println("id------------------------------------------", id)
 	loginLog := models.SgjUserAdminLoginLog{
@@ -2161,7 +2161,7 @@ func (this *NewDialysisApiController) EditOrg() {
 			cityID = int(city.ID)
 			district, getDistrictErr := service.GetDistrictWithName(city.ID, districtName)
 			if getDistrictErr != nil {
-				utils.ErrorLog("查询区县名失败：%v", getDistrictErr)
+				utils.ErrorLog("查询区县名失：%v", getDistrictErr)
 				this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				this.ServeJSON()
 				return
@@ -2197,9 +2197,7 @@ func (this *NewDialysisApiController) EditOrg() {
 }
 
 func (this *NewDialysisApiController) GetMyInforName() {
-
 	id, _ := this.GetInt64("id")
-	//Rolename, err := service.GetMyInfoName(id)
 	Username, err := service.GetAdminName(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -2210,6 +2208,22 @@ func (this *NewDialysisApiController) GetMyInforName() {
 	})
 }
 
+func (this *NewDialysisApiController) GetMyInformationFour() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	creatId := adminUserInfo.AdminUser.Id
+	fmt.Println("创建者ID", creatId)
+	orgid := adminUserInfo.Org.Id
+	fmt.Println("orgid", orgid)
+	Username, err := service.GetMyOrgInformationFour(creatId, orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"Username": Username,
+	})
+}
+
 func (this *NewDialysisApiController) GetPartionDetail() {
 	id, _ := this.GetInt64("id")
 	partionDetail, err := service.GetPartionDetail(id)
@@ -2315,6 +2329,7 @@ func (this *NewDialysisApiController) GetMyOrgInformation() {
 	fmt.Println("cretor", creator)
 	adminInfo := this.GetMobileAdminUserInfo()
 	appId := adminInfo.App.Id
+	//fmt.Println("appid------------------------------------",appId)
 	information, err := service.GetMyOrgInformation(creator, appId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -147,4 +147,5 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getmyorginformation", &NewDialysisApiController{}, "Get:GetMyOrgInformation")
 	beego.Router("/m/api/patient/savenametwo", &NewDialysisApiController{}, "Get:SaveNameTwo")
 	beego.Router("/m/api/patient/getcurrentorg", &NewDialysisApiController{}, "Get:GetCurrentOrg")
+	beego.Router("/m/api/patient/getmyinformationfour", &NewDialysisApiController{}, "Get:GetMyInformationFour")
 }

controllers/new_mobile_api_controllers/patient.json

@@ -45,7 +45,7 @@
       "hospital_first_dialysis_date": 1511366400,
       "induction_period": 0,
       "initial_dialysis": 0,
-      "total_dialysis": 14,
+      "total_dialysis": 0,
       "attending_doctor_id": 0,
       "head_nurse_id": 0,
       "evaluate": "",
@@ -77,7 +77,8 @@
       "expense_kind": 3,
       "tell_phone": "21212",
       "first_treatment_date": 1582560000,
-      "contact_name": "21221"
+      "contact_name": "21221",
+      "is_infectious":1
     },
     {
       "avatar": "https://images.shengws.com/201809182128111.png",
@@ -124,7 +125,7 @@
       "hospital_first_dialysis_date": 1511366400,
       "induction_period": 0,
       "initial_dialysis": 0,
-      "total_dialysis": 14,
+      "total_dialysis": 0,
       "attending_doctor_id": 0,
       "head_nurse_id": 0,
       "evaluate": "",
@@ -156,7 +157,9 @@
       "expense_kind": 3,
       "tell_phone": "21212",
       "first_treatment_date": 1582560000,
-      "contact_name": "21221"
+      "contact_name": "21221",
+      "is_infectious":2
+
     }
   ]
 }

controllers/new_mobile_api_controllers/role.json

@@ -18,7 +18,7 @@
       "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"
+      "func_ids": "20001,20002,20004,20005,20007,20008,20010,20011,20012,20034,20035,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028"
 
 
     },
@@ -30,10 +30,7 @@
       "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"
-
-
-
+      "func_ids": "20007,20008,20010,20011,20012,20055,20056,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028"
     },
     {
       "role_name": "库存",

controllers/role.json

@@ -18,7 +18,7 @@
       "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"
+      "func_ids": "20001,20002,20004,20005,20007,20008,20010,20011,20012,20034,20035,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028"
 
 
     },
@@ -30,7 +30,7 @@
       "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"
+      "func_ids": "20007,20008,20010,20011,20012,20055,20056,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028"
     }
   ]
 }

enums/error_code.go

@@ -192,6 +192,10 @@ const ( // ErrorCode
 	ErrorCodeRole = 20037
 
 	ErrorCodeAdminUserIsExit = 20038
+
+	ErrorCodePhone = 20039
+
+	ErrorCodeLogOut = 20049
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -383,6 +387,9 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeRole: "尚未配置角色,无访问权限",
 
 	ErrorCodeAdminUserIsExit: "用户不存在",
+	ErrorCodePhone:           "请填写正确的联系电话",
+
+	ErrorCodeLogOut: "退出",
 }
 
 type SGJError struct {

service/data.go

@@ -172,7 +172,7 @@ func FindFiledByOrgId(org_id int64) (filedConfig []*models.FiledConfig, err erro
 }
 
 func BatchInsertFiledConfig(org_id int64) (err error) {
-	err = readDb.Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 0", org_id).Error
+	err = readDb.Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 0 AND is_show = 1", org_id).Error
 	return
 }
 
@@ -185,3 +185,8 @@ func FindSysDialysisFiledByOrgId() (filedConfig []*models.FiledConfig, err error
 	err = readDb.Model(&models.FiledConfig{}).Where("org_id =? AND id in (11250,11251,11252,11253,11254,11255,11256,11257,11258,11259,11260,11261,11262)", 0).Find(&filedConfig).Error
 	return
 }
+
+func BatchInsertFiledSystemConfig(org_id int64) (err error) {
+	err = readDb.Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 9442  AND sys_module = 2", org_id).Error
+	return
+}

service/patientmanage_service.go

@@ -1261,6 +1261,12 @@ func GetAdminName(id int64) (models.AdminUsers, error) {
 	return user, err
 }
 
+func GetMyOrgInformationFour(creator int64, orgid int64) (models.SgjUserAdminRole, error) {
+	role := models.SgjUserAdminRole{}
+	err := UserReadDB().Model(&role).Where("admin_user_id = ? and org_id = ? and status = 1", creator, orgid).Find(&role).Error
+	return role, err
+}
+
 func GetPartionDetail(id int64) (models.DeviceZone, error) {
 
 	zone := models.DeviceZone{}