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

conf/app.conf

@@ -148,29 +148,27 @@ readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = test_xt
-//readmysqlname = sgj_xt
+readmysqlname = sgj_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = test_xt
-//writemysqlname = sgj_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/base_api_controller.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -65,36 +64,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 400
-		userAdmin.Mobile = "13535547901"
-
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 12
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 12
-		adminUserInfo.CurrentAppId = 18
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 400
+		//userAdmin.Mobile = "13535547901"
+		//
+		////userAdmin.Id = 597
+		////userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 12
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 12
+		//adminUserInfo.CurrentAppId = 18
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
@@ -316,35 +315,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 400
-		userAdmin.Mobile = "13535547901"
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 12
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 12
-		adminUserInfo.CurrentAppId = 18
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 400
+		//userAdmin.Mobile = "13535547901"
+		////userAdmin.Id = 597
+		////userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 12
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 12
+		//adminUserInfo.CurrentAppId = 18
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1017,11 +1017,6 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	//}
 
 	//TODO 需要根据角色去判断
-	if appRole.UserType == 2 || appRole.UserType == 1 {
-		prescription_doctor = appRole.AdminUserId
-	} else {
-		prescription_doctor = 0
-	}
 
 	prescription := models.DialysisPrescription{
 
@@ -1091,6 +1086,12 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		//if mode_id > 0 {
 		//	//service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 		//}
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			prescription_doctor = adminUserInfo.AdminUser.Id
+		} else {
+			prescription_doctor = 0
+		}
+
 		prescription.Creater = adminUserInfo.AdminUser.Id
 		err := service.AddSigleRecord(&prescription)
 
@@ -2235,9 +2236,18 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		prescription.CreatedTime = dialysisPrescription.CreatedTime
 		prescription.Modifier = adminUserInfo.AdminUser.Id
-		prescription.Creater = adminUserInfo.AdminUser.Id
+		if dialysisPrescription.Creater == 0 {
+			prescription.Creater = adminUserInfo.AdminUser.Id
+			if appRole.UserType == 2 || appRole.UserType == 1 {
+				prescription_doctor = adminUserInfo.AdminUser.Id
+				prescription.PrescriptionDoctor = dialysisPrescription.PrescriptionDoctor
+			} else {
+				prescription_doctor = 0
+			}
+		} else {
+			prescription.Creater = dialysisPrescription.Creater
+		}
 
-		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

@@ -49,7 +49,7 @@ type MobileBaseAPIAuthController struct {
 
 func (this *MobileBaseAPIAuthController) Prepare() {
 	token := this.Ctx.GetCookie("token_cookie")
-	//logout_cookie := this.Ctx.GetCookie("logout_cookie")
+	logout_cookie := this.Ctx.GetCookie("logout_cookie")
 
 	//if len(token) == 0{
 	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
@@ -58,17 +58,25 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 	this.MobileBaseAPIController.Prepare()
 	adminUserInfo := this.GetMobileAdminUserInfo()
 
-	if adminUserInfo == nil {
-		this.DelSession("mobile_admin_user_info")
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
-	}
-
+	fmt.Println(token)
 	if len(token) == 0 {
-
 		this.DelSession("mobile_admin_user_info")
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeLoginTimeout)
-		this.StopRun()
+		fmt.Println(logout_cookie)
+		if len(logout_cookie) == 1 {
+			this.Ctx.SetCookie("logout_cookie", "2")
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeLogOut)
+			this.StopRun()
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeLoginTimeout)
+			this.StopRun()
+		}
+
+	} else {
+		if adminUserInfo == nil {
+			this.DelSession("mobile_admin_user_info")
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+			this.StopRun()
+		}
 	}
 
 	//if this.Ctx.Request.Method != "GET" {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -609,6 +609,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	advice.ExecutionStaff = execution_staff
 	advice.ExecutionTime = theTime.Unix()
 	advice.ExecutionState = 1
