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

controllers/dialysis_api_controller.go

@@ -54,6 +54,8 @@ func DialysisApiRegistRouters() {
 
 	beego.Router("/api/dryweight/commit", &DialysisApiController{}, "Post:UploadDryWeight")
 
+	beego.Router("/api/func_per/get", &DialysisApiController{}, "Get:GetFuncPurview")
+
 }
 
 func (c *DialysisApiController) PostPrescription() {
@@ -4932,3 +4934,113 @@ func (c *DialysisApiController) UploadDryWeight() {
 	}
 
 }
+
+func (this *DialysisApiController) GetFuncPurview() {
+	adminUserInfo := this.GetAdminUserInfo()
+	user_id := adminUserInfo.AdminUser.Id
+	app_id := adminUserInfo.CurrentAppId
+	org_id := adminUserInfo.CurrentOrgId
+	create_url := this.GetString("create_url")
+	modify_url := this.GetString("modify_url")
+	modify_other_url := this.GetString("modify_other_url")
+	del_url := this.GetString("del_url")
+	del_other_url := this.GetString("del_other_url")
+	exce_url := this.GetString("exce_url")
+	check_url := this.GetString("check_url")
+	modify_exce_url := this.GetString("modify_exce_url")
+	module, _ := this.GetInt64("module", 0)
+
+	app_role, _ := service.GetAppRole(org_id, app_id, user_id)
+	var is_has_create bool
+	var is_has_modify bool
+	var is_has_modify_other bool
+	var is_has_del bool
+	var is_has_del_other bool
+	var is_has_exce bool
+	var is_has_check bool
+	var is_has_modify_exce bool
+
+	org, _ := service.GetOrgById(adminUserInfo.CurrentOrgId)
+
+	if adminUserInfo.AdminUser.Id != org.Creator {
+
+		if app_role != nil {
+			if len(app_role.RoleIds) > 0 {
+				roles := strings.Split(app_role.RoleIds, ",")
+				var userRolePurviews string
+				for _, item := range roles {
+					role_id, _ := strconv.ParseInt(item, 10, 64)
+					purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+					if len(userRolePurviews) == 0 {
+						userRolePurviews = purviews
+					} else {
+						userRolePurviews = userRolePurviews + "," + purviews
+					}
+				}
+				userRolePurviewsArr := RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
+				funcPurviews, _ := service.FindAllFuncPurview(userRolePurviewsArr)
+				for _, item := range funcPurviews {
+					//for _, url := range strings.Split(item.Urlfor,","){
+					if strings.Split(item.Urlfor, ",")[0] == create_url {
+						is_has_create = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_url {
+						is_has_modify = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_other_url {
+						is_has_modify_other = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == del_url {
+						is_has_del = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == del_other_url {
+						is_has_del_other = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == exce_url {
+						is_has_exce = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == check_url {
+						is_has_check = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_exce_url {
+						is_has_modify_exce = true
+					}
+
+				}
+			} else {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRole)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"is_has_create":       is_has_create,
+				"is_has_modify":       is_has_modify,
+				"is_has_modify_other": is_has_modify_other,
+				"is_has_del":          is_has_del,
+				"is_has_del_other":    is_has_del_other,
+				"is_has_exce":         is_has_exce,
+				"is_has_check":        is_has_check,
+				"is_has_modify_exce":  is_has_modify_exce,
+				"module":              module,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserIsExit)
+			return
+
+		}
+
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"is_has_create":       true,
+			"is_has_modify":       true,
+			"is_has_modify_other": true,
+			"is_has_del":          true,
+			"is_has_del_other":    true,
+			"is_has_exce":         true,
+			"is_has_check":        true,
+			"is_has_modify_exce":  true,
+			"module":              true,
+		})
+
+	}
+
+}

controllers/integration_config_api_controller.go

@@ -22,6 +22,162 @@ func IntegrationConfigRegistRouters() {
 	beego.Router("/api/adminhis/edit", &IntegrationConfigApiController{}, "post:EditAdminHis")
 	beego.Router("/api/adminhis/create", &IntegrationConfigApiController{}, "post:CreateAdminHis")
 
+	beego.Router("/api/patienthis/getinterface", &IntegrationConfigApiController{}, "post:GetInterface")
+	beego.Router("/api/patienthis/saveinterface", &IntegrationConfigApiController{}, "post:SaveInterface")
+	beego.Router("/api/integration/synclist", &IntegrationConfigApiController{}, "get:GetSyncList")
+	beego.Router("/api/integration/sysinspectionlist", &IntegrationConfigApiController{}, "get:GetSysInspectionList")
+	beego.Router("/api/patienthis/saveinspectionsysitemid", &IntegrationConfigApiController{}, "post:SaveInspectionSysItemId")
+}
+
+func (c *IntegrationConfigApiController) SaveInspectionSysItemId() {
+	adminUserInfo := c.GetAdminUserInfo()
+	org_id,_ := c.GetInt64("org_id",0)
+	sys_item_id,_ := c.GetInt64("sys_item_id",0)
+	id,_ := c.GetInt64("id",0)
+	if org_id != adminUserInfo.CurrentOrgId || sys_item_id<= 0 || id <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	}
+
+	inspection_reference := &models.InspectionReference{
+		ID : id,
+		SysItemId : sys_item_id,
+		UpdatedTime : time.Now().Unix(),
+	}
+	err := service.UpdateSysItemIdByID(inspection_reference)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"inspection_reference":  inspection_reference,
+	})
+	return
+}
+
+func (c *IntegrationConfigApiController) GetSysInspectionList() {
+	adminUserInfo := c.GetAdminUserInfo()
+	sysInspection,ownerInspection,err := service.GetSysInspectionList(adminUserInfo.CurrentOrgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	}
+
+	type InspectionStruce struct {
+		ProjectName string  `gorm:"-" json:"project_name" form:"project_name"`
+		ProjectId int64 `gorm:"-" json:"project_id" form:"project_id"`
+		InspectionReference []*models.InspectionReference  `gorm:"-" json:"inspection_reference" form:"inspection_reference"`
+	}
+
+	sysInspec := make(map[int64]*InspectionStruce, 0)
+	ownerInspec := make(map[int64]*InspectionStruce, 0)
+
+	
+
+	for _, item := range sysInspection {
+		result := sysInspec[item.ProjectId]
+		if result == nil {
+			result = new(InspectionStruce)
+			result.ProjectName = item.ProjectName
+			result.ProjectId = item.ProjectId
+		}
+		result.InspectionReference = append(result.InspectionReference, item)
+		sysInspec[item.ProjectId] = result
+	}
+
+	for _, oitem := range ownerInspection {
+		oresult := ownerInspec[oitem.ProjectId]
+		if oresult == nil {
+			oresult = new(InspectionStruce)
+			oresult.ProjectName = oitem.ProjectName
+			oresult.ProjectId = oitem.ProjectId
+		}
+		oresult.InspectionReference = append(oresult.InspectionReference, oitem)
+		ownerInspec[oitem.ProjectId] = oresult
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"sysInspec":  sysInspec,
+		"ownerInspec": ownerInspec,
+	})
+	return
+}
+
+func (c *IntegrationConfigApiController) GetSyncList() {
+	page, _ := c.GetInt64("page", 1)
+	limit, _ := c.GetInt64("limit", 10)
+
+	if page <= 0 {
+		page = 1
+	}
+	if limit <= 0 {
+		limit = 10
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+	patients, total, _ := service.GetSyncList(adminUserInfo.CurrentOrgId, page, limit)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":  patients,
+		"total": total,
+	})
+	return
+}
+
+func (c *IntegrationConfigApiController) SaveInterface() {
+	adminUserInfo := c.GetAdminUserInfo()
+	ID,_ := c.GetInt64("id",0)
+	OrgId := adminUserInfo.CurrentOrgId
+	Creater := adminUserInfo.AdminUser.Id 
+	Pattern,_ := c.GetInt("pattern",0)		
+	Dbhost := c.GetString("dbhost") 
+	Dbuser := c.GetString("dbuser")
+	Dbpassword := c.GetString("dbpassword") 
+	Dbname := c.GetString("dbname")
+	InterfaceUrl := c.GetString("interface_url") 
+	InterFaceToken := c.GetString("interface_token")
+	AllowIp := c.GetString("allow_ip")
+	AllowToken := c.GetString("allow_token")		
+	SyncFrequency,_ := c.GetInt("sync_frequency")
+	Status := 1
+	UpdatedTime :=  time.Now().Unix()
+	interfaceinfo := &models.MiddleInterface{
+		ID  		: ID,
+	OrgId   		: OrgId	,
+	Creater   		: Creater	,
+	Pattern 		: Pattern	,
+	Dbhost 			: Dbhost	,
+	Dbuser 			: Dbuser	,
+	Dbpassword 		: Dbpassword	,
+	Dbname 			: Dbname	,
+	InterfaceUrl 	: InterfaceUrl	,
+	InterFaceToken 	: InterFaceToken	,
+	AllowIp 		: AllowIp	,
+	AllowToken 		: AllowToken	,
+	SyncFrequency 	: SyncFrequency	,
+	Status			: Status	,
+	UpdatedTime     : UpdatedTime	,
+	}
+	if ID <= 0 {
+		interfaceinfo.CreatedTime =  time.Now().Unix()
+	}
+	err:= service.SaveInterface(interfaceinfo)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"interfaceinfo":  interfaceinfo,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	}
+	return
+}
+
+func (c *IntegrationConfigApiController) GetInterface() {
+	adminUserInfo := c.GetAdminUserInfo()
+	interfaceinfo, _ := service.GetInterface(adminUserInfo.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"interfaceinfo":  interfaceinfo,
+	})
+	return
+
 }
 
 func (c *IntegrationConfigApiController) GetPatientsList() {
@@ -43,7 +199,6 @@ func (c *IntegrationConfigApiController) GetPatientsList() {
 		"total": total,
 	})
 	return
