1

.gitignore

@@ -1,5 +0,0 @@
-.svn
-.git
-XT.ext
-/*.exe
-/*.exe~

conf/app.conf

@@ -122,6 +122,7 @@ redisdb = 0
 
 
 
+
 niprocart =  63
 jms = 58
 fistula_needle_set = 65
@@ -162,6 +163,7 @@ readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
 readusername = sgj_users
 
+
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
@@ -169,6 +171,7 @@ writeuserpass = 1Q2W3e4r!@#$
 writeusername = sgj_users
 
 
+
 readmiddlehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmiddleport = 3306
 readmiddleuser = root

controllers/base_api_controller.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	//"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"

controllers/dialysis_api_controller.go

@@ -1369,7 +1369,17 @@ func (c *DialysisApiController) PostPrescription() {
 			}
 		}
 
-		prescription.Creater = adminUserInfo.AdminUser.Id
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			prescription_doctor := adminUserInfo.AdminUser.Id
+			prescription.PrescriptionDoctor = prescription_doctor
+		}
+		if dialysisPrescription.Creater == 0 { //体重称
+			prescription.Creater = adminUserInfo.AdminUser.Id
+
+		} else {
+			prescription.Creater = dialysisPrescription.Creater
+		}
+
 		prescription.CreatedTime = dialysisPrescription.CreatedTime
 		prescription.UpdatedTime = time.Now().Unix()
 		prescription.Modifier = adminUserInfo.AdminUser.Id
@@ -3055,6 +3065,10 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.DialysisIntakesUnit = data.DialysisIntakesUnit
 	assessment.Dialyzer = data.Dialyzer
 	assessment.IsEat = data.IsEat
+	assessment.CvcA = data.CvcA
+	assessment.CvcB = data.CvcB
+	assessment.Channel = data.Channel
+
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	_, evaluation := service.FindPredialysisEvaluationByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
@@ -3070,31 +3084,17 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	}
 
 	if assessment.ID > 0 {
-		//if appRole.UserType == 3 {
-		//	if assessment.Creater != adminUserInfo.AdminUser.Id && assessment.Creater != 0 {
-		//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		//		if getPermissionErr != nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//			return
-		//		} else if headNursePermission == nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//			return
-		//		}
-		//	}
-		//}
+
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessment.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessment.AssessmentTime = time.Now().Unix()
-
-		}
-		if assessment.Creater == 0 {
-			assessment.Modifier = adminUserInfo.AdminUser.Id
-			assessment.Creater = adminUserInfo.AdminUser.Id
-
 		} else {
-			assessment.Modifier = adminUserInfo.AdminUser.Id
-			assessment.Creater = assessment.Creater
-
+			if assessment.Creater == 0 {
+				assessment.Modifier = adminUserInfo.AdminUser.Id
+				assessment.Creater = adminUserInfo.AdminUser.Id
+			} else {
+				assessment.Modifier = adminUserInfo.AdminUser.Id
+			}
 		}
 
 		assessment.UpdatedTime = time.Now().Unix()
@@ -3103,9 +3103,9 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessment.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessment.AssessmentTime = time.Now().Unix()
-
+		} else {
+			assessment.Creater = adminUserInfo.AdminUser.Id
 		}
-		assessment.Creater = adminUserInfo.AdminUser.Id
 		assessment.CreatedTime = time.Now().Unix()
 		assessment.UpdatedTime = time.Now().Unix()
 		assessment.UserOrgId = adminUserInfo.CurrentOrgId
@@ -3253,9 +3253,10 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessmentBeforeDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessmentBeforeDislysis.AssessmentTime = time.Now().Unix()
-		}
+		} else {
+			assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
 
-		assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
+		}
 
 		err := service.AddSigleAssessmentBeforeDislysisRecord(&assessmentBeforeDislysis)
 		if err == nil {
@@ -3284,14 +3285,13 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessmentBeforeDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessmentBeforeDislysis.AssessmentTime = time.Now().Unix()
-		}
-
-		if evaluation.Creater == 0 {
-			assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
-			assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
 		} else {
-			assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
-			assessmentBeforeDislysis.Creater = evaluation.Creater
+			if evaluation.Creater == 0 {
+				assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
+				assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
+			} else {
+				assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
+			}
 		}
 
 		assessmentBeforeDislysis.UpdatedTime = time.Now().Unix()
@@ -4322,11 +4322,12 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//获取医嘱内容
 	doctor, err := service.FindDoctor(doctorAdvice.AdviceDoctor, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
 	DoctorName, err := service.FindDoctorName(doctorAdvice.AdviceDoctor, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
-	//fmt.Print("err---------------------------------",err)
+	fmt.Print("err-----------------------------------------------------------------", err)
 	DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	doctorAdevieInfo, err := service.FindDoctorAdviceByInfo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//获取上次的透后体重
-	assessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	//	assessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	assessmentAfterDislysis, _ := service.MobileGetLast(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//获取透析次数
 	_, total, err := service.GetTotalDialysisCout(adminUserInfo.CurrentOrgId, patientInfo.ID)
 

controllers/gobal_config_api_controller.go

@@ -1072,18 +1072,17 @@ func (this *GobalConfigApiController) ChangeOrg() {
 					curAppUrlfors = append(curAppUrlfors, "")
 
 				}
-			}
-		}
-
-		for _, item := range pruviews {
-			if item.Module == 6 {
-				didRegistedForSCRM = true
-			}
-			if item.Module == 4 {
-				didRegistedForCDM = true
-			}
-			if item.Module == 7 {
-				didRegistedForMall = true
+				for _, item := range pruviews {
+					if item.Module == 6 {
+						didRegistedForSCRM = true
+					}
+					if item.Module == 4 {
+						didRegistedForCDM = true
+					}
+					if item.Module == 7 {
+						didRegistedForMall = true
+					}
+				}
 			}
 		}
 

controllers/inspection_api_controller.go

@@ -432,7 +432,7 @@ func (c *InspectionApiController) GetPatientInspections() {
 
 	date := ""
 	if len(inspections) > 0 {
-		date = time.Unix(dateTime, 0).Format("2006-01-02")
+		date = time.Unix(dateTime, 0).Format("2006-01-02 15:04")
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/mobile_api_controllers/admin_user_api_controller.go

@@ -18,9 +18,9 @@ type AdminUserApiController struct {
 func (c *AdminUserApiController) GetAdminUserElectronicSignature() {
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
-
-	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id)
-
+	//orgId, _ := service.GetCreatByOrgId(adminUserInfo.Org.Id)
+	id := adminUserInfo.AdminUser.Id
+	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, id)
 	if es != nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"state":                1,
@@ -35,6 +35,7 @@ func (c *AdminUserApiController) GetAdminUserElectronicSignature() {
 }
 
 func (c *AdminUserApiController) SaveAdminUserElectronicSignature() {
+
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
 	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -783,6 +783,10 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	in_advance_reason_other := c.GetString("in_advance_reason_other")
 	is_eat, _ := c.GetInt64("is_eat", 0)
 
+	cvc_a, _ := c.GetFloat("cvc_a", 0)
+	cvc_b, _ := c.GetFloat("cvc_b", 0)
+	channels, _ := c.GetInt64("channel", 0)
+
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -870,20 +874,23 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		Dialyzer:                     dialyzer,
 		InAdvanceReasonOther:         in_advance_reason_other,
 		IsEat:                        is_eat,
+		CvcA:                         cvc_a,
+		CvcB:                         cvc_b,
+		Channel:                      channels,
 	}
 
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	_, assessmentAfter := service.FindAssessmentAfterDislysisByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	if assessmentAfter.ID == 0 { //新增
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-		assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
-		assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
+			assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
 
-		//} else {
-		assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
+		} else {
+			assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
 
-		//}
+		}
 
 		err := service.AddSigleAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 		if err == nil {
@@ -892,29 +899,16 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 			})
 		}
 	} else { //修改
-		//if appRole.UserType == 3 {
-		//	if assessmentAfter.Creater != adminUserInfo.AdminUser.Id && assessmentAfter.Creater != 0 {
-		//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		//		if getPermissionErr != nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//			return
-		//		} else if headNursePermission == nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//			return
-		//		}
-		//	}
-		//}
 
-		//TODO 根据角色判断
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-		assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
-		assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
-		//} else {
-		assessmentAfterDislysis.Modifier = adminUserInfo.AdminUser.Id
-		if assessmentAfterDislysis.Creater == 0 {
-			assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
+			assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
+		} else {
+			assessmentAfterDislysis.Modifier = adminUserInfo.AdminUser.Id
+			if assessmentAfterDislysis.Creater == 0 {
+				assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
+			}
 		}
-		//}
 
 		assessmentAfterDislysis.CreatedTime = assessmentAfter.CreatedTime
 		assessmentAfterDislysis.ID = assessmentAfter.ID
@@ -1030,11 +1024,6 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	//}
 
 	//TODO 需要根据角色去判断
-	if appRole.UserType == 2 || appRole.UserType == 1 {
-		prescription_doctor = appRole.AdminUserId
-	} else {
-		prescription_doctor = 0
-	}
 
 	prescription := models.DialysisPrescription{
 
@@ -1104,6 +1093,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)
 
@@ -2248,9 +2243,17 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		prescription.CreatedTime = dialysisPrescription.CreatedTime
 		prescription.Modifier = adminUserInfo.AdminUser.Id
-		prescription.Creater = dialysisPrescription.Creater
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			prescription_doctor := adminUserInfo.AdminUser.Id
+			prescription.PrescriptionDoctor = prescription_doctor
+		}
+		if dialysisPrescription.Creater == 0 { //体重称
+			prescription.Creater = adminUserInfo.AdminUser.Id
+
+		} 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

@@ -23,6 +23,8 @@ func (this *MobileBaseAPIController) Prepare() {
 	// beego.Trace("============================================================")
 }
 
+//
+
 func (this *MobileBaseAPIController) GetMobileAdminUserInfo() *MobileAdminUserInfo {
 	userInfo := this.GetSession("mobile_admin_user_info")
 	if userInfo == nil {
@@ -47,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)
@@ -56,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",
@@ -843,27 +844,10 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		return
 	}
 	//templateInfo,_ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	var evaluation models.PredialysisEvaluation
 	if theEvaluation != nil {
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-
 		evaluation = *theEvaluation
-
-		//} else {
-		//	if theEvaluation.Creater != adminUserInfo.AdminUser.Id && theEvaluation.Creater != 0 {
-		//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		//		if getPermissionErr != nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//			return
-		//		} else if headNursePermission == nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//			return
-		//		}
-		//	} else {
-		//		evaluation = *theEvaluation
-		//	}
-		//}
 	}
 
 	code := predialysisEvaluationFormData(&evaluation, c.Ctx.Input.RequestBody)
@@ -879,24 +863,24 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		evaluation.AssessmentDate = theAssessmentDateTime
 		evaluation.PatientId = id
 		evaluation.UserOrgId = adminUserInfo.Org.Id
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-		//	evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
-		//	evaluation.AssessmentTime = time.Now().Unix()
-		//} else {
-		evaluation.Creater = adminUserInfo.AdminUser.Id
-		//}
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
+			evaluation.AssessmentTime = time.Now().Unix()
+		} else {
+			evaluation.Creater = adminUserInfo.AdminUser.Id
+		}
 	} else {
 		evaluation.UpdatedTime = time.Now().Unix()
 		evaluation.Evaluator = adminUserInfo.AdminUser.Id
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-		//	evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
-		//	evaluation.AssessmentTime = time.Now().Unix()
-		//} else {
-		evaluation.Modifier = adminUserInfo.AdminUser.Id
-		if evaluation.Creater == 0 {
-			evaluation.Creater = adminUserInfo.AdminUser.Id
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
+			evaluation.AssessmentTime = time.Now().Unix()
+		} else {
+			evaluation.Modifier = adminUserInfo.AdminUser.Id
+			if evaluation.Creater == 0 {
+				evaluation.Creater = adminUserInfo.AdminUser.Id
+			}
 		}
-		//}
 	}
 
 	//新增逻辑
@@ -2190,186 +2174,269 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 }
 
 func (c *PatientApiController) CreateGroupAdvice() {
-	patient, _ := c.GetInt64("id", 0)
-	if patient <= 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	adminUserInfo := c.GetMobileAdminUserInfo()
+	is_child, _ := c.GetInt64("is_child", 0)
 
-	patientInfo, _ := service.FindPatientById(adminUserInfo.Org.Id, patient)
-	if patientInfo.ID == 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	if is_child == 1 {
+		patient, _ := c.GetInt64("id", 0)
+		if patient <= 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		adminUserInfo := c.GetMobileAdminUserInfo()
 
-	//if appRole.UserType == 3{
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdvicePermissionDeniedModify)
-	//	return
-	//}
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+		patientInfo, _ := service.FindPatientById(adminUserInfo.Org.Id, patient)
+		if patientInfo.ID == 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+			return
+		}
 
-	//if appRole.UserType == 3 {
-	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-	//	if getPermissionErr != nil {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//		return
-	//	} else if headNursePermission == nil {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-	//		return
-	//	}
-	//}
-	//TODO根据路由做权限
+		group_no, _ := c.GetInt64("group_no")
+		if group_no <= 0 {
+			group_no = 0
+		}
 
-	group_no, _ := c.GetInt64("group_no")
-	if group_no <= 0 {
-		group_no = 0
-	}
+		dataBody := make(map[string]interface{}, 0)
+		err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
 
-	dataBody := make(map[string]interface{}, 0)
-	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
 
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
+		if dataBody["advice_type"] == nil || reflect.TypeOf(dataBody["advice_type"]).String() != "float64" {
+			utils.ErrorLog("advice_type")
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		adviceType := int64(dataBody["advice_type"].(float64))
+		if adviceType != 1 && adviceType != 2 {
+			utils.ErrorLog("advice_type != 1&&2")
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
 
-	if dataBody["advice_type"] == nil || reflect.TypeOf(dataBody["advice_type"]).String() != "float64" {
-		utils.ErrorLog("advice_type")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	adviceType := int64(dataBody["advice_type"].(float64))
-	if adviceType != 1 && adviceType != 2 {
-		utils.ErrorLog("advice_type != 1&&2")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+		if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+			utils.ErrorLog("start_time")
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
 
-	if dataBody["advice_date"] == nil || reflect.TypeOf(dataBody["advice_date"]).String() != "string" {
-		utils.ErrorLog("advice_date")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	adviceDate, _ := dataBody["advice_date"].(string)
-	if len(adviceDate) == 0 {
-		utils.ErrorLog("len(adviceDate) == 0")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	theTime, err := time.ParseInLocation(timeLayout, adviceDate, loc)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	AdviceDate := theTime.Unix()
-	RecordDate := theTime.Unix()
+		startTime2, _ := dataBody["start_time"].(string)
+		time_arr := strings.Split(startTime2, " ")
+		if len(time_arr) > 0 {
+			startTime2 = time_arr[0]
+		}
+		if dataBody["advice_date"] == nil || reflect.TypeOf(dataBody["advice_date"]).String() != "string" {
+			utils.ErrorLog("advice_date")
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		adviceDate := startTime2
+		if len(adviceDate) == 0 {
+			utils.ErrorLog("len(adviceDate) == 0")
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		theTime, err := time.ParseInLocation(timeLayout, adviceDate, loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		AdviceDate := theTime.Unix()
+		RecordDate := theTime.Unix()
 
-	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
-		utils.ErrorLog("start_time")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	startTime, _ := dataBody["start_time"].(string)
-	if len(startTime) == 0 {
-		utils.ErrorLog("len(start_time) == 0")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	theTime, err = time.ParseInLocation(timeLayout+" 15:04:05", startTime, loc)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	StartTime := theTime.Unix()
+		if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+			utils.ErrorLog("start_time")
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime, _ := dataBody["start_time"].(string)
+		if len(startTime) == 0 {
+			utils.ErrorLog("len(start_time) == 0")
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		theTime, err = time.ParseInLocation(timeLayout+" 15:04:05", startTime, loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		StartTime := theTime.Unix()
 
-	Remark := ""
-	if dataBody["remark"] != nil && reflect.TypeOf(dataBody["remark"]).String() == "string" {
-		remark, _ := dataBody["remark"].(string)
-		Remark = remark
-	}
+		Remark := ""
+		if dataBody["remark"] != nil && reflect.TypeOf(dataBody["remark"]).String() == "string" {
+			remark, _ := dataBody["remark"].(string)
+			Remark = remark
+		}
 
-	var advices []*models.GroupAdvice
-	// utils.TraceLog("%+v", dataBody["adviceNames"])
-	if dataBody["adviceNames"] == nil || reflect.TypeOf(dataBody["adviceNames"]).String() != "[]interface {}" {
-		utils.ErrorLog("adviceNames")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		var advices []*models.GroupAdvice
+		// utils.TraceLog("%+v", dataBody["adviceNames"])
+		if dataBody["adviceNames"] == nil || reflect.TypeOf(dataBody["adviceNames"]).String() != "[]interface {}" {
+			utils.ErrorLog("adviceNames")
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		adviceNames := dataBody["adviceNames"].([]interface{})
+		for _, adviceNameMap := range adviceNames {
+			adviceNameM := adviceNameMap.(map[string]interface{})
+			var advice models.GroupAdvice
+			advice.Remark = Remark
+			advice.AdviceType = adviceType
+			advice.StartTime = StartTime
+			advice.AdviceDate = AdviceDate
+			advice.RecordDate = RecordDate
+			advice.Status = 1
+			advice.CreatedTime = time.Now().Unix()
+			advice.UpdatedTime = time.Now().Unix()
+			advice.StopState = 2
+			advice.ExecutionState = 2
+			advice.UserOrgId = adminUserInfo.Org.Id
+			advice.PatientId = patientInfo.ID
+			advice.AdviceDoctor = adminUserInfo.AdminUser.Id
+
+			errcode := c.setAdviceWithJSON(&advice, adviceNameM)
+			if errcode > 0 {
+				c.ServeFailJSONWithSGJErrorCode(errcode)
+				return
+			}
+
+			if adviceNameM["subdrugs"] != nil && reflect.TypeOf(adviceNameM["subdrugs"]).String() == "[]interface {}" {
+				subdrugs := adviceNameM["subdrugs"].([]interface{})
+				if len(subdrugs) > 0 {
+					for _, subdrug := range subdrugs {
+						var s models.GroupAdvice
+						s.Remark = Remark
+						s.AdviceType = adviceType
+						s.StartTime = StartTime
+						s.AdviceDate = AdviceDate
+						s.RecordDate = RecordDate
+						s.Status = 1
+						s.CreatedTime = time.Now().Unix()
+						s.UpdatedTime = time.Now().Unix()
+						s.StopState = 2
+						s.ExecutionState = 2
+						s.UserOrgId = adminUserInfo.Org.Id
+						s.PatientId = patientInfo.ID
+						s.AdviceDoctor = adminUserInfo.AdminUser.Id
+
+						errcode := c.setAdviceWithJSON(&s, subdrug.(map[string]interface{}))
+						if errcode > 0 {
+							c.ServeFailJSONWithSGJErrorCode(errcode)
+							return
+						}
+
+						advice.Children = append(advice.Children, &s)
+					}
+				}
+			}
+
+			advices = append(advices, &advice)
+		}
+
+		newAdvices, createErr := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, group_no)
+		if createErr != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
+			return
+		}
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":     "ok",
+			"advices": newAdvices,
+		})
 		return
-	}
-	adviceNames := dataBody["adviceNames"].([]interface{})
-	for _, adviceNameMap := range adviceNames {
-		adviceNameM := adviceNameMap.(map[string]interface{})
-		var advice models.GroupAdvice
-		advice.Remark = Remark
-		advice.AdviceType = adviceType
-		advice.StartTime = StartTime
-		advice.AdviceDate = AdviceDate
-		advice.RecordDate = RecordDate
+
+	} else if is_child == 2 {
+
+		patient, _ := c.GetInt64("id", 0)
+		if patient <= 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+
+		adminUserInfo := c.GetMobileAdminUserInfo()
+		patientInfo, _ := service.FindPatientById(adminUserInfo.Org.Id, patient)
+		if patientInfo.ID == 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+			return
+		}
+		//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+
+		//if appRole.UserType == 3{
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdvicePermissionDeniedModify)
+		//	return
+		//}
+
+		//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+		//
+		//if appRole.UserType == 3 {
+		//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+		//	if getPermissionErr != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//		return
+		//	} else if headNursePermission == nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+		//		return
+		//	}
+		//}
+
+		var advice models.DoctorAdvice
+		code := adviceFormData(&advice, c.Ctx.Input.RequestBody, "create")
+		if code > 0 {
+			c.ServeFailJSONWithSGJErrorCode(code)
+			return
+		}
+
+		if advice.ParentId > 0 {
+			old, _ := service.FindDoctorAdvice(adminUserInfo.Org.Id, advice.ParentId)
+			if old.ID == 0 || old.PatientId != patient {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParentAdviceNotExist)
+				return
+			}
+
+			if old.StopState == 1 || old.ExecutionState == 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceStoped)
+				return
+			}
+
+			if old.ParentId > 0 {
+				advice.ParentId = old.ParentId
+			}
+			advice.StartTime = old.StartTime
+			advice.AdviceDoctor = old.AdviceDoctor
+			advice.DeliveryWay = old.DeliveryWay
+			advice.ExecutionFrequency = old.ExecutionFrequency
+			advice.GroupNo = old.GroupNo
+
+		}
+
 		advice.Status = 1
 		advice.CreatedTime = time.Now().Unix()
 		advice.UpdatedTime = time.Now().Unix()
 		advice.StopState = 2
 		advice.ExecutionState = 2
 		advice.UserOrgId = adminUserInfo.Org.Id
-		advice.PatientId = patientInfo.ID
+		advice.PatientId = patient
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 
-		errcode := c.setAdviceWithJSON(&advice, adviceNameM)
-		if errcode > 0 {
-			c.ServeFailJSONWithSGJErrorCode(errcode)
+		err := service.CreateDoctorAdvice(&advice)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 			return
 		}
 
-		if adviceNameM["subdrugs"] != nil && reflect.TypeOf(adviceNameM["subdrugs"]).String() == "[]interface {}" {
-			subdrugs := adviceNameM["subdrugs"].([]interface{})
-			if len(subdrugs) > 0 {
-				for _, subdrug := range subdrugs {
-					var s models.GroupAdvice
-					s.Remark = Remark
-					s.AdviceType = adviceType
-					s.StartTime = StartTime
-					s.AdviceDate = AdviceDate
-					s.RecordDate = RecordDate
-					s.Status = 1
-					s.CreatedTime = time.Now().Unix()
-					s.UpdatedTime = time.Now().Unix()
-					s.StopState = 2
-					s.ExecutionState = 2
-					s.UserOrgId = adminUserInfo.Org.Id
-					s.PatientId = patientInfo.ID
-					s.AdviceDoctor = adminUserInfo.AdminUser.Id
-
-					errcode := c.setAdviceWithJSON(&s, subdrug.(map[string]interface{}))
-					if errcode > 0 {
-						c.ServeFailJSONWithSGJErrorCode(errcode)
-						return
-					}
-
-					advice.Children = append(advice.Children, &s)
-				}
-			}
-		}
-
-		advices = append(advices, &advice)
-	}
-
-	newAdvices, createErr := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, group_no)
-	if createErr != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":    "ok",
+			"advice": advice,
+		})
 		return
+
 	}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg":     "ok",
-		"advices": newAdvices,
-	})
-	return
 }
 
 func (c *PatientApiController) setAdviceWithJSON(advice *models.GroupAdvice, json map[string]interface{}) int {

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -21,6 +21,7 @@ type HomeController struct {
 }
 
 func (this *HomeController) GetHomeData() {
+
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	if adminUserInfo.Org != nil && adminUserInfo.Org.Id != 0 {
 		//获取该管理员所有机构列表
@@ -72,13 +73,14 @@ func (this *HomeController) GetHomeData() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
-
+		cretor := adminUserInfo.AdminUser.Id
 		this.ServeSuccessJSON(map[string]interface{}{
 			"orgs":            orgs,
 			"apps":            apps,
 			"banners":         banners,
 			"isCreateOrg":     true,
 			"isSubSuperAdmin": isSubSuperAdmin,
+			"cretor":          cretor,
 		})
 	} else {
 		apps, err := service.GetAllApp(0)
@@ -283,14 +285,6 @@ func (this *HomeController) CreateOrg() {
 	}
 	orgPhone := this.GetString("telephone")
 
-	if len(orgPhone) > 0 {
-		if utils.PhoneRegexp().MatchString(orgPhone) == false {
-			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			this.ServeJSON()
-			return
-		}
-	}
-
 	provinceID := 0
 	cityID := 0
 	districtID := 0
@@ -377,8 +371,8 @@ func (this *HomeController) CreateOrg() {
 		InitRoleAndPurviews(org)
 		//初始化设备管理
 		InitEquitMentInformation(org)
-
-		//初始化显示配置
+		//初始化显示配置和打印模版
+		InitShowConfig(org)
 
 		if len(orgs) == 0 {
 			ip := utils.GetIP(this.Ctx.Request)
@@ -721,3 +715,20 @@ func RemoveRepeatedPurviewElement2(arr []string) (newArr []string) {
 	}
 	return
 }
+
+func RemoveRepeatedOrgElementTwo(orgs []*models.SgjUserOrg) (newOrgs []*models.SgjUserOrg) {
+	newOrgs = make([]*models.SgjUserOrg, 0)
+	for i := 0; i < len(orgs); i++ {
+		repeat := false
+		for j := i + 1; j < len(orgs); j++ {
+			if orgs[i].ID == orgs[j].ID {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newOrgs = append(newOrgs, orgs[i])
+		}
+	}
+	return
+}

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -235,14 +235,12 @@ func (this *MobileRegistController) CreateOrg() {
 		InitPatientAndSchedule(org)
 		//初始化透析方案
 		InitSystemPrescrption(org)
-		//初始化医嘱模版
-		//InitAdviceTemplate(org)
 		//初始化角色和权限
 		InitRoleAndPurviews(org)
 		//初始化设备管理org
 		InitEquitMentInformation(org)
-		//初始化显示配置
-		//InitShowConfig(org)
+		//初始化显示配置和打印模版
+		InitShowConfig(org)
 
 		//创建完机构后进行登录验证操作
 		ip := utils.GetIP(this.Ctx.Request)
@@ -1176,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

@@ -1496,6 +1496,26 @@ func (this *NewDialysisApiController) GetAllDoctor() {
 	})
 }
 
+func (this *NewDialysisApiController) GetAllProjectName() {
+	id := this.GetString("date")
+	fmt.Println("id是", id)
+	ids, _ := strconv.ParseInt(id, 10, 64)
+	patientid := this.GetString("patientid")
+	fmt.Println("patient", patientid)
+	paientids, _ := strconv.ParseInt(patientid, 10, 64)
+	patient, _ := service.GetNewPatient(paientids)
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	projectName, err := service.GetAllProjectName(ids, orgid, patient.BloodId)
+	fmt.Println("projectname----------------------------------", err)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projectName": projectName,
+	})
+}
+
 func (this *NewDialysisApiController) GetAllInspection() {
 
 	//查询该机构是否存在检验检测项目
@@ -1701,10 +1721,11 @@ func (this *NewDialysisApiController) SaveMessage() {
 	fmt.Println("id", id)
 	message := this.GetString("message")
 	fmt.Println("message", message)
+	orgid, _ := this.GetInt64("orgid")
 	role := models.SgjUserAdminRole{
 		Message: message,
 	}
-	err := service.SaveMessage(id, &role)
+	err := service.SaveMessage(id, orgid, &role)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1719,8 +1740,10 @@ func (this *NewDialysisApiController) SaveSex() {
 	fmt.Println("sex", sex)
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
+	orgid, _ := this.GetInt64("orgid")
 	role := models.SgjUserAdminRole{
-		Sex: sex,
+		Sex:   sex,
+		OrgId: orgid,
 	}
 	err := service.SaveSex(id, &role)
 	if err != nil {
@@ -1743,8 +1766,11 @@ func (this *NewDialysisApiController) SaveBirthday() {
 	timeLayout := "2006-01-02 15:04:05"
 	theTime, err := utils.ParseTimeStringToTime(timeLayout, birthday+" 00:00:00")
 	birth := theTime.Unix()
+	orgid := dataBody["orgid"].(string)
+	orgids, err := strconv.ParseInt(orgid, 10, 64)
 	role := models.SgjUserAdminRole{
 		Birthday: birth,
+		OrgId:    orgids,
 	}
 	err = service.SaveBirthday(ids, &role)
 	if err != nil {
@@ -1772,14 +1798,24 @@ func (this *NewDialysisApiController) GetOrgName() {
 func (this *NewDialysisApiController) GetRoleName() {
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
-	orgid := this.GetMobileAdminUserInfo().Org.Id
+	orgid, _ := this.GetInt64("orgid")
 	fmt.Println("orgid", orgid)
-	appid := this.GetMobileAdminUserInfo().App.Id
-	fmt.Println("appid", appid)
-	name, err := service.GetRoleName(id, orgid, appid)
+	//跟剧机构ID获取APPID
+	app, _ := service.GetAppId(orgid)
+	name, err := service.GetRoleName(id, orgid, app.Id)
 	//获取管理员
 	admin, err := service.GetAdmin(id)
-	positionName, err := service.GetPositionName(id, orgid, appid)
+	positionName, err := service.GetPositionName(id, orgid, app.Id)
+	role_ids := strings.Split(positionName.RoleIds, ",")
+	var names = ""
+	for _, item := range role_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		role, _ := service.GetRole(id)
+		if len(role.RoleName) != 0 {
+			names = role.RoleName + "," + names
+		}
+	}
+	fmt.Println("role_ids--------------", role_ids)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1788,6 +1824,7 @@ func (this *NewDialysisApiController) GetRoleName() {
 		"name":         name,
 		"positionName": positionName,
 		"admin":        admin,
+		"names":        names,
 	})
 }
 
@@ -1986,8 +2023,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")
@@ -2196,7 +2231,8 @@ func (this *NewDialysisApiController) EditOrg() {
 
 func (this *NewDialysisApiController) GetMyInforName() {
 	id, _ := this.GetInt64("id")
-	Username, err := service.GetAdminName(id)
+	orgid, _ := this.GetInt64("orgid")
+	Username, err := service.GetAdminName(id, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -2208,10 +2244,16 @@ func (this *NewDialysisApiController) GetMyInforName() {
 
 func (this *NewDialysisApiController) GetMyInformationFour() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
-	creatId := adminUserInfo.AdminUser.Id
-	fmt.Println("创建者ID", creatId)
+	//creatId := adminUserInfo.AdminUser.Id
+	//fmt.Println("创建者ID", creatId)
 	orgid := adminUserInfo.Org.Id
+	//跟剧机构ID获取创建者ID
 	fmt.Println("orgid", orgid)
+	//OrgId, _ := service.GetCreatByOrgId(orgid)
+	//fmt.Println("创建者ID", OrgId.Creator)
+	creatId := adminUserInfo.AdminUser.Id
+	fmt.Println("creatid", creatId)
+	fmt.Println("当前机构ID信息", orgid)
 	Username, err := service.GetMyOrgInformationFour(creatId, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -2327,7 +2369,6 @@ 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)
@@ -2341,11 +2382,12 @@ func (this *NewDialysisApiController) GetMyOrgInformation() {
 func (this *NewDialysisApiController) SaveNameTwo() {
 	id, _ := this.GetInt64("id")
 	name := this.GetString("name")
-	fmt.Println("name------------------", name)
+	orgid, _ := this.GetInt64("orgid")
 	role := models.SgjUserAdminRole{
 		UserName: name,
 	}
-	err := service.SaveNameTwo(id, &role)
+	err := service.SaveNameTwo(id, orgid, &role)
+	fmt.Println("err", err)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -2382,3 +2424,110 @@ func (this *NewDialysisApiController) GetCurrentOrg() {
 		"signToken": signToken,
 	})
 }
+
+func (this *NewDialysisApiController) GetMyMobile() {
+	id, _ := this.GetInt64("id")
+	mobile, err := service.GetMyMobile(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"mobile": mobile,
+	})
+}
+
+func (this *NewDialysisApiController) SumitForm() {
+
+	name := this.GetString("name")
+	fmt.Println("姓名", name)
+	mobile := this.GetString("mobile")
+	fmt.Println("mobile", mobile)
+	address := this.GetString("address")
+	fmt.Println("address", address)
+	positon, _ := this.GetInt64("position")
+	fmt.Println("职位", positon)
+	hospitalName := this.GetString("hospitalName")
+	fmt.Println("医院名称", hospitalName)
+	systemName := this.GetString("systemName")
+	fmt.Println("系统名称", systemName)
+	isUser, _ := this.GetInt64("isUser")
+	fmt.Println("是否使用", isUser)
+	isThink, _ := this.GetInt64("isThink")
+	fmt.Println("是否考虑", isThink)
+	result := this.GetString("result")
+	fmt.Println("result", result)
+	otherRemark := this.GetString("otherRemark")
+	fmt.Println("result", otherRemark)
+	otherMessage := this.GetString("otherMessage")
+	fmt.Println("otherMessage", otherMessage)
+	gift, _ := this.GetInt64("gift")
+	fmt.Println("gift", gift)
+	admininfo := this.GetMobileAdminUserInfo()
+	creator := admininfo.AdminUser.Id
+	fmt.Println("创建者", creator)
+	_, errcode := service.GetActivtyCreator(creator)
+	if errcode == gorm.ErrRecordNotFound {
+		table := models.KyActivityTable{
+			Name:         name,
+			Phone:        mobile,
+			Address:      address,
+			Position:     positon,
+			HospitalName: hospitalName,
+			SystemName:   systemName,
+			IsUser:       isUser,
+			IsThink:      isThink,
+			OtherMode:    result,
+			OtherRemark:  otherRemark,
+			OtherMessage: otherMessage,
+			Gift:         gift,
+			AdminUserId:  creator,
+			Status:       1,
+			Ctime:        time.Now().Unix(),
+		}
+		err := service.CreateTable(&table)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"table": table,
+		})
+	} else if errcode == nil {
+		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		this.ServeJSON()
+		return
+	} else {
+		return
+	}
+}
+
+func (this *NewDialysisApiController) GetMobile() {
+	fmt.Println("--------------触发了没有")
+	adminInfo := this.GetMobileAdminUserInfo()
+	id := adminInfo.AdminUser.Id
+
+	mobile, err := service.GetMobile(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"mobile": mobile,
+	})
+}
+
+func (this *NewDialysisApiController) GetRolePosition() {
+
+	adminInfo := this.GetMobileAdminUserInfo()
+	cretor := adminInfo.AdminUser.Id
+	cretorPosition, err := service.GetRolePosition(cretor)
+	fmt.Println("cretorPosition", cretorPosition.RoleName)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"cretorPosition": cretorPosition,
+	})
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -101,6 +101,7 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/deletemanagement", &NewDialysisApiController{}, "Delete:DeleteManagement")
 	beego.Router("/m/api/patient/updatedpatient", &NewDialysisApiController{}, "Post:UpdatedPatient")
 	beego.Router("/m/api/patient/getalldoctor", &NewDialysisApiController{}, "Get:GetAllDoctor")
+	beego.Router("/m/api/patient/getallprojectname", &NewDialysisApiController{}, "Get:GetAllProjectName")
 	beego.Router("/m/api/patient/getallinspection", &NewDialysisApiController{}, "Get:GetAllInspection")
 	beego.Router("/m/api/patient/getinspection", &NewDialysisApiController{}, "Get:GetInspection")
 	beego.Router("/m/api/patient/getmyinformation", &NewDialysisApiController{}, "Get:GetMyInformation")
@@ -148,4 +149,8 @@ func NewMobileAPIControllersRegisterRouters() {
 	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")
+	beego.Router("/m/api/org/getMyMobile", &NewDialysisApiController{}, "Get:GetMyMobile")
+	beego.Router("/m/api/patient/sumitform", &NewDialysisApiController{}, "Get:SumitForm")
+	beego.Router("/m/api/patient/getroleposition", &NewDialysisApiController{}, "Get:GetRolePosition")
+	beego.Router("/m/api/patient/getmobile", &NewDialysisApiController{}, "Get:GetMobile")
 }

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,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",
-      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029"
-    },
-    {
+      "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,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)
@@ -1060,7 +1060,27 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	adviceDate, _ := dataBody["advice_date"].(string)
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	startTime2, _ := dataBody["start_time"].(string)
+
+	time_arr := strings.Split(startTime2, " ")
+
+	if len(time_arr) > 0 {
+		startTime2 = time_arr[0]
+	}
+
+	if dataBody["advice_date"] == nil || reflect.TypeOf(dataBody["advice_date"]).String() != "string" {
+		utils.ErrorLog("advice_date")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adviceDate := startTime2
 	if len(adviceDate) == 0 {
 		utils.ErrorLog("len(adviceDate) == 0")
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1547,11 +1567,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 +1576,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 +1624,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 {
@@ -468,7 +468,6 @@ func (c *PublicApiController) HandleData() {
 	//			continue
 	//		}
 	//
-	//
 	//		app.OrgId = apps.OrgId
 	//		app.Creator = int(org.Creator)
 	//		app.Pid = xt_temp_org_app.Id
@@ -490,7 +489,7 @@ func (c *PublicApiController) HandleData() {
 	//InitRoleAndPurviews(org_ids)
 
 	//var org_id int = 0
-	////管理员
+	//管理员
 	//app_roles  := service.GetAllUserRoleByUserTypeOne(org_id)
 	//for _, item := range app_roles{
 	//	var ids string
@@ -501,28 +500,28 @@ func (c *PublicApiController) HandleData() {
 	//	}
 	//	service.UpdateRoleIds(item.Id, ids)
 	//}
-	////护士医生
+	//护士医生
 	//app_roles2  := service.GetAllUserRoleByUserTypeOther()
-	//	//for _, item := range app_roles2{
-	//	//	var ids string
-	//	//	if len(item.RoleIds) == 0{
-	//	//		ids = strconv.FormatInt( item.RoleId,10)
-	//	//	}else{
-	//	//		ids = item.RoleIds + ","+strconv.FormatInt( item.RoleId,10)
-	//	//	}
-	//	//	if item.UserType == 2{
-	//	//		role := service.FindRoleByUserTypeOne(item.OrgId)
-	//	//		ids = ids +"," + strconv.FormatInt(role.Id,10)
-	//	//
-	//	//	} else if item.UserType == 3{
-	//	//		role := service.FindRoleByUserTypeTwo(item.OrgId)
-	//	//		ids = ids +"," + strconv.FormatInt(role.Id,10)
-	//	//	}
-	//	//	service.UpdateRoleIds(item.Id, ids)
-	//	//}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "ok",
-	})
+	//	for _, item := range app_roles2{
+	//		var ids string
+	//		if len(item.RoleIds) == 0{
+	//			ids = strconv.FormatInt( item.RoleId,10)
+	//		}else{
+	//			ids = item.RoleIds + ","+strconv.FormatInt( item.RoleId,10)
+	//		}
+	//		if item.UserType == 2{
+	//			role := service.FindRoleByUserTypeOne(item.OrgId)
+	//			ids = ids +"," + strconv.FormatInt(role.Id,10)
+	//
+	//		} else if item.UserType == 3{
+	//			role := service.FindRoleByUserTypeTwo(item.OrgId)
+	//			ids = ids +"," + strconv.FormatInt(role.Id,10)
+	//		}
+	//		service.UpdateRoleIds(item.Id, ids)
+	//	}
+	//c.ServeSuccessJSON(map[string]interface{}{
+	//	"msg": "ok",
+	//})
 
 }
 
@@ -530,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,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,8 +27,45 @@
       "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",
-      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029"
+      "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,94",
+      "func_ids": ""
+    },{
+      "role_name": "运营",
+      "role_introduction": "运营角色能够在SCRM中管理微网站、使用营销工具、做会员管理和分销商品经营的操作",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 0,
+      "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": "技师角色能够进行设备的管理，日常维护维修记录等",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 0,
+      "number": 9994,
+      "purview_ids": "77,78,79,80,197,76",
+      "func_ids": ""
+    },
+    {
+      "role_name": "院长",
+      "role_introduction": "院长角色了解血透患者血液透析质量和相关的大数据，以及掌握透析中心整体运营情况",
+      "is_super_admin": false,
+      "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,94",
+      "func_ids": ""
     }
   ]
 }

controllers/verify_login_controller.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"github.com/astaxie/beego"
 	"net/url"
+	"regexp"
 	"strconv"
 	"strings"
 )
@@ -186,15 +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)
@@ -361,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/device_models.go

@@ -832,6 +832,9 @@ type XtAssessmentAfterDislysis struct {
 	AssessmentTime                  int64   `gorm:"column:assessment_time" json:"assessment_time" form:"assessment_time"`
 	IsEat                           int64   `gorm:"column:is_eat" json:"is_eat" form:"is_eat"`
 	DialysisIntakesUnit             int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit" form:"dialysis_intakes_unit"`
+	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
+	CvcB                            float64 `gorm:"column:cvc_b" json:"cvc_b" form:"cvc_b"`
+	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 }
 
 func (XtAssessmentAfterDislysis) TableName() string {

models/dialysis.go

@@ -545,6 +545,9 @@ type AssessmentAfterDislysis struct {
 	AssessmentDoctor                int64   `gorm:"column:assessment_doctor" json:"assessment_doctor"`
 	IsEat                           int64   `gorm:"column:is_eat" json:"is_eat"`
 	DialysisIntakesUnit             int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit"`
+	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
+	CvcB                            float64 `gorm:"column:cvc_b" json:"cvc_b" form:"cvc_b"`
+	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {
@@ -804,22 +807,23 @@ func (GobalTemplate) TableName() string {
 }
 
 type SgjUserAdminRole struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	OrgId       int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	AppId       int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
-	RoleId      int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
-	UserName    string `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	Avatar      string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	UserType    int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
-	UserTitle   int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
-	Intro       string `gorm:"column:intro" json:"intro" form:"intro"`
-	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"`
-	Message     string `gorm:"column:message" json:"message" form:"message"`
-	Sex         int64  `gorm:"column:sex" json:"sex" form:"sex"`
-	Birthday    int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
+	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"`
+	Message       string `gorm:"column:message" json:"message" form:"message"`
+	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
 }
 
 func (SgjUserAdminRole) TableName() string {

models/patient_models.go

@@ -813,3 +813,49 @@ func (SgjUserAdminLoginLog) TableName() string {
 
 	return "sgj_user_admin_login_log"
 }
+
+type KyActivityTable struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	Phone        string `gorm:"column:phone" json:"phone" form:"phone"`
+	Address      string `gorm:"column:address" json:"address" form:"address"`
+	Position     int64  `gorm:"column:position" json:"position" form:"position"`
+	HospitalName string `gorm:"column:hospital_name" json:"hospital_name" form:"hospital_name"`
+	IsUser       int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	IsThink      int64  `gorm:"column:is_think" json:"is_think" form:"is_think"`
+	OtherMode    string `gorm:"column:other_mode" json:"other_mode" form:"other_mode"`
+	OtherRemark  string `gorm:"column:other_remark" json:"other_remark" form:"other_remark"`
+	Gift         int64  `gorm:"column:gift" json:"gift" form:"gift"`
+	OtherMessage string `gorm:"column:other_message" json:"other_message" form:"other_message"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
+	SystemName   string `gorm:"column:system_name" json:"system_name" form:"system_name"`
+	AdminUserId  int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+}
+
+func (KyActivityTable) TableName() string {
+
+	return "ky_activity_table"
+}
+
+type SgjUserRole struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	RoleName         string `gorm:"column:role_name" json:"role_name" form:"role_name"`
+	RoleIntroduction string `gorm:"column:role_introduction" json:"role_introduction" form:"role_introduction"`
+	Creator          int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId            int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	IsSuperAdmin     int64  `gorm:"column:is_super_admin" json:"is_super_admin" form:"is_super_admin"`
+	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"`
+	Number           int64  `gorm:"column:number" json:"number" form:"number"`
+	IsSystem         int64  `gorm:"column:is_system" json:"is_system" form:"is_system"`
+}
+
+func (SgjUserRole) TableName() string {
+
+	return "sgj_user_role"
+}

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

@@ -21,7 +21,7 @@ func GetAppVersionByAppType(apptype int64) (*models.AppVersion, error) {
 
 func GetAllAppOrg() ([]*models.OrgApp, error) {
 	var app []*models.OrgApp
-	err := readUserDbT.Model(&models.OrgApp{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
+	err := readUserDb.Model(&models.OrgApp{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, nil
 	}
@@ -60,7 +60,7 @@ func GetApp() ([]*models.OrgApp, error) {
 
 func GetAppByType(orgID int64, app_type int) (*models.OrgApp, error) {
 	var apps models.OrgApp
-	err := readUserDbT.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
+	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
 	if err != nil {
 		return nil, err
 	}
@@ -68,7 +68,7 @@ func GetAppByType(orgID int64, app_type int) (*models.OrgApp, error) {
 }
 
 func CreateOrgApp(app *models.OrgApp) {
-	writeUserDbT.Create(&app)
+	writeUserDb.Create(&app)
 
 }
 
@@ -84,7 +84,7 @@ func GetAllUserRole(org_id int64) (appRole []*models.App_Role) {
 }
 
 func GetAllUserRoleByUserTypeOne(org_id int) (appRole []*models.App_Role) {
-	readUserDbT.Model(&models.App_Role{}).Where("status = 1 AND user_type = 1").Find(&appRole)
+	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND user_type = 1").Find(&appRole)
 	return
 }
 
@@ -92,7 +92,7 @@ func GetAllUserRoleByUserTypeOther() (appRole []*models.App_Role) {
 	//app, _ := GetOrgApp(int64(org_id), 3)
 
 	//if org_id == 0 {
-	readUserDbT.Model(&models.App_Role{}).Where("status = 1 AND user_type > 1").Find(&appRole)
+	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND user_type > 1").Find(&appRole)
 	//
 	//} else {
 	//	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND org_id = ?  AND user_type > 1 AND app_id = ? ", org_id, app.Id).Find(&appRole)
@@ -102,18 +102,18 @@ func GetAllUserRoleByUserTypeOther() (appRole []*models.App_Role) {
 }
 
 func FindRoleByUserTypeOne(org_id int64) (role models.Role) {
-	readUserDbT.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 2 AND role_name = '医生'", org_id).First(&role)
+	readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 2 AND role_name = '医生'", org_id).First(&role)
 	return
 }
 
 func FindRoleByUserTypeTwo(org_id int64) (role models.Role) {
-	readUserDbT.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 3 AND role_name = '护士'", org_id).First(&role)
+	readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 3 AND role_name = '护士'", org_id).First(&role)
 	return
 }
 
 func GetAllRole() ([]*models.Role, error) {
 	var app []*models.Role
-	err := readUserDbT.Model(&models.Role{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
+	err := readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, nil
 	}
@@ -124,13 +124,13 @@ func GetAllRole() ([]*models.Role, error) {
 }
 
 func UpdateRoleIds(id int64, ids string) {
-	writeUserDbT.Model(&models.App_Role{}).Where("status = 1 AND id = ?", id).Updates(map[string]interface{}{"role_ids": ids, "mtime": time.Now().Unix()})
+	writeUserDb.Model(&models.App_Role{}).Where("status = 1 AND id = ?", id).Updates(map[string]interface{}{"role_ids": ids, "mtime": time.Now().Unix()})
 
 }
 
 func GetOrgAppA(orgID int64, app_type int) (*models.OrgApp, error) {
 	var apps models.OrgApp
-	err := readUserDbT.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
+	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
 	if err != nil {
 		return nil, err
 	}
@@ -139,7 +139,7 @@ func GetOrgAppA(orgID int64, app_type int) (*models.OrgApp, error) {
 
 func GetOrgByIdB(orgID int64) (*models.Org, error) {
 	var org models.Org
-	err := readUserDbT.Model(&models.Org{}).Where("id = ?", orgID).First(&org).Error
+	err := readUserDb.Model(&models.Org{}).Where("id = ?", orgID).First(&org).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -152,7 +152,7 @@ func GetOrgByIdB(orgID int64) (*models.Org, error) {
 
 func GetOrgAppB(orgID int64, app_type int) (*models.OrgApp, error) {
 	var apps models.OrgApp
-	err := readUserDbT.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
+	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
 	if err != nil {
 		return nil, err
 	}
@@ -160,16 +160,25 @@ func GetOrgAppB(orgID int64, app_type int) (*models.OrgApp, error) {
 }
 
 func CreateOrgRoleB(role *models.Role) (err error) {
-	err = writeUserDbT.Create(&role).Error
+	err = writeUserDb.Create(&role).Error
 	return
 }
 
 func CreateRolePurviewB(purview *models.RolePurview) (err error) {
-	err = writeUserDbT.Create(&purview).Error
+	err = writeUserDb.Create(&purview).Error
 	return
 }
 
 func CreateFuncRolePurviewB(purview *models.SgjUserRoleFuncPurview) (err error) {
-	err = writeUserDbT.Create(&purview).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/data.go

@@ -187,6 +187,6 @@ func FindSysDialysisFiledByOrgId() (filedConfig []*models.FiledConfig, err error
 }
 
 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
+	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", org_id).Error
 	return
 }

service/gobal_config_service.go

@@ -81,7 +81,7 @@ func UpdateFiledConfig(org_id int64) (err error) {
 }
 
 func FindAllHideFiledConfig(template_id int64) (err error, config []*models.FiledConfig) {
-	err = readDb.Model(&models.FiledConfig{}).Where("sys_module = 0  AND is_show = 2", template_id).Find(&config).Error
+	err = readDb.Model(&models.FiledConfig{}).Where("sys_module = ?  AND is_show = 2", template_id).Find(&config).Error
 	return
 }
 

service/inspection_service.go

@@ -8,7 +8,13 @@ import (
 )
 
 func GetInspectionReference(orgId int64) (reference []*models.InspectionReference, err error) {
-	err = readDb.Model(&models.InspectionReference{}).Where("(org_id=0 OR org_id=?) and status=1", orgId).Order("project_id").Find(&reference).Error
+	var count int
+	err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1", orgId).Count(&count).Error
+	if count > 0 {
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1", orgId).Order("project_id").Find(&reference).Error
+	} else {
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1").Order("project_id").Find(&reference).Error
+	}
 	return
 }
 

service/manage_service.go

@@ -416,6 +416,12 @@ func GetOrgName(orgid int64) (models.Org, error) {
 	return org, err
 }
 
+func GetMyMobile(id int64) (models.SgjUserAdmin, error) {
+	admin := models.SgjUserAdmin{}
+	err := UserReadDB().Model(&admin).Where("id=? and status = 1", id).Find(&admin).Error
+	return admin, err
+}
+
 func CreateCulture(culture *models.DeviceCulture) error {
 
 	err := writeUserDb.Create(&culture).Error
@@ -1062,3 +1068,33 @@ func DeleteImages(id int64) error {
 	err := UserWriteDB().Model(&repair).Where("id=?", id).Update(map[string]interface{}{"images": "", "image_name": ""}).Error
 	return err
 }
+
+func GetActivtyCreator(creator int64) (*models.KyActivityTable, error) {
+	table := models.KyActivityTable{}
+	err := UserReadDB().Model(&table).Where("admin_user_id = ? and status =1", creator).Find(&table).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &table, nil
+}
+
+func CreateTable(table *models.KyActivityTable) error {
+
+	err := UserWriteDB().Model(&table).Create(&table).Error
+	return err
+}
+
+func GetRolePosition(id int64) (models.SgjUserRole, error) {
+	role := models.SgjUserRole{}
+	err := UserReadDB().Where("id = ? And status =1", id).Find(&role).Error
+	return role, err
+}
+
+func GetMobile(id int64) (models.SgjUserAdmin, error) {
+	admin := models.SgjUserAdmin{}
+	err := UserReadDB().Where("id=? and status = 1", id).Find(&admin).Error
+	return admin, err
+}

service/mobile_dialysis_service.go

@@ -557,6 +557,11 @@ func MobileGetLastTimeAssessmentAfterDislysis(orgID int64, patientID int64, maxD
 	}
 	return &record, nil
 }
+func MobileGetLast(orgID int64, patientID int64, maxDate int64) (models.AssessmentAfterDislysis, error) {
+	dislysis := models.AssessmentAfterDislysis{}
+	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date < ?", patientID, orgID, maxDate).Order("assessment_date desc").First(&dislysis).Error
+	return dislysis, err
+}
 
 // 治疗小结
 func MobileGetTreatmentSummary(orgID int64, patientID int64, recordDate int64) (*models.TreatmentSummary, error) {

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/patientmanage_service.go

@@ -983,6 +983,13 @@ func GetInspectionByOrgId(orgid int64) (*models.XtInspectionReference, error) {
 
 }
 
+func GetAllProjectName(date int64, orgid int64, patientid int64) (inspection []*models.XtInspection, err error) {
+
+	err = XTReadDB().Model(&inspection).Where("inspect_date = ? and org_id = ? and patient_id = ? and status = 1", date, orgid, patientid).Order("inspect_date desc").Group("project_name").Find(&inspection).Error
+
+	return inspection, err
+}
+
 func GetAllInspection(orgid int64) (inspection []*models.XtInspectionReference, err error) {
 
 	err = XTReadDB().Model(&inspection).Where("org_id = ? and status = 1", orgid).Group("project_name").Find(&inspection).Error
@@ -1053,9 +1060,9 @@ func DeleteChildInspection(name string, date int64, orgid int64) error {
 	return err
 }
 
-func SaveMessage(id int64, role *models.SgjUserAdminRole) error {
+func SaveMessage(id int64, orgid int64, role *models.SgjUserAdminRole) error {
 
-	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ?", id).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ? and org_id = ?", id, orgid).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1250,17 +1257,23 @@ func GetMyInfoName(id int64) (models.SgjUserAdminRole, error) {
 	return role, err
 }
 
-func GetAdminName(id int64) (models.AdminUsers, error) {
+func GetAdminName(id int64, orgid int64) (models.AdminUsers, error) {
 	user := models.AdminUsers{}
 	//err := UserReadDB().Model(&user).Where("id=? and status =1", id).Find(&user).Error
 	//return user, err
 	db := UserReadDB().Table("sgj_user_admin as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Println("table", table)
-	err := db.Group("x.id").Select("x.id,x.mobile,x.password,x.is_super_admin,x.source,x.name,r.admin_user_id,r.org_id,r.app_id,r.role_id,r.user_name,r.avatar,r.message,r.sex,r.birthday").Where("x.id = ?", id).Joins("left join sgj_user_admin_role as r on r.admin_user_id = x.id").Scan(&user).Error
+	err := db.Group("x.id").Select("x.id,x.mobile,x.password,x.is_super_admin,x.source,x.name,r.admin_user_id,r.org_id,r.app_id,r.role_id,r.user_name,r.avatar,r.message,r.sex,r.birthday").Where("x.id = ?", id).Joins("left join sgj_user_admin_role as r on r.admin_user_id = x.id and r.org_id = ?", orgid).Scan(&user).Error
 	return user, err
 }
 
+func GetCreatByOrgId(orgid int64) (models.SgjUserOrg, error) {
+	org := models.SgjUserOrg{}
+	err := UserReadDB().Model(&org).Where("id=? and status = 1", orgid).Find(&org).Error
+	return org, 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
@@ -1310,6 +1323,12 @@ func CreateLoginLod(log *models.SgjUserAdminLoginLog) error {
 	return err
 }
 
+func GetAppId(orgid int64) (models.OrgApp, error) {
+	app := models.OrgApp{}
+	err := UserReadDB().Model(&app).Where("org_id = ? and status = 1 and app_type = 3", orgid).Find(&app).Error
+	return app, err
+}
+
 func GetRoleName(adminid int64, orgid int64, appid int64) (models.Roles, error) {
 
 	role := models.Roles{}
@@ -1317,6 +1336,12 @@ func GetRoleName(adminid int64, orgid int64, appid int64) (models.Roles, error)
 	return role, err
 }
 
+func GetRole(id int64) (models.Role, error) {
+	role := models.Role{}
+	err := UserReadDB().Model(&role).Where("id = ? and status =1", id).Find(&role).Error
+	return role, err
+}
+
 func GetPositionName(adminid int64, orgid int64, appid int64) (models.App_Role, error) {
 
 	role := models.App_Role{}
@@ -1349,8 +1374,8 @@ func GetMyOrgInformation(id int64, appid int64) (models.SgjUserAdminRole, error)
 	return admin, err
 }
 
-func SaveNameTwo(id int64, role *models.SgjUserAdminRole) error {
+func SaveNameTwo(id int64, orgid int64, role *models.SgjUserAdminRole) error {
 
-	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id =?", id).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id =? and org_id = ?", id, orgid).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
 	return err
 }

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -318,6 +318,9 @@ type AssessmentAfterDislysisVM struct {
 	AssessmentDoctor                int64   `gorm:"column:assessment_doctor" json:"assessment_doctor"`
 	IsEat                           int64   `gorm:"column:is_eat" json:"is_eat"`
 	DialysisIntakesUnit             int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit"`
+	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
+	CvcB                            float64 `gorm:"column:cvc_b" json:"cvc_b" form:"cvc_b"`
+	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 }
 
 func (AssessmentAfterDislysisVM) TableName() string {
@@ -381,6 +384,9 @@ type XtAssessmentAfterDislysisVM struct {
 	AssessmentDoctor                int64   `gorm:"column:assessment_doctor" json:"assessment_doctor"`
 	IsEat                           int64   `gorm:"column:is_eat" json:"is_eat"`
 	DialysisIntakesUnit             int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit"`
+	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
+	CvcB                            float64 `gorm:"column:cvc_b" json:"cvc_b" form:"cvc_b"`
+	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 }
 
 func (XtAssessmentAfterDislysisVM) TableName() string {

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
+}