+	advice.Modifier = adminUserInfo.AdminUser.Id
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":    "ok",

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -369,8 +369,8 @@ func (this *HomeController) CreateOrg() {
 		InitRoleAndPurviews(org)
 		//初始化设备管理
 		InitEquitMentInformation(org)
-		//初始化显示配置
-		//InitShowConfig(org)
+		//初始化显示配置和打印模版
+		InitShowConfig(org)
 
 		if len(orgs) == 0 {
 			ip := utils.GetIP(this.Ctx.Request)

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -239,8 +239,8 @@ func (this *MobileRegistController) CreateOrg() {
 		InitRoleAndPurviews(org)
 		//初始化设备管理org
 		InitEquitMentInformation(org)
-		//初始化显示配置
-		//InitShowConfig(org)
+		//初始化显示配置和打印模版
+		InitShowConfig(org)
 
 		//创建完机构后进行登录验证操作
 		ip := utils.GetIP(this.Ctx.Request)
@@ -1174,4 +1174,12 @@ func InitEquitMentInformation(org *models.Org) {
 
 func InitShowConfig(org *models.Org) {
 	service.BatchInsertFiledSystemConfig(org.Id)
+	template := &models.VMGobalTemplate{
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		OrgId:      org.Id,
+		TemplateId: 2,
+	}
+	service.CreateVMPrintTemplate(template)
 }

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1997,8 +1997,6 @@ func (this *NewDialysisApiController) DeleteBed() {
 }
 
 func (this *NewDialysisApiController) LoginOut() {
-
-	this.DelSession("mobile_admin_user_info")
 	this.Ctx.SetCookie("logout_cookie", "1")
 	this.Ctx.SetCookie("token_cookie", "")
 	id, _ := this.GetInt64("id")

controllers/new_mobile_api_controllers/patient.json

@@ -15,7 +15,7 @@
       "nation": "汉",
       "native_place": "广东深圳",
       "marital_status": 1,
-      "id_card_no": "431230199808081111",
+      "id_card_no": "999999190001019999",
       "birthday": -312537600,
       "reimbursement_way_id": 7,
       "health_care_type": 0,
@@ -95,7 +95,7 @@
       "nation": "汉",
       "native_place": "广东深圳",
       "marital_status": 1,
-      "id_card_no": "4312301999090952222",
+      "id_card_no": "999999190001018888",
       "birthday": -312537600,
       "reimbursement_way_id": 7,
       "health_care_type": 0,

controllers/new_mobile_api_controllers/role.json

@@ -7,7 +7,7 @@
       "status": 1,
       "is_system": 1,
       "number": 9999,
-      "purview_ids": "71,72,70,74,75,73,48,49,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102,83,94",
       "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20039,20055,20056,20040,20041,20042,20043,20054,20044,20045,20046,20047,20048,20049,20050,20051,20052,20053,20013,20014,20015,20016,20017,20018,20019,20020,20021,20022,20023,20024,20025,20026,20027,20028,20029,20030"
     },
     {
@@ -19,8 +19,6 @@
       "number": 9998,
       "purview_ids": "71,72,70,74,75,73,48,52,110,77,78,79,80,197,76,93,121,122,124,125,120,127,128,193,194,196,192,101,100,102,49",
       "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028,20029,20030"
-
-
     },
     {
       "role_name": "护士",
@@ -29,21 +27,17 @@
       "status": 1,
       "is_system": 3,
       "number": 9997,
-      "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76",
+      "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76,83,94",
       "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029,20055,20056,20052,20012"
-    },
-    {
+    },{
       "role_name": "库存",
       "role_introduction": "库存角色负责透析耗材的日常管理，对耗材的入库、出库、退库的登记操作",
       "is_super_admin": false,
       "status": 1,
       "is_system": 0,
       "number": 9996,
-      "purview_ids": "111,112,113,114,115,116,117,118,119,129,84",
+      "purview_ids": "111,112,113,114,115,116,117,118,119,129,84,83,94",
       "func_ids": ""
-
-
-
     },{
       "role_name": "运营",
       "role_introduction": "运营角色能够在SCRM中管理微网站、使用营销工具、做会员管理和分销商品经营的操作",
@@ -53,9 +47,6 @@
       "number": 9995,
       "purview_ids": "48,110,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
       "func_ids": ""
-
-
-
     },{
       "role_name": "技师",
       "role_introduction": "技师角色能够进行设备的管理，日常维护维修记录等",
@@ -65,8 +56,6 @@
       "number": 9994,
       "purview_ids": "77,78,79,80,197,76",
       "func_ids": ""
-
-
     },
     {
       "role_name": "院长",
@@ -75,7 +64,7 @@
       "status": 1,
       "is_system": 0,
       "number": 9993,
-      "purview_ids": "71,72,70,74,75,73,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201,83,94",
       "func_ids": ""
 
 

controllers/patient_api_controller.go

@@ -243,29 +243,29 @@ func (c *PatientApiController) CreatePatient() {
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:                    adminUserInfo.CurrentOrgId,
-		UserId:                       0,
-		Avatar:                       patients.Avatar,
-		PatientType:                  patients.PatientType,
-		DialysisNo:                   patients.DialysisNo,
-		AdmissionNumber:              patients.AdmissionNumber,
-		Source:                       patients.Source,
-		Lapseto:                      patients.Lapseto,
-		PartitionId:                  patients.PartitionId,
-		BedId:                        patients.BedId,
-		Name:                         patients.Name,
-		Alias:                        patients.Alias,
-		Gender:                       patients.Gender,
-		MaritalStatus:                patients.MaritalStatus,
-		IdCardNo:                     patients.IdCardNo,
-		Birthday:                     patients.Birthday,
-		ReimbursementWayId:           patients.ReimbursementWayId,
-		HealthCareType:               patients.HealthCareType,
-		HealthCareNo:                 patients.HealthCareNo,
-		HealthCareDueDate:            patients.HealthCareDueDate,
-		Height:                       patients.Height,
-		BloodType:                    patients.BloodType,
-		Rh:                           patients.Rh,
+		UserOrgId:          adminUserInfo.CurrentOrgId,
+		UserId:             0,
+		Avatar:             patients.Avatar,
+		PatientType:        patients.PatientType,
+		DialysisNo:         patients.DialysisNo,
+		AdmissionNumber:    patients.AdmissionNumber,
+		Source:             patients.Source,
+		Lapseto:            patients.Lapseto,
+		PartitionId:        patients.PartitionId,
+		BedId:              patients.BedId,
+		Name:               patients.Name,
+		Alias:              patients.Alias,
+		Gender:             patients.Gender,
+		MaritalStatus:      patients.MaritalStatus,
+		IdCardNo:           patients.IdCardNo,
+		Birthday:           patients.Birthday,
+		ReimbursementWayId: patients.ReimbursementWayId,
+		HealthCareType:     patients.HealthCareType,
+		HealthCareNo:       patients.HealthCareNo,
+		HealthCareDueDate:  patients.HealthCareDueDate,
+		Height:             patients.Height,
+		BloodType:          patients.BloodType,
+		Rh:                 patients.Rh,
 		HealthCareDueAlertDate:       patients.HealthCareDueAlertDate,
 		EducationLevel:               patients.EducationLevel,
 		Profession:                   patients.Profession,
@@ -311,27 +311,27 @@ func (c *PatientApiController) CreatePatient() {
 		Nation:                       patients.Nation,
 		NativePlace:                  patients.NativePlace,
 		Age:                          patients.Age,
-		InfectiousNextRecordTime:     patients.InfectiousNextRecordTime,
-		IsInfectious:                 patients.IsInfectious,
-		RemindCycle:                  patients.RemindCycle,
-		ResponseResult:               patients.ResponseResult,
-		IsOpenRemind:                 patients.IsOpenRemind,
-		FirstTreatmentDate:           patients.FirstTreatmentDate,
-		DialysisAge:                  patients.DialysisAge,
-		ExpenseKind:                  patients.ExpenseKind,
-		TellPhone:                    patients.TellPhone,
-		ContactName:                  patients.ContactName,
-		BloodPatients:                1,
-		SlowPatients:                 0,
-		MemberPatients:               0,
-		EcommerPatients:              "",
-		BloodId:                      patients.ID,
-		SlowId:                       0,
-		MemberId:                     0,
-		MemberFistdate:               0,
-		MemberPatienttype:            0,
-		MemberTreatement:             0,
-		EquitmentId:                  "",
+		InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
+		IsInfectious:             patients.IsInfectious,
+		RemindCycle:              patients.RemindCycle,
+		ResponseResult:           patients.ResponseResult,
+		IsOpenRemind:             patients.IsOpenRemind,
+		FirstTreatmentDate:       patients.FirstTreatmentDate,
+		DialysisAge:              patients.DialysisAge,
+		ExpenseKind:              patients.ExpenseKind,
+		TellPhone:                patients.TellPhone,
+		ContactName:              patients.ContactName,
+		BloodPatients:            1,
+		SlowPatients:             0,
+		MemberPatients:           0,
+		EcommerPatients:          "",
+		BloodId:                  patients.ID,
+		SlowId:                   0,
+		MemberId:                 0,
+		MemberFistdate:           0,
+		MemberPatienttype:        0,
+		MemberTreatement:         0,
+		EquitmentId:              "",
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -459,29 +459,29 @@ func (c *PatientApiController) EditPatient() {
 	}
 	fmt.Println("病人--------------------------------------------------------------", patient.Name, patient.Age)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:                 patient.UserOrgId,
-		UserId:                    patient.UserId,
-		Avatar:                    patient.Avatar,
-		PatientType:               patient.PatientType,
-		DialysisNo:                patient.DialysisNo,
-		AdmissionNumber:           patient.AdmissionNumber,
-		Source:                    patient.Source,
-		Lapseto:                   patient.Lapseto,
-		PartitionId:               patient.PartitionId,
-		BedId:                     patient.BedId,
-		Name:                      patient.Name,
-		Alias:                     patient.Alias,
-		Gender:                    patient.Gender,
-		MaritalStatus:             patient.MaritalStatus,
-		IdCardNo:                  patient.IdCardNo,
-		Birthday:                  patient.Birthday,
-		ReimbursementWayId:        patient.ReimbursementWayId,
-		HealthCareType:            patient.HealthCareType,
-		HealthCareNo:              patient.HealthCareNo,
-		HealthCareDueDate:         patient.HealthCareDueDate,
-		Height:                    patient.Height,
-		BloodType:                 patient.BloodType,
-		Rh:                        patient.Rh,
+		UserOrgId:          patient.UserOrgId,
+		UserId:             patient.UserId,
+		Avatar:             patient.Avatar,
+		PatientType:        patient.PatientType,
+		DialysisNo:         patient.DialysisNo,
+		AdmissionNumber:    patient.AdmissionNumber,
+		Source:             patient.Source,
+		Lapseto:            patient.Lapseto,
+		PartitionId:        patient.PartitionId,
+		BedId:              patient.BedId,
+		Name:               patient.Name,
+		Alias:              patient.Alias,
+		Gender:             patient.Gender,
+		MaritalStatus:      patient.MaritalStatus,
+		IdCardNo:           patient.IdCardNo,
+		Birthday:           patient.Birthday,
+		ReimbursementWayId: patient.ReimbursementWayId,
+		HealthCareType:     patient.HealthCareType,
+		HealthCareNo:       patient.HealthCareNo,
+		HealthCareDueDate:  patient.HealthCareDueDate,
+		Height:             patient.Height,
+		BloodType:          patient.BloodType,
+		Rh:                 patient.Rh,
 		HealthCareDueAlertDate:    patient.HealthCareDueAlertDate,
 		EducationLevel:            patient.EducationLevel,
 		Profession:                patient.Profession,
@@ -523,17 +523,17 @@ func (c *PatientApiController) EditPatient() {
 		Nation:                    patient.Nation,
 		NativePlace:               patient.NativePlace,
 		Age:                       patient.Age,
-		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
-		IsInfectious:              patient.IsInfectious,
-		RemindCycle:               patient.RemindCycle,
-		ResponseResult:            patient.ResponseResult,
-		IsOpenRemind:              patient.IsOpenRemind,
-		FirstTreatmentDate:        patient.FirstTreatmentDate,
-		DialysisAge:               patient.DialysisAge,
-		ExpenseKind:               patient.ExpenseKind,
-		TellPhone:                 patient.TellPhone,
-		ContactName:               patient.ContactName,
-		UpdatedTime:               time.Now().Unix(),
+		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
+		IsInfectious:             patient.IsInfectious,
+		RemindCycle:              patient.RemindCycle,
+		ResponseResult:           patient.ResponseResult,
+		IsOpenRemind:             patient.IsOpenRemind,
+		FirstTreatmentDate:       patient.FirstTreatmentDate,
+		DialysisAge:              patient.DialysisAge,
+		ExpenseKind:              patient.ExpenseKind,
+		TellPhone:                patient.TellPhone,
+		ContactName:              patient.ContactName,
+		UpdatedTime:              time.Now().Unix(),
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -1547,11 +1547,6 @@ func (c *PatientApiController) CheckGroupAdvice() {
 		return
 	}
 
-	if advice.ExecutionStaff == 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceCheckBeforeExce)
-		return
-	}
-
 	if advice.ExecutionStaff >= 0 && advice.ExecutionStaff == adminUserInfo.AdminUser.Id {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
 		return
@@ -1561,11 +1556,6 @@ func (c *PatientApiController) CheckGroupAdvice() {
 
 	theTime := time.Now()
 
-	//if advice.ExecutionTime > theTime.Unix() {
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
-	//	return
-	//}
-
 	exceAdvice := models.DoctorAdvice{
 		Checker:     checker,
 		CheckTime:   theTime.Unix(),
@@ -1614,11 +1604,6 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		return
 	}
 
-	if advice.ExecutionStaff == 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceCheckBeforeExce)
-		return
-	}
-
 	if advice.ExecutionStaff >= 0 && advice.ExecutionStaff == adminUserInfo.AdminUser.Id {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
 		return

controllers/public_api_controller.go

@@ -165,7 +165,7 @@ func (this *PublicApiController) GetJson() {
 func (c *PublicApiController) HandleData() {
 	//org_app, _ := service.GetAllAppOrg()
 	//org_role, _ := service.GetAllRole()
-
+	//
 	//var org_ids []int64
 
 	//for _, apps := range org_app {
@@ -486,10 +486,10 @@ func (c *PublicApiController) HandleData() {
 	//
 	//
 	////创建内置角色
-	//InitRoleAndPurviews(org_ids)
+	InitRoleAndPurviews(org_ids)
 
 	//var org_id int = 0
-	////管理员
+	//管理员
 	//app_roles  := service.GetAllUserRoleByUserTypeOne(org_id)
 	//for _, item := range app_roles{
 	//	var ids string
@@ -500,7 +500,7 @@ func (c *PublicApiController) HandleData() {
 	//	}
 	//	service.UpdateRoleIds(item.Id, ids)
 	//}
-	////护士医生
+	//护士医生
 	//app_roles2  := service.GetAllUserRoleByUserTypeOther()
 	//	for _, item := range app_roles2{
 	//		var ids string
@@ -529,49 +529,53 @@ func InitRoleAndPurviews(org_ids []int64) {
 	roles := LoadRoleConfig("./role.json").Roles
 	for _, org_id := range org_ids {
 		app, _ := service.GetOrgAppB(org_id, 3)
+		role, _ := service.GetSystemRole(org_id)
+
 		if app == nil || app.Id == 0 {
 			continue
 		}
-		for _, item := range roles {
-			role := &models.Role{
-				RoleName:     item.RoleName,
-				RoleIntro:    item.RoleIntroduction,
-				Creator:      0,
-				OrgId:        org_id,
-				AppId:        app.Id,
-				IsSuperAdmin: false,
-				Status:       1,
-				CreateTime:   time.Now().Unix(),
-				ModifyTime:   time.Now().Unix(),
-				Number:       item.Number,
-				IsSystem:     item.IsSystem,
-			}
-			err := service.CreateOrgRoleB(role)
-			if err == nil {
-				purview := &models.RolePurview{
-					RoleId:     role.Id,
-					OrgId:      org_id,
-					AppId:      role.AppId,
-					PurviewIds: item.PurviewIds,
-					Status:     1,
-					CreateTime: time.Now().Unix(),
-					ModifyTime: time.Now().Unix(),
+		if len(role) == 0 {
+			for _, item := range roles {
+				role := &models.Role{
+					RoleName:     item.RoleName,
+					RoleIntro:    item.RoleIntroduction,
+					Creator:      0,
+					OrgId:        org_id,
+					AppId:        app.Id,
+					IsSuperAdmin: false,
+					Status:       1,
+					CreateTime:   time.Now().Unix(),
+					ModifyTime:   time.Now().Unix(),
+					Number:       item.Number,
+					IsSystem:     item.IsSystem,
 				}
-				func_purview := &models.SgjUserRoleFuncPurview{
-					RoleId:     role.Id,
-					OrgId:      org_id,
-					AppId:      role.AppId,
-					PurviewIds: item.FuncIds,
-					Status:     1,
-					Ctime:      time.Now().Unix(),
-					Mtime:      time.Now().Unix(),
+				err := service.CreateOrgRoleB(role)
+				if err == nil {
+					purview := &models.RolePurview{
+						RoleId:     role.Id,
+						OrgId:      org_id,
+						AppId:      role.AppId,
+						PurviewIds: item.PurviewIds,
+						Status:     1,
+						CreateTime: time.Now().Unix(),
+						ModifyTime: time.Now().Unix(),
+					}
+					func_purview := &models.SgjUserRoleFuncPurview{
+						RoleId:     role.Id,
+						OrgId:      org_id,
+						AppId:      role.AppId,
+						PurviewIds: item.FuncIds,
+						Status:     1,
+						Ctime:      time.Now().Unix(),
+						Mtime:      time.Now().Unix(),
+					}
+
+					service.CreateRolePurviewB(purview)
+					service.CreateFuncRolePurviewB(func_purview)
 				}
-
-				service.CreateRolePurviewB(purview)
-				service.CreateFuncRolePurviewB(func_purview)
 			}
-		}
 
+		}
 	}
 
 }

controllers/role.json

@@ -7,7 +7,7 @@
       "status": 1,
       "is_system": 1,
       "number": 9999,
-      "purview_ids": "71,72,70,74,75,73,48,49,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102,83,94",
       "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20039,20055,20056,20040,20041,20042,20043,20054,20044,20045,20046,20047,20048,20049,20050,20051,20052,20053,20013,20014,20015,20016,20017,20018,20019,20020,20021,20022,20023,20024,20025,20026,20027,20028,20029,20030"
     },
     {
@@ -19,8 +19,6 @@
       "number": 9998,
       "purview_ids": "71,72,70,74,75,73,48,52,110,77,78,79,80,197,76,93,121,122,124,125,120,127,128,193,194,196,192,101,100,102,49",
       "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028,20029,20030"
-
-
     },
     {
       "role_name": "护士",
@@ -29,7 +27,7 @@
       "status": 1,
       "is_system": 3,
       "number": 9997,
-      "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76",
+      "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76,83,94",
       "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029,20055,20056,20052,20012"
     },{
       "role_name": "库存",
@@ -38,11 +36,8 @@
       "status": 1,
       "is_system": 0,
       "number": 9996,
-      "purview_ids": "111,112,113,114,115,116,117,118,119,129,84",
+      "purview_ids": "111,112,113,114,115,116,117,118,119,129,84,94",
       "func_ids": ""
-
-
-
     },{
       "role_name": "运营",
       "role_introduction": "运营角色能够在SCRM中管理微网站、使用营销工具、做会员管理和分销商品经营的操作",
@@ -52,9 +47,6 @@
       "number": 9995,
       "purview_ids": "48,110,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
       "func_ids": ""
-
-
-
     },{
       "role_name": "技师",
       "role_introduction": "技师角色能够进行设备的管理，日常维护维修记录等",
@@ -64,8 +56,6 @@
       "number": 9994,
       "purview_ids": "77,78,79,80,197,76",
       "func_ids": ""
-
-
     },
     {
       "role_name": "院长",
@@ -74,10 +64,8 @@
       "status": 1,
       "is_system": 0,
       "number": 9993,
-      "purview_ids": "71,72,70,74,75,73,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201,94",
       "func_ids": ""
-
-
     }
   ]
 }

controllers/verify_login_controller.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"github.com/astaxie/beego"
 	"net/url"
+	"regexp"
 	"strconv"
 	"strings"
 )
@@ -186,16 +187,31 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 						var ids string
 						for _, role_id := range role_arr {
 							id, _ := strconv.ParseInt(role_id, 10, 64)
-
+							role, _ := service.GetRoleByRoleID(id)
+							var system_ids = ""
+							if role.RoleName == "子管理员" && role.IsSystem > 0 {
+								purviews, _ := service.GetSystemPurview()
+								for _, purview := range purviews {
+									if len(system_ids) == 0 {
+										system_ids = strconv.FormatInt(purview.Id, 10)
+									} else {
+										system_ids = system_ids + "," + strconv.FormatInt(purview.Id, 10)
+									}
+								}
+							}
 							purview_ids, _ := service.GetRolePurviewIds(id)
 							if len(ids) == 0 {
 								ids = purview_ids
 							} else {
 								ids = ids + "," + purview_ids
 							}
+
+							if len(system_ids) > 0 {
+								ids = ids + "," + system_ids
+							}
 						}
 						if len(ids) != 0 {
-							pruviews, _ = service.GetPurviewById(ids)
+							pruviews, _ = service.GetPurviewById(CompressStr(ids))
 							for _, item := range pruviews {
 								if item.Module == 3 && item.Parentid > 0 {
 									fmt.Println(item.Urlfor)
@@ -362,3 +378,12 @@ func (this *PersonAPIController) ModifyPwd() {
 		"msg": "密码已修改",
 	})
 }
+
+func CompressStr(str string) string {
+	if str == "" {
+		return ""
+	}
+	//匹配一个或多个空白符的正则表达式
+	reg := regexp.MustCompile("\\s+")
+	return reg.ReplaceAllString(str, "")
+}

models/vm_models.go

@@ -317,3 +317,16 @@ type VMUserRoleAndPurview struct {
 func (VMUserRoleAndPurview) TableName() string {
 	return "sgj_user_role"
 }
+
+type VMGobalTemplate 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"`
+	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 (VMGobalTemplate) TableName() string {
+	return "xt_gobal_template"
+}

service/app_version.go

@@ -173,3 +173,12 @@ func CreateFuncRolePurviewB(purview *models.SgjUserRoleFuncPurview) (err error)
 	err = writeUserDb.Create(&purview).Error
 	return
 }
+
+func GetSystemRole(orgID int64) ([]*models.Role, error) {
+	var roles []*models.Role
+	err := readUserDb.Where(" org_id = ? AND status = 1 AND is_system > 1", orgID).First(&roles).Error
+	if err != nil {
+		return nil, err
+	}
+	return roles, nil
+}

service/patient_service.go

@@ -972,6 +972,7 @@ func UpdateAdviceGroupStartTime(orgID int64, groupNO int64, startTime int64, adm
 	err := writeDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? AND status = 1 AND execution_state <> 1 AND check_state <> 1 AND groupno = ? AND admin_user_id = ?", orgID, groupNO, admin_user_id).Updates(map[string]interface{}{
 		"start_time":   startTime,
 		"updated_time": now,
+		"modifier":     admin_user_id,
 	}).Error
 	return err
 }

service/role_service.go

@@ -754,3 +754,8 @@ func FindAllFuncPurview(ids []string) (purview []*models.SgjUserOperatePurview,
 	return
 
 }
+
+func GetSystemPurview() (purview []*models.Purview, err error) {
+	err = readUserDb.Model(&models.Purview{}).Where("status = 1 AND module = 3 AND super_admin_exclusive = 1").Find(&purview).Error
+	return
+}

service/vm_service.go

@@ -76,3 +76,8 @@ func CreatedTreateMode(treatmentmode *models.VmDeviceTreatmentmode) {
 	XTWriteDB().Model(&models.VmDeviceTreatmentmode{}).Create(&treatmentmode)
 
 }
+
+func CreateVMPrintTemplate(template *models.VMGobalTemplate) (err error) {
+	err = writeDb.Model(&models.VMGobalTemplate{}).Create(template).Error
+	return
+}