百霖

main.go

@@ -8,13 +8,14 @@ import (
 
 func init() {
 	service.ConnectDB()
+	service.ConnectSHMSDB()
 	// service.ConnectMSDB()
 }
 
 func main() {
-	service.BeginAutoSyncLis()
+	//service.BeginAutoSyncLis()
 	//service.GetDataInsertDB(10138)
 	//service.GetResultDataInsertDB(10138)
-
+	service.GetSHResultDataInsertDB(10215)
 	beego.Run()
 }

service/cron.go

@@ -57,15 +57,15 @@ func init() {
 
 // 返回一个支持至 秒 级别的 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())
+	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()

service/db.go

@@ -219,7 +219,6 @@ func ConnectDB() {
 	shDb, err = gorm.Open("mysql", shdsn)
 	if err != nil {
 		fmt.Println("12344")
-		fmt.Println(bldsn)
 
 		fmt.Println(err)
 	}

service/ms_db.go

@@ -28,11 +28,11 @@ var dataBase *gorm.DB
 
 var (
 	dbName   = "local"
-	user     = beego.AppConfig.DefaultString(dbName+"::user", "sa")
-	password = beego.AppConfig.DefaultString(dbName+"::password", "hy123456")
-	host     = beego.AppConfig.DefaultString(dbName+"::host", "192.168.10.10")
+	user     = beego.AppConfig.DefaultString(dbName+"::user", "KingMed")
+	password = beego.AppConfig.DefaultString(dbName+"::password", "KingMed")
+	host     = beego.AppConfig.DefaultString(dbName+"::host", "192.168.10.80")
 	port     = beego.AppConfig.DefaultInt(dbName+"::port", 1633)
-	dbname   = beego.AppConfig.DefaultString(dbName+"::dbname", "hyDB")
+	dbname   = beego.AppConfig.DefaultString(dbName+"::dbname", "KMDB")
 )
 
 func ConnectSHMSDB() {

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(client.Context()).Result()
+	pong, err := client.Ping().Result()
 	fmt.Println(pong, err)
 	return client
 }

service/ystx_service.go

@@ -497,10 +497,10 @@ type gzjhyz struct {
 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.Get(apiurl)
-	rep.Param("sync_time", strconv.FormatInt(sync_time,10))
-	rep.Param("access_token","0")
+	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(strconv.FormatInt(sync_time, 10))
 	utils.InfoLog(his_user_id)
 	// str, _ := rep.String()
 	xmlKey := XmlKey{}
@@ -528,16 +528,16 @@ func SyncGzjhyz() (err error) {
 
 	redisClient := RedisClient()
 	defer redisClient.Close()
-	sync_time_tt, _ := redisClient.Get(redisClient.Context(),"gdjh_sync_time").Result()
+	sync_time_tt, _ := redisClient.Get("gdjh_sync_time").Result()
 
-	sync_time,_ := strconv.ParseInt(sync_time_tt,10,64)
+	sync_time, _ := strconv.ParseInt(sync_time_tt, 10, 64)
 	if sync_time == 0 {
 		sync_time = time.Now().Unix()
 	}
 	new_sync_time := time.Now().Unix()
 	utils.InfoLog("new_sync_time:%v", new_sync_time)
 	// 切换为当前时间
-	redisClient.Set(redisClient.Context(),"gdjh_sync_time", new_sync_time, time.Minute*60*24)
+	redisClient.Set("gdjh_sync_time", new_sync_time, time.Minute*60*24)
 	// 第二步： 获取当天排班患者的住院号
 	schedulesDateStr := time.Now().Format("2006-01-02")
 	schedulesDate, _ := utils.ParseTimeStringToTime("2006-01-02", schedulesDateStr)
@@ -545,19 +545,19 @@ func SyncGzjhyz() (err error) {
 	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(patient_zy_ids) == 0 {
-						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) + "-" + item.Patients.AdmissionNumber
-					}
-				// }
+	schedules, _ := GetPatientGzjhList(org_id, schedulesTime)
+	if len(schedules) > 0 {
+		for _, item := range schedules {
+			// if len(item.Patients.AdmissionNumber) > 0 {
+			if len(patient_zy_ids) == 0 {
+				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) + "-" + item.Patients.AdmissionNumber
 			}
-			// redisClient.Set(redisClient.Context(),"gdjh_patient_zy_ids", patient_zy_ids, time.Minute*5)
+			// }
 		}
+		// redisClient.Set(redisClient.Context(),"gdjh_patient_zy_ids", patient_zy_ids, time.Minute*5)
+	}
 	// }
 	utils.InfoLog("2gdjh_patient_zy_ids:%v", patient_zy_ids)
 
@@ -569,7 +569,7 @@ func SyncGzjhyz() (err error) {
 		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{
+		if len(gzjhyz.Result) == 0 && len(admission_number) > 0 {
 			utils.InfoLog("admission_number:%v", admission_number)
 			gzjhyz, yzstr = GetGzjhYz(sync_time, admission_number)
 		}
@@ -581,12 +581,12 @@ func SyncGzjhyz() (err error) {
 			for _, yz := range gzjhyz.Result {
 				// 根据姓名获取医生ID
 				var doctor_id int64
-				temp_doctor_id, _ := redisClient.Get(redisClient.Context(),"gdjh_doctor_id_" + yz.DoctorId).Result()
+				temp_doctor_id, _ := redisClient.Get("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(redisClient.Context(),"gdjh_doctor_id_"+yz.DoctorId, doctor_id, time.Minute*60*2)
+						redisClient.Set("gdjh_doctor_id_"+yz.DoctorId, doctor_id, time.Minute*60*2)
 					} else {
 						continue
 					}
@@ -628,9 +628,9 @@ func SyncGzjhyz() (err error) {
 				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)
+					redisClient.Set(key, "", time.Second)
 					keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedulesTime, 10) + ":advice_list_all"
-					redisClient.Set(redisClient.Context(),keyOne, "", time.Second)
+					redisClient.Set(keyOne, "", time.Second)
 					continue
 				} else {
 					if len(yz.AdviceName) > 0 {
@@ -918,7 +918,7 @@ func SyncHbJldyyz() (err error) {
 
 	redisClient := RedisClient()
 	defer redisClient.Close()
-	sync_time, _ := redisClient.Get(redisClient.Context(),"gdjh_sync_time1").Result()
+	sync_time, _ := redisClient.Get("gdjh_sync_time1").Result()
 	if len(sync_time) == 0 {
 		sync_time = strconv.FormatInt(time.Now().Unix(), 10)
 		utils.InfoLog("sync_time:%v", sync_time)
@@ -929,12 +929,12 @@ func SyncHbJldyyz() (err error) {
 	new_sync_time := time.Now().Unix()
 	utils.InfoLog("new_sync_time:%v", new_sync_time)
 	// 切换为当前时间
-	redisClient.Set(redisClient.Context(),"gdjh_sync_time", new_sync_time, time.Minute*60*24)
+	redisClient.Set("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(redisClient.Context(),"gdjh_patient_zy_ids").Result()
+	patient_zy_ids, _ := redisClient.Get("gdjh_patient_zy_ids").Result()
 	if len(patient_zy_ids) == 0 {
 		schedules, _ := GetPatientGzjhList(org_id, schedulesTime)
 		if len(schedules) > 0 {
@@ -945,7 +945,7 @@ func SyncHbJldyyz() (err error) {
 					patient_zy_ids = patient_zy_ids + "," + item.Patients.IdCardNo + "-" + strconv.FormatInt(item.Patients.ID, 10)
 				}
 			}
-			redisClient.Set(redisClient.Context(),"gdjh_patient_zy_ids", patient_zy_ids, time.Minute*60*2)
+			redisClient.Set("gdjh_patient_zy_ids", patient_zy_ids, time.Minute*60*2)
 		}
 	}
 	utils.InfoLog("2gdjh_patient_zy_ids:%v", patient_zy_ids)
@@ -962,12 +962,12 @@ func SyncHbJldyyz() (err error) {
 				utils.InfoLog("yz:%v", yz)
 				// 根据姓名获取医生ID
 				var doctor_id int64
-				temp_doctor_id, _ := redisClient.Get(redisClient.Context(),"gdjh_doctor_id_" + strconv.FormatInt(yz.DoctorId, 10)).Result()
+				temp_doctor_id, _ := redisClient.Get("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(redisClient.Context(),"gdjh_doctor_id_"+strconv.FormatInt(yz.DoctorId, 10), doctor_id, time.Minute*60*2)
+						redisClient.Set("gdjh_doctor_id_"+strconv.FormatInt(yz.DoctorId, 10), doctor_id, time.Minute*60*2)
 					} else {
 						continue
 					}