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

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/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

@@ -163,7 +163,7 @@ func (this *MobileRegistController) CreateOrg() {
 
 	if len(orgPhone) > 0 {
 		if utils.PhoneRegexp().MatchString(orgPhone) == false {
-			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodePhone)
 			this.ServeJSON()
 			return
 		}
@@ -515,7 +515,7 @@ func InitPatientAndSchedule(org *models.Org) {
 
 	//创建两个血透的虚拟病人到新表
 	fmt.Print("patients", patients)
-	for _, it := range patients {
+	for index, it := range patients {
 		patientsNew := models.XtPatientsNew{
 			UserOrgId:               org.Id,
 			CreatedTime:             time.Now().Unix(),
@@ -556,6 +556,14 @@ func InitPatientAndSchedule(org *models.Org) {
 			FirstTreatmentDate:      it.FirstTreatmentDate,
 			ContactName:             it.ContactName,
 		}
+		if index == 1 {
+			patientsNew.IsInfectious = 1
+
+		} else {
+			patientsNew.IsInfectious = 2
+
+		}
+
 		service.CreateVMOrgNewPatient(&patientsNew)
 	}
 	//创建1个分组

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1985,8 +1985,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{

controllers/new_mobile_api_controllers/patient.json

@@ -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",
@@ -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
 }