1

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/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
+}

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/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

@@ -1497,34 +1497,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
 		}
 	}
 }
@@ -1696,7 +1713,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"