Changes

controllers/lis.go

@@ -39,7 +39,7 @@ func (c *LisController) SyncTest() {
 	// 获取备份库里所有的医嘱信息
 	// service.EmrBloodDiaylOrder()
 	// service.EmrBloodDiaylDetail()
-	service.SyncScpaLis()
+	//service.SyncScpaLis()
 	c.ServeSuccessJSON(map[string]interface{}{
 		"resultList": "12345",
 	})

main.go

@@ -15,11 +15,14 @@ func init() {
 }
 
 func main() {
-	service.BeginAutoSyncLis()
+	//service.BeginAutoSyncLis()
 	//service.GetDataInsertDB(10138)
 	//service.GetResultDataInsertDB(10138)
 	// service.GetSHResultDataInsertDB(10215)
 	// service.Synctfyz()
 	// service.GetSHResultDataInsertDB(10215)
+
+	service.SyncSYData2(10191)
+	//service.UploadSYData(10191)
 	beego.Run()
 }

models/exists_report.go

@@ -0,0 +1 @@
+package models

models/jy_apply.go

@@ -0,0 +1,77 @@
+package models
+
+import "encoding/xml"
+
+type JYApplyEnvelope struct {
+	XMLName xml.Name    `xml:"soap:Envelope"`
+	Soap    string      `xml:"xmlns:soap,attr"`
+	Xsi     string      `xml:"xmlns:xsi,attr"`
+	Xsd     string      `xml:"xmlns:xsd,attr"`
+	Body    JYApplyBody `xml:"soap:Body"`
+}
+
+type JYApplyBody struct {
+	XMLName         xml.Name        `xml:"soap:Body"`
+	InspectApplyReq InspectApplyReq `xml:"InspectApplyByInstituteItemCode"`
+}
+
+type InspectApplyReq struct {
+	XMLName         xml.Name `xml:"http://tempuri.org/ InspectApplyByInstituteItemCode"`
+	ApiKey          string   `xml:"apiKey"`
+	Apply           JYApply  `xml:"apply"`
+	ApplyDetailList struct {
+		CustomerApplyDetail []CustomerApplyDetail `xml:"CustomerApplyDetail"`
+	} `xml:"applyDetailList"`
+	//ApplyDetailList []JYApplyDetail    `xml:"applyDetailList>JYApplyDetail"`
+	ApplyAdditional *JYApplyAdditional `xml:"applyAdditional,omitempty"`
+}
+
+type EnvelopeFour struct {
+	XMLName xml.Name         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Envelope"`
+	Body    EnvelopeBodyFour `xml:"Body"`
+}
+
+type EnvelopeBodyFour struct {
+	InspectApplyByInstituteItemCodeResponse InspectApplyByInstituteItemCodeResponse `xml:"InspectApplyByInstituteItemCodeResponse"`
+}
+
+type InspectApplyByInstituteItemCodeResponse struct {
+	XMLName      xml.Name `xml:"http://tempuri.org/ InspectApplyByInstituteItemCodeResponse"`
+	InspectApply string   `xml:"InspectApplyByInstituteItemCodeResult"`
+}
+
+type InspectApplyData struct {
+	Res           int           `json:"Res"`
+	Error         string        `json:"Error"`
+	JYApplyResult JYApplyResult `json:"Data"`
+}
+
+type JYApply struct {
+	XMLName      xml.Name `xml:"apply"`
+	PatientName  string   `xml:"PatientName"`
+	Sex          string   `xml:"Sex"`
+	Age          string   `xml:"Age"`
+	AgeUnit      string   `xml:"AgeUnit"`
+	RegisterCode string   `xml:"RegisterCode"`
+	Diagnosis    string   `xml:"Diagnosis"`
+	Ward         string   `xml:"Ward"`
+	BedCode      string   `xml:"BedCode"`
+	SendDoctor   string   `xml:"SendDoctor"`
+	PatientType  int      `xml:"PatientType"`
+	PatientPhone string   `xml:"PatientPhone"`
+}
+
+type CustomerApplyDetail struct {
+	RowIndex               int64  `xml:"RowIndex"`
+	CustomerChargeItemCode string `xml:"CustomerChargeItemCode"`
+	TakeSampleTime         string `xml:"TakeSampleTime"`
+	Barcode                string `xml:"Barcode"`
+	CustomerBarcode        string `xml:"CustomerBarcode"`
+	Comment                string `xml:"Comment"`
+}
+type JYApplyResult struct {
+	ApplyCode   string  `xml:"ApplyCode"`
+	TotalAmount float64 `xml:"TotalAmount"`
+}
+type JYApplyAdditional struct {
+}

models/lis_model.go

@@ -140,6 +140,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 {
@@ -207,20 +209,22 @@ func (TBLISItem) TableName() string {
 }
 
 type Inspection struct {
-	ID           int64  `gorm:"column:id" json:"id" form:"id"`
-	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	ProjectId    int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	ItemId       int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
-	ItemName     string `gorm:"column:item_name" json:"item_name" form:"item_name"`
-	ProjectName  string `gorm:"column:project_name" json:"project_name" form:"project_name"`
-	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
-	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
-	InspectTips  string `gorm:"column:inspect_tips" json:"inspect_tips" form:"inspect_tips"`
-	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
-	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"`
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId              int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId          int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId             int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName           string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName        string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType        int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue       string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectTips        string `gorm:"column:inspect_tips" json:"inspect_tips" form:"inspect_tips"`
+	InspectDate        int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	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"`
+	ReferenceItemId    int64  `gorm:"column:reference_item_id" json:"reference_item_id" form:"reference_item_id"`
+	ReferenceProjectId int64  `gorm:"column:reference_project_id" json:"reference_project_id" form:"reference_project_id"`
 }
 
 func (Inspection) TableName() string {
@@ -331,6 +335,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"`
+
+	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 {
@@ -447,3 +454,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"
+}

models/report_list.go

@@ -0,0 +1,70 @@
+package models
+
+import "encoding/xml"
+
+type ReportListEnvelope struct {
+	XMLName xml.Name       `xml:"soap:Envelope"`
+	Soap    string         `xml:"xmlns:soap,attr"`
+	Xsi     string         `xml:"xmlns:xsi,attr"`
+	Xsd     string         `xml:"xmlns:xsd,attr"`
+	Body    ReportListBody `xml:"soap:Body"`
+}
+
+type ReportListBody struct {
+	XMLName      xml.Name     `xml:"soap:Body"`
+	GetReportReq GetReportReq `xml:"GetAllSampleList"`
+}
+
+type GetReportReq struct {
+	XMLName       xml.Name `xml:"http://tempuri.org/ GetAllSampleList"`
+	Key           string   `xml:"key"`
+	BeginDateTime string   `xml:"BeginDateTime"`
+	EndDateTime   string   `xml:"EndDateTime"`
+	DateType      int      `xml:"DateType"`
+	PrintState    int      `xml:"PrintState"`
+}
+
+type EnvelopeTwo struct {
+	XMLName xml.Name     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Envelope"`
+	Body    EnvelopeBody `xml:"Body"`
+}
+
+type EnvelopeBody struct {
+	GetAllSampleListResponse GetAllSampleListResponse `xml:"GetAllSampleListResponse"`
+}
+
+type GetAllSampleListResponse struct {
+	XMLName                xml.Name `xml:"http://tempuri.org/ GetAllSampleListResponse"`
+	GetAllSampleListResult string   `xml:"GetAllSampleListResult"`
+}
+
+type ReportData struct {
+	Res                    int                      `json:"Res"`
+	Error                  string                   `json:"Error"`
+	GPReportListResultData []GPReportListResultData `json:"Data"`
+}
+
+type GPReportListResultData struct {
+	RecordID           string `json:"RecordID"`
+	PatientName        string `json:"PatientName"`
+	Sex                string `json:"Sex"`
+	Age                int    `json:"Age"`
+	AgeUnit            string `json:"AgeUnit"`
+	OfficeName         string `json:"OfficeName"`
+	BedCode            string `json:"BedCode"`
+	Barcode            string `json:"Barcode"`
+	CustomerBarcode    string `json:"CustomerBarcode"`
+	SampleCode         string `json:"SampleCode"`
+	SampleCategory     string `json:"SampleCategory"`
+	SampleDescription  string `json:"SampleDescription"`
+	Diagnostics        string `json:"Diagnostics"`
+	TakeSampleDateTime string `json:"TakeSampleDateTime"`
+	ReceiveDateTime    string `json:"ReceiveDateTime"`
+	AuditDateTime      string `json:"AuditDateTime"`
+	InspectDate        string `json:"InspectDate"`
+	SendDoctor         string `json:"SendDoctor"`
+	InspectDoctorName  string `json:"InspectDoctorName"`
+	AuditorName        string `json:"AuditorName"`
+	Instrument         string `json:"Instrument"`
+	Comment            string `json:"Comment"`
+}

models/report_result.go

@@ -0,0 +1,55 @@
+package models
+
+import "encoding/xml"
+
+type ReportResultEnvelope struct {
+	XMLName xml.Name         `xml:"soap:Envelope"`
+	Soap    string           `xml:"xmlns:soap,attr"`
+	Xsi     string           `xml:"xmlns:xsi,attr"`
+	Xsd     string           `xml:"xmlns:xsd,attr"`
+	Body    ReportResultBody `xml:"soap:Body"`
+}
+
+type ReportResultBody struct {
+	XMLName            xml.Name           `xml:"soap:Body"`
+	GetReportResultReq GetReportResultReq `xml:"GetJSONReportItemListByCustomerBarocde"`
+}
+
+type GetReportResultReq struct {
+	XMLName         xml.Name `xml:"http://tempuri.org/ GetJSONReportItemListByCustomerBarocde"`
+	Key             string   `xml:"key"`
+	CustomerBarCode string   `xml:"CustomerBarCode"`
+}
+
+type EnvelopeThree struct {
+	XMLName xml.Name          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Envelope"`
+	Body    EnvelopeBodyThree `xml:"Body"`
+}
+
+type EnvelopeBodyThree struct {
+	GetJSONReportItemListByCustomerBarocdeResponse GetJSONReportItemListByCustomerBarocdeResponse `xml:"GetJSONReportItemListByCustomerBarocdeResponse"`
+}
+
+type GetJSONReportItemListByCustomerBarocdeResponse struct {
+	XMLName                                      xml.Name `xml:"http://tempuri.org/ GetJSONReportItemListByCustomerBarocdeResponse"`
+	GetJSONReportItemListByCustomerBarocdeResult string   `xml:"GetJSONReportItemListByCustomerBarocdeResult"`
+}
+
+type ReportResultData struct {
+	Res           int             `json:"Res"`
+	Error         string          `json:"Error"`
+	InspectResult []InspectResult `json:"Data"`
+}
+
+type InspectResult struct {
+	ChargeItemName string `json:"ChargeItemName"`
+	InspectionName string `json:"InspectionName"`
+	InspectionCode string `json:"InspectionCode"`
+	Result         string `json:"Result"`
+	Reference      string `json:"Reference"`
+	Barcode        string `json:"Barcode"`
+	Unit           string `json:"Unit"`
+	Flag           string `json:"Flag"`
+	intFlag        int    `json:"intFlag"`
+	ListResult     GPReportListResultData
+}

models/report_result_two.go

@@ -0,0 +1,55 @@
+package models
+
+import "encoding/xml"
+
+type GPReportResultEnvelope struct {
+	XMLName xml.Name           `xml:"soap:Envelope"`
+	Soap    string             `xml:"xmlns:soap,attr"`
+	Xsi     string             `xml:"xmlns:xsi,attr"`
+	Xsd     string             `xml:"xmlns:xsd,attr"`
+	Body    GPReportResultBody `xml:"soap:Body"`
+}
+
+type GPReportResultBody struct {
+	XMLName            xml.Name             `xml:"soap:Body"`
+	GetReportResultReq GetGPReportResultReq `xml:"GetJSONReportItemListByGPBarocde"`
+}
+
+type GetGPReportResultReq struct {
+	XMLName   xml.Name `xml:"http://tempuri.org/ GetJSONReportItemListByGPBarocde"`
+	Key       string   `xml:"key"`
+	GPBarCode string   `xml:"GPBarCode"`
+}
+
+type EnvelopeFive struct {
+	XMLName xml.Name         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Envelope"`
+	Body    EnvelopeBodyFive `xml:"Body"`
+}
+
+type EnvelopeBodyFive struct {
+	GetJSONReportItemListByGPBarocdeResponse GetJSONReportItemListByGPBarocdeResponse `xml:"GetJSONReportItemListByGPBarocdeResponse"`
+}
+
+type GetJSONReportItemListByGPBarocdeResponse struct {
+	XMLName                                xml.Name `xml:"http://tempuri.org/ GetJSONReportItemListByGPBarocdeResponse"`
+	GetJSONReportItemListByGPBarocdeResult string   `xml:"GetJSONReportItemListByGPBarocdeResult"`
+}
+
+type ReportResultDataFive struct {
+	Res           int                 `json:"Res"`
+	Error         string              `json:"Error"`
+	InspectResult []InspectResultFive `json:"Data"`
+}
+
+type InspectResultFive struct {
+	ChargeItemName string `json:"ChargeItemName"`
+	InspectionName string `json:"InspectionName"`
+	InspectionCode string `json:"InspectionCode"`
+	Result         string `json:"Result"`
+	Reference      string `json:"Reference"`
+	Barcode        string `json:"Barcode"`
+	Unit           string `json:"Unit"`
+	Flag           string `json:"Flag"`
+	IntFlag        int    `json:"intFlag"`
+	ListResult     GPReportListResultData
+}

routers/router.go

@@ -28,6 +28,6 @@ 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:SyncScpaLis")
+	//beego.Router("/api/test", &controllers.LisController{}, "get:SyncScpaLis")
 
 }

service/bl_service.go

@@ -146,23 +146,25 @@ func (CmLisitems) TableName() string {
 }
 
 type HisLabelPrintInfo struct {
-	ID                     int64                  `gorm:"column:id" json:"id" form:"id"`
-	PatientId              int64                  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Number                 string                 `gorm:"column:number" json:"number" form:"number"`
-	Ctime                  int64                  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                  int64                  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	DoctorId               int64                  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
-	Status                 int64                  `gorm:"column:status" json:"status" form:"status"`
-	ProjectName            string                 `gorm:"column:project_name" json:"project_name" form:"project_name"`
-	ProjectId              int64                  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	IsPrint                int64                  `gorm:"column:is_print" json:"is_print" form:"is_print"`
-	RecordDate             int64                  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	ItemId                 int64                  `gorm:"column:item_id" json:"item_id" form:"item_id"`
-	PProjectId             int64                  `gorm:"column:p_project_id" json:"p_project_id" form:"p_project_id"`
-	UserOrgId              int64                  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	DoctorName             string                 `gorm:"column:doctor_name" json:"doctor_name" form:"doctor_name"`
-	PatientName            string                 `gorm:"column:patient_name" json:"patient_name" form:"patient_name"`
-	FeedetlSn              string                 `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number      string `gorm:"column:number" json:"number" form:"number"`
+	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	DoctorId    int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	ProjectName string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	ProjectId   int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	IsPrint     int64  `gorm:"column:is_print" json:"is_print" form:"is_print"`
+	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ItemId      int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	PProjectId  int64  `gorm:"column:p_project_id" json:"p_project_id" form:"p_project_id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	DoctorName  string `gorm:"column:doctor_name" json:"doctor_name" form:"doctor_name"`
+	PatientName string `gorm:"column:patient_name" json:"patient_name" form:"patient_name"`
+	FeedetlSn   string `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Phone       string `gorm:"column:phone" json:"phone" form:"phone"`
+
 	PrescriptionId         int64                  `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
 	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:PProjectId" json:"project"`
 	Patient                models.Patients        `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patient"`
@@ -216,14 +218,15 @@ func (CmResult) TableName() string {
 }
 
 type LisSyncResultStatusInfo struct {
-	ID         int64 `gorm:"column:id" json:"id" form:"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"`
-	LastId     int64 `gorm:"column:last_id" json:"last_id" form:"last_id"`
-	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	IsResult   int64 `gorm:"column:is_result" json:"is_result" form:"is_result"`
-	ResultDate int64 `gorm:"column:result_date" json:"result_date" form:"result_date"`
+	ID            int64  `gorm:"column:id" json:"id" form:"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"`
+	LastId        int64  `gorm:"column:last_id" json:"last_id" form:"last_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsResult      int64  `gorm:"column:is_result" json:"is_result" form:"is_result"`
+	ResultDate    int64  `gorm:"column:result_date" json:"result_date" form:"result_date"`
+	GpSyncEndDate string `gorm:"column:gp_sync_end_date" json:"gp_sync_end_date" form:"gp_sync_end_date"`
 }
 
 func (LisSyncResultStatusInfo) TableName() string {
@@ -293,7 +296,7 @@ func GetLisResultDataByRecord(org_id int64) (list []*CmResult, err error) {
 	return
 }
 
-//插入中间件逻辑
+// 插入中间件逻辑
 func GetDataInsertDB(org_id int64) {
 	record, _ := GetLastSyncRecord(org_id)
 	if record.ID == 0 {
@@ -540,7 +543,7 @@ func GetDataInsertDB(org_id int64) {
 	}
 }
 
-//获取lis返回检验检查结果数据
+// 获取lis返回检验检查结果数据
 func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 	record, _ := GetLastSyncResultRecord(org_id)
 	if record.ID == 0 {
@@ -551,8 +554,9 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 			//插入到系统检验检查数据
 			for _, item := range list {
 				project_id := int64(0)
+				xt_project_id := int64(0)
 				if len(item.Barcode) > 0 {
-					project_id, _ = GetBljhProjectID(org_id, item.Groupname)
+					project_id, xt_project_id, _ = GetBljhProjectID(org_id, item.Groupname)
 				} else {
 					continue
 				}
@@ -565,7 +569,7 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 					continue
 				}
 
-				item_id, _ := GetBlItemID(org_id, item.Groupname, item.Itemname, project_id)
+				item_id, sys_item_id, _ := GetBlItemID(org_id, item.Groupname, item.Itemname, project_id)
 
 				tx := writeMiddleDb.Begin()
 				var inspection models.MiddleInspection
@@ -590,7 +594,6 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 				var ItemType int
 				if strings.Contains(item.Refrange, "-") {
 					ItemType = 1
-
 				} else {
 					ItemType = 2
 
@@ -604,60 +607,123 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 					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()
+				if xt_project_id > 0 && sys_item_id > 0 {
+					err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and xt_project_id = ? and xt_item_id = ? and status = 1", org_id, xt_project_id, sys_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 {
-					//item.Result = strings.Replace(item.Result, "&gt;", ">", -1)
-					//item.Result = strings.Replace(item.Result, "&lt;", "<", -1)
-					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()
+				} else {
+					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()
+						}
+					}
+
 				}
 
+				if xt_project_id > 0 && sys_item_id > 0 {
+					var itotal int
+					err = readMiddleDb.Model(&models.MiddleInspection{}).Where("org_id = ? and xt_project_id = ? and xt_item_id = ? and record_date = ? and patient_id = ?  and status = 1", org_id, xt_project_id, sys_item_id, record_date.Unix(), printInfo.PatientId).Find(&inspection).Count(&itotal).Error
+					if itotal <= 0 {
+						//item.Result = strings.Replace(item.Result, "&gt;", ">", -1)
+						//item.Result = strings.Replace(item.Result, "&lt;", "<", -1)
+						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()
+						}
+					}
+
+				} else {
+					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 {
+						//item.Result = strings.Replace(item.Result, "&gt;", ">", -1)
+						//item.Result = strings.Replace(item.Result, "&lt;", "<", -1)
+						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()
 
 			}
@@ -686,13 +752,15 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 				//插入到系统检验检查数据
 				for _, item := range list {
 					project_id := int64(0)
+					sys_project_id := int64(0)
+
 					if len(item.Barcode) > 0 {
-						project_id, _ = GetBljhProjectID(org_id, item.Groupname)
+						project_id, sys_project_id, _ = GetBljhProjectID(org_id, item.Groupname)
 					} else {
 						continue
 					}
 					printInfo, _ := GetHisLabelPrintInfoById(item.Barcode)
-					item_id, _ := GetBlItemID(org_id, item.Groupname, item.Itemname, project_id)
+					item_id, sys_item_id, _ := GetBlItemID(org_id, item.Groupname, item.Itemname, project_id)
 
 					tx := writeMiddleDb.Begin()
 					var inspection models.MiddleInspection
@@ -731,7 +799,7 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 						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
+					err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and xt_project_id = ? and xt_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
 					}
@@ -783,6 +851,64 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 						}
 					}
 
+					if sys_project_id > 0 && sys_item_id > 0 {
+						var itotal int
+						err = readMiddleDb.Model(&models.MiddleInspection{}).Where("org_id = ? and xt_project_id = ? and xt_item_id = ? and record_date = ? and patient_id = ?  and status = 1", org_id, sys_item_id, record_date.Unix(), printInfo.PatientId).Find(&inspection).Count(&itotal).Error
+						if itotal <= 0 {
+							//item.Result = strings.Replace(item.Result, "&gt;", ">", -1)
+							//item.Result = strings.Replace(item.Result, "&lt;", "<", -1)
+							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()
+							}
+						}
+
+					} else {
+						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 {
+							//item.Result = strings.Replace(item.Result, "&gt;", ">", -1)
+							//item.Result = strings.Replace(item.Result, "&lt;", "<", -1)
+							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()
 
 				}
@@ -811,7 +937,7 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 	// 第二步：将数据同步到业务库
 	if len(inspection_references) > 0 {
 		for _, inspection_reference := range inspection_references {
-			SyncInspectionReference(&inspection_reference)
+			SyncInspectionReferenceTwo(&inspection_reference)
 		}
 	}
 
@@ -1024,3 +1150,13 @@ func GetPatientsInfoByIDCardNo(id_card_no string, org_id int64) (info models.Pat
 	err = readDb.Model(&models.Patients{}).Where("id_card_no = ? AND user_org_id = ?", id_card_no, org_id).First(&info).Error
 	return
 }
+
+func GetAllLisDataFor10191(org_id int64) (list []models.HisLabelPrintStatusInfo, err error) {
+	err = readDb.Model(&models.HisLabelPrintStatusInfo{}).Preload("Patient", "status = 1").Where("user_org_id = ? AND status = 1  and apply_code = ''", org_id).Find(&list).Error
+	return
+}
+
+func GetAllLisDataFor10191LastId(org_id int64, last_id int64) (list []*models.HisLabelPrintStatusInfo, err error) {
+	err = readDb.Model(&models.HisLabelPrintStatusInfo{}).Preload("Patient", "status = 1").Where("user_org_id = ? AND status = 1 and is_print = 1 and id > ?", org_id, last_id).Find(&list).Error
+	return
+}

service/cron.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	_ "fmt"
 	_ "github.com/jinzhu/gorm"
-	"github.com/robfig/cron"
 	_ "strings"
 	"time"
 )
@@ -18,40 +17,40 @@ 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 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() {
-		SyncScpaLis()
-	})
-
-	specys1 := "0 10 */2 * * ?" // 每两个小时同步长沙南雅医院
-	createLisSyncCronJob.AddFunc(specys1, func() {
-		// SyncCsnyLis()
-	})
-
-	spec := "0 50 1 * * ?" // 每天凌晨1点同步 监利大院的
-	createLisSyncCronJob.AddFunc(spec, func() {
-		// SyncHbdyLis()
-	})
-
-	createLisSyncCronJob.Start()
-}
+//// 返回一个支持至 秒 级别的 cron
+//func newWithSeconds() *cron.Cron {
+//	secondParser := cron.NewParser(cron.Second | cron.Minute |
+//		cron.Hour | cron.Dom | cron.Month | cron.DowOptional | cron.Descriptor)
+//	return cron.New(cron.WithParser(secondParser), cron.WithChain())
+//}
+//
+//func BeginAutoSyncLis() {
+//	utils.InfoLog("开启自动检验检查同步定时任务")
+//	createLisSyncCronJob := newWithSeconds()
+//
+//	// specgzjh := "0 */1 * * * ?" // 每1分钟同步 广州暨华HIS医嘱
+//	// createLisSyncCronJob.AddFunc(specgzjh, func() {
+//	// 	// SyncGzjhyz()
+//	// 	Synctfyz()
+//	// })
+//
+//	specys := "0 0 */1 * * ?" // 每天凌晨3点同步 唐山朝阳医院
+//	createLisSyncCronJob.AddFunc(specys, func() {
+//		SyncScpaLis()
+//	})
+//
+//	specys1 := "0 10 */2 * * ?" // 每两个小时同步长沙南雅医院
+//	createLisSyncCronJob.AddFunc(specys1, func() {
+//		// SyncCsnyLis()
+//	})
+//
+//	spec := "0 50 1 * * ?" // 每天凌晨1点同步 监利大院的
+//	createLisSyncCronJob.AddFunc(spec, func() {
+//		// SyncHbdyLis()
+//	})
+//
+//	createLisSyncCronJob.Start()
+//}
 
 func AutoSyncLis() {
 	utils.TraceLog("检验检查任务开始执行")
@@ -127,7 +126,7 @@ func AutoSyncLis() {
 				}
 				// utils.InfoLog("同步信息详情:%v",syncInfo)
 				continue
-			} 
+			}
 
 			// 第四部：将同步过来的数据插入到中间库对应的表
 			syncSuccessNum := 0
@@ -194,11 +193,11 @@ func SyncToBase() {
 	utils.SuccessLog("检验检查同步任务完成")
 }
 
-// func SyncSZblLis() {
-// 	utils.TraceLog("检验检查同步任务开始执行")
-// 	org_id := int64(10138)
-// 	GetDataInsertDB(org_id)
-// }
+func SyncSZblLis() {
+	utils.TraceLog("检验检查同步任务开始执行")
+	org_id := int64(10138)
+	GetDataInsertDB(org_id)
+}
 
 // func SyncSZblLisResult() {
 // 	utils.TraceLog("获取检验检查结果任务开始执行")

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.InspectDate).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.InspectDate).Find(&inspection).Count(&total).Error
 	if total <= 0 {
 		inspection.OrgId = data.OrgId
 		inspection.PatientId = data.PatientId
@@ -119,7 +158,9 @@ func SyncInspection(data *models.MiddleInspection) error {
 		inspection.InspectDate = data.RecordDate
 		inspection.Status = 1
 		inspection.CreatedTime = time.Now().Unix()
-		inspection.UpdatedTime = time.Now().Unix()
+		//inspection.ReferenceProjectId = data.
+		//inspection.UpdatedTime = time.Now().Unix()
+		//inspection.ReferenceItemId = data.
 
 		err := tx.Model(&models.Inspection{}).Create(&inspection).Error
 		if err != nil {
@@ -139,13 +180,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 +210,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 +264,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 +299,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 +327,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

@@ -1,17 +1,13 @@
 package service
 
 import (
-	"Data_Upload_Api/models/sz"
-	"Data_Upload_Api/service"
+	//"Data_Upload_Api/models/sz"
+	//"Data_Upload_Api/service"
 	"IC/models"
 	"IC/utils"
 	_ "encoding/json"
 	_ "encoding/xml"
-	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type scpalis struct {
@@ -38,10 +34,11 @@ func (scpalis) TableName() string {
 	return "检验检查信息"
 }
 
-func GetScpaLis(rdb *gorm.DB, synctime int64, hisuserid string) (record []*scpalis, err error) {
-	err = rdb.Model(&scpalis{}).Where("inspect_date >= ? and his_user_id = ?", synctime, hisuserid).Find(&record).Error
-	return
-}
+//
+//func GetScpaLis(rdb *gorm.DB, synctime int64, hisuserid string) (record []*scpalis, err error) {
+//	err = rdb.Model(&scpalis{}).Where("inspect_date >= ? and his_user_id = ?", synctime, hisuserid).Find(&record).Error
+//	return
+//}
 
 // 根据机构ID和检验检查名称获取该检查的project_id，如没有，则创建一个
 func GetScpaProjectID(org_id int64, project_name string) (project_id int64, err error) {
@@ -77,166 +74,166 @@ func GetScpaItemID(org_id int64, project_name string, item_name string, project_
 }
 
 // 四川蓬安济民透析中心Lis同步
-func SyncScpaLis() (err error) {
-	org_id := int64(9829)
-
-	org := &sz.DataUploadConfig{
-		OrgId:  org_id,
-		DbHost: "192.168.0.254",
-		DbPort: "1433",
-		DbPass: "999999",
-		DbUser: "sa",
-		DbName: "nfjiminhis",
-	}
-
-	orgDb, err := service.CreateSqlServiceDB(org.DbHost, org.DbPort, org.DbUser, org.DbPass, org.DbName)
-	if err != nil {
-		utils.ErrorLog("创建数据库连接失败:%v", err)
-		return
-	}
-
-	// var sync_time int64
-	// sync_time = 1627747200
-
-	// scpaLis, _ := GetScpaLis(orgDb, sync_time,"512926196302182682")
-	// utils.InfoLog("IdCardNo:%v",scpaLis)
-
-	// 第一步：获取上一次同步的时间点
-	syncLastInfo, _ := GetSyncTimeByOrgIDForYs(org_id)
-	var sync_time int64
-	if syncLastInfo.ID > 0 {
-		sync_time = syncLastInfo.SyncTime
-	} else {
-		sync_time = 1627747200
-	}
-	// 第二步：获取所有患者的病历号
-
-	patientList, _ := GetPatientGzjhByOrgId(org_id)
-	if len(patientList) > 0 {
-		for _, patient := range patientList {
-			if len(patient.IdCardNo) > 0 {
-				// 上次同步时间转换为接口需要的格式
-				patient_id := patient.ID
-				utils.InfoLog("IdCardNo:%v", patient.IdCardNo)
-				scpaLis, _ := GetScpaLis(orgDb, sync_time, patient.IdCardNo)
-				if len(scpaLis) > 0 {
-					for _, info := range scpaLis {
-						utils.InfoLog("Result:%v", info)
-						// 根据project_id和item_id 判断该项是否存在
-						project_id := int64(0)
-						if info.ProjectId > 0 {
-							project_id, _ = GetScpaProjectID(org_id, info.ProjectName)
-						} else {
-							continue
-						}
-						item_id, _ := GetScpaItemID(org_id, info.ProjectName, info.ItemName, project_id)
-						tx := writeMiddleDb.Begin()
-						var inspection models.MiddleInspection
-						var inspection_reference models.MiddleInspectionReference
-						record_date := info.InspectDate
-						if info.InspectDate == 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.RangeValue
-						// Range := strings.Split(info.RangeValue, "-")
-						// if len(Range) > 1 {
-						// 	RangeMin = Range[0]
-						// 	RangeMax = Range[1]
-						// 	ItemType = 1
-						// } else {
-						// 	ItemType = 2
-						// 	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 = strconv.FormatInt(info.ItemId, 10)
-							inspection_reference.ItemId = item_id
-							inspection_reference.RangeType, _ = strconv.Atoi(strconv.FormatInt(ItemType, 10))
-							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(strconv.FormatInt(ItemType, 10))
-							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
-	}
-	SyncToScpatx()
-	return
-}
+//func SyncScpaLis() (err error) {
+//	org_id := int64(9829)
+//
+//	org := &sz.DataUploadConfig{
+//		OrgId:  org_id,
+//		DbHost: "192.168.0.254",
+//		DbPort: "1433",
+//		DbPass: "999999",
+//		DbUser: "sa",
+//		DbName: "nfjiminhis",
+//	}
+//
+//	orgDb, err := service.CreateSqlServiceDB(org.DbHost, org.DbPort, org.DbUser, org.DbPass, org.DbName)
+//	if err != nil {
+//		utils.ErrorLog("创建数据库连接失败:%v", err)
+//		return
+//	}
+//
+//	// var sync_time int64
+//	// sync_time = 1627747200
+//
+//	// scpaLis, _ := GetScpaLis(orgDb, sync_time,"512926196302182682")
+//	// utils.InfoLog("IdCardNo:%v",scpaLis)
+//
+//	// 第一步：获取上一次同步的时间点
+//	syncLastInfo, _ := GetSyncTimeByOrgIDForYs(org_id)
+//	var sync_time int64
+//	if syncLastInfo.ID > 0 {
+//		sync_time = syncLastInfo.SyncTime
+//	} else {
+//		sync_time = 1627747200
+//	}
+//	// 第二步：获取所有患者的病历号
+//
+//	patientList, _ := GetPatientGzjhByOrgId(org_id)
+//	if len(patientList) > 0 {
+//		for _, patient := range patientList {
+//			if len(patient.IdCardNo) > 0 {
+//				// 上次同步时间转换为接口需要的格式
+//				patient_id := patient.ID
+//				utils.InfoLog("IdCardNo:%v", patient.IdCardNo)
+//				scpaLis, _ := GetScpaLis(orgDb, sync_time, patient.IdCardNo)
+//				if len(scpaLis) > 0 {
+//					for _, info := range scpaLis {
+//						utils.InfoLog("Result:%v", info)
+//						// 根据project_id和item_id 判断该项是否存在
+//						project_id := int64(0)
+//						if info.ProjectId > 0 {
+//							project_id, _ = GetScpaProjectID(org_id, info.ProjectName)
+//						} else {
+//							continue
+//						}
+//						item_id, _ := GetScpaItemID(org_id, info.ProjectName, info.ItemName, project_id)
+//						tx := writeMiddleDb.Begin()
+//						var inspection models.MiddleInspection
+//						var inspection_reference models.MiddleInspectionReference
+//						record_date := info.InspectDate
+//						if info.InspectDate == 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.RangeValue
+//						// Range := strings.Split(info.RangeValue, "-")
+//						// if len(Range) > 1 {
+//						// 	RangeMin = Range[0]
+//						// 	RangeMax = Range[1]
+//						// 	ItemType = 1
+//						// } else {
+//						// 	ItemType = 2
+//						// 	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 = strconv.FormatInt(info.ItemId, 10)
+//							inspection_reference.ItemId = item_id
+//							inspection_reference.RangeType, _ = strconv.Atoi(strconv.FormatInt(ItemType, 10))
+//							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(strconv.FormatInt(ItemType, 10))
+//							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
+//	}
+//	SyncToScpatx()
+//	return
+//}
 
 func SyncToScpatx() {
 	utils.TraceLog("检验检查同步任务开始执行")

service/xml_service.go

@@ -0,0 +1,412 @@
+package service
+
+import (
+	"IC/models"
+	"bytes"
+	"encoding/json"
+	"encoding/xml"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+)
+
+// 获取可下载标本列表
+func GetGPReportListData(start_date string, end_date string, key string) (result []models.GPReportListResultData) {
+	// 构建SOAP请求数据
+	requestData := &models.ReportListEnvelope{
+		Soap: "http://schemas.xmlsoap.org/soap/envelope/",
+		Xsi:  "http://www.w3.org/2001/XMLSchema-instance",
+		Xsd:  "http://www.w3.org/2001/XMLSchema",
+		Body: models.ReportListBody{
+			GetReportReq: models.GetReportReq{
+				XMLName:       xml.Name{Local: "GetAllSampleList", Space: "http://tempuri.org/"},
+				Key:           key,
+				BeginDateTime: start_date,
+				EndDateTime:   end_date,
+				DateType:      1,
+				PrintState:    0,
+			},
+		},
+	}
+
+	// 将SOAP请求数据转换为XML格式
+	requestBody, err := xml.Marshal(requestData)
+	if err != nil {
+		fmt.Println("XML Marshal error:", err)
+		return result
+	}
+
+	// 创建POST请求
+	url := "http://gpis.cnhiqc.com:9799/InstituteLISService.asmx"
+	req, err := http.NewRequest("POST", url, bytes.NewBuffer(requestBody))
+	if err != nil {
+		fmt.Println("Request creation error:", err)
+		return result
+	}
+
+	// 设置请求头
+	req.Header.Set("Content-Type", "text/xml; charset=utf-8")
+	req.Header.Set("Content-Length", "length")
+	req.Header.Set("SOAPAction", "http://tempuri.org/GetAllSampleList")
+
+	// 发送请求
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		fmt.Println("Request error:", err)
+		return result
+	}
+	defer resp.Body.Close()
+
+	// 读取响应数据
+	responseBody, err := ioutil.ReadAll(resp.Body)
+	//fmt.Println(string(responseBody))
+	if err != nil {
+		fmt.Println("Response read error:", err)
+		return result
+	}
+
+	// 解析XML数据
+	var envelope_two models.EnvelopeTwo
+	err2 := xml.Unmarshal(responseBody, &envelope_two)
+	if err2 != nil {
+		fmt.Println("XML Unmarshal error:", err2)
+		return result
+	}
+
+	// 获取GetReportListResult的JSON字符串
+	jsonStr := envelope_two.Body.GetAllSampleListResponse.GetAllSampleListResult
+	//fmt.Println(jsonStr)
+	// 解析JSON字符串到结构体
+	var reportData models.ReportData
+	err = json.Unmarshal([]byte(jsonStr), &reportData)
+	if err != nil {
+		fmt.Println("JSON Unmarshal error:", err)
+		return result
+	}
+	if reportData.Res == 0 {
+		//fmt.Println( . ."Data:", reportData.GPReportListResultData)
+		return reportData.GPReportListResultData
+	}
+	return result
+}
+
+// 根据院所自身条码获取标本检测结果或诊断结果,遍历结果
+//func GetGPResultData(result []models.GPReportListResultData, key string) (results []models.InspectResult) {
+//	for _, item := range result {
+//
+//		// 构建SOAP请求数据
+//		requestData := &models.ReportResultEnvelope{
+//			Soap: "http://schemas.xmlsoap.org/soap/envelope/",
+//			Xsi:  "http://www.w3.org/2001/XMLSchema-instance",
+//			Xsd:  "http://www.w3.org/2001/XMLSchema",
+//			Body: models.ReportResultBody{
+//				GetReportResultReq: models.GetReportResultReq{
+//					XMLName:         xml.Name{Local: "GetJSONReportItemListByCustomerBarocde", Space: "http://tempuri.org/"},
+//					Key:             key,
+//					CustomerBarCode: item.CustomerBarcode,
+//				},
+//			},
+//		}
+//
+//		// 将SOAP请求数据转换为XML格式
+//		requestBody, err := xml.Marshal(requestData)
+//		if err != nil {
+//			fmt.Println("XML Marshal error:", err)
+//
+//		}
+//
+//		// 创建POST请求
+//		url := "http://gpis.cnhiqc.com:9799/InstituteLISService.asmx"
+//		req, err := http.NewRequest("POST", url, bytes.NewBuffer(requestBody))
+//		if err != nil {
+//			fmt.Println("Request creation error:", err)
+//		}
+//		// 设置请求头
+//		req.Header.Set("Content-Type", "text/xml; charset=utf-8")
+//		req.Header.Set("Content-Length", "length")
+//		req.Header.Set("SOAPAction", "http://tempuri.org/GetJSONReportItemListByCustomerBarocde")
+//		// 发送请求
+//		client := &http.Client{}
+//		resp, err := client.Do(req)
+//		if err != nil {
+//			fmt.Println("Request error:", err)
+//
+//		}
+//		defer resp.Body.Close()
+//		// 读取响应数据
+//		responseBody, err := ioutil.ReadAll(resp.Body)
+//		if err != nil {
+//			fmt.Println("Response read error:", err)
+//		}
+//
+//		// 解析XML数据
+//		var envelope_three models.EnvelopeThree
+//		err2 := xml.Unmarshal(responseBody, &envelope_three)
+//		if err2 != nil {
+//			fmt.Println("XML Unmarshal error:", err2)
+//		}
+//		// 获取GetReportListResult的JSON字符串
+//		jsonStr := envelope_three.Body.GetJSONReportItemListByCustomerBarocdeResponse.GetJSONReportItemListByCustomerBarocdeResult
+//		// 解析JSON字符串到结构体
+//		fmt.Println(jsonStr)
+//		var reportData models.ReportResultData
+//		err = json.Unmarshal([]byte(jsonStr), &reportData)
+//		if err != nil {
+//			fmt.Println("JSON Unmarshal error:", err)
+//		}
+//		if reportData.Res == 0 {
+//			fmt.Println("Data:", reportData.InspectResult)
+//			reportData.InspectResult.ListResult = item
+//			results = append(results, reportData.InspectResult)
+//		}
+//	}
+//	return results
+//}
+
+// 根据高品条码获取标本检测结果或诊断结果,遍历结果
+func GetGPResultDataTwo(result []models.GPReportListResultData, key string) (results []models.InspectResultFive) {
+	for _, item := range result {
+		if len(item.CustomerBarcode) > 0 {
+			fmt.Println("~~~~~~-------")
+			// 构建SOAP请求数据
+			requestData := &models.ReportResultEnvelope{
+				Soap: "http://schemas.xmlsoap.org/soap/envelope/",
+				Xsi:  "http://www.w3.org/2001/XMLSchema-instance",
+				Xsd:  "http://www.w3.org/2001/XMLSchema",
+				Body: models.ReportResultBody{
+					GetReportResultReq: models.GetReportResultReq{
+						XMLName:         xml.Name{Local: "GetJSONReportItemListByCustomerBarocde", Space: "http://tempuri.org/"},
+						Key:             key,
+						CustomerBarCode: item.CustomerBarcode,
+					},
+				},
+			}
+
+			// 将SOAP请求数据转换为XML格式
+			requestBody, err := xml.Marshal(requestData)
+			if err != nil {
+				fmt.Println("XML Marshal error:", err)
+
+			}
+
+			// 创建POST请求
+			url := "http://gpis.cnhiqc.com:9799/InstituteLISService.asmx"
+			req, err := http.NewRequest("POST", url, bytes.NewBuffer(requestBody))
+			if err != nil {
+				fmt.Println("Request creation error:", err)
+			}
+			// 设置请求头
+			req.Header.Set("Content-Type", "text/xml; charset=utf-8")
+			req.Header.Set("Content-Length", "length")
+			req.Header.Set("SOAPAction", "http://tempuri.org/GetJSONReportItemListByCustomerBarocde")
+			// 发送请求
+			client := &http.Client{}
+			resp, err := client.Do(req)
+			if err != nil {
+				fmt.Println("Request error:", err)
+
+			}
+			defer resp.Body.Close()
+			// 读取响应数据
+			responseBody, err := ioutil.ReadAll(resp.Body)
+			if err != nil {
+				fmt.Println("Response read error:", err)
+			}
+
+			// 解析XML数据
+			var envelope_three models.EnvelopeThree
+			err2 := xml.Unmarshal(responseBody, &envelope_three)
+			if err2 != nil {
+				fmt.Println("XML Unmarshal error:", err2)
+			}
+			// 获取GetReportListResult的JSON字符串
+			jsonStr := envelope_three.Body.GetJSONReportItemListByCustomerBarocdeResponse.GetJSONReportItemListByCustomerBarocdeResult
+			// 解析JSON字符串到结构体
+			//fmt.Println(jsonStr)
+			var reportData models.ReportResultData
+			err = json.Unmarshal([]byte(jsonStr), &reportData)
+			if err != nil {
+				fmt.Println("JSON Unmarshal error:", err)
+			}
+			if reportData.Res == 0 {
+				//reportData.ListResult = item
+				for _, subItem := range reportData.InspectResult {
+					subItem.ListResult = item
+					var resultTwo models.InspectResultFive
+					resultTwo.ListResult = subItem.ListResult
+					resultTwo.Result = subItem.Result
+					resultTwo.Barcode = subItem.Barcode
+					resultTwo.Flag = subItem.Flag
+					resultTwo.Unit = subItem.Unit
+					resultTwo.ChargeItemName = subItem.ChargeItemName
+					resultTwo.InspectionName = subItem.InspectionName
+					resultTwo.InspectionCode = subItem.InspectionCode
+					resultTwo.Reference = subItem.Reference
+					results = append(results, resultTwo)
+				}
+			}
+		} else {
+
+			if len(item.Barcode) > 0 {
+				//fmt.Println("11122222")
+				// 构建SOAP请求数据
+				requestData := &models.GPReportResultEnvelope{
+					Soap: "http://schemas.xmlsoap.org/soap/envelope/",
+					Xsi:  "http://www.w3.org/2001/XMLSchema-instance",
+					Xsd:  "http://www.w3.org/2001/XMLSchema",
+					Body: models.GPReportResultBody{
+						GetReportResultReq: models.GetGPReportResultReq{
+							XMLName:   xml.Name{Local: "GetJSONReportItemListByGPBarocde", Space: "http://tempuri.org/"},
+							Key:       key,
+							GPBarCode: item.Barcode,
+						},
+					},
+				}
+
+				// 将SOAP请求数据转换为XML格式
+				requestBody, err := xml.Marshal(requestData)
+				if err != nil {
+					fmt.Println("XML Marshal error:", err)
+
+				}
+
+				// 创建POST请求
+				url := "http://gpis.cnhiqc.com:9799/InstituteLISService.asmx"
+				req, err := http.NewRequest("POST", url, bytes.NewBuffer(requestBody))
+				if err != nil {
+					fmt.Println("Request creation error:", err)
+				}
+				// 设置请求头
+				req.Header.Set("Content-Type", "text/xml; charset=utf-8")
+				req.Header.Set("Content-Length", "length")
+				req.Header.Set("SOAPAction", "http://tempuri.org/GetJSONReportItemListByGPBarocde")
+				// 发送请求
+				client := &http.Client{}
+				resp, err := client.Do(req)
+				if err != nil {
+					fmt.Println("Request error:", err)
+
+				}
+				defer resp.Body.Close()
+				// 读取响应数据
+				responseBody, err := ioutil.ReadAll(resp.Body)
+				if err != nil {
+					fmt.Println("Response read error:", err)
+				}
+
+				// 解析XML数据
+				var envelope_five models.EnvelopeFive
+				err2 := xml.Unmarshal(responseBody, &envelope_five)
+				if err2 != nil {
+					fmt.Println("XML Unmarshal error:", err2)
+				}
+
+				// 获取GetReportListResult的JSON字符串
+				jsonStr := envelope_five.Body.GetJSONReportItemListByGPBarocdeResponse.GetJSONReportItemListByGPBarocdeResult
+				// 解析JSON字符串到结构体
+				var reportData models.ReportResultDataFive
+				err = json.Unmarshal([]byte(jsonStr), &reportData)
+				if err != nil {
+					fmt.Println("JSON Unmarshal error:", err)
+				}
+				//fmt.Println(reportData)
+
+				if reportData.Res == 0 {
+					//reportData.ListResult = item
+					for _, subItem := range reportData.InspectResult {
+						subItem.ListResult = item
+						results = append(results, subItem)
+
+					}
+				}
+
+			}
+		}
+
+	}
+	return results
+
+}
+
+// 送检单
+func PostInspectApply(key string, apply models.JYApply, list []models.CustomerApplyDetail) models.InspectApplyData {
+	// 构建SOAP请求数据
+	requestData := &models.JYApplyEnvelope{
+		Soap: "http://schemas.xmlsoap.org/soap/envelope/",
+		Xsi:  "http://www.w3.org/2001/XMLSchema-instance",
+		Xsd:  "http://www.w3.org/2001/XMLSchema",
+		Body: models.JYApplyBody{
+			InspectApplyReq: models.InspectApplyReq{
+				XMLName: xml.Name{Local: "InspectApplyByInstituteItemCode", Space: "http://tempuri.org/"},
+				ApiKey:  key,
+				Apply:   apply,
+				ApplyDetailList: struct {
+					CustomerApplyDetail []models.CustomerApplyDetail `xml:"CustomerApplyDetail"`
+				}{
+					CustomerApplyDetail: list,
+				},
+				ApplyAdditional: nil,
+			},
+		},
+	}
+
+	// 将SOAP请求数据转换为XML格式
+	requestBody, err := xml.Marshal(requestData)
+	if err != nil {
+		fmt.Println("XML Marshal error:", err)
+	}
+	fmt.Println(string(requestBody))
+
+	// 创建POST请求
+	url := "http://gpis.cnhiqc.com:9799/InstituteLISService.asmx"
+	req, err := http.NewRequest("POST", url, bytes.NewBuffer(requestBody))
+	if err != nil {
+		fmt.Println("Request creation error:", err)
+	}
+
+	// 设置请求头
+	req.Header.Set("Content-Type", "text/xml; charset=utf-8")
+	req.Header.Set("Content-Length", "length")
+	req.Header.Set("SOAPAction", "http://tempuri.org/InspectApplyByInstituteItemCode")
+
+	// 发送请求
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		fmt.Println("Request error:", err)
+	}
+	defer resp.Body.Close()
+
+	// 读取响应数据
+	responseBody, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println("Response read error:", err)
+
+	}
+	fmt.Println(string(responseBody))
+
+	// 解析XML数据
+	var envelope_four models.EnvelopeFour
+	err2 := xml.Unmarshal(responseBody, &envelope_four)
+	if err2 != nil {
+		fmt.Println("XML Unmarshal error:", err2)
+
+	}
+
+	// 获取GetReportListResult的JSON字符串
+	jsonStr := envelope_four.Body.InspectApplyByInstituteItemCodeResponse.InspectApply
+
+	// 解析JSON字符串到结构体
+	var reportData models.InspectApplyData
+	err = json.Unmarshal([]byte(jsonStr), &reportData)
+
+	if err != nil {
+		fmt.Println("JSON Unmarshal error:", err)
+	}
+	if reportData.Res != 0 {
+		fmt.Println("Data:", reportData)
+		//return reportData.JYApplyResult
+	}
+	return reportData
+}

service/ystx_service.go

@@ -1520,34 +1520,51 @@ func SyncToHbdytx() {
 }
 
 // 根据机构ID和检验检查名称获取该检查的project_id，如没有，则创建一个
-func GetBljhProjectID(org_id int64, project_name string) (project_id int64, err error) {
+func GetBljhProjectID(org_id int64, project_name string) (project_id int64, sys_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
+		return inspection_reference.ProjectId, inspection_reference.XtProjectId, 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
+			return inspection_reference.ProjectId + 1, 0, err
 		} else {
-			return 5210138, err
+			return 5210138, 0, err
 		}
 	}
 }
 
+//// 根据机构ID和检验检查小项名称获取该检查的item_id，如没有，则创建一个
+//func GetBlItemIDTwo(org_id int64, project_name string, item_name string, project_id int64) (item_id int64, sys_project_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*10 + 1, err
+//		}
+//	}
+//}
+
 // 根据机构ID和检验检查小项名称获取该检查的item_id，如没有，则创建一个
-func GetBlItemID(org_id int64, project_name string, item_name string, project_id int64) (item_id int64, err error) {
+func GetBlItemID(org_id int64, project_name string, item_name string, project_id int64) (item_id int64, sys_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
+		return inspection_reference.ItemId, inspection_reference.XtItemId, 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
+		err := readMiddleDb.Table("xt_middle_inspection_reference").Where("org_id = ? and xt_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, 0, err
 		} else {
-			return project_id*10 + 1, err
+			return project_id*10 + 1, 0, err
 		}
 	}
 }
@@ -1719,7 +1736,7 @@ func Synctfyz() (err error) {
 				}
 				utils.InfoLog("advice:%v", advice)
 				// 根据同步来的 advice_id 来查询库里是否已经存在
-				advice_info, _ := GetAdviceBySyncAdviceIdTwo(org_id, strconv.FormatInt(yz.AdviceId,10))
+				advice_info, _ := GetAdviceBySyncAdviceIdTwo(org_id, strconv.FormatInt(yz.AdviceId, 10))
 				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"