1

controllers/lis.go

@@ -35,6 +35,15 @@ func (c *LisController) Schedule() {
 
 }
 
+// 石狮盛誉LIS同步
+func (c *LisController) SyncSssy() {
+	service.SyncToSssytx()
+	c.ServeSuccessJSON(map[string]interface{}{
+		"resultList": "12345",
+	})
+	return
+}
+
 func (c *LisController) SyncTest() {
 	// 获取备份库里所有的医嘱信息
 	// service.EmrBloodDiaylOrder()
@@ -64,6 +73,15 @@ func (c *LisController) SyncTscyLis() {
 	return
 }
 
+// 唐山朝阳医院LIS
+func (c *LisController) SyncTscyVipLis() {
+	service.SyncTscyVipLis()
+	c.ServeSuccessJSON(map[string]interface{}{
+		"resultList": "12345",
+	})
+	return
+}
+
 func (c *LisController) SyncShLis() {
 	// 获取备份库里所有的医嘱信息
 

models/lis_model.go

@@ -80,20 +80,20 @@ func (DataUploadConfig) TableName() string {
 }
 
 type VYunjingPatientLabItems struct {
-	Id             	int64  	`gorm:"column:ID" json:"ID"`
-	Zyid			string  `gorm:"column:ZYID" json:"ZYID"`
-	Mzid     		string  `gorm:"column:MZID" json:"MZID"`
-	PatientId       string  `gorm:"column:PATIENT_ID" json:"PATIENT_ID"`
-	Sfzh 			string 	`gorm:"column:SFZH" json:"SFZH"`
-	PatientName     string 	`gorm:"column:PATIENT_NAME" json:"PATIENT_NAME"`
-	TestOrderNo		string 	`gorm:"column:TEST_ORDER_NO" json:"TEST_ORDER_NO"`
-	ItemType		string  `gorm:"column:ITEM_TYPE" json:"ITEM_TYPE"`
-	ItemTypeName    string  `gorm:"column:ITEM_TYPE_NAME" json:"ITEM_TYPE_NAME"`
-	ItemCode     	string  `gorm:"column:ITEM_CODE" json:"ITEM_CODE"`
-	ItemName    	string  `gorm:"column:ITEM_NAME" json:"ITEM_NAME"`
-	SubmitAt    	string  `gorm:"column:SUBMIT_AT" json:"SUBMIT_AT"`
-	CreateAt    	string  `gorm:"column:CREATE_AT" json:"CREATE_AT"`
-	DeptName    	string  `gorm:"column:DEPT_NAME" json:"DEPT_NAME"`
+	Id           int64  `gorm:"column:ID" json:"ID"`
+	Zyid         string `gorm:"column:ZYID" json:"ZYID"`
+	Mzid         string `gorm:"column:MZID" json:"MZID"`
+	PatientId    string `gorm:"column:PATIENT_ID" json:"PATIENT_ID"`
+	Sfzh         string `gorm:"column:SFZH" json:"SFZH"`
+	PatientName  string `gorm:"column:PATIENT_NAME" json:"PATIENT_NAME"`
+	TestOrderNo  string `gorm:"column:TEST_ORDER_NO" json:"TEST_ORDER_NO"`
+	ItemType     string `gorm:"column:ITEM_TYPE" json:"ITEM_TYPE"`
+	ItemTypeName string `gorm:"column:ITEM_TYPE_NAME" json:"ITEM_TYPE_NAME"`
+	ItemCode     string `gorm:"column:ITEM_CODE" json:"ITEM_CODE"`
+	ItemName     string `gorm:"column:ITEM_NAME" json:"ITEM_NAME"`
+	SubmitAt     string `gorm:"column:SUBMIT_AT" json:"SUBMIT_AT"`
+	CreateAt     string `gorm:"column:CREATE_AT" json:"CREATE_AT"`
+	DeptName     string `gorm:"column:DEPT_NAME" json:"DEPT_NAME"`
 }
 
 func (VYunjingPatientLabItems) TableName() string {
@@ -101,21 +101,20 @@ func (VYunjingPatientLabItems) TableName() string {
 }
 
 type VYunjingPatientLabAnti struct {
-	Id             	int64  	`gorm:"column:ID" json:"ID"`
-	Zyid			string  `gorm:"column:ZYID" json:"ZYID"`
-	Mzid     		string  `gorm:"column:MZID" json:"MZID"`
-	PatientId       string  `gorm:"column:PATIENT_ID" json:"PATIENT_ID"`
-	Sfzh 			string 	`gorm:"column:SFZH" json:"SFZH"`
-	PatientName     string 	`gorm:"column:PATIENT_NAME" json:"PATIENT_NAME"`
-	TestOrderNo		string 	`gorm:"column:TEST_ORDER_NO" json:"TEST_ORDER_NO"`
-	ResultDate		string 	`gorm:"column:RESULT_DATE" json:"RESULT_DATE"`
-	TestResult		string 	`gorm:"column:TEST_RESULT" json:"TEST_RESULT"`
-	Unit			string 	`gorm:"column:UNIT" json:"UNIT"`
-	ReferRange		string 	`gorm:"column:REFER_RANGE" json:"REFER_RANGE"`
-	AntiCode		string 	`gorm:"column:ANTI_CODE" json:"ANTI_CODE"`
-	AntiName		string 	`gorm:"column:ANTI_NAME" json:"ANTI_NAME"`
-	CreateAt    	string  `gorm:"column:CREATE_AT" json:"CREATE_AT"`
-
+	Id          int64  `gorm:"column:ID" json:"ID"`
+	Zyid        string `gorm:"column:ZYID" json:"ZYID"`
+	Mzid        string `gorm:"column:MZID" json:"MZID"`
+	PatientId   string `gorm:"column:PATIENT_ID" json:"PATIENT_ID"`
+	Sfzh        string `gorm:"column:SFZH" json:"SFZH"`
+	PatientName string `gorm:"column:PATIENT_NAME" json:"PATIENT_NAME"`
+	TestOrderNo string `gorm:"column:TEST_ORDER_NO" json:"TEST_ORDER_NO"`
+	ResultDate  string `gorm:"column:RESULT_DATE" json:"RESULT_DATE"`
+	TestResult  string `gorm:"column:TEST_RESULT" json:"TEST_RESULT"`
+	Unit        string `gorm:"column:UNIT" json:"UNIT"`
+	ReferRange  string `gorm:"column:REFER_RANGE" json:"REFER_RANGE"`
+	AntiCode    string `gorm:"column:ANTI_CODE" json:"ANTI_CODE"`
+	AntiName    string `gorm:"column:ANTI_NAME" json:"ANTI_NAME"`
+	CreateAt    string `gorm:"column:CREATE_AT" json:"CREATE_AT"`
 }
 
 func (VYunjingPatientLabAnti) TableName() string {
@@ -123,17 +122,17 @@ func (VYunjingPatientLabAnti) TableName() string {
 }
 
 type PlugPlugcase struct {
-	Id             	int64  	`gorm:"column:ID" json:"ID"`
-	Oldserialno		string  `gorm:"column:oldSerialNo" json:"oldSerialNo"`
-	Serialno     	string  `gorm:"column:serialNo" json:"serialNo"`
-	Name         	string  `gorm:"column:name" json:"name"`
-	Gender 			string 	`gorm:"column:gender" json:"gender"`
-	Age          	int64 	`gorm:"column:age" json:"age"`
-	RegistrantmanId	int64 	`gorm:"column:registrantMan_id" json:"registrantMan_id"`
-	Mainindex		string  `gorm:"column:mainIndex" json:"mainIndex"`
-	Orddoctor     	string  `gorm:"column:ordDoctor" json:"ordDoctor"`
-	Ordloc     		string  `gorm:"column:ordLoc" json:"ordLoc"`
-	Birthday    	string  `gorm:"column:birthDay" json:"birthDay"`
+	Id              int64  `gorm:"column:ID" json:"ID"`
+	Oldserialno     string `gorm:"column:oldSerialNo" json:"oldSerialNo"`
+	Serialno        string `gorm:"column:serialNo" json:"serialNo"`
+	Name            string `gorm:"column:name" json:"name"`
+	Gender          string `gorm:"column:gender" json:"gender"`
+	Age             int64  `gorm:"column:age" json:"age"`
+	RegistrantmanId int64  `gorm:"column:registrantMan_id" json:"registrantMan_id"`
+	Mainindex       string `gorm:"column:mainIndex" json:"mainIndex"`
+	Orddoctor       string `gorm:"column:ordDoctor" json:"ordDoctor"`
+	Ordloc          string `gorm:"column:ordLoc" json:"ordLoc"`
+	Birthday        string `gorm:"column:birthDay" json:"birthDay"`
 }
 
 func (PlugPlugcase) TableName() string {
@@ -141,30 +140,30 @@ func (PlugPlugcase) TableName() string {
 }
 
 type PlugPlugcheckitem struct {
-	Id             	int64  	`gorm:"column:ID" json:"ID"`
-	Serialno		string  `gorm:"column:serialNo" json:"serialNo"`
-	Itemcode     	string  `gorm:"column:itemCode" json:"itemCode"`
-	State         	int64  	`gorm:"column:state" json:"state"`
-	Itemplug 		string 	`gorm:"column:itemPlug" json:"itemPlug"`
-	Checkitemid		string 	`gorm:"column:checkItemId" json:"checkItemId"`
-	Oldserialno		string 	`gorm:"column:oldSerialNo" json:"oldSerialNo"`
-	Applytime		string 	`gorm:"column:applyTime" json:"applyTime"`
-	Specimenname	string  `gorm:"column:specimenName" json:"specimenName"`
-	Checkitemname 	string  `gorm:"column:checkItemName" json:"checkItemName"`
-	Liscollectuser	string  `gorm:"column:LisCollectUser" json:"LisCollectUser"`
-	Liscollecttime	string  `gorm:"column:LisCollectTime" json:"LisCollectTime"`
-	Lissignuser    	string  `gorm:"column:LisSignUser" json:"LisSignUser"`
-	Lissigntime    	string  `gorm:"column:LissignTime" json:"LissignTime"`
-	Lisacceptuser   string  `gorm:"column:LisAcceptUser" json:"LisAcceptUser"`
-	Lisaccepttime   string  `gorm:"column:LisAcceptTime" json:"LisAcceptTime"`
-	Lisregisteruser	string  `gorm:"column:LisRegisterUser" json:"LisRegisterUser"`
-	Lisregistertime	string  `gorm:"column:LisRegisterTime" json:"LisRegisterTime"`
-	Lischeckuser    string  `gorm:"column:LisCheckUser" json:"LisCheckUser"`
-	Lischecktime    string  `gorm:"column:LisCheckTime" json:"LisCheckTime"`
-	Lisrefuseuser   string  `gorm:"column:LisRefuseUser" json:"LisRefuseUser"`
-	Lisrefusetime   string  `gorm:"column:LisRefuseTime" json:"LisRefuseTime"`
-	Lisstatus    	string  `gorm:"column:LisStatus" json:"LisStatus"`
-	Refusereason    string  `gorm:"column:RefuseReason" json:"RefuseReason"`
+	Id              int64  `gorm:"column:ID" json:"ID"`
+	Serialno        string `gorm:"column:serialNo" json:"serialNo"`
+	Itemcode        string `gorm:"column:itemCode" json:"itemCode"`
+	State           int64  `gorm:"column:state" json:"state"`
+	Itemplug        string `gorm:"column:itemPlug" json:"itemPlug"`
+	Checkitemid     string `gorm:"column:checkItemId" json:"checkItemId"`
+	Oldserialno     string `gorm:"column:oldSerialNo" json:"oldSerialNo"`
+	Applytime       string `gorm:"column:applyTime" json:"applyTime"`
+	Specimenname    string `gorm:"column:specimenName" json:"specimenName"`
+	Checkitemname   string `gorm:"column:checkItemName" json:"checkItemName"`
+	Liscollectuser  string `gorm:"column:LisCollectUser" json:"LisCollectUser"`
+	Liscollecttime  string `gorm:"column:LisCollectTime" json:"LisCollectTime"`
+	Lissignuser     string `gorm:"column:LisSignUser" json:"LisSignUser"`
+	Lissigntime     string `gorm:"column:LissignTime" json:"LissignTime"`
+	Lisacceptuser   string `gorm:"column:LisAcceptUser" json:"LisAcceptUser"`
+	Lisaccepttime   string `gorm:"column:LisAcceptTime" json:"LisAcceptTime"`
+	Lisregisteruser string `gorm:"column:LisRegisterUser" json:"LisRegisterUser"`
+	Lisregistertime string `gorm:"column:LisRegisterTime" json:"LisRegisterTime"`
+	Lischeckuser    string `gorm:"column:LisCheckUser" json:"LisCheckUser"`
+	Lischecktime    string `gorm:"column:LisCheckTime" json:"LisCheckTime"`
+	Lisrefuseuser   string `gorm:"column:LisRefuseUser" json:"LisRefuseUser"`
+	Lisrefusetime   string `gorm:"column:LisRefuseTime" json:"LisRefuseTime"`
+	Lisstatus       string `gorm:"column:LisStatus" json:"LisStatus"`
+	Refusereason    string `gorm:"column:RefuseReason" json:"RefuseReason"`
 }
 
 func (PlugPlugcheckitem) TableName() string {
@@ -172,18 +171,18 @@ func (PlugPlugcheckitem) TableName() string {
 }
 
 type PlugPlugresult struct {
-	Id             		int64  	`gorm:"column:ID" json:"ID"`
-	Serialno			string  `gorm:"column:serialNo" json:"serialNo"`
-	Testitemname		string  `gorm:"column:testItemName" json:"testItemName"`
-	Itemcode			string  `gorm:"column:itemcode" json:"itemcode"`
-	Paritemno			string  `gorm:"column:parItemNo" json:"parItemNo"`
-	Reportvalueall		string  `gorm:"column:reportValueAll" json:"reportValueAll"`
-	Testitemdatetime	string  `gorm:"column:testItemDateTime" json:"testItemDateTime"`
-	Unit				string  `gorm:"column:unit" json:"unit"`
-	Refrange			string  `gorm:"column:refrange" json:"refrange"`
-	Resultstatus		string  `gorm:"column:resultStatus" json:"resultStatus"`
-	Itemorder			int64  	`gorm:"column:itemOrder" json:"itemOrder"`
-	Checker				string  `gorm:"column:checker" json:"checker"`
+	Id               int64  `gorm:"column:ID" json:"ID"`
+	Serialno         string `gorm:"column:serialNo" json:"serialNo"`
+	Testitemname     string `gorm:"column:testItemName" json:"testItemName"`
+	Itemcode         string `gorm:"column:itemcode" json:"itemcode"`
+	Paritemno        string `gorm:"column:parItemNo" json:"parItemNo"`
+	Reportvalueall   string `gorm:"column:reportValueAll" json:"reportValueAll"`
+	Testitemdatetime string `gorm:"column:testItemDateTime" json:"testItemDateTime"`
+	Unit             string `gorm:"column:unit" json:"unit"`
+	Refrange         string `gorm:"column:refrange" json:"refrange"`
+	Resultstatus     string `gorm:"column:resultStatus" json:"resultStatus"`
+	Itemorder        int64  `gorm:"column:itemOrder" json:"itemOrder"`
+	Checker          string `gorm:"column:checker" json:"checker"`
 }
 
 func (PlugPlugresult) TableName() string {
@@ -240,7 +239,6 @@ func (MiddlePatients) TableName() string {
 	return "xt_middle_patients"
 }
 
-
 type Patients 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"`
@@ -252,6 +250,8 @@ type Patients struct {
 	ContactName     string `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	Gender          int64  `gorm:"column:gender" json:"gender" form:"gender"`
 	Birthday        int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Phone           string `gorm:"column:phone" json:"phone" form:"phone"`
+	Age             int64  `gorm:"column:age" json:"age"`
 }
 
 func (Patients) TableName() string {
@@ -412,8 +412,10 @@ type MiddleInspection struct {
 	UTime        string `gorm:"column:u_time" json:"u_time" form:"u_time"`
 	IsSync       int    `gorm:"column:is_sync" json:"is_sync" form:"is_sync"`
 	// SyncItemId int64 `gorm:"column:sync_item_id" json:"sync_item_id" form:"sync_item_id"`
-	HisUserId string `gorm:"column:his_user_id" json:"his_user_id" form:"his_user_id"`
-	SyncId    int64  `gorm:"column:sync_id" json:"sync_id" form:"sync_id"`
+	HisUserId    string `gorm:"column:his_user_id" json:"his_user_id" form:"his_user_id"`
+	SyncId       int64  `gorm:"column:sync_id" json:"sync_id" form:"sync_id"`
+	SysProjectId int64  `gorm:"column:sys_project_id" json:"sys_project_id" form:"sys_project_id"`
+	SysItemId    int64  `gorm:"column:sys_item_id" json:"sys_item_id" form:"sys_item_id"`
 }
 
 func (MiddleInspection) TableName() string {
@@ -443,7 +445,9 @@ type MiddleInspectionReference struct {
 	IsSync           int    `gorm:"column:is_sync" json:"is_sync" form:"is_sync"`
 	UTime            string `gorm:"column:u_time" json:"u_time" form:"u_time"`
 	SyncId           int64  `gorm:"column:sync_id" json:"sync_id" form:"sync_id"`
-	ItemCode         string  `gorm:"column:item_code" json:"item_code" form:"item_code"`
+	ItemCode         string `gorm:"column:item_code" json:"item_code" form:"item_code"`
+	XtProjectId      int64  `gorm:"column:xt_project_id" json:"xt_project_id" form:"xt_project_id"`
+	XtItemId         int64  `gorm:"column:xt_item_id" json:"xt_item_id" form:"xt_item_id"`
 }
 
 func (MiddleInspectionReference) TableName() string {
@@ -560,3 +564,26 @@ type VMItemProjectList struct {
 func (VMItemProjectList) TableName() string {
 	return "xt_his_project_list"
 }
+
+type HisLabelPrintStatusInfo struct {
+	ID                 int64    `gorm:"column:id" json:"id" form:"id"`
+	PatientId          int64    `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime              int64    `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64    `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64    `gorm:"column:status" json:"status" form:"status"`
+	IsCombinationPrint int64    `gorm:"column:is_combination_print" json:"is_combination_print" form:"is_combination_print"`
+	RecordDate         string   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ItemIds            string   `gorm:"column:item_ids" json:"item_ids" form:"item_ids"`
+	UserOrgId          int64    `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectIds         string   `gorm:"column:project_ids" json:"project_ids" form:"project_ids"`
+	DoctorId           int64    `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	Ids                string   `gorm:"column:ids" json:"ids" form:"ids"`
+	IsTeam             int64    `gorm:"column:is_team" json:"is_team" form:"is_team"`
+	IsPrint            int64    `gorm:"column:is_print" json:"is_print" form:"is_print"`
+	Patient            Patients `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patient"`
+	ApplyCode          string   `gorm:"column:apply_code" json:"apply_code" form:"apply_code"`
+}
+
+func (HisLabelPrintStatusInfo) TableName() string {
+	return "his_label_print_status_info"
+}

routers/router.go

@@ -29,7 +29,9 @@ func init() {
 	beego.Router("/api/syncshLis", &controllers.LisController{}, "get:SyncShLis")
 	beego.Router("/api/syncszblis", &controllers.LisController{}, "get:SyncSzblLis")
 	beego.Router("/api/test", &controllers.LisController{}, "get:SyncTest")
-	beego.Router("/api/lis/gzjhxytx", &controllers.LisController{}, "get:SyncGzjhxytx")
-	beego.Router("/api/lis/scdckfyy", &controllers.LisController{}, "get:SyncSccdkfyyLis")
-	beego.Router("/api/lis/pajm", &controllers.LisController{}, "get:SyncPajmLis")
+	//beego.Router("/api/lis/gzjhxytx", &controllers.LisController{}, "get:SyncGzjhxytx")
+	//beego.Router("/api/lis/scdckfyy", &controllers.LisController{}, "get:SyncSccdkfyyLis")
+	//beego.Router("/api/lis/pajm", &controllers.LisController{}, "get:SyncPajmLis")
+	beego.Router("/api/lis/sssy", &controllers.LisController{}, "get:SyncSssy")
+	beego.Router("/api/lis/tscyvip", &controllers.LisController{}, "get:SyncTscyVipLis")
 }

service/cron.go

@@ -25,78 +25,48 @@ func newWithSeconds() *cron.Cron {
 	return cron.New(cron.WithParser(secondParser), cron.WithChain())
 }
 
-// func BeginAutoSyncLis() {
-// 	utils.InfoLog("开启自动检验检查同步定时任务")
-// 	createLisSyncCronJob := newWithSeconds()
-
-// 	// specgzjh := "0 */1 * * * ?" // 每1分钟同步 广州暨华HIS医嘱
-// 	// createLisSyncCronJob.AddFunc(specgzjh, func() {
-// 	// 	// SyncGzjhyz()
-// 	// 	Synctfyz()
-// 	// })
-
-// 	specys := "0 0 */1 * * ?" // 每天凌晨3点同步 唐山朝阳医院
-// 	createLisSyncCronJob.AddFunc(specys, func() {
-// 		// SyncStsyLis()
-// 	})
-
-// 	specys1 := "0 10 */2 * * ?" // 每两个小时同步长沙南雅医院
-// 	createLisSyncCronJob.AddFunc(specys1, func() {
-// 		// SyncCsnyLis()
-// 	})
-
-// 	spec := "0 50 1 * * ?" // 每天凌晨1点同步 监利大院的
-// 	createLisSyncCronJob.AddFunc(spec, func() {
-// 		// SyncHbdyLis()
-// 	})
-
-// 	createLisSyncCronJob.Start()
-// }
-
 func BeginAutoSyncLis() {
 	utils.InfoLog("开启自动检验检查同步定时任务")
 	createLisSyncCronJob := newWithSeconds()
 
-	// specgzjh := "0 */1 * * * ?" // 每1分钟同步 广州暨华HIS医嘱
-	// createLisSyncCronJob.AddFunc(specgzjh, func() {
-	// 	// SyncGzjhyz()
-	// 	Synctfyz()
-	// })
-
-	// specys := "0 0 */1 * * ?" // 每天凌晨3点同步 唐山朝阳医院
-	// createLisSyncCronJob.AddFunc(specys, func() {
-	// 	SyncTscyLis()
-	// })
-
-	// specys1 := "0 10 */2 * * ?" // 每两个小时同步长沙南雅医院
-	// createLisSyncCronJob.AddFunc(specys1, func() {
-	// 	SyncCsnyLis()
-	// })
-
-	// spec := "0 50 1 * * ?" // 每天凌晨1点同步 监利大院的
-	// createLisSyncCronJob.AddFunc(spec, func() {
-	// 	SyncHbdyLis()
-	// })
-	
-	// spec2 := "0 50 2 * * ?" // 每天凌晨2点同步 龙岗二院
-	// createLisSyncCronJob.AddFunc(spec2, func() {
-	// 	SyncLisLgty()
-	// })
-
-	// spec3 := "0 50 3 * * ?" // 每天凌晨2点同步 广州暨华血液透析中心
-	// createLisSyncCronJob.AddFunc(spec3, func() {
-	// 	SyncLisGzjhtx()
-	// })
-
-	specgzjh := "0 0 */2 * * ?" // 每2个小时同步 汕头三优血液透析中心LIS
-	createLisSyncCronJob.AddFunc(specgzjh, func() {
-		SyncScpaLis()
+	specys := "0 0 */1 * * ?" // 每天凌晨3点同步 唐山朝阳医院
+	createLisSyncCronJob.AddFunc(specys, func() {
+		SyncTscyLis()
+	})
+
+	specys1 := "0 10 */2 * * ?" // 每两个小时同步长沙南雅医院
+	createLisSyncCronJob.AddFunc(specys1, func() {
+		SyncCsnyLis()
+	})
+
+	spec := "0 50 1 * * ?" // 每天凌晨1点同步 监利大院的
+	createLisSyncCronJob.AddFunc(spec, func() {
+		SyncHbdyLis()
+	})
+
+	spec2 := "0 50 2 * * ?" // 每天凌晨2点同步 龙岗二院
+	createLisSyncCronJob.AddFunc(spec2, func() {
+		SyncLisLgty()
+	})
+
+	spec3 := "0 50 3 * * ?" // 每天凌晨2点同步 广州暨华血液透析中心
+	createLisSyncCronJob.AddFunc(spec3, func() {
+		SyncLisGzjhtx()
+	})
+
+	spec4 := "0 20 3 * * ?" // 每天凌晨同步 石狮盛誉血液透析中心
+	createLisSyncCronJob.AddFunc(spec4, func() {
+		SyncSYData2()
+	})
+
+	spec5 := "0 20 4 * * ?" // 每天凌晨同步 石狮盛誉血液透析中心
+	createLisSyncCronJob.AddFunc(spec5, func() {
+		SyncTscyVipLis()
 	})
 
 	createLisSyncCronJob.Start()
 }
 
-
 func AutoSyncLis() {
 	utils.TraceLog("检验检查任务开始执行")
 	org_id := int64(9538)
@@ -171,7 +141,7 @@ func AutoSyncLis() {
 				}
 				// utils.InfoLog("同步信息详情:%v",syncInfo)
 				continue
-			} 
+			}
 
 			// 第四部：将同步过来的数据插入到中间库对应的表
 			syncSuccessNum := 0

service/lis_service.go

@@ -3,28 +3,28 @@ package service
 import (
 	"IC/models"
 	"IC/utils"
-	_"strconv"
+	_ "IC/utils"
+	_ "fmt"
+	_ "github.com/jinzhu/gorm"
+	_ "strconv"
 	"strings"
 	"time"
-	_"IC/utils"
-	_"fmt"
-	_"github.com/jinzhu/gorm"
 )
 
 // 获取备份库所有的医嘱信息
-func GetAllAdvice() (Advice []models.DoctorAdvice,err error) {
+func GetAllAdvice() (Advice []models.DoctorAdvice, err error) {
 	err = backupDb.Model(&models.DoctorAdvice{}).Offset(100000).Limit(10000).Find(&Advice).Error
 	return
 }
 
 // 获取备份库所有的医嘱信息
-func GetScheduless(id int64) (schedule models.Schedules,err error) {
-	err = tempwriteDb.Model(&models.Schedules{}).Where("id = ?",id).First(&schedule).Error
+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
+func UpdateSchedule(id int64, status int64) error {
+	err := writeDb.Model(&models.Schedules{}).Where("id = ? ", id).Updates(map[string]interface{}{"status": status}).Error
 	return err
 }
 
@@ -34,23 +34,23 @@ func SyncAdvice(Advice *models.DoctorAdvice) error {
 	return err
 }
 
-// 查找有字段的机构 
-func GetfiledConfigOrg() (FiledConfig []models.FiledConfig,err error) {
+// 查找有字段的机构
+func GetfiledConfigOrg() (FiledConfig []models.FiledConfig, err error) {
 	db := readDb.Begin()
 	err = db.Table("xt_filed_config").Group("org_id").Select("org_id,module,filed_name").Where("org_id > 0").Scan(&FiledConfig).Error
 	return
 }
 
-// 查询系统字段 
-func GetfiledConfigSys() (FiledConfig []models.FiledConfig,err error) {
+// 查询系统字段
+func GetfiledConfigSys() (FiledConfig []models.FiledConfig, err error) {
 	err = readDb.Model(&models.FiledConfig{}).Where("org_id = 0").Find(&FiledConfig).Error
-	return 
+	return
 }
 
 // 跟进查询条件查询结果
-func GetfiledConfigByOrgId(org_id int64,module int64,filed_name string)(FiledConfig models.FiledConfig,err error) {
-	err = readDb.Model(&models.FiledConfig{}).Where("org_id = ? and module = ? and filed_name = ?",org_id,module,filed_name).First(&FiledConfig).Error
-	return 
+func GetfiledConfigByOrgId(org_id int64, module int64, filed_name string) (FiledConfig models.FiledConfig, err error) {
+	err = readDb.Model(&models.FiledConfig{}).Where("org_id = ? and module = ? and filed_name = ?", org_id, module, filed_name).First(&FiledConfig).Error
+	return
 }
 
 // 创建一条字段数据详情
@@ -64,7 +64,46 @@ func SyncInspectionReference(data *models.MiddleInspectionReference) error {
 	tx := writeDb.Begin()
 	var inspection_reference models.InspectionReference
 	var total int
-	err = readDb.Model(&models.InspectionReference{}).Where("org_id = ? and project_id = ? and item_id = ?  and status = 1", data.OrgId, data.ProjectId,data.ItemId).Find(&inspection_reference).Count(&total).Error
+	err = readDb.Model(&models.InspectionReference{}).Where("org_id = ? and project_id = ? and item_id = ?  and status = 1", data.OrgId, data.ProjectId, data.ItemId).Find(&inspection_reference).Count(&total).Error
+	if total <= 0 {
+		inspection_reference.OrgId = data.OrgId
+		inspection_reference.ProjectName = data.ProjectName
+		inspection_reference.Project = data.ProjectName
+		inspection_reference.ProjectId = data.ProjectId
+		inspection_reference.ItemName = data.ItemName
+		inspection_reference.ItemId = data.ItemId
+		inspection_reference.RangeType = data.RangeType
+		inspection_reference.RangeMin = data.RangeMin
+		inspection_reference.RangeMax = data.RangeMax
+		inspection_reference.RangeValue = data.RangeValue
+		inspection_reference.RangeOptions = data.RangeOptions
+		inspection_reference.Unit = data.Unit
+		inspection_reference.Status = 1
+		inspection_reference.CreatedTime = time.Now().Unix()
+		inspection_reference.UpdatedTime = time.Now().Unix()
+
+		err := tx.Model(&models.InspectionReference{}).Create(&inspection_reference).Error
+		if err != nil {
+			tx.Rollback()
+		}
+
+		data.IsSync = 1
+		data.SyncId = inspection_reference.ID
+		data.UpdatedTime = time.Now().Unix()
+		ierr := writeMiddleDb.Save(&data).Error
+		if ierr != nil {
+			tx.Rollback()
+		}
+	}
+	tx.Commit()
+	return err
+}
+
+func SyncInspectionReferenceTwo(data *models.MiddleInspectionReference) error {
+	tx := writeDb.Begin()
+	var inspection_reference models.InspectionReference
+	var total int
+	err = readDb.Model(&models.InspectionReference{}).Where("org_id = ? and project_id = ? and item_id = ?  and status = 1", data.OrgId, data.XtProjectId, data.XtItemId).Find(&inspection_reference).Count(&total).Error
 	if total <= 0 {
 		inspection_reference.OrgId = data.OrgId
 		inspection_reference.ProjectName = data.ProjectName
@@ -104,7 +143,7 @@ func SyncInspection(data *models.MiddleInspection) error {
 	tx := writeDb.Begin()
 	var inspection models.Inspection
 	var total int
-	err = readDb.Model(&models.Inspection{}).Where("org_id = ? and project_id = ? and item_id = ? and patient_id =? and inspect_date=?  and status = 1", data.OrgId, data.ProjectId,data.ItemId,data.PatientId,data.RecordDate).Find(&inspection).Count(&total).Error
+	err = readDb.Model(&models.Inspection{}).Where("org_id = ? and project_id = ? and item_id = ? and patient_id =? and inspect_date=?  and status = 1", data.OrgId, data.ProjectId, data.ItemId, data.PatientId, data.RecordDate).Find(&inspection).Count(&total).Error
 	if total <= 0 {
 		inspection.OrgId = data.OrgId
 		inspection.PatientId = data.PatientId
@@ -139,13 +178,13 @@ func SyncInspection(data *models.MiddleInspection) error {
 }
 
 // 跟进org_id获取未同步的检验检查选项信息
-func GetSyncInspectionReferenceByOrgId(org_id int64) (InspectionReferences []models.MiddleInspectionReference,err error) {
+func GetSyncInspectionReferenceByOrgId(org_id int64) (InspectionReferences []models.MiddleInspectionReference, err error) {
 	err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and status = 1 and is_sync = 0", org_id).Find(&InspectionReferences).Error
 	return
 }
 
 // 跟进org_id获取未同步的检验检查信息
-func GetSyncInspectionByOrgId(org_id int64) (Inspection []models.MiddleInspection,err error) {
+func GetSyncInspectionByOrgId(org_id int64) (Inspection []models.MiddleInspection, err error) {
 	err = readMiddleDb.Model(&models.MiddleInspection{}).Where("org_id = ? and status = 1 and is_sync = 0", org_id).Find(&Inspection).Error
 	return
 }
@@ -169,48 +208,48 @@ func CreateReportHandle(report *models.MiddleReportHandle) error {
 }
 
 // 根据机构ID获取该机构检验检查操作表里状态为0的数据
-func GetReportHandleListyOrgID(org_id int64) (report_handle_list []models.MiddleReportHandle ,err error){
-	err = readMiddleDb.Model(&models.MiddleReportHandle{}).Where("org_id = ?  and  handle_type = 0 ",  org_id).Find(&report_handle_list).Error
+func GetReportHandleListyOrgID(org_id int64) (report_handle_list []models.MiddleReportHandle, err error) {
+	err = readMiddleDb.Model(&models.MiddleReportHandle{}).Where("org_id = ?  and  handle_type = 0 ", org_id).Find(&report_handle_list).Error
 	return
 }
 
 // 根据机构ID修改检验检查操作表里的数据
-func UpdateReportHandleListyOrgID(report_handle *models.MiddleReportHandle)  error{
+func UpdateReportHandleListyOrgID(report_handle *models.MiddleReportHandle) error {
 	err := writeMiddleDb.Model(&models.MiddleReportHandle{}).Updates(&report_handle).Error
 	return err
 }
 
 // 跟进机构ID获取该机构所有病人的his_user_id
-func GetHisUserIdByOrgID(org_id int64) (patients []models.MiddlePatients ,err error) {
+func GetHisUserIdByOrgID(org_id int64) (patients []models.MiddlePatients, err error) {
 	err = readMiddleDb.Model(&models.MiddlePatients{}).Where("user_org_id = ? and status = 1", org_id).Find(&patients).Error
 	return
 }
 
 // 根据机构ID获取该机构上次同步信息
-func GetSyncTimeByOrgID(org_id int64,his_user_id string) (sync_info models.MiddleSyncInfo ,err error){
-	err = readMiddleDb.Model(&models.MiddleSyncInfo{}).Where("org_id = ?  and  his_user_id =? ",  org_id,his_user_id).Last(&sync_info).Error
+func GetSyncTimeByOrgID(org_id int64, his_user_id string) (sync_info models.MiddleSyncInfo, err error) {
+	err = readMiddleDb.Model(&models.MiddleSyncInfo{}).Where("org_id = ?  and  his_user_id =? ", org_id, his_user_id).Last(&sync_info).Error
 	return
 }
 
 // 根据机构ID获取该机构上次同步信息
-func GetSyncTimeByOrgIDForYs(org_id int64) (sync_info models.MiddleSyncInfo ,err error){
-	err = readMiddleDb.Model(&models.MiddleSyncInfo{}).Where("org_id = ? ",  org_id).Last(&sync_info).Error
+func GetSyncTimeByOrgIDForYs(org_id int64) (sync_info models.MiddleSyncInfo, err error) {
+	err = readMiddleDb.Model(&models.MiddleSyncInfo{}).Where("org_id = ? ", org_id).Last(&sync_info).Error
 	return
 }
 
 // 根据机构ID和His_useer_id获取该患者最后一条同步检查数据
-func GetInspectionLastInfoByOrgID(org_id int64,his_user_id string) (inspectionLastInfo models.MiddleInspection ,err error){
-	err = readMiddleDb.Model(&models.MiddleInspection{}).Where("org_id = ?  and  his_user_id =? ",  org_id,his_user_id).Order("created_time desc").First(&inspectionLastInfo).Error
+func GetInspectionLastInfoByOrgID(org_id int64, his_user_id string) (inspectionLastInfo models.MiddleInspection, err error) {
+	err = readMiddleDb.Model(&models.MiddleInspection{}).Where("org_id = ?  and  his_user_id =? ", org_id, his_user_id).Order("created_time desc").First(&inspectionLastInfo).Error
 	return
 }
 
 // 从机构将数据同步到中间库
-func Sync(data *models.TBLISItem,org_id int64,patient_id int64)(*models.MiddleInspectionReference,*models.MiddleInspection,error) {
+func Sync(data *models.TBLISItem, org_id int64, patient_id int64) (*models.MiddleInspectionReference, *models.MiddleInspection, error) {
 	tx := writeMiddleDb.Begin()
 	var inspection models.MiddleInspection
 	var inspection_reference models.MiddleInspectionReference
 	recordDateStr := data.UTime
-	if len(data.UTime) == 0 { 
+	if len(data.UTime) == 0 {
 		recordDateStr = time.Now().Format("2006-01-02 15:04")
 	}
 	record_date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", recordDateStr)
@@ -223,17 +262,17 @@ func Sync(data *models.TBLISItem,org_id int64,patient_id int64)(*models.MiddleIn
 	} else {
 		data.ItemType = 1
 		if len(data.RangeMax) > 0 {
-			Range := strings.Split(data.RangeMax,"-")
+			Range := strings.Split(data.RangeMax, "-")
 			if len(Range) > 1 {
 				data.RangeMin = Range[0]
-				data.RangeMax = Range[1] 
+				data.RangeMax = Range[1]
 			} else {
 				data.RangeMin = Range[0]
 			}
 		}
 	}
 
-	err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and project_id = ? and item_id = ? and status = 1", org_id, data.ProjectId,data.ItemId).Find(&inspection_reference).Count(&total).Error
+	err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and project_id = ? and item_id = ? and status = 1", org_id, data.ProjectId, data.ItemId).Find(&inspection_reference).Count(&total).Error
 	if total <= 0 && len(data.ProjectName) > 0 {
 		inspection_reference.OrgId = org_id
 		inspection_reference.ProjectName = data.ProjectName
@@ -258,7 +297,7 @@ func Sync(data *models.TBLISItem,org_id int64,patient_id int64)(*models.MiddleIn
 		}
 	}
 
-	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, data.ProjectId,data.ItemId,record_date.Unix(),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, data.ProjectId, data.ItemId, record_date.Unix(), patient_id).Find(&inspection).Count(&itotal).Error
 	if itotal <= 0 {
 		inspection.PatientId = patient_id
 		inspection.OrgId = org_id
@@ -286,22 +325,21 @@ func Sync(data *models.TBLISItem,org_id int64,patient_id int64)(*models.MiddleIn
 	}
 
 	tx.Commit()
-	return &inspection_reference,&inspection,err
+	return &inspection_reference, &inspection, err
 }
 
-//GetPatientList 返回患者的列表
-func GetList(his_user_id []interface{},syncTimes string) (lis []*models.TBLISItem,  err error) {
-	err = readRemoteDb.Model(&models.TBLISItem{}).Where("u_time > ? AND his_user_id in (?)  ",syncTimes,his_user_id).Find(&lis).Error
+// GetPatientList 返回患者的列表
+func GetList(his_user_id []interface{}, syncTimes string) (lis []*models.TBLISItem, err error) {
+	err = readRemoteDb.Model(&models.TBLISItem{}).Where("u_time > ? AND his_user_id in (?)  ", syncTimes, his_user_id).Find(&lis).Error
 	return
 }
 
-//GetPatientList 返回患者的列表
-func GetListByHisUserID(his_user_id string,syncTimes string,selectType int64) (lis []*models.TBLISItem,err error) {
+// GetPatientList 返回患者的列表
+func GetListByHisUserID(his_user_id string, syncTimes string, selectType int64) (lis []*models.TBLISItem, err error) {
 	if selectType == 1 {
-	 	err = readRemoteDb.Model(&models.TBLISItem{}).Where("u_time > ? AND patient_name = ?  ",syncTimes,his_user_id).Find(&lis).Error
-	 } else {
-		err = readRemoteDb.Model(&models.TBLISItem{}).Where("u_time > ? AND his_user_id = ? ",syncTimes,his_user_id).Find(&lis).Error
-	 }
+		err = readRemoteDb.Model(&models.TBLISItem{}).Where("u_time > ? AND patient_name = ?  ", syncTimes, his_user_id).Find(&lis).Error
+	} else {
+		err = readRemoteDb.Model(&models.TBLISItem{}).Where("u_time > ? AND his_user_id = ? ", syncTimes, his_user_id).Find(&lis).Error
+	}
 	return
 }
-

service/pajm_service.go

@@ -27,7 +27,7 @@ type scpalis struct {
 	RangeValue   string `gorm:"column:range_value" json:"range_value"`
 	RangeOptions string `gorm:"column:range_options" json:"range_options"`
 	Unit         string `gorm:"column:unit" json:"unit"`
-	State        string  `gorm:"column:state" json:"state"`
+	State        int64  `gorm:"column:state" json:"state"`
 	CTime        int64  `gorm:"column:c_time" json:"c_time"`
 	UTime        int64  `gorm:"column:u_time" json:"u_time"`
 }
@@ -74,11 +74,6 @@ func GetScpaItemID(org_id int64, project_name string, item_name string, project_
 	}
 }
 
-func GetPatientPajmByOrgId(org_id int64) (patientList []*models.Patients, err error) {
-	err = readDb.Model(&models.Patients{}).Where("user_org_id = ? and status = 1", org_id).Find(&patientList).Error
-	return
-}
-
 // 四川蓬安济民透析中心Lis同步
 func SyncScpaLis() (err error) {
 	org_id := int64(9829)
@@ -114,7 +109,7 @@ func SyncScpaLis() (err error) {
 	}
 	// 第二步：获取所有患者的病历号
 
-	patientList, _ := GetPatientPajmByOrgId(org_id)
+	patientList, _ := GetPatientGzjhByOrgId(org_id)
 	if len(patientList) > 0 {
 		for _, patient := range patientList {
 			if len(patient.IdCardNo) > 0 {

service/sy_service.go

@@ -6,37 +6,37 @@ import (
 	"IC/utils"
 	_ "encoding/json"
 	_ "encoding/xml"
+	"fmt"
 	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm"
-	_"strconv"
+	_ "strconv"
 	"strings"
 	"time"
-	"fmt"
 )
 
 type stsylis struct {
-	Testno    	string  `gorm:"column:testno " json:"testno "`
-	Seqno    	string  `gorm:"column:seqno  " json:"seqno  "`
-	Itemno     	string  `gorm:"column:itemno " json:"itemno "`
-	Itemname  	string  `gorm:"column:itemname" json:"itemname"`
-	Testresult  string  `gorm:"column:testresult" json:"testresult"`
-	Result1  	string  `gorm:"column:result1" json:"result1"`
-	Result2     string  `gorm:"column:result2" json:"result2"`
-	Resultflag	string  `gorm:"column:resultflag" json:"resultflag"`
-	Units    	string  `gorm:"column:units" json:"units"`
-	Ranges     	string  `gorm:"column:ranges" json:"ranges"`
-	Resulttime	string  `gorm:"column:resulttime" json:"resulttime"`
-	Checkman   	string  `gorm:"column:checkman" json:"checkman"`
-	Testman 	string  `gorm:"column:testman" json:"testman"`
-	Lastmodify	string  `gorm:"column:lastmodify" json:"lastmodify"`
-	Instrument	string  `gorm:"column:instrument" json:"instrument"`
-	Sampleno	string  `gorm:"column:sampleno" json:"sampleno"`
-	Brdh        string  `gorm:"column:brdh" json:"brdh"`
-	Brxm        string  `gorm:"column:brxm" json:"brxm"`
-	Sfxmdh      string  `gorm:"column:sfxmdh" json:"sfxmdh"`
-	Sendflag    string  `gorm:"column:sendflag" json:"sendflag"`
-	Myid        string  `gorm:"column:myid" json:"myid"`
-	Uploadflag  string  `gorm:"column:uploadflag" json:"uploadflag"`
+	Testno     string `gorm:"column:testno " json:"testno "`
+	Seqno      string `gorm:"column:seqno  " json:"seqno  "`
+	Itemno     string `gorm:"column:itemno " json:"itemno "`
+	Itemname   string `gorm:"column:itemname" json:"itemname"`
+	Testresult string `gorm:"column:testresult" json:"testresult"`
+	Result1    string `gorm:"column:result1" json:"result1"`
+	Result2    string `gorm:"column:result2" json:"result2"`
+	Resultflag string `gorm:"column:resultflag" json:"resultflag"`
+	Units      string `gorm:"column:units" json:"units"`
+	Ranges     string `gorm:"column:ranges" json:"ranges"`
+	Resulttime string `gorm:"column:resulttime" json:"resulttime"`
+	Checkman   string `gorm:"column:checkman" json:"checkman"`
+	Testman    string `gorm:"column:testman" json:"testman"`
+	Lastmodify string `gorm:"column:lastmodify" json:"lastmodify"`
+	Instrument string `gorm:"column:instrument" json:"instrument"`
+	Sampleno   string `gorm:"column:sampleno" json:"sampleno"`
+	Brdh       string `gorm:"column:brdh" json:"brdh"`
+	Brxm       string `gorm:"column:brxm" json:"brxm"`
+	Sfxmdh     string `gorm:"column:sfxmdh" json:"sfxmdh"`
+	Sendflag   string `gorm:"column:sendflag" json:"sendflag"`
+	Myid       string `gorm:"column:myid" json:"myid"`
+	Uploadflag string `gorm:"column:uploadflag" json:"uploadflag"`
 }
 
 func (stsylis) TableName() string {
@@ -49,13 +49,13 @@ func GetStsyLis(rdb *gorm.DB, synctime time.Time) (record []*stsylis, err error)
 }
 
 // 根据机构ID和患者姓名获取患者信息
-func GetUserInfoByName(org_id int64,name string) (patients models.Patients, err error) {
-	err = readDb.Model(&models.Patients{}).Where("user_org_id = ? and status = 1 and name = ?", org_id,name).First(&patients).Error
+func GetUserInfoByName(org_id int64, name string) (patients models.Patients, err error) {
+	err = readDb.Model(&models.Patients{}).Where("user_org_id = ? and status = 1 and name = ?", org_id, name).First(&patients).Error
 	return
 }
 
 // 根据机构ID和检验检查名称获取该检查的project_id，如没有，则创建一个
-func GetStsyProjectID(org_id int64, project_name string,item_name string) (project_id int64, err error) {
+func GetStsyProjectID(org_id int64, project_name string, item_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 = ?  and item_name = ? ", org_id, project_name, item_name).First(&inspection_reference).Error
 	if inspection_reference.ID > 0 {
@@ -120,17 +120,17 @@ func SyncStsyLis() (err error) {
 		sync_time = 1685548800
 	}
 
-	SyncTime := time.Unix(sync_time,0)
+	SyncTime := time.Unix(sync_time, 0)
 
 	fmt.Println(SyncTime)
 	// 第二步：获取时间内所有检验结果
 	stsyLis, _ := GetStsyLis(orgDb, SyncTime)
 
 	if len(stsyLis) > 0 {
-		for _,LisInfo := range stsyLis{
+		for _, LisInfo := range stsyLis {
 			brxm := LisInfo.Brxm
 			// 根据姓名获取患者ID
-			patient,_ := GetUserInfoByName(org_id,brxm)
+			patient, _ := GetUserInfoByName(org_id, brxm)
 			if patient.ID > 0 {
 				project_id, _ := GetStsyProjectID(org_id, LisInfo.Instrument, LisInfo.Itemname)
 				item_id, _ := GetStsyItemID(org_id, LisInfo.Instrument, LisInfo.Itemname, project_id)
@@ -147,7 +147,7 @@ func SyncStsyLis() (err error) {
 
 				recordTime, _ := time.ParseInLocation("2006-01-02 15:04:05", tempRecord, loc)
 				recordTimeInt := recordTime.Unix()
-				recordTimeStr := time.Unix(recordTimeInt,0).Format(timeLayout)
+				recordTimeStr := time.Unix(recordTimeInt, 0).Format(timeLayout)
 
 				var total int
 				var RangeOptions string
@@ -190,7 +190,7 @@ func SyncStsyLis() (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, recordTimeInt, 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, recordTimeStr, 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)
@@ -219,7 +219,7 @@ func SyncStsyLis() (err error) {
 			} else {
 				continue
 			}
-		}				
+		}
 	}
 	var syncInfo models.MiddleSyncInfo
 	syncInfo.OrgId = org_id
@@ -251,7 +251,6 @@ func SyncStsyLis() (err error) {
 // 	return
 // }
 
-
 func SyncToStsytx() {
 
 	utils.TraceLog("检验检查同步任务开始执行")

service/tscyyy_service.go

@@ -4,11 +4,10 @@ import (
 	"IC/models"
 	"IC/utils"
 	_ "IC/utils"
-	_"bytes"
+	_ "bytes"
 	"encoding/json"
 	_ "encoding/json"
-	_"encoding/xml"
-	_"fmt"
+	_ "encoding/xml"
 	_ "fmt"
 	"github.com/astaxie/beego/httplib"
 	_ "github.com/jinzhu/gorm"
@@ -18,25 +17,24 @@ import (
 	"time"
 )
 
-
 type tscylis struct {
 	HisUserId    string `json:"his_user_id"`
 	PatientName  string `json:"patient_name"`
-	ProjectId    string  `json:"project_id"`
+	ProjectId    string `json:"project_id"`
 	ProjectName  string `json:"project_name"`
-	InspectDate  string  `json:"inspect_date"`
-	ItemId       string  `json:"item_id"`
+	InspectDate  string `json:"inspect_date"`
+	ItemId       string `json:"item_id"`
 	ItemName     string `json:"item_name"`
-	ItemType     string  `json:"item_type"`
+	ItemType     string `json:"item_type"`
 	ItemValue    string `json:"item_value"`
 	RangeMin     string `json:"range_min"`
 	RangeMax     string `json:"range_max"`
 	RangeValue   string `json:"range_value"`
 	RangeOptions string `json:"range_options"`
 	Unit         string `json:"unit"`
-	State        string  `json:"state"`
-	CTime        string  `json:"c_time"`
-	UTime        string  `json:"u_time"`
+	State        string `json:"state"`
+	CTime        string `json:"c_time"`
+	UTime        string `json:"u_time"`
 }
 
 type tscyLisResult struct {
@@ -53,8 +51,6 @@ func GetTscyLis(sync_time string, his_user_id string) (str tscyLisResult, checkS
 	if err != nil {
 		utils.InfoLog("err:%v", err)
 	}
-	utils.InfoLog("str:%v", strs)
-
 	var checkJSON tscyLisResult
 	json.Unmarshal([]byte(strs), &checkJSON)
 	// utils.InfoLog("checkJSON:%v", checkJSON)
@@ -77,19 +73,35 @@ func GetTscyProjectID(org_id int64, project_name string) (project_id int64, err
 	}
 }
 
+// 根据机构ID和检验检查名称获取该检查的project_id，如没有，则创建一个
+func GetTscyVipProjectID(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 1056201, err
+		}
+	}
+}
+
 // 根据机构ID和检验检查小项名称获取该检查的item_id，如没有，则创建一个
-func GetTscyItemID(org_id int64,project_name string,item_name string,project_id int64) (item_id int64 ,err error) {
+func GetTscyItemID(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_name = ? and item_name = ?", org_id, project_name, item_name).First(&inspection_reference).Error
 	if inspection_reference.ID > 0 {
-		return inspection_reference.ItemId,err
+		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)
+		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
+			return inspection_reference.ItemId + 1, err
 		} else {
-			return project_id * 100 + 1 ,err
+			return project_id*100 + 1, err
 		}
 	}
 }
@@ -135,7 +147,7 @@ func SyncTscyLis() (err error) {
 						// 根据project_id和item_id 判断该项是否存在
 						project_id := int64(0)
 						// if info.ProjectId > 0 {
-							project_id, _ = GetTscyProjectID(org_id, info.ProjectName)
+						project_id, _ = GetTscyProjectID(org_id, info.ProjectName)
 						// } else {
 						// 	continue
 						// }
@@ -146,7 +158,7 @@ func SyncTscyLis() (err error) {
 						var inspection models.MiddleInspection
 						var inspection_reference models.MiddleInspectionReference
 
-						record_date,_ := strconv.ParseInt(info.InspectDate, 10, 64)
+						record_date, _ := strconv.ParseInt(info.InspectDate, 10, 64)
 
 						if record_date == 0 {
 							record_date = time.Now().Unix()
@@ -166,12 +178,12 @@ func SyncTscyLis() (err error) {
 						ItemType := info.ItemType
 						// Range := strings.Split(info.RangeValue, "-")
 						// if len(Range) > 1 {
-							RangeMin = info.RangeMin
-							RangeMax = info.RangeMax
+						RangeMin = info.RangeMin
+						RangeMax = info.RangeMax
 						// 	ItemType = 1
 						// } else {
 						// 	ItemType = 2
-							RangeOptions = info.RangeOptions
+						RangeOptions = info.RangeOptions
 						// }
 
 						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
@@ -280,3 +292,159 @@ func SyncToTscytx() {
 	}
 	utils.SuccessLog("检验检查同步任务完成")
 }
+
+// 唐山朝阳医院Vip区透析中心Lis同步
+func SyncTscyVipLis() (err error) {
+	org_id := int64(10562)
+	// 第一步：获取上一次同步的时间点
+	syncLastInfo, _ := GetSyncTimeByOrgIDForYs(org_id)
+	var sync_time int64
+	if syncLastInfo.ID > 0 {
+		sync_time = syncLastInfo.SyncTime
+	} else {
+		sync_time = 1651334400
+	}
+	// 第二步：获取所有患者的病历号
+
+	patientList, _ := GetPatientGzjhByOrgId(org_id)
+	if len(patientList) > 0 {
+		for _, patient := range patientList {
+			if len(patient.IdCardNo) > 0 || len(patient.DialysisNo) > 0 {
+				// 上次同步时间转换为接口需要的格式
+				patient_id := patient.ID
+				utils.InfoLog("IdCardNo:%v", patient.IdCardNo)
+				gzjhLis, _ := GetTscyLis(strconv.FormatInt(sync_time, 10), patient.IdCardNo)
+
+				if len(gzjhLis.Result) > 0 {
+					for _, info := range gzjhLis.Result {
+						// 根据project_id和item_id 判断该项是否存在
+						project_id := int64(0)
+						project_id, _ = GetTscyVipProjectID(org_id, info.ProjectName)
+
+						item_id, _ := GetTscyItemID(org_id, info.ProjectName, info.ItemName, project_id)
+
+						tx := writeMiddleDb.Begin()
+						var inspection models.MiddleInspection
+						var inspection_reference models.MiddleInspectionReference
+
+						record_date, _ := strconv.ParseInt(info.InspectDate, 10, 64)
+
+						if record_date == 0 {
+							record_date = time.Now().Unix()
+						}
+						inspect_date := time.Unix(record_date, 0).Format("2006-01-02 15:04")
+						var total int
+						var RangeOptions string
+						var RangeMin string
+						var RangeMax string
+
+						// // 判断检查类型
+						ItemType := info.ItemType
+						RangeMin = info.RangeMin
+						RangeMax = info.RangeMax
+
+						RangeOptions = info.RangeOptions
+						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 total <= 0 {
+							inspection_reference.OrgId = org_id
+							inspection_reference.ProjectName = info.ProjectName
+							inspection_reference.Project = info.ProjectName
+							inspection_reference.ProjectId = project_id
+							inspection_reference.ItemName = info.ItemName
+							inspection_reference.ItemNameAddition = info.ItemId
+							inspection_reference.ItemId = item_id
+							inspection_reference.RangeType, _ = strconv.Atoi(ItemType)
+							inspection_reference.RangeMin = RangeMin
+							inspection_reference.RangeMax = RangeMax
+							// inspection_reference.RangeValue = RangeValue
+							inspection_reference.RangeOptions = RangeOptions
+							inspection_reference.Unit = info.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, patient_id).Find(&inspection).Count(&itotal).Error
+						if itotal <= 0 {
+							info.ItemValue = strings.Replace(info.ItemValue, "&gt;", ">", -1)
+							info.ItemValue = strings.Replace(info.ItemValue, "&lt;", "<", -1)
+							inspection.PatientId = patient_id
+							inspection.OrgId = org_id
+							inspection.ProjectId = project_id
+							inspection.ItemName = inspection_reference.ItemName
+							inspection.ProjectName = inspection_reference.ProjectName
+							inspection.InspectType, _ = strconv.Atoi(ItemType)
+							inspection.ItemId = item_id
+							inspection.InspectValue = info.ItemValue
+							inspection.InspectDate = inspect_date
+							inspection.RecordDate = record_date
+							// inspection.InspectTips = report.Resultstate
+							inspection.Status = 1
+							inspection.CreatedTime = time.Now().Unix()
+							inspection.UpdatedTime = time.Now().Unix()
+							inspection.UTime = inspect_date
+							inspection.HisUserId = strconv.FormatInt(patient_id, 10)
+							err = tx.Model(&models.MiddleInspection{}).Create(&inspection).Error
+							if err != nil {
+								tx.Rollback()
+							}
+						}
+
+						tx.Commit()
+					}
+				}
+			} else {
+				continue
+			}
+		}
+	}
+	var syncInfo models.MiddleSyncInfo
+	syncInfo.OrgId = org_id
+	syncInfo.SyncTime = time.Now().Unix()
+	syncInfo.SyncResultType = 1
+	syncInfo.SyncRsultRemark = "同步成功"
+	syncInfo.SyncTotalNum = 0
+	syncInfo.SyncSuccessNum = 0
+	syncInfo.SyncInfo = ""
+	syncInfo.CreateTime = time.Now().Unix()
+	syncInfo.UpdateTime = time.Now().Unix()
+
+	cwderr := CreateSyncInfo(&syncInfo)
+	if cwderr != nil {
+		utils.ErrorLog("创建同步信息失败:%v", cwderr)
+		return
+	}
+	SyncToTscyVip()
+	return
+}
+
+func SyncToTscyVip() {
+	utils.TraceLog("检验检查同步任务开始执行")
+	org_id := int64(10562)
+
+	// 第一步：跟进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)
+		}
+	}
+	utils.SuccessLog("检验检查同步任务完成")
+}