1111

conf/app.conf

@@ -1,5 +1,5 @@
 appname = IC
-httpport = 9818
+httpport = 9859
 runmode = prod
 
 copyrequestbody = true

main.go

@@ -15,7 +15,7 @@ func init() {
 }
 
 func main() {
-	//service.BeginAutoSyncLis()
+	service.BeginAutoSyncLis()
 	//service.SyncStsyLis() //  汕头三优  打开程序马上运行LIS同步
 	//service.SyncLisSgyhs() //  韶关源和盛  打开程序马上运行LIS同步
 	//service.SyncLisPljx(10597) //  揭阳景熹透析中心  打开程序马上运行LIS同步
@@ -27,6 +27,13 @@ func main() {
 	//service.SyncSclsyyyyyz(orgDb) // 深圳五洲医院  打开程序马上运行LIS同步
 	//service.SyncGzkyLis() // 广州康允 打开程序马上运行LIS同步
 	//service.SyncLisZqshtx() // 肇庆三鹤 打开程序马上运行LIS同步
-	//service.SyncBjncHis()
+	//service.SyncScyyyyLis() // 四川乐生友谊医院 打开程序马上运行LIS同步
+	//service.SyncGxlsskyz() // 广西灵山盛康 医嘱
+	//service.SyncSzxdyyLis() // 山西朔州现代医院  打开程序马上运行LIS同步
+	//service.SyncSzxdyyyz() // 山西朔州现代医院  打开程序马上运行医嘱同步
+	//service.SyncSHLisFunc() // 舒和LIS对接
+	//service.SyncLisLaxk() //乐安祥康LIS对接
+	//service.SyncLisPljx(10597) // 揭阳LIS对接
+	service.SyncLisPljx(10599) // 揭阳LIS对接
 	beego.Run()
 }

models/report_result.go

@@ -118,3 +118,93 @@ type HisLabelPrintInfo struct {
 func (HisLabelPrintInfo) TableName() string {
 	return "his_label_print_info"
 }
+
+type XtHisProjectTeam struct {
+	ID          int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectTeam string  `gorm:"column:project_team" json:"project_team" form:"project_team"`
+	Price       float64 `gorm:"column:price" json:"price" form:"price"`
+	Pinyin      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	TubeColor   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	TeamType    int64   `gorm:"column:team_type" json:"team_type" form:"team_type"`
+	Remark      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	UserOrgId   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
+	ProjectId   string  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId      string  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	Sort        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+}
+
+func (XtHisProjectTeam) TableName() string {
+	return "xt_his_project_team"
+}
+
+type XtHisProjectList struct {
+	ID           int64        `gorm:"column:id" json:"id" form:"id"`
+	Number       int64        `gorm:"column:number" json:"number" form:"number"`
+	UserOrgId    int64        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId    int64        `gorm:"column:project_id" json:"project_id" form:"project_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"`
+	TeamId       int64        `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	Type         int64        `gorm:"column:type" json:"type" form:"type"`
+	XtHisProject XtHisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	PN           string       `gorm:"-" json:"pn" form:"pn"`
+}
+
+func (XtHisProjectList) TableName() string {
+	return "xt_his_project_list"
+}
+
+type XtHisProject struct {
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName                 string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	Price                       float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit                        string  `gorm:"column:unit" json:"unit" form:"unit"`
+	CostClassify                int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	ExecutiveSection            int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
+	MedicalCoverage             int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
+	StatisticalClassification   int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
+	DiseaseDirectory            int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	MedicalCode                 string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+	TubeColor                   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	MedicalStatus               int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	DefaultNumber               string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsCharge                    int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
+	IsEstimate                  int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
+	IsWorkload                  int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
+	Sort                        string  `gorm:"column:sort" json:"sort" form:"sort"`
+	DoctorAdvice                int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
+	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	NumberDays                  string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
+	Total                       string  `gorm:"column:total" json:"total" form:"total"`
+	Category                    int64   `gorm:"column:category" json:"category" form:"category"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
+	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	Bbx01                       string  `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
+	Bby01                       string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
+	ZuobiaoId                   string  `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+}
+
+func (XtHisProject) TableName() string {
+	return "xt_his_project"
+}

service/cron.go

@@ -1,14 +1,14 @@
 package service
 
 import (
+	"IC/models"
+	"IC/utils"
 	"encoding/json"
 	_ "fmt"
+	_ "github.com/jinzhu/gorm"
+	"github.com/robfig/cron/v3"
 	_ "strings"
 	"time"
-
-	"IC/models"
-	"IC/utils"
-	_ "github.com/jinzhu/gorm"
 )
 
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
@@ -19,15 +19,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())
-//}
+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()
+	createLisSyncCronJob := newWithSeconds()
 
 	//orgDb, err := gorm.Open(oracle.Open("oracle://zjybase:zjybase@10.0.0.248:1521/orcl"), &gorm.Config{})
 	//
@@ -35,6 +35,12 @@ func BeginAutoSyncLis() {
 	//	utils.InfoLog("创建数据库连接失败:%v", err)
 	//}
 
+	//orgDb, err := gorm.Open(oracle.Open("oracle://BSLIS52:zhsoft@172.9.200.3:1521/JYK"), &gorm.Config{})
+	//
+	//if err != nil {
+	//	utils.InfoLog("syncTimeStr:%v", err)
+	//}
+
 	//specys := "0 0 */1 * * ?" // 每天凌晨3点同步 唐山朝阳医院
 	//createLisSyncCronJob.AddFunc(specys, func() {
 	//	SyncTscyLis()
@@ -47,7 +53,7 @@ func BeginAutoSyncLis() {
 	//
 	//spec := "0 50 1 * * ?" // 每天凌晨1点同步 监利大院的
 	//createLisSyncCronJob.AddFunc(spec, func() {
-	//	SyncHbdyLis()
+	//SyncHbdyLis()
 	//})
 	//
 	//spec2 := "0 50 2 * * ?" // 每天凌晨2点同步 龙岗二院
@@ -80,9 +86,9 @@ func BeginAutoSyncLis() {
 	//	SyncLisSzwz()
 	//})
 
-	//spec8 := "0 25 */3 * * ?" // 每个小时同步一次 汕头三优透析中心LIS对接，本地部署的
+	//spec8 := "0 25 */12 * * ?" // 每个小时同步一次 汕头三优透析中心LIS对接，本地部署的
 	//createLisSyncCronJob.AddFunc(spec8, func() {
-	SyncStsyLis()
+	//	SyncStsyLis()
 	//})
 
 	//spec9 := "0 57 * * * ?" // 每个小时同步一次 遵化仁爱医院LIS对接，本地部署的
@@ -95,15 +101,15 @@ func BeginAutoSyncLis() {
 	//	SyncLisSgyhs()
 	//})
 
-	//spec11 := "0 20 */2 * * ?" // 每个小时同步一次 揭阳景熹LIS对接，本地部署的
-	//createLisSyncCronJob.AddFunc(spec11, func() {
-	//	SyncLisPljx(10597)
-	//})
+	spec11 := "0 20 */12 * * ?" // 每个小时同步一次 揭阳景熹LIS对接，本地部署的
+	createLisSyncCronJob.AddFunc(spec11, func() {
+		SyncLisPljx(10597)
+	})
 
-	//spec12 := "0 40 */2 * * ?" // 每个小时同步一次 普宁景熹LIS对接，本地部署的
-	//createLisSyncCronJob.AddFunc(spec12, func() {
-	//	SyncLisPljx(10599)
-	//})
+	spec12 := "0 40 */12 * * ?" // 每个小时同步一次 普宁景熹LIS对接，本地部署的
+	createLisSyncCronJob.AddFunc(spec12, func() {
+		SyncLisPljx(10599)
+	})
 
 	//spec13 := "0 10 * * * ?" // 每个小时同步一次 唐山遵化仁爱医院LIS对接，本地部署的
 	//createLisSyncCronJob.AddFunc(spec13, func() {
@@ -122,7 +128,7 @@ func BeginAutoSyncLis() {
 
 	//spec16 := "0 20 */2 * * ?" // 每个小时同步一次 深圳五洲医院，本地部署的
 	//createLisSyncCronJob.AddFunc(spec16, func() {
-	//	SyncLisSzwz()
+	//	SyncLisSzwz(orgDb)
 	//})
 
 	//spec17 := "0 20 */2 * * ?" // 每个小时同步一次 湖南嘉禾恒佳医院，本地部署的
@@ -132,7 +138,7 @@ func BeginAutoSyncLis() {
 
 	//spec18 := "1 * * * * ?" // 每个30秒同步一次 四川乐山友谊医院医嘱对接，本地部署的
 	//createLisSyncCronJob.AddFunc(spec18, func() {
-	//	SyncSclsyyyyyz(orgDb)
+	//SyncSclsyyyyyz(orgDb)
 	//})
 
 	//spec19 := "* 35 */4 * * ?" // 每个2个小时同步一次 四川乐山友谊医院LIS对接，本地部署的
@@ -150,7 +156,27 @@ func BeginAutoSyncLis() {
 	//	SyncBjncHis()
 	//})
 
-	//createLisSyncCronJob.Start()
+	//spec22 := "1 * * * * ?" // 每个30秒同步一次 广西灵山盛康医嘱对接，本地部署的
+	//createLisSyncCronJob.AddFunc(spec22, func() {
+	//	SyncGxlsskyz()
+	//})
+
+	//spec23 := "1 * * * * ?" // 每个30秒同步一次 朔州现代医院医嘱对接，本地部署的
+	//createLisSyncCronJob.AddFunc(spec23, func() {
+	//	SyncSzxdyyyz()
+	//})
+
+	//spec24 := "* 25 */2 * * ?" // 每个2个小时同步一次 四川乐山友谊医院LIS对接，本地部署的
+	//createLisSyncCronJob.AddFunc(spec24, func() {
+	//	SyncSzxdyyLis()
+	//})
+
+	//spec25 := "* 10 */2 * * ?" // 每个30秒同步一次 朔州现代医院医嘱对接，本地部署的
+	//createLisSyncCronJob.AddFunc(spec25, func() {
+	//	SyncSHLisFunc()
+	//})
+
+	createLisSyncCronJob.Start()
 }
 
 func AutoSyncLis() {

service/lgty_service.go

@@ -40,7 +40,7 @@ func SyncLisLgty() (err error) {
 				if inspectionLastInfo.ID > 0 {
 					sync_time = inspectionLastInfo.CreatedTime
 				} else {
-					sync_time = 1672502400
+					sync_time = 1704038400
 				}
 			}
 
@@ -170,7 +170,7 @@ func ReportInfoHandle(org_id int64) {
 					//return
 				}
 				report_handle.ReportInfoItemNum = int64(report_info_item_num)
-				project_id, _ := GetProjectID(org_id, report_handle.Item)
+				//project_id, _ := GetProjectID(org_id, report_handle.Item)
 				patient, perr := GetUserInfoByAdmission(report_handle.PatientId, org_id)
 				if perr != nil {
 					utils.ErrorLog("查询病人信息失败:%v", perr)
@@ -183,8 +183,8 @@ func ReportInfoHandle(org_id int64) {
 							continue
 						}
 						// 获取该小项的检验检查item_id,如果没有，则创建一个
-						item_id, _ := GetItemID(org_id, report_handle.Item, reportInfo.ItemName, project_id)
-						_, _, syerr := LgthSync(&report_handle, reportInfo, project_id, item_id, org_id, patient.ID, patient.AdmissionNumber)
+						//item_id, _ := GetItemID(org_id, report_handle.Item, reportInfo.ItemName, project_id)
+						_, _, syerr := LgthSync(&report_handle, reportInfo, org_id, patient.ID, patient.AdmissionNumber)
 						if syerr != nil {
 							utils.ErrorLog("创建同步信息失败:%v", syerr)
 							return
@@ -194,7 +194,7 @@ func ReportInfoHandle(org_id int64) {
 			}
 		}
 	}
-	SyncToLgey()
+	//SyncToLgey()
 }
 
 func SyncToLgey() {
@@ -221,10 +221,12 @@ func SyncToLgey() {
 }
 
 // 从机构将数据同步到中间库
-func LgthSync(Head *models.MiddleReportHandle, report ReportInfo, project_id int64, item_id int64, org_id int64, patient_id int64, his_user_id string) (*models.MiddleInspectionReference, *models.MiddleInspection, error) {
+func LgthSync(Head *models.MiddleReportHandle, report ReportInfo, org_id int64, patient_id int64, his_user_id string) (*models.MiddleInspectionReference, *models.MiddleInspection, error) {
 	tx := writeMiddleDb.Begin()
 	var inspection models.MiddleInspection
 	var inspection_reference models.MiddleInspectionReference
+	//var project_id int64
+	//var item_id int64
 	recordDateStr := Head.CheckTime
 	utils.InfoLog("打印测试: %v", recordDateStr)
 
@@ -259,21 +261,26 @@ func LgthSync(Head *models.MiddleReportHandle, report ReportInfo, project_id int
 		RangeOptions = report.Reference
 	}
 
-	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
+	err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and item_name = ? and range_value = ? and status = 1", org_id, report.ItemName, report.Reference).Find(&inspection_reference).Count(&total).Error
 	if inspection_reference.ID > 0 {
 		ItemType = inspection_reference.RangeType
+		//project_id = inspection_reference.ProjectId
+		//item_id = inspection_reference.ItemId
 	}
 	if total <= 0 && len(Head.Item) > 0 {
+		projectId, _ := GetProjectID(org_id, Head.Item)
+		itemId, _ := GetItemID(org_id, Head.Item, report.ItemName, projectId)
+
 		inspection_reference.OrgId = org_id
 		inspection_reference.ProjectName = Head.Item
 		inspection_reference.Project = Head.Item
-		inspection_reference.ProjectId = project_id
+		inspection_reference.ProjectId = projectId
 		inspection_reference.ItemName = report.ItemName
-		inspection_reference.ItemId = item_id
+		inspection_reference.ItemId = itemId
 		inspection_reference.RangeType = ItemType
 		inspection_reference.RangeMin = RangeMin
 		inspection_reference.RangeMax = RangeMax
-		// inspection_reference.RangeValue = RangeValue
+		inspection_reference.RangeValue = report.Reference
 		inspection_reference.RangeOptions = RangeOptions
 		inspection_reference.Unit = report.Unit
 		inspection_reference.Status = 1
@@ -287,15 +294,15 @@ func LgthSync(Head *models.MiddleReportHandle, report ReportInfo, project_id 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, patient_id).Find(&inspection).Count(&itotal).Error
+	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, inspection_reference.ProjectId, inspection_reference.ItemId, record_date, patient_id).Find(&inspection).Count(&itotal).Error
 	if itotal <= 0 {
 		inspection.PatientId = patient_id
 		inspection.OrgId = org_id
-		inspection.ProjectId = project_id
+		inspection.ProjectId = inspection_reference.ProjectId
 		inspection.ItemName = report.ItemName
 		inspection.ProjectName = Head.Item
 		inspection.InspectType = ItemType
-		inspection.ItemId = item_id
+		inspection.ItemId = inspection_reference.ItemId
 		inspection.InspectValue = report.Result
 		inspection.InspectDate = inspect_date
 		inspection.RecordDate = record_date
@@ -335,7 +342,7 @@ func LgthSync(Head *models.MiddleReportHandle, report ReportInfo, project_id int
 // 根据机构ID和检验检查小项名称获取该检查的item_id，如没有，则创建一个
 func GetItemID(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
+	err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and status = 1 and project = ? and item_name = ?", org_id, project_name, item_name).First(&inspection_reference).Error
 	if inspection_reference.ID > 0 {
 		return inspection_reference.ItemId, err
 	} else {
@@ -352,7 +359,7 @@ func GetItemID(org_id int64, project_name string, item_name string, project_id i
 // 根据机构ID和检验检查名称获取该检查的project_id，如没有，则创建一个
 func GetProjectID(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
+	err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and status = 1 and project = ? ", org_id, project_name).First(&inspection_reference).Error
 	if inspection_reference.ID > 0 {
 		return inspection_reference.ProjectId, err
 	} else {

service/pljx_service.go

@@ -35,7 +35,7 @@ func GetPljxLisReport(rdb *gorm.DB, synctime string) (record []*pljxLisReportRes
 func SyncLisPljx(org_id int64) (err error) {
 	org := &models.DataUploadConfig{
 		OrgId:  org_id,
-		DbHost: "localhost",
+		DbHost: "(local)",
 		DbPort: "1433",
 		DbPass: "1Q2W3e4r!@#$",
 		DbUser: "kyy",
@@ -55,9 +55,9 @@ func SyncLisPljx(org_id int64) (err error) {
 	syncLastInfo, _ := GetSyncTimeByOrgIDForYs(org_id)
 	var sync_time int64
 	if syncLastInfo.ID > 0 {
-		sync_time = syncLastInfo.SyncTime
+		sync_time = syncLastInfo.SyncTime - 60*60*24*7
 	} else {
-		sync_time = 1698768000 // 2023-01-01
+		sync_time = 1704038400 // 2024-01-01
 	}
 
 	SyncTime := time.Unix(sync_time, 0)
@@ -141,7 +141,7 @@ func SyncLisPljx(org_id int64) (err error) {
 					}
 				}
 				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, recordTimeStr, patient.ID).Find(&inspection).Count(&itotal).Error
+				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, recordTimeInt, patient.ID).Find(&inspection).Count(&itotal).Error
 				if itotal <= 0 {
 					// inspection.InspectValue = strings.Replace(LisInfo.Testresult, "&gt;", ">", -1)
 					// inspection.InspectValue = strings.Replace(LiLisInfo.Testresult, "&lt;", "<", -1)

service/sclsyyyy_service.go

@@ -176,7 +176,7 @@ func SyncScyyyyLis() (err error) {
 				}
 			}
 			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, recordTimeStr, patientInfo.ID).Find(&inspection).Count(&itotal).Error
+			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, recordTimeInt, patientInfo.ID).Find(&inspection).Count(&itotal).Error
 			if itotal <= 0 {
 				// inspection.InspectValue = strings.Replace(LisInfo.Testresult, "&gt;", ">", -1)
 				// inspection.InspectValue = strings.Replace(LiLisInfo.Testresult, "&lt;", "<", -1)

service/sssy_service.go

@@ -675,7 +675,7 @@ func SyncSYData2() {
 	}
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation("2006-01-02", start_time, loc)
-	newtheTime := theTime.Unix() - 60*60*24
+	newtheTime := theTime.Unix() - 60*60*24*9
 
 	SyncTime := time.Unix(newtheTime, 0)
 	syncTimeStr := SyncTime.Format("2006-01-02")

service/sy_service.go

@@ -87,57 +87,6 @@ func GetStsyItemID(org_id int64, project_name string, item_name string, project_
 	}
 }
 
-func SyncShuHeLis() (err error) {
-
-	org_id := int64(10644)
-	org := &models.DataUploadConfig{
-		OrgId:  org_id,
-		DbHost: "192.168.2.4",
-		DbPort: "1433",
-		DbPass: "a123456..",
-		DbUser: "sa",
-		DbName: "BI",
-	}
-
-	orgDb, err := CreateSqlServiceDB(org.DbHost, org.DbPort, org.DbUser, org.DbPass, org.DbName)
-	if err != nil {
-		utils.ErrorLog("创建数据库连接失败:%v", err)
-		return
-	}
-	fmt.Println(orgDb)
-
-	infoList, _ := GetHisLabelPrintStatusInfo(org_id)
-	if len(infoList) > 0 {
-		for _, item := range infoList {
-			p_ids_arr := strings.Split(item.Ids, ",")
-			list, _ := GetHisLabelPrintInfo(org_id, p_ids_arr)
-			fmt.Println("list==============", list)
-			patients, _ := GetPatientByIDOne(org_id, item.PatientId)
-			fmt.Println("patinets", patients.Name)
-			fmt.Println("patinets", patients.IdCardNo)
-			if len(list) > 0 {
-				for _, it := range list {
-					printCode := models.DataPrintCode{
-						HisUserId:   patients.IdCardNo,
-						Name:        patients.Name,
-						RecordDate:  it.RecordDate,
-						ProjectName: it.ProjectName,
-						Ctime:       time.Now().Unix(),
-						Mtime:       time.Now().Unix(),
-						Status:      1,
-						PrintId:     item.ID,
-						PatientId:   it.PatientId,
-					}
-					err = CratePrintCode(orgDb, printCode)
-					fmt.Println("errr-000000000000000", err)
-				}
-			}
-
-		}
-	}
-	return
-}
-
 // 汕头三优血液透析中心
 func SyncStsyLis() (err error) {
 	org_id := int64(10223)
@@ -332,31 +281,3 @@ func SyncToStsytx() {
 	// 第四步：关闭数据库连接
 	utils.SuccessLog("检验检查同步任务完成")
 }
-
-//舒和
-
-func CratePrintCode(rdb *gorm.DB, code models.DataPrintCode) error {
-
-	err := rdb.Create(&code).Error
-	return err
-}
-
-func GetHisLabelPrintStatusInfo(user_org_id int64) (info []*models.XtHisLabelPrintStatusInfo, err error) {
-
-	err = XTReadDB().Where("user_org_id = ? and status=1 and record_date ='2024-09-04'", user_org_id).Find(&info).Error
-
-	return info, err
-}
-
-func GetHisLabelPrintInfo(user_org_id int64, p_ids_arr []string) (list []*models.HisLabelPrintInfo, err error) {
-
-	err = XTReadDB().Where("user_org_id = ? and status=1 and id in(?)", user_org_id, p_ids_arr).Find(&list).Error
-
-	return list, err
-}
-func GetPatientByIDOne(orgID int64, patientID int64) (models.Patients, error) {
-	var patient models.Patients
-	err := readDb.Model(&models.Patients{}).Where("id = ? and user_org_id=? and status=1", patientID, orgID).First(&patient).Error
-
-	return patient, err
-}

service/szwz_service.go

@@ -3,7 +3,6 @@ package service
 import (
 	"IC/models"
 	"IC/utils"
-	oracle "github.com/dzwvip/gorm-oracle"
 	"gorm.io/gorm"
 	"strings"
 	"time"
@@ -49,15 +48,15 @@ func GetSzwzyLisReportResule(rdb *gorm.DB, repno string) (record []*wzLisReportR
 }
 
 // 深圳五洲中医院Lis同步
-func SyncLisSzwz() (err error) {
+func SyncLisSzwz(orgDb *gorm.DB) (err error) {
 
 	org_id := int64(10580)
 
-	orgDb, err := gorm.Open(oracle.Open("oracle://BSLIS52:zhsoft@172.9.200.3:1521/JYK"), &gorm.Config{})
-
-	if err != nil {
-		utils.InfoLog("syncTimeStr:%v", err)
-	}
+	//orgDb, err := gorm.Open(oracle.Open("oracle://BSLIS52:zhsoft@172.9.200.3:1521/JYK"), &gorm.Config{})
+	//
+	//if err != nil {
+	//	utils.InfoLog("syncTimeStr:%v", err)
+	//}
 
 	// 第一步：获取上一次同步的时间点
 	syncLastInfo, _ := GetSyncTimeByOrgIDForYs(org_id)