-
 }
 
 func (c *IntegrationConfigApiController) EditPatientHis() {

controllers/mobile_api_controllers/dialysis_api_controller.go

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

controllers/new_mobile_api_controllers/mobile_regist_controller.go

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

controllers/new_mobile_api_controllers/patient.json

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

controllers/new_mobile_api_controllers/role.json

@@ -18,7 +18,7 @@
       "is_system": 2,
       "number": 9998,
       "purview_ids": "49,71,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,15571,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,155",
-      "func_ids": "20001,20002,20004,20005,20007,20008,20010,20011,20012,20034,20035,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028"
+      "func_ids": "20001,20002,20004,20005,20007,20008,20010,20011,20012,20034,20035,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028,20030"
 
 
     },
@@ -30,7 +30,7 @@
       "is_system": 3,
       "number": 9997,
       "purview_ids": "49,74,75,73,48,52,110,93,121,122,124,125,120",
-      "func_ids": "20007,20008,20010,20011,20012,20055,20056,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028"
+      "func_ids": "20007,20008,20010,20011,20012,20055,20056,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20051,20052,20053"
     },
     {
       "role_name": "库存",

controllers/role.json

@@ -18,7 +18,7 @@
       "is_system": 2,
       "number": 9998,
       "purview_ids": "49,71,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,15571,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,155",
-      "func_ids": "20001,20002,20004,20005,20007,20008,20010,20011,20012,20034,20035,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028"
+      "func_ids": "20001,20002,20004,20005,20007,20008,20010,20011,20012,20034,20035,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028,20030"
 
 
     },
@@ -30,7 +30,7 @@
       "is_system": 3,
       "number": 9997,
       "purview_ids": "49,74,75,73,48,52,110,93,121,122,124,125,120",
-      "func_ids": "20007,20008,20010,20011,20012,20055,20056,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028"
+      "func_ids": "20007,20008,20010,20011,20012,20055,20056,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20051,20052,20053"
     }
   ]
 }

controllers/verify_login_controller.go

@@ -141,6 +141,10 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 				"address":        curOrg.Address,
 			}
 
+			var didRegistedForSCRM bool = false
+			var didRegistedForCDM bool = false
+			var didRegistedForMall bool = false
+
 			tempInfo, _ := service.GetOrgInfoTemplate(curOrg.Id)
 			fmt.Println("teimpInfo", tempInfo)
 			template_info := map[string]interface{}{
@@ -166,6 +170,10 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 			if len(curAppUrlfors) == 0 {
 				if adminUser.Id == curOrg.Creator { //超级管理员
 					urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(3)
+					didRegistedForSCRM = true
+					didRegistedForCDM = true
+					didRegistedForMall = true
+
 					//urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(4)
 					//urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(5)
 					//urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(6)
@@ -204,10 +212,6 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 				}
 			}
 
-			var didRegistedForSCRM bool = false
-			var didRegistedForCDM bool = false
-			var didRegistedForMall bool = false
-
 			for _, item := range pruviews {
 				if item.Module == 6 {
 					didRegistedForSCRM = true

models/inspection_models.go

@@ -43,23 +43,25 @@ type Inspections struct {
 }
 
 type InspectionReference struct {
-	ID               int64  `gorm:"column:id" json:"id" form:"id"`
-	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	ProjectName      string `gorm:"column:project_name" json:"project_name" form:"project_name"`
-	Project          string `gorm:"column:project" json:"project" form:"project"`
-	ProjectId        int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	ItemName         string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectName string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Project string `gorm:"column:project" json:"project" form:"project"`
+	ProjectId int64 `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemName string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ItemId string `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	SysItemId int64 `gorm:"column:sys_item_id" json:"sys_item_id" form:"sys_item_id"`
 	ItemNameAddition string `gorm:"column:item_name_addition" json:"item_name_addition" form:"item_name_addition"`
-	Item             string `gorm:"column:item" json:"item" form:"item"`
-	RangeType        int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
-	RangeMin         string `gorm:"column:range_min" json:"range_min" form:"range_min"`
-	RangeMax         string `gorm:"column:range_max" json:"range_max" form:"range_max"`
-	RangeValue       string `gorm:"column:range_value" json:"range_value" form:"range_value"`
-	RangeOptions     string `gorm:"column:range_options" json:"range_options" form:"range_options"`
-	Unit             string `gorm:"column:unit" json:"unit" form:"unit"`
-	Status           int64  `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime      int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime      int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Item string `gorm:"column:item" json:"item" form:"item"`
+	RangeType int64 `gorm:"column:range_type" json:"range_type" form:"range_type"`
+	RangeMin string `gorm:"column:range_min" json:"range_min" form:"range_min"`
+	RangeMax string `gorm:"column:range_max" json:"range_max" form:"range_max"`
+	RangeValue string `gorm:"column:range_value" json:"range_value" form:"range_value"`
+	RangeOptions string `gorm:"column:range_options" json:"range_options" form:"range_options"`
+	Unit string `gorm:"column:unit" json:"unit" form:"unit"`
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 }
 
 func (InspectionReference) TableName() string {

models/intergration_models.go

@@ -1,5 +1,45 @@
 package models
 
+type MiddleSyncInfo struct {
+	ID             	int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId       	int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	SyncTime       int64 `gorm:"column:sync_time" json:"sync_time" form:"sync_time"`
+	SyncResultType  int	  `gorm:"column:sync_result_type" json:"sync_result_type" form:"sync_result_type"`
+	SyncRsultRemark string `gorm:"column:sync_result_remark" json:"sync_result_remark" form:"sync_result_remark"`
+	SyncTotalNum    int64 `gorm:"column:sync_total_num" json:"sync_total_num" form:"sync_total_num"`
+	SyncSuccessNum  int64 `gorm:"column:sync_success_num" json:"sync_success_num" form:"sync_success_num"`
+	SyncInfo      	string `gorm:"column:sync_info" json:"sync_info" form:"sync_info"`
+	CreateTime      int64 `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdateTime    	int64 `gorm:"column:update_time" json:"update_time" form:"update_time"`
+}
+
+func (MiddleSyncInfo) TableName() string {
+	return "xt_middle_sync_info"
+}
+
+type MiddleInterface struct {
+	ID          	int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId   		int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Creater   		int64 `gorm:"column:creater" json:"creater" form:"creater"`
+	Pattern 		int  `gorm:"column:pattern" json:"pattern" form:"pattern"`
+	Dbhost 			string  `gorm:"column:dbhost" json:"dbhost" form:"dbhost"`
+	Dbuser 			string  `gorm:"column:dbuser" json:"dbuser" form:"dbuser"`
+	Dbpassword 		string  `gorm:"column:dbpassword" json:"dbpassword" form:"dbpassword"`
+	Dbname 			string  `gorm:"column:dbname" json:"dbname" form:"dbname"`
+	InterfaceUrl 	string  `gorm:"column:interface_url" json:"interface_url" form:"interface_url"`
+	InterFaceToken 	string  `gorm:"column:interface_token" json:"interface_token" form:"interface_token"`
+	AllowIp 		string  `gorm:"column:allow_ip" json:"allow_ip" form:"allow_ip"`
+	AllowToken 		string  `gorm:"column:allow_token" json:"allow_token" form:"allow_token"`
+	SyncFrequency 	int  `gorm:"column:sync_frequency" json:"sync_frequency" form:"sync_frequency"`
+	Status			int  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime     int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime     int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+}
+
+func (MiddleInterface) TableName() string {
+	return "xt_middle_interface"
+}
+
 type VMPatients struct {
 	ID                           int64                `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId                    int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
@@ -265,8 +305,6 @@ type VMUserRole struct {
 	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 (VMUserRole) TableName() string {

service/data.go

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

service/integration_service.go

@@ -6,6 +6,44 @@ import (
 	"time"
 )
 
+func UpdateSysItemIdByID(sysInspection *models.InspectionReference) error {
+	db := XTWriteDB()
+	err := db.Model(&models.InspectionReference{}).Update(&sysInspection).Error
+	return err
+}
+
+func GetSysInspectionList(orgID int64) (sysInspection []*models.InspectionReference,ownerInspection []*models.InspectionReference, err error) {
+	db := XTReadDB()
+	err = db.Model(&models.InspectionReference{}).Where("org_id= 0 and status=1").Find(&sysInspection).Error
+	err = db.Model(&models.InspectionReference{}).Where("org_id= ? and status=1", orgID).Find(&ownerInspection).Error
+	return
+}
+
+func GetSyncList(orgID int64, page, limit int64) (patients []*models.MiddleSyncInfo, total int64, err error) {
+	//db := MiddleReadDB()
+	db := MiddleReadDB()
+	offset := (page - 1) * limit
+	err = db.Model(&models.MiddleSyncInfo{}).Where("org_id=? ", orgID).Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+	return
+}
+
+func SaveInterface(interfaceinfo *models.MiddleInterface) error {
+	db := MiddleWriteDB()
+	if (interfaceinfo.ID > 0 ) {
+		err := db.Save(&interfaceinfo).Error
+		return err
+	} else {
+		err := db.Create(&interfaceinfo).Error
+		return err
+	}
+}
+
+func GetInterface(orgID int64) (interfaceinfo models.MiddleInterface, err error){
+	db := MiddleReadDB()
+	err = db.Model(&models.MiddleInterface{}).Where("org_id=? and status=1", orgID).First(&interfaceinfo).Error
+	return
+}
+
 func GetIntegrationPatientList(orgID int64, page, limit int64) (patients []*models.VMPatients, total int64, err error) {
 	//db := MiddleReadDB()
 	db := readDb.Model(&models.VMPatients{}).Where("status=1")