Merge branch 'master' of http://git.shengws.com/zhangbj/IC

controllers/lis.go

@@ -35,6 +35,28 @@ func (c *LisController) Schedule() {
 
 }
 
+func (c *LisController) SyncSzblLis() {
+	// 获取备份库里所有的医嘱信息
+	
+	service.GetSZBLResultDataInsertDB(10138)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"resultList": "12345",
+	})
+	return
+
+}
+
+func (c *LisController) SyncShLis() {
+	// 获取备份库里所有的医嘱信息
+	
+	service.GetSHResultDataInsertDB(10215)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"resultList": "12345",
+	})
+	return
+
+}
+
 func (c *LisController) SyncAdvice() {
 	// 获取备份库里所有的医嘱信息
 	advices, _ := service.GetAllAdvice()

main.go

@@ -10,13 +10,16 @@ func init() {
 	service.ConnectDB()
 	//service.ConnectMSDB2()
 	//service.ConnectMSDB()
+	// service.ConnectMSDB2()
+	// service.ConnectMSDB()
 }
 
 func main() {
-	//service.BeginAutoSyncLis()
+	service.BeginAutoSyncLis()
 	//service.GetDataInsertDB(10138)
 	//service.GetResultDataInsertDB(10138)
 	//service.GetSHResultDataInsertDB(10215)
 	service.Synctfyz()
+	// service.GetSHResultDataInsertDB(10215)
 	beego.Run()
 }

models/lis_model.go

@@ -53,6 +53,32 @@ func (DoctorAdvice) TableName() string {
 	return "xt_doctor_advice"
 }
 
+type DataUploadConfig struct {
+	ID             int64  `gorm:"column:id" json:"id"`
+	OrgId          int64  `gorm:"column:org_id" json:"org_id"`
+	ProvinceId     int64  `gorm:"column:province_id" json:"province_id"`
+	CityId         int64  `gorm:"column:city_id" json:"city_id"`
+	GatewayAddress string `gorm:"column:gateway_address" json:"gateway_address"`
+	AppId          string `gorm:"column:app_id" json:"app_id"`
+	Key            string `gorm:"column:key" json:"key"`
+	Status         int64  `gorm:"column:status" json:"status"`
+	CreateTime     int64  `gorm:"column:create_time" json:"create_time"`
+	ModifyTime     int64  `gorm:"column:modify_time" json:"modify_time"`
+	TimeQuantum    int64  `gorm:"column:time_quantum" json:"time_quantum"`
+	DepartmentName string `gorm:"column:department_name" json:"department_name"`
+	HospitalId     string `gorm:"column:hospital_id" json:"hospital_id"`
+	InstType       int64  `gorm:"column:inst_type" json:"inst_type"`
+	DbHost         string `gorm:"column:db_host" json:"db_host"`
+	DbPort         string `gorm:"column:db_port" json:"db_port"`
+	DbUser         string `gorm:"column:db_user" json:"db_user"`
+	DbPass         string `gorm:"column:db_pass" json:"db_pass"`
+	DbName         string `gorm:"column:db_name" json:"db_name"`
+}
+
+func (DataUploadConfig) TableName() string {
+	return "data_upload_config"
+}
+
 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"`

routers/router.go

@@ -23,4 +23,7 @@ func init() {
 	beego.Router("/api/lis/blresulttest", &controllers.LisController{}, "get:SyncBlResultLis")
 	beego.Router("/api/schedule", &controllers.LisController{}, "get:Schedule")
 
+	beego.Router("/api/syncshLis", &controllers.LisController{}, "get:SyncShLis")
+	beego.Router("/api/syncszblis", &controllers.LisController{}, "get:SyncSzblLis")
+
 }

service/bl_service.go

@@ -1021,6 +1021,6 @@ func GetHisLabelPrintInfoById(id string) (info HisLabelPrintInfo, err error) {
 }
 
 func GetPatientsInfoByIDCardNo(id_card_no string, org_id int64) (info models.Patients, err error) {
-	err = readDb.Model(&models.Patients{}).Where("id_card_no = ? AND user_org_id = ?", id_card_no, org_id).First(&info).Error
+	err = readDb.Model(&models.Patients{}).Where("Name = ? AND user_org_id = ?", id_card_no, org_id).First(&info).Error
 	return
 }

service/cron.go

@@ -66,14 +66,14 @@ func BeginAutoSyncLis() {
 	utils.InfoLog("开启自动检验检查同步定时任务")
 	createLisSyncCronJob := newWithSeconds()
 
-	specgzjh := "0 */1 * * * ?" // 每1分钟同步 广州暨华HIS医嘱
-	createLisSyncCronJob.AddFunc(specgzjh, func() {
-		SyncGzjhyz()
-	})
+	// specgzjh := "0 */1 * * * ?" // 每1分钟同步 广州暨华HIS医嘱
+	// createLisSyncCronJob.AddFunc(specgzjh, func() {
+	// 	SyncGzjhyz()
+	// })
 
 	specys := "0 0 3 * * ?" // 每天凌晨3点同步 湖北监利
 	createLisSyncCronJob.AddFunc(specys, func() {
-		SyncHbdyLis()
+		GetSZBLResultDataInsertDB(10138)
 	})
 
 	// spec := "0 0 1 * * ?" // 每天凌晨1点同步 中能建的

service/db.go

@@ -40,6 +40,25 @@ var err error
 var blDb *gorm.DB
 var shDb *gorm.DB
 
+
+func CreateSqlServiceDB(Host string, Port string, User string, Pass string, Name string) (mssqlDb *gorm.DB, err error) {
+	//rdb := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", User, Pass, Host, Port, Name)
+	mssqlstring := fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s;encrypt=disable", Host, Port, Name, User, Pass)
+	fmt.Println(mssqlstring)
+	mssqlDb, err = gorm.Open("mssql", mssqlstring)
+	if err != nil {
+		panic(err)
+	}
+	mssqlDb.DB().SetMaxIdleConns(5)
+	mssqlDb.DB().SetMaxOpenConns(20)
+	mssqlDb.LogMode(true)
+	return
+}
+
+func CloseDB(DB *gorm.DB) {
+	DB.Close()
+}
+
 func ConnectDB() {
 
 	readHost := beego.AppConfig.String("readmysqlhost")
@@ -54,11 +73,11 @@ 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")
+	// 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")
@@ -108,15 +127,15 @@ func ConnectDB() {
 	// fmt.Println(blPass)
 	// fmt.Println(blName)
 
-	shHost := beego.AppConfig.String("shmysqlhost")
-	shPort := beego.AppConfig.String("shmysqlport")
-	shUser := beego.AppConfig.String("shmysqluser")
-	shPass := beego.AppConfig.String("shmysqlpass")
-	shName := beego.AppConfig.String("shmysqlname")
+	// shHost := beego.AppConfig.String("shmysqlhost")
+	// shPort := beego.AppConfig.String("shmysqlport")
+	// shUser := beego.AppConfig.String("shmysqluser")
+	// shPass := beego.AppConfig.String("shmysqlpass")
+	// shName := beego.AppConfig.String("shmysqlname")
 
 	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)
+	// 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)
@@ -127,7 +146,7 @@ func ConnectDB() {
 
 	// bldsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", blUser, blPass, blHost, blPort, blName)
 
-	shdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", shUser, shPass, shHost, shPort, shName)
+	// shdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", shUser, shPass, shHost, shPort, shName)
 
 	// bdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", backupUser, backupPass, backupHost, backupPort, backupName)
 
@@ -155,13 +174,13 @@ 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)
+	// 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)
 
@@ -216,15 +235,15 @@ func ConnectDB() {
 	// blDb.DB().SetMaxOpenConns(100)
 	// blDb.LogMode(true)
 
-	shDb, err = gorm.Open("mysql", shdsn)
-	if err != nil {
-		fmt.Println("12344")
+	// shDb, err = gorm.Open("mysql", shdsn)
+	// if err != nil {
+	// 	fmt.Println("12344")
 
-		fmt.Println(err)
-	}
-	shDb.DB().SetMaxIdleConns(10)
-	shDb.DB().SetMaxOpenConns(100)
-	shDb.LogMode(true)
+	// 	fmt.Println(err)
+	// }
+	// shDb.DB().SetMaxIdleConns(10)
+	// shDb.DB().SetMaxOpenConns(100)
+	// shDb.LogMode(true)
 
 }
 

service/ms_two_db.go

@@ -28,16 +28,15 @@ var dataBase2 *gorm.DB
 
 var (
 	dbName2   = "local"
-	user2     = beego.AppConfig.DefaultString(dbName2+"::user", "sa")
+	user2     = beego.AppConfig.DefaultString(dbName2+"::user", "KingMed")
 	password2 = beego.AppConfig.DefaultString(dbName2+"::password", "KingMed")
-	host2     = beego.AppConfig.DefaultString(dbName2+"::host", "192.168.10.80")
-	port2     = beego.AppConfig.DefaultInt(dbName2+"::port", 1633)
+	host2     = beego.AppConfig.DefaultString(dbName2+"::host", "localhost")
+	port2     = beego.AppConfig.DefaultString(dbName2+"::port", "1433")
 	dbname2   = beego.AppConfig.DefaultString(dbName2+"::dbname", "KMDB")
 )
 
 func ConnectMSDB2() {
-	connectionString := fmt.Sprintf("server=%s;user id=%s;password=%s;port=%d;database=%s",
-		host2, user2, password2, port2, dbname2)
+	connectionString := fmt.Sprintf("server=%s;user id=%s;password=%s;port=%s;database=%s;encrypt=disable", host2, user2, password2, port2, dbname2)
 	fmt.Println(connectionString)
 	db, err := gorm.Open("mssql", connectionString)
 	if err != nil {

service/sh_service.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 	"unicode"
+	"github.com/jinzhu/gorm"
 )
 
 type KMResult struct {
@@ -68,24 +69,64 @@ func (KMResult) TableName() string {
 	return "v_km_lis_result"
 }
 
+type KMSheet struct {
+	FName                  string `gorm:"column:F_Name" json:"F_Name" form:"F_Name"`
+	FCompoundItemName      string `gorm:"column:F_CompoundItemName" json:"F_CompoundItemName" form:"F_CompoundItemName"`
+	FReference             string `gorm:"column:F_Reference" json:"F_Reference" form:"F_Reference"`
+	FSingleItemName        string `gorm:"column:F_SingleItemName" json:"F_SingleItemName" form:"F_SingleItemName"`
+	FRecordTime            string `gorm:"column:F_RecordTime" json:"F_RecordTime" form:"F_RecordTime"`
+	FCheckTime             string `gorm:"column:F_CheckTime" json:"F_CheckTime" form:"F_CheckTime"`
+	FResult                string `gorm:"column:F_Result" json:"F_Result" form:"F_Result"`
+	FUnit                  string `gorm:"column:F_Unit" json:"F_Unit" form:"F_Unit"`
+}
+
+func (KMSheet) TableName() string {
+	return "Sheet"
+}
+
 //获取lis返回检验检查结果数据
 func GetSHResultDataInsertDB(org_id int64) (result []*KMResult) {
+
+	org := &models.DataUploadConfig{
+		OrgId:          10138,
+		ProvinceId:     19,
+		CityId:         291,
+		DepartmentName: "深圳市百霖血液透析中心",
+		HospitalId:     "MA5DB4KB6",
+		InstType:       1,
+		DbHost:         "localhost",
+		DbPort:         "1433",
+		DbPass:         "KingMed",
+		DbUser:         "KingMed",
+		DbName:         "KMDB",
+	}
+
+	if len(org.DbHost) > 0 && len(org.DbUser) > 0 && len(org.DbPort) > 0 && len(org.DbPass) > 0 && len(org.DbName) > 0 {
+		orgDb, err := CreateSqlServiceDB(org.DbHost, org.DbPort, org.DbUser, org.DbPass, org.DbName)
+		if err != nil {
+			utils.ErrorLog("创建数据库连接失败:%v", err)
+			return
+		}
+
 	record, _ := GetLastSyncResultRecord(org_id)
 	fmt.Println(record)
-	if record.ID == 0 {
-		list, err := GetSHResultRecord()
+	var sync_time int64
+	if record.ID > 0 {
+		sync_time = record.Ctime
+	} else {
+		sync_time = 1627747200
+	}
+
+	sync_time_temp := time.Unix(sync_time,0)
+	syncTimeStr := sync_time_temp.Format("2006-01-02 15:04:05")
+
+		list, err := GetSHResultRecord(orgDb,syncTimeStr)
 		if err == nil {
-			fmt.Println(list)
+			// fmt.Println(list)
 
 			//插入到系统检验检查数据
 			for _, item := range list {
-				project_id := int64(0)
-				if len(item.FIDCardNo) > 0 {
-					project_id, _ = GetShjhProjectID(org_id, item.FCompoundItemName)
-				} else {
-					continue
-				}
-				printInfo, _ := GetPatientsInfoByIDCardNo(item.FIDCardNo, 10215)
+				printInfo, _ := GetPatientsInfoByIDCardNo(item.FName, 10215)
 
 				if printInfo.ID == 0 {
 					fmt.Println(item)
@@ -94,6 +135,12 @@ func GetSHResultDataInsertDB(org_id int64) (result []*KMResult) {
 					continue
 				}
 
+				project_id := int64(0)
+				
+				project_id, _ = GetShjhProjectID(org_id, item.FCompoundItemName)
+				
+				
+
 				item_id, _ := GetShItemID(org_id, item.FCompoundItemName, item.FSingleItemName, project_id)
 
 				tx := writeMiddleDb.Begin()
@@ -103,9 +150,20 @@ func GetSHResultDataInsertDB(org_id int64) (result []*KMResult) {
 				recordDateStr := ""
 				//inspect_date := item.FRecordTime.Format("2006-01-02 15:04")
 
+				// timstr := strings.Split(item.FRecordTime, "T")
+				// timstem := strings.Split(timstr[1], "Z")
+
+				// recordDateStr = timstr[0] + " " + timstem[0]
 				recordDateStr = item.FRecordTime
-				date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", recordDateStr)
+				date ,_ :=  utils.ParseTimeStringToTime("2006-01-02 15:04:05",recordDateStr)
 				record_date, _ := utils.ParseTimeStringToTime("2006-01-02", date.Format("2006-01-02"))
+			
+				// ftimstr := strings.Split(item.FCheckTime, "T")
+				// ftimstem := strings.Split(timstr[1], "Z")
+
+				// fdate := ftimstr[0] + " " + ftimstem[0]
+				fdate := item.FCheckTime
+
 				var total int
 				var RangeOptions string
 				var RangeMin string
@@ -150,8 +208,8 @@ func GetSHResultDataInsertDB(org_id int64) (result []*KMResult) {
 					inspection_reference.Status = 1
 					inspection_reference.CreatedTime = time.Now().Unix()
 					inspection_reference.UpdatedTime = time.Now().Unix()
-					inspection_reference.InspectDate = item.FCheckTime
-					inspection_reference.UTime = item.FCheckTime
+					inspection_reference.InspectDate = fdate
+					inspection_reference.UTime = fdate
 					err = tx.Model(&models.MiddleInspectionReference{}).Create(&inspection_reference).Error
 					if err != nil {
 						tx.Rollback()
@@ -197,137 +255,6 @@ func GetSHResultDataInsertDB(org_id int64) (result []*KMResult) {
 			writeMiddleDb.Save(&info)
 		}
 
-	}
-	//else
-	//{
-	//	if record.LastId != 0 {
-	//		list, err := GetResultRecordByID(record.LastId)
-	//		fmt.Println(list)
-	//		//插入中间库中
-	//		//插入一条插入中间库记录数据
-	//		if err == nil {
-	//
-	//			//插入到系统检验检查数据
-	//			for _, item := range list {
-	//				project_id := int64(0)
-	//				if len(item.Barcode) > 0 {
-	//					project_id, _ = GetBljhProjectID(org_id, item.Groupname)
-	//				} else {
-	//					continue
-	//				}
-	//				printInfo, _ := GetHisLabelPrintInfoById(item.Barcode)
-	//				item_id, _ := GetBlItemID(org_id, item.Groupname, item.Itemname, project_id)
-	//
-	//				tx := writeMiddleDb.Begin()
-	//				var inspection models.MiddleInspection
-	//				var inspection_reference models.MiddleInspectionReference
-	//
-	//				recordDateStr := ""
-	//				inspect_date := item.Repdate.Format("2006-01-02 15:04")
-	//				if item.Repdate.Unix() == 0 {
-	//					recordDateStr = time.Now().Format("2006-01-02 15:04")
-	//				} else {
-	//
-	//					recordDateStr = inspect_date
-	//				}
-	//
-	//				date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", recordDateStr)
-	//				record_date, _ := utils.ParseTimeStringToTime("2006-01-02", date.Format("2006-01-02"))
-	//				var total int
-	//				var RangeOptions string
-	//				var RangeMin string
-	//				var RangeMax string
-	//				// 判断检查类型
-	//				var ItemType int
-	//				if strings.Contains(item.Refrange, "-") {
-	//					ItemType = 1
-	//
-	//				} else {
-	//					ItemType = 2
-	//
-	//				}
-	//
-	//				if ItemType == 1 {
-	//					Range := strings.Split(item.Refrange, "-")
-	//					RangeMin = Range[0]
-	//					RangeMax = Range[1]
-	//				} else {
-	//					RangeOptions = item.Refrange
-	//				}
-	//
-	//				err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and project_id = ? and item_id = ? and status = 1", org_id, project_id, item_id).Find(&inspection_reference).Count(&total).Error
-	//				if inspection_reference.ID > 0 {
-	//					ItemType = inspection_reference.RangeType
-	//				}
-	//				if total <= 0 {
-	//					inspection_reference.OrgId = org_id
-	//					inspection_reference.ProjectName = item.Groupname
-	//					inspection_reference.Project = item.Groupname
-	//					inspection_reference.ProjectId = project_id
-	//					inspection_reference.ItemName = item.Itemname
-	//					inspection_reference.ItemNameAddition = item.Barcode
-	//					inspection_reference.ItemId = item_id
-	//					inspection_reference.RangeType = ItemType
-	//					inspection_reference.RangeMin = RangeMin
-	//					inspection_reference.RangeMax = RangeMax
-	//					inspection_reference.RangeOptions = RangeOptions
-	//					inspection_reference.Unit = item.Unit
-	//					inspection_reference.Status = 1
-	//					inspection_reference.CreatedTime = time.Now().Unix()
-	//					inspection_reference.UpdatedTime = time.Now().Unix()
-	//					inspection_reference.InspectDate = inspect_date
-	//					inspection_reference.UTime = inspect_date
-	//					err = tx.Model(&models.MiddleInspectionReference{}).Create(&inspection_reference).Error
-	//					if err != nil {
-	//						tx.Rollback()
-	//					}
-	//				}
-	//
-	//				var itotal int
-	//				err = readMiddleDb.Model(&models.MiddleInspection{}).Where("org_id = ? and project_id = ? and item_id = ? and record_date = ? and patient_id = ?  and status = 1", org_id, project_id, item_id, record_date.Unix(), printInfo.PatientId).Find(&inspection).Count(&itotal).Error
-	//				if itotal <= 0 {
-	//					inspection.PatientId = printInfo.PatientId
-	//					inspection.OrgId = org_id
-	//					inspection.ProjectId = project_id
-	//					inspection.ItemName = inspection_reference.ItemName
-	//					inspection.ProjectName = inspection_reference.ProjectName
-	//					inspection.InspectType = ItemType
-	//					inspection.ItemId = item_id
-	//					inspection.InspectValue = item.Result
-	//					inspection.InspectDate = inspect_date
-	//					inspection.RecordDate = record_date.Unix()
-	//					inspection.Status = 1
-	//					inspection.CreatedTime = time.Now().Unix()
-	//					inspection.UpdatedTime = time.Now().Unix()
-	//					inspection.UTime = inspect_date
-	//					inspection.HisUserId = strconv.FormatInt(printInfo.PatientId, 10)
-	//					err = tx.Model(&models.MiddleInspection{}).Create(&inspection).Error
-	//					if err != nil {
-	//						tx.Rollback()
-	//					}
-	//				}
-	//
-	//				tx.Commit()
-	//
-	//			}
-	//			//插入一条查询检验检查结果记录状态数据
-	//			var info LisSyncResultStatusInfo
-	//			info.Ctime = time.Now().Unix()
-	//			info.Status = 1
-	//			info.Mtime = time.Now().Unix()
-	//			info.OrgId = org_id
-	//			info.IsResult = 1
-	//			code, _ := strconv.ParseInt(list[0].Barcode, 10, 64)
-	//			info.LastId = code
-	//			info.ResultDate = time.Now().Unix()
-	//			writeMiddleDb.Save(&info)
-	//
-	//		}
-	//
-	//	}
-	//
-	//}
-	//
 	// 第一步：跟进org_id 去中间库查出需要同步的数据
 	inspection_references, _ := GetSyncInspectionReferenceByOrgId(org_id)
 	inspections, _ := GetSyncInspectionByOrgId(org_id)
@@ -344,12 +271,13 @@ func GetSHResultDataInsertDB(org_id int64) (result []*KMResult) {
 			SyncInspection(&inspection)
 		}
 	}
-	return
+}
+return
 
 }
 
-func GetSHResultRecord() (record []*KMResult, err error) {
-	err = dataBase.Model(&KMResult{}).Order("barcode asc").Find(&record).Error
+func GetSHResultRecord(rdb *gorm.DB,synctime string) (record []*KMSheet, err error) {
+	err = rdb.Model(&KMSheet{}).Where("F_CheckTime >= ?",synctime).Find(&record).Error
 	return
 }
 

service/szbl_service.go

@@ -0,0 +1,245 @@
+package service
+
+import (
+	"IC/models"
+	"IC/utils"
+	"fmt"
+	_"regexp"
+	"strconv"
+	"strings"
+	"time"
+	_"unicode"
+	"github.com/jinzhu/gorm"
+)
+
+
+
+type SZBLJYJC struct {
+	FName                  string `gorm:"column:name" json:"name" form:"name"`
+	FCompoundItemName      string `gorm:"column:DockingApplyItemName" json:"DockingApplyItemName" form:"DockingApplyItemName"`
+	FReference             string `gorm:"column:refrange" json:"refrange" form:"refrange"`
+	FSingleItemName        string `gorm:"column:itemname" json:"itemname" form:"itemname"`
+	FRecordTime            string `gorm:"column:recordTime" json:"recordTime" form:"recordTime"`
+	FCheckTime             string `gorm:"column:repdate" json:"repdate" form:"repdate"`
+	FResult                string `gorm:"column:result" json:"result" form:"result"`
+	FUnit                  string `gorm:"column:unit" json:"unit" form:"unit"`
+}
+
+func (SZBLJYJC) TableName() string {
+	return "v_cm_result"
+}
+
+//获取lis返回检验检查结果数据
+func GetSZBLResultDataInsertDB(org_id int64) (result []*SZBLJYJC) {
+
+	org := &models.DataUploadConfig{
+		OrgId:          10138,
+		ProvinceId:     19,
+		CityId:         291,
+		DepartmentName: "深圳市百霖血液透析中心",
+		HospitalId:     "MA5DB4KB6",
+		InstType:       1,
+		DbHost:         "localhost",
+		DbPort:         "1433",
+		DbPass:         "1Q2W3e4r!@#$",
+		DbUser:         "adapter",
+		DbName:         "hyDB",
+	}
+
+	if len(org.DbHost) > 0 && len(org.DbUser) > 0 && len(org.DbPort) > 0 && len(org.DbPass) > 0 && len(org.DbName) > 0 {
+		orgDb, err := CreateSqlServiceDB(org.DbHost, org.DbPort, org.DbUser, org.DbPass, org.DbName)
+		if err != nil {
+			utils.ErrorLog("创建数据库连接失败:%v", err)
+			return
+		}
+
+	record, _ := GetLastSyncResultRecord(org_id)
+	fmt.Println(record)
+	var sync_time int64
+	if record.ID > 0 {
+		sync_time = record.Ctime
+	} else {
+		sync_time = 1627747200
+	}
+
+	sync_time_temp := time.Unix(sync_time,0)
+	syncTimeStr := sync_time_temp.Format("2006-01-02 15:04:05")
+
+		list, err := GetSZBLResultRecord(orgDb,syncTimeStr)
+		if err == nil {
+			// fmt.Println(list)
+
+			//插入到系统检验检查数据
+			for _, item := range list {
+				printInfo, _ := GetPatientsInfoByIDCardNo(item.FName, 10138)
+
+				if printInfo.ID == 0 {
+					fmt.Println(item)
+					fmt.Println(printInfo)
+					fmt.Println("暂无该患者")
+					continue
+				}
+
+				project_id := int64(0)
+				
+				project_id, _ = GetSzbljhProjectID(org_id, item.FCompoundItemName)
+				
+				
+
+				item_id, _ := GetSzblItemID(org_id, item.FCompoundItemName, item.FSingleItemName, project_id)
+
+				tx := writeMiddleDb.Begin()
+				var inspection models.MiddleInspection
+				var inspection_reference models.MiddleInspectionReference
+
+				recordDateStr := ""
+				//inspect_date := item.FRecordTime.Format("2006-01-02 15:04")
+
+				timstr := strings.Split(item.FCheckTime, "T")
+				timstem := strings.Split(timstr[1], "Z")
+
+				recordDateStr = timstr[0] + " " + timstem[0]
+				// recordDateStr = item.FCheckTime
+				fmt.Println(recordDateStr)
+				date ,_ :=  utils.ParseTimeStringToTime("2006-01-02 15:04:05",recordDateStr)
+				fmt.Println(date)
+				record_date, _ := utils.ParseTimeStringToTime("2006-01-02", date.Format("2006-01-02"))
+				fmt.Println(record_date)
+			
+				// ftimstr := strings.Split(item.FCheckTime, "T")
+				// ftimstem := strings.Split(timstr[1], "Z")
+
+				// fdate := ftimstr[0] + " " + ftimstem[0]
+				fdate := recordDateStr
+
+				var total int
+				var RangeOptions string
+				var RangeMin string
+				var RangeMax string
+				// 判断检查类型
+				var ItemType int
+				if IsChineseChar(item.FReference) || strings.Contains(item.FReference, "|") || strings.Contains(item.FReference, "≤") {
+					ItemType = 2
+				} else {
+					if strings.Contains(item.FReference, "-") {
+						ItemType = 1
+					} else {
+						ItemType = 2
+					}
+				}
+
+				if ItemType == 1 {
+					Range := strings.Split(item.FReference, "-")
+					RangeMin = Range[0]
+					RangeMax = Range[1]
+				} else {
+					RangeOptions = item.FReference
+				}
+
+				err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and project_id = ? and item_id = ? and status = 1", org_id, project_id, item_id).Find(&inspection_reference).Count(&total).Error
+				if inspection_reference.ID > 0 {
+					ItemType = inspection_reference.RangeType
+				}
+				if total <= 0 {
+					inspection_reference.OrgId = org_id
+					inspection_reference.ProjectName = item.FCompoundItemName
+					inspection_reference.Project = item.FCompoundItemName
+					inspection_reference.ProjectId = project_id
+					inspection_reference.ItemName = item.FSingleItemName
+					inspection_reference.ItemNameAddition = ""
+					inspection_reference.ItemId = item_id
+					inspection_reference.RangeType = ItemType
+					inspection_reference.RangeMin = RangeMin
+					inspection_reference.RangeMax = RangeMax
+					inspection_reference.RangeOptions = RangeOptions
+					inspection_reference.Unit = item.FUnit
+					inspection_reference.Status = 1
+					inspection_reference.CreatedTime = time.Now().Unix()
+					inspection_reference.UpdatedTime = time.Now().Unix()
+					inspection_reference.InspectDate = fdate
+					inspection_reference.UTime = fdate
+					err = tx.Model(&models.MiddleInspectionReference{}).Create(&inspection_reference).Error
+					if err != nil {
+						tx.Rollback()
+					}
+				}
+
+				var itotal int
+				err = readMiddleDb.Model(&models.MiddleInspection{}).Where("org_id = ? and project_id = ? and item_id = ? and record_date = ? and patient_id = ?  and status = 1", org_id, project_id, item_id, record_date.Unix(), printInfo.ID).Find(&inspection).Count(&itotal).Error
+				if itotal <= 0 {
+					inspection.PatientId = printInfo.ID
+					inspection.OrgId = org_id
+					inspection.ProjectId = project_id
+					inspection.ItemName = inspection_reference.ItemName
+					inspection.ProjectName = inspection_reference.ProjectName
+					inspection.InspectType = ItemType
+					inspection.ItemId = item_id
+					inspection.InspectValue = item.FResult
+					inspection.InspectDate = item.FCheckTime
+					inspection.RecordDate = record_date.Unix()
+					inspection.Status = 1
+					inspection.CreatedTime = time.Now().Unix()
+					inspection.UpdatedTime = time.Now().Unix()
+					inspection.UTime = item.FCheckTime
+					inspection.HisUserId = strconv.FormatInt(printInfo.ID, 10)
+					err = tx.Model(&models.MiddleInspection{}).Create(&inspection).Error
+					if err != nil {
+						tx.Rollback()
+					}
+				}
+
+				tx.Commit()
+
+			}
+			//插入一条查询检验检查结果记录状态数据
+			var info LisSyncResultStatusInfo
+			info.Ctime = time.Now().Unix()
+			info.Status = 1
+			info.Mtime = time.Now().Unix()
+			info.OrgId = org_id
+			info.IsResult = 1
+			info.LastId = int64(len(list))
+			info.ResultDate = time.Now().Unix()
+			writeMiddleDb.Save(&info)
+		}
+
+	// 第一步：跟进org_id 去中间库查出需要同步的数据
+	inspection_references, _ := GetSyncInspectionReferenceByOrgId(org_id)
+	inspections, _ := GetSyncInspectionByOrgId(org_id)
+
+	// 第二步：将数据同步到业务库
+	if len(inspection_references) > 0 {
+		for _, inspection_reference := range inspection_references {
+			SyncInspectionReference(&inspection_reference)
+		}
+	}
+
+	if len(inspections) > 0 {
+		for _, inspection := range inspections {
+			SyncInspection(&inspection)
+		}
+	}
+}
+return
+
+}
+
+func GetSZBLResultRecord(rdb *gorm.DB,synctime string) (record []*SZBLJYJC, err error) {
+	err = rdb.Model(&SZBLJYJC{}).Where("repdate >= ?",synctime).Find(&record).Error
+	return
+}
+
+//判断是否包含中文
+// func IsChineseChar(str string) bool {
+// 	for _, r := range str {
+// 		if unicode.Is(unicode.Scripts["Han"], r) || (regexp.MustCompile("[\u3002\uff1b\uff0c\uff1a\u201c\u201d\uff08\uff09\u3001\uff1f\u300a\u300b]").MatchString(string(r))) {
+// 			return true
+// 		}
+// 	}
+// 	return false
+// }
+
+// func GetResultRecordByTime(id int64) (record []*KMResult, err error) {
+// 	err = readDb.Model(&KMResult{}).Where("barcode > ? AND repdate >= 2021-08-12 00:00:00", id).Order("barcode asc").Find(&record).Error
+// 	return
+// }

service/ystx_service.go

@@ -699,9 +699,12 @@ func SyncGzjhyz() (err error) {
 	if len(schedules) > 0 {
 		for _, item := range schedules {
 			// if len(item.Patients.AdmissionNumber) > 0 {
-			patient_zy_ids = append(patient_zy_ids, item.Patients.IdCardNo)
-
-			//
+			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)
 	}
@@ -709,87 +712,90 @@ func SyncGzjhyz() (err error) {
 	utils.InfoLog("2gdjh_patient_zy_ids:%v", patient_zy_ids)
 
 	// 第三步： 根据获取的同步时间，同步人员，去获取医嘱信息
-	//idArray := strings.Split(patient_zy_ids, ",")
-	//for _, idStr := range patient_zy_ids {
-	//	temp_id := strings.Split(idStr, "-")
-	//	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 {
-	//		timeLayout := "2006010215:04:05"     //转化所需模板
-	//		loc, _ := time.LoadLocation("Local") //重要：获取时区
-	//		for _, yz := range gzjhyz.Result {
-	//			// 根据姓名获取医生ID
-	//			var doctor_id int64
-	//			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("gdjh_doctor_id_"+yz.DoctorId, doctor_id, time.Minute*60*2)
-	//				} else {
-	//					continue
-	//				}
-	//			} else {
-	//				doctor_id, _ = strconv.ParseInt(temp_doctor_id, 10, 64)
-	//			}
-	//			theTime, _ := time.ParseInLocation(timeLayout, yz.StartTime, loc) //使用模板在对应时区转化为time.time类型
-	//			start_time := theTime.Unix()
-	//			temp_patient_id, _ := strconv.ParseInt(patient_id, 10, 64)
-	//			SingleDose, _ := strconv.ParseFloat(yz.SingleDose, 64)
-	//			PrescribingNumber, _ := strconv.ParseFloat(yz.PrescribingNumber, 64)
-	//			advice := models.XtDoctorAdvice{
-	//				UserOrgId:             org_id,
-	//				PatientId:             temp_patient_id,
-	//				AdviceType:            2,
-	//				AdviceDate:            schedulesTime,
-	//				StartTime:             start_time,
-	//				AdviceName:            yz.AdviceName,
-	//				AdviceDesc:            yz.AdviceDesc,
-	//				RecordDate:            schedulesTime,
-	//				SingleDose:            SingleDose,
-	//				SingleDoseUnit:        yz.SingleDoseUnit,
-	//				PrescribingNumber:     PrescribingNumber,
-	//				PrescribingNumberUnit: yz.PrescribingNumberUnit,
-	//				DeliveryWay:           yz.DeliveryWay,
-	//				ExecutionFrequency:    yz.ExecutionFrequency,
-	//				AdviceDoctor:          doctor_id,
-	//				CreatedTime:           time.Now().Unix(),
-	//				UpdatedTime:           time.Now().Unix(),
-	//				SyncAdviceId:          yz.AdviceId,
-	//				ExecutionState:        2,
-	//				Status:                1,
-	//				IsSync:                1,
-	//			}
-	//			utils.InfoLog("advice:%v", advice)
-	//			// 根据同步来的 advice_id 来查询库里是否已经存在
-	//			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(key, "", time.Second)
-	//				keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedulesTime, 10) + ":advice_list_all"
-	//				redisClient.Set(keyOne, "", time.Second)
-	//				continue
-	//			} else {
-	//				if len(yz.AdviceName) > 0 {
-	//					handleerr := CreateDoctorAdviceHandle(&advice)
-	//					if handleerr != nil {
-	//						utils.ErrorLog("添加医嘱信息失败:%v", handleerr)
-	//						continue
-	//					}
-	//				} else {
-	//					continue
-	//				}
-	//			}
-	//		}
-	//	}
-	//}
+	idArray := strings.Split(patient_zy_ids, ",")
+	for _, idStr := range idArray {
+		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 {
+			timeLayout := "2006010215:04:05"     //转化所需模板
+			loc, _ := time.LoadLocation("Local") //重要：获取时区
+			for _, yz := range gzjhyz.Result {
+				// 根据姓名获取医生ID
+				var doctor_id int64
+				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("gdjh_doctor_id_"+yz.DoctorId, doctor_id, time.Minute*60*2)
+					} else {
+						continue
+					}
+				} else {
+					doctor_id, _ = strconv.ParseInt(temp_doctor_id, 10, 64)
+				}
+				theTime, _ := time.ParseInLocation(timeLayout, yz.StartTime, loc) //使用模板在对应时区转化为time.time类型
+				start_time := theTime.Unix()
+				temp_patient_id, _ := strconv.ParseInt(patient_id, 10, 64)
+				SingleDose, _ := strconv.ParseFloat(yz.SingleDose, 64)
+				PrescribingNumber, _ := strconv.ParseFloat(yz.PrescribingNumber, 64)
+				advice := models.XtDoctorAdvice{
+					UserOrgId:             org_id,
+					PatientId:             temp_patient_id,
+					AdviceType:            2,
+					AdviceDate:            schedulesTime,
+					StartTime:             start_time,
+					AdviceName:            yz.AdviceName,
+					AdviceDesc:            yz.AdviceDesc,
+					RecordDate:            schedulesTime,
+					SingleDose:            SingleDose,
+					SingleDoseUnit:        yz.SingleDoseUnit,
+					PrescribingNumber:     PrescribingNumber,
+					PrescribingNumberUnit: yz.PrescribingNumberUnit,
+					DeliveryWay:           yz.DeliveryWay,
+					ExecutionFrequency:    yz.ExecutionFrequency,
+					AdviceDoctor:          doctor_id,
+					CreatedTime:           time.Now().Unix(),
+					UpdatedTime:           time.Now().Unix(),
+					SyncAdviceId:          yz.AdviceId,
+					ExecutionState:        2,
+					Status:                1,
+					IsSync:                1,
+				}
+				utils.InfoLog("advice:%v", advice)
+				// 根据同步来的 advice_id 来查询库里是否已经存在
+				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(key, "", time.Second)
+					keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedulesTime, 10) + ":advice_list_all"
+					redisClient.Set(keyOne, "", time.Second)
+					continue
+				} else {
+					if len(yz.AdviceName) > 0 {
+						handleerr := CreateDoctorAdviceHandle(&advice)
+						if handleerr != nil {
+							utils.ErrorLog("添加医嘱信息失败:%v", handleerr)
+							continue
+						}
+					} else {
+						continue
+					}
+				}
+			}
+		}
+	}
 	return
 }
 
@@ -1561,6 +1567,22 @@ func GetShjhProjectID(org_id int64, project_name string) (project_id int64, err
 	}
 }
 
+// 根据机构ID和检验检查名称获取该检查的project_id，如没有，则创建一个
+func GetSzbljhProjectID(org_id int64, project_name string) (project_id int64, err error) {
+	var inspection_reference models.MiddleInspectionReference
+	err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and status = 1 and project_name = ?", org_id, project_name).First(&inspection_reference).Error
+	if inspection_reference.ID > 0 {
+		return inspection_reference.ProjectId, err
+	} else {
+		err = readMiddleDb.Table("xt_middle_inspection_reference").Where("org_id=? ", org_id).Select("max(project_id) as project_id").Scan(&inspection_reference).Error
+		if inspection_reference.ProjectId > 0 {
+			return inspection_reference.ProjectId + 1, err
+		} else {
+			return 1013800, err
+		}
+	}
+}
+
 // 根据机构ID和检验检查小项名称获取该检查的item_id，如没有，则创建一个
 func GetShItemID(org_id int64, project_name string, item_name string, project_id int64) (item_id int64, err error) {
 	var inspection_reference models.MiddleInspectionReference
@@ -1765,3 +1787,19 @@ func saveLog(result string, request string, infno string, desc string, org_name
 	}
 
 }
+
+func GetSzblItemID(org_id int64, project_name string, item_name string, project_id int64) (item_id int64, err error) {
+	var inspection_reference models.MiddleInspectionReference
+	err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and status = 1 and project_name = ? and item_name = ?", org_id, project_name, item_name).First(&inspection_reference).Error
+	if inspection_reference.ID > 0 {
+		return inspection_reference.ItemId, err
+	} else {
+		err := readMiddleDb.Table("xt_middle_inspection_reference").Where("org_id = ? and project_id = ? ", org_id, project_id).Select("max(item_id) as item_id").First(&inspection_reference).Error
+		utils.InfoLog("inspection_reference: %v", inspection_reference)
+		if inspection_reference.ItemId > 0 {
+			return inspection_reference.ItemId + 1, err
+		} else {
+			return project_id*100 + 1, err
+		}
+	}
+}