1111

conf/app.conf

@@ -30,11 +30,11 @@ httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 
-blmysqlhost = 192.168.10.10
-blmysqlport = 3306
-blmysqluser = root
-blmysqlpass = 12345678
-blmysqlname = kuyicloud
+# blmysqlhost = 192.168.10.10
+# blmysqlport = 3306
+# blmysqluser = root
+# blmysqlpass = 12345678
+# blmysqlname = kuyicloud
 
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
@@ -49,6 +49,12 @@ writemysqluser = syh
 writemysqlpass = xhPECP2nFObR8aUK
 writemysqlname = sgj_xt
 
+tempwritemysqlhost = rm-wz930n4u3k76i95tuuo.mysql.rds.aliyuncs.com
+tempwritemysqlport = 3306
+tempwritemysqluser = syh
+tempwritemysqlpass = xhPECP2nFObR8aUK
+tempwritemysqlname = sgj_xt
+
 readremotehost = 219.135.207.166
 readremoteport = 1433
 readremoteuser = lis_xt
@@ -87,10 +93,10 @@ backuppass = xhPECP2nFObR8aUK
 backupname = sgj_xt
 
 
-redishost = kuyi6666.redis.rds.aliyuncs.com
+redishost = kuyicloud.redis.rds.aliyuncs.com
 redisport = 6379
-redispasswrod = TZtBW098WId3i27clkpj3q8dnUaVFP
-redisdb = 2
+redispasswrod = 1Q2W3e4r!@#$
+redisdb = 1
 
 
 

controllers/lis.go

@@ -6,7 +6,7 @@ import (
 	"IC/service"
 	"IC/utils"
 	"encoding/json"
-	_ "fmt"
+	"fmt"
 	_ "github.com/astaxie/beego"
 	_ "github.com/jinzhu/gorm"
 	_ "strconv"
@@ -18,6 +18,23 @@ type LisController struct {
 	BaseAPIController
 }
 
+func (c *LisController) Schedule() {
+	for i := 762429; i > 0; i-- {
+		schedule,err := service.GetScheduless(int64(i))
+		fmt.Println(schedule.ID)
+		if err == nil {
+			service.UpdateSchedule(schedule.ID,schedule.Status)
+		}
+		
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"resultList": "12345",
+	})
+	return
+
+}
+
 func (c *LisController) SyncAdvice() {
 	// 获取备份库里所有的医嘱信息
 	advices, _ := service.GetAllAdvice()

main.go

@@ -8,7 +8,7 @@ import (
 
 func init() {
 	service.ConnectDB()
-	service.ConnectMSDB()
+	// service.ConnectMSDB()
 }
 
 func main() {

models/lis_model.go

@@ -53,6 +53,26 @@ func (DoctorAdvice) TableName() string {
 	return "xt_doctor_advice"
 }
 
+type Schedules 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"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	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"`
+	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
+}
+
+func (Schedules) TableName() string {
+	return "xt_schedule"
+}
+
 type FiledConfig struct {
 	ID          int64  `gorm:"column:id" json:"id"`
 	OrgId       int64  `gorm:"column:org_id" json:"org_id"`

routers/router.go

@@ -21,5 +21,6 @@ func init() {
 	//百霖lis
 	beego.Router("/api/lis/bltest", &controllers.LisController{}, "get:SyncBlLis")
 	beego.Router("/api/lis/blresulttest", &controllers.LisController{}, "get:SyncBlResultLis")
+	beego.Router("/api/schedule", &controllers.LisController{}, "get:Schedule")
 
 }

service/cron.go

@@ -12,15 +12,15 @@ import (
 )
 
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
-var createLisSyncCronJob *cron.Cron
+// var createLisSyncCronJob *cron.Cron
 
 func init() {
-	utils.InfoLog("开启自动检验检查同步定时任务")
-	createLisSyncCronJob = cron.New()
-	spec := "0 0 1 * * ?" // 每天凌晨1点同步
-	createLisSyncCronJob.AddFunc(spec, func() {
-		AutoSyncLis()
-	})
+	// utils.InfoLog("开启自动检验检查同步定时任务")
+	// createLisSyncCronJob = cron.New()
+	// spec := "0 0 1 * * ?" // 每天凌晨1点同步
+	// createLisSyncCronJob.AddFunc(spec, func() {
+	// 	AutoSyncLis()
+	// })
 
 	//speclg := "0 0 2 * * ?" // 每天凌晨2点同步 龙岗二院
 	//createLisSyncCronJob.AddFunc(speclg, func() {
@@ -32,8 +32,10 @@ func init() {
 	//	SyncHbdyLis()
 	//})
 
-	// specgzjh := "0 */1 7-20 * *  " // 每2分钟同步 广州暨华HIS医嘱
+	// utils.InfoLog("3333333")
+	// specgzjh := "1 * * * * ?" // 每1分钟同步 广州暨华HIS医嘱
 	// createLisSyncCronJob.AddFunc(specgzjh, func() {
+	// 	utils.InfoLog("1111111111")
 	// 	SyncGzjhyz()
 	// })
 
@@ -42,18 +44,42 @@ func init() {
 	//	SyncGzjhLis()
 	//})
 	//
-	specszbllis := "0 0 4 * * ?" // 每天凌晨4点00同步 深圳百霖
-	createLisSyncCronJob.AddFunc(specszbllis, func() {
-		SyncSZblLis()
-	})
+	// specszbllis := "0 0 4 * * ?" // 每天凌晨4点00同步 深圳百霖
+	// createLisSyncCronJob.AddFunc(specszbllis, func() {
+	// 	SyncSZblLis()
+	// })
 
-	specszbllisResult := "0 30 4 * * ?" // 每天凌晨4点30同步 深圳百霖
-	createLisSyncCronJob.AddFunc(specszbllisResult, func() {
-		SyncSZblLisResult()
-	})
+	// specszbllisResult := "0 30 4 * * ?" // 每天凌晨4点30同步 深圳百霖
+	// createLisSyncCronJob.AddFunc(specszbllisResult, func() {
+	// 	SyncSZblLisResult()
+	// })
+}
+
+// 返回一个支持至 秒 级别的 cron
+func newWithSeconds() *cron.Cron {
+    secondParser := cron.NewParser(cron.Second | cron.Minute |
+        cron.Hour | cron.Dom | cron.Month | cron.DowOptional | cron.Descriptor)
+    return cron.New(cron.WithParser(secondParser), cron.WithChain())
 }
 
 func BeginAutoSyncLis() {
+	utils.InfoLog("开启自动检验检查同步定时任务")
+	createLisSyncCronJob := newWithSeconds()
+	 
+	specgzjh := "0 */1 * * * ?" // 每1分钟同步 广州暨华HIS医嘱
+	createLisSyncCronJob.AddFunc(specgzjh, func() {
+		SyncGzjhyz()
+	})
+
+	specys := "0 0 3 * * ?" // 每天凌晨3点同步 湖北监利
+	createLisSyncCronJob.AddFunc(specys, func() {
+		SyncHbdyLis()
+	})
+
+	// spec := "0 0 1 * * ?" // 每天凌晨1点同步 中能建的
+	// createLisSyncCronJob.AddFunc(spec, func() {
+	// 	AutoSyncLis()
+	// })
 	createLisSyncCronJob.Start()
 }
 
@@ -198,14 +224,14 @@ func SyncToBase() {
 	utils.SuccessLog("检验检查同步任务完成")
 }
 
-func SyncSZblLis() {
-	utils.TraceLog("检验检查同步任务开始执行")
-	org_id := int64(10138)
-	GetDataInsertDB(org_id)
-}
-
-func SyncSZblLisResult() {
-	utils.TraceLog("获取检验检查结果任务开始执行")
-	org_id := int64(10138)
-	GetResultDataInsertDB(org_id)
-}
+// func SyncSZblLis() {
+// 	utils.TraceLog("检验检查同步任务开始执行")
+// 	org_id := int64(10138)
+// 	GetDataInsertDB(org_id)
+// }
+
+// func SyncSZblLisResult() {
+// 	utils.TraceLog("获取检验检查结果任务开始执行")
+// 	org_id := int64(10138)
+// 	GetResultDataInsertDB(org_id)
+// }

service/db.go

@@ -27,6 +27,7 @@ import (
 
 var readDb *gorm.DB
 var writeDb *gorm.DB
+var tempwriteDb *gorm.DB
 var readRemoteDb *gorm.DB
 var writeUserDb *gorm.DB
 var readUserDb *gorm.DB
@@ -52,6 +53,12 @@ func ConnectDB() {
 	writePass := beego.AppConfig.String("writemysqlpass")
 	writeName := beego.AppConfig.String("writemysqlname")
 
+	tempwriteHost := beego.AppConfig.String("tempwritemysqlhost")
+	tempwritePort := beego.AppConfig.String("tempwritemysqlport")
+	tempwriteUser := beego.AppConfig.String("tempwritemysqluser")
+	tempwritePass := beego.AppConfig.String("tempwritemysqlpass")
+	tempwriteName := beego.AppConfig.String("tempwritemysqlname")
+
 	readUserHost := beego.AppConfig.String("readuserhost")
 	readUserPort := beego.AppConfig.String("readuserport")
 	readUserUser := beego.AppConfig.String("readuseruser")
@@ -88,20 +95,21 @@ func ConnectDB() {
 	// backupPass := beego.AppConfig.String("backuppass")
 	// backupName := beego.AppConfig.String("backupname")
 
-	blHost := beego.AppConfig.String("blmysqlhost")
-	blPort := beego.AppConfig.String("blmysqlport")
-	blUser := beego.AppConfig.String("blmysqluser")
-	blPass := beego.AppConfig.String("blmysqlpass")
-	blName := beego.AppConfig.String("blmysqlname")
+	// blHost := beego.AppConfig.String("blmysqlhost")
+	// blPort := beego.AppConfig.String("blmysqlport")
+	// blUser := beego.AppConfig.String("blmysqluser")
+	// blPass := beego.AppConfig.String("blmysqlpass")
+	// blName := beego.AppConfig.String("blmysqlname")
 
-	fmt.Println(blHost)
-	fmt.Println(blPort)
-	fmt.Println(blUser)
-	fmt.Println(blPass)
-	fmt.Println(blName)
+	// fmt.Println(blHost)
+	// fmt.Println(blPort)
+	// fmt.Println(blUser)
+	// fmt.Println(blPass)
+	// fmt.Println(blName)
 
 	rdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser, readPass, readHost, readPort, readName)
 	wdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUser, writePass, writeHost, writePort, writeName)
+	tempwdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", tempwriteUser, tempwritePass, tempwriteHost, tempwritePort, tempwriteName)
 
 	// rudsn := fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s", readRemoteHost, readRemotePort, readRemoteName, readRemoteUser, readRemotePass)
 	wudsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUserUser, writeUserPass, writeUserHost, writeUserPort, writeUserName)
@@ -110,7 +118,7 @@ func ConnectDB() {
 	wmdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeMiddleUser, writeMiddlePass, writeMiddleHost, writeMiddlePort, writeMiddleName)
 	rudsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUserUser, readUserPass, readUserHost, readUserPort, readUserName)
 
-	bldsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", blUser, blPass, blHost, blPort, blName)
+	// bldsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", blUser, blPass, blHost, blPort, blName)
 
 	// bdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", backupUser, backupPass, backupHost, backupPort, backupName)
 
@@ -138,6 +146,14 @@ func ConnectDB() {
 	writeDb.DB().SetMaxOpenConns(100)
 	writeDb.LogMode(true)
 
+	tempwriteDb, err = gorm.Open("mysql", tempwdsn)
+	if err != nil {
+		//beego.Error(err)
+	}
+	tempwriteDb.DB().SetMaxIdleConns(10)
+	tempwriteDb.DB().SetMaxOpenConns(100)
+	tempwriteDb.LogMode(true)
+
 	// fmt.Println(rudsn)
 
 	// readRemoteDb, err = gorm.Open("mssql", rudsn)
@@ -180,16 +196,16 @@ func ConnectDB() {
 	readUserDb.DB().SetMaxOpenConns(100)
 	readUserDb.LogMode(true)
 
-	blDb, err = gorm.Open("mysql", bldsn)
-	if err != nil {
-		fmt.Println("12344")
-		fmt.Println(bldsn)
+	// blDb, err = gorm.Open("mysql", bldsn)
+	// if err != nil {
+	// 	fmt.Println("12344")
+	// 	fmt.Println(bldsn)
 
-		fmt.Println(err)
-	}
-	blDb.DB().SetMaxIdleConns(10)
-	blDb.DB().SetMaxOpenConns(100)
-	blDb.LogMode(true)
+	// 	fmt.Println(err)
+	// }
+	// blDb.DB().SetMaxIdleConns(10)
+	// blDb.DB().SetMaxOpenConns(100)
+	// blDb.LogMode(true)
 
 }
 

service/lis_service.go

@@ -17,6 +17,17 @@ func GetAllAdvice() (Advice []models.DoctorAdvice,err error) {
 	return
 }
 
+// 获取备份库所有的医嘱信息
+func GetScheduless(id int64) (schedule models.Schedules,err error) {
+	err = tempwriteDb.Model(&models.Schedules{}).Where("id = ?",id).First(&schedule).Error
+	return
+}
+
+func UpdateSchedule(id int64,status int64) error{
+	err := writeDb.Model(&models.Schedules{}).Where("id = ? ", id).Updates(map[string]interface{}{"status":status}).Error
+	return err
+}
+
 // 修改医嘱信息
 func SyncAdvice(Advice *models.DoctorAdvice) error {
 	err := writeDb.Model(&models.DoctorAdvice{}).Updates(&Advice).Error

service/redis.go

@@ -14,7 +14,7 @@ func RedisClient() *redis.Client {
 		Password: beego.AppConfig.String("redispasswrod"), // no password set
 		DB:       0,                                       // use default DB
 	})
-	pong, err := client.Ping().Result()
+	pong, err := client.Ping(client.Context()).Result()
 	fmt.Println(pong, err)
 	return client
 }

service/ystx_service.go

@@ -494,12 +494,14 @@ type gzjhyz struct {
 	UTime                 string `json:"u_time"`
 }
 
-func GetGzjhYz(sync_time string, his_user_id string) (str gzjhResult, checkStr string) {
+func GetGzjhYz(sync_time int64, his_user_id string) (str gzjhResult, checkStr string) {
 	apiurl := "http://219.135.166.106:8067/WebService.asmx/queryyzxx"
-	rep := httplib.Post(apiurl)
-	rep.Param("sync_time", sync_time)
-	rep.Param("access_token", "")
+	rep := httplib.Get(apiurl)
+	rep.Param("sync_time", strconv.FormatInt(sync_time,10))
+	rep.Param("access_token","0")
 	rep.Param("his_user_id", his_user_id)
+	utils.InfoLog(strconv.FormatInt(sync_time,10))
+	utils.InfoLog(his_user_id)
 	// str, _ := rep.String()
 	xmlKey := XmlKey{}
 	rep.ToXML(&xmlKey)
@@ -522,38 +524,41 @@ func GetAdviceBySyncAdviceId(orgId int64, sync_advice_id int64) (advice models.X
 // 广州暨华透析中心医嘱同步
 func SyncGzjhyz() (err error) {
 	// 第一步：获取上次同步时间
-	org_id := int64(10016)
+	org_id := int64(10015)
 
 	redisClient := RedisClient()
 	defer redisClient.Close()
-	sync_time, _ := redisClient.Get("gdjh_sync_time").Result()
-	if len(sync_time) == 0 {
-		sync_time = time.Now().Format("2006010215:04:05")
+	sync_time_tt, _ := redisClient.Get(redisClient.Context(),"gdjh_sync_time").Result()
+
+	sync_time,_ := strconv.ParseInt(sync_time_tt,10,64)
+	if sync_time == 0 {
+		sync_time = time.Now().Unix()
 	}
-	new_sync_time := time.Now().Format("2006010215:04:05")
+	new_sync_time := time.Now().Unix()
 	utils.InfoLog("new_sync_time:%v", new_sync_time)
 	// 切换为当前时间
-	redisClient.Set("gdjh_sync_time", new_sync_time, time.Minute*60*24)
+	redisClient.Set(redisClient.Context(),"gdjh_sync_time", new_sync_time, time.Minute*60*24)
 	// 第二步： 获取当天排班患者的住院号
 	schedulesDateStr := time.Now().Format("2006-01-02")
 	schedulesDate, _ := utils.ParseTimeStringToTime("2006-01-02", schedulesDateStr)
 	schedulesTime := schedulesDate.Unix()
-	patient_zy_ids, _ := redisClient.Get("gdjh_patient_zy_ids").Result()
-	if len(patient_zy_ids) == 0 {
+	var patient_zy_ids string
+	// patient_zy_ids, _ := redisClient.Get(redisClient.Context(),"gdjh_patient_zy_ids").Result()
+	// if len(patient_zy_ids) == 0 {
 		schedules, _ := GetPatientGzjhList(org_id, schedulesTime)
 		if len(schedules) > 0 {
 			for _, item := range schedules {
-				if len(item.Patients.AdmissionNumber) > 0 {
+				// if len(item.Patients.AdmissionNumber) > 0 {
 					if len(patient_zy_ids) == 0 {
-						patient_zy_ids = item.Patients.IdCardNo + "-" + strconv.FormatInt(item.Patients.ID, 10)
+						patient_zy_ids = item.Patients.IdCardNo + "-" + strconv.FormatInt(item.Patients.ID, 10) + "-" + item.Patients.AdmissionNumber
 					} else {
-						patient_zy_ids = patient_zy_ids + "," + item.Patients.IdCardNo + "-" + strconv.FormatInt(item.Patients.ID, 10)
+						patient_zy_ids = patient_zy_ids + "," + item.Patients.IdCardNo + "-" + strconv.FormatInt(item.Patients.ID, 10) + "-" + item.Patients.AdmissionNumber
 					}
-				}
+				// }
 			}
-			redisClient.Set("gdjh_patient_zy_ids", patient_zy_ids, time.Minute*60*2)
+			// redisClient.Set(redisClient.Context(),"gdjh_patient_zy_ids", patient_zy_ids, time.Minute*5)
 		}
-	}
+	// }
 	utils.InfoLog("2gdjh_patient_zy_ids:%v", patient_zy_ids)
 
 	// 第三步： 根据获取的同步时间，同步人员，去获取医嘱信息
@@ -562,7 +567,12 @@ func SyncGzjhyz() (err error) {
 		temp_id := strings.Split(idStr, "-")
 		id := temp_id[0]
 		patient_id := temp_id[1]
+		admission_number := temp_id[2]
 		gzjhyz, yzstr := GetGzjhYz(sync_time, id)
+		if len(gzjhyz.Result) == 0 && len(admission_number) > 0{
+			utils.InfoLog("admission_number:%v", admission_number)
+			gzjhyz, yzstr = GetGzjhYz(sync_time, admission_number)
+		}
 		utils.InfoLog("sync_time:%v", sync_time)
 		utils.InfoLog("yzstr:%v", yzstr)
 		if len(gzjhyz.Result) > 0 {
@@ -571,12 +581,12 @@ func SyncGzjhyz() (err error) {
 			for _, yz := range gzjhyz.Result {
 				// 根据姓名获取医生ID
 				var doctor_id int64
-				temp_doctor_id, _ := redisClient.Get("gdjh_doctor_id_" + yz.DoctorId).Result()
+				temp_doctor_id, _ := redisClient.Get(redisClient.Context(),"gdjh_doctor_id_" + yz.DoctorId).Result()
 				if len(temp_doctor_id) == 0 {
 					doctor, _ := GetAdminUserId(org_id, yz.DoctorId)
 					doctor_id = doctor.AdminUserId
 					if doctor_id > 0 {
-						redisClient.Set("gdjh_doctor_id_"+yz.DoctorId, doctor_id, time.Minute*60*2)
+						redisClient.Set(redisClient.Context(),"gdjh_doctor_id_"+yz.DoctorId, doctor_id, time.Minute*60*2)
 					} else {
 						continue
 					}
@@ -616,6 +626,11 @@ func SyncGzjhyz() (err error) {
 				advice_info, _ := GetAdviceBySyncAdviceId(org_id, yz.AdviceId)
 				utils.InfoLog("advice_info:%v", advice_info)
 				if advice_info.ID > 0 {
+					key := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(temp_patient_id, 10) + ":" + strconv.FormatInt(schedulesTime, 10) + ":doctor_advices"
+					//清空key 值
+					redisClient.Set(redisClient.Context(),key, "", time.Second)
+					keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedulesTime, 10) + ":advice_list_all"
+					redisClient.Set(redisClient.Context(),keyOne, "", time.Second)
 					continue
 				} else {
 					if len(yz.AdviceName) > 0 {
@@ -903,7 +918,7 @@ func SyncHbJldyyz() (err error) {
 
 	redisClient := RedisClient()
 	defer redisClient.Close()
-	sync_time, _ := redisClient.Get("gdjh_sync_time1").Result()
+	sync_time, _ := redisClient.Get(redisClient.Context(),"gdjh_sync_time1").Result()
 	if len(sync_time) == 0 {
 		sync_time = strconv.FormatInt(time.Now().Unix(), 10)
 		utils.InfoLog("sync_time:%v", sync_time)
@@ -914,12 +929,12 @@ func SyncHbJldyyz() (err error) {
 	new_sync_time := time.Now().Unix()
 	utils.InfoLog("new_sync_time:%v", new_sync_time)
 	// 切换为当前时间
-	redisClient.Set("gdjh_sync_time", new_sync_time, time.Minute*60*24)
+	redisClient.Set(redisClient.Context(),"gdjh_sync_time", new_sync_time, time.Minute*60*24)
 	// 第二步： 获取当天排班患者的住院号
 	schedulesDateStr := time.Now().Format("2006-01-02")
 	schedulesDate, _ := utils.ParseTimeStringToTime("2006-01-02", schedulesDateStr)
 	schedulesTime := schedulesDate.Unix()
-	patient_zy_ids, _ := redisClient.Get("gdjh_patient_zy_ids").Result()
+	patient_zy_ids, _ := redisClient.Get(redisClient.Context(),"gdjh_patient_zy_ids").Result()
 	if len(patient_zy_ids) == 0 {
 		schedules, _ := GetPatientGzjhList(org_id, schedulesTime)
 		if len(schedules) > 0 {
@@ -930,7 +945,7 @@ func SyncHbJldyyz() (err error) {
 					patient_zy_ids = patient_zy_ids + "," + item.Patients.IdCardNo + "-" + strconv.FormatInt(item.Patients.ID, 10)
 				}
 			}
-			redisClient.Set("gdjh_patient_zy_ids", patient_zy_ids, time.Minute*60*2)
+			redisClient.Set(redisClient.Context(),"gdjh_patient_zy_ids", patient_zy_ids, time.Minute*60*2)
 		}
 	}
 	utils.InfoLog("2gdjh_patient_zy_ids:%v", patient_zy_ids)
@@ -947,12 +962,12 @@ func SyncHbJldyyz() (err error) {
 				utils.InfoLog("yz:%v", yz)
 				// 根据姓名获取医生ID
 				var doctor_id int64
-				temp_doctor_id, _ := redisClient.Get("gdjh_doctor_id_" + strconv.FormatInt(yz.DoctorId, 10)).Result()
+				temp_doctor_id, _ := redisClient.Get(redisClient.Context(),"gdjh_doctor_id_" + strconv.FormatInt(yz.DoctorId, 10)).Result()
 				if len(temp_doctor_id) == 0 {
 					doctor, _ := GetAdminUserId(org_id, yz.DoctorName)
 					doctor_id = doctor.AdminUserId
 					if doctor_id > 0 {
-						redisClient.Set("gdjh_doctor_id_"+strconv.FormatInt(yz.DoctorId, 10), doctor_id, time.Minute*60*2)
+						redisClient.Set(redisClient.Context(),"gdjh_doctor_id_"+strconv.FormatInt(yz.DoctorId, 10), doctor_id, time.Minute*60*2)
 					} else {
 						continue
 					}
@@ -1051,7 +1066,7 @@ func GethbdyLis(sync_time string, his_user_id string) (str hbdyLisResult, checkS
 	return checkJSON, strs
 }
 
-// 广州暨华透析中心Lis同步
+// 湖北监利大院透析中心Lis同步
 func SyncHbdyLis() (err error) {
 	org_id := int64(10101)