更新

controllers/sync.go

@@ -0,0 +1,84 @@
+package controllers
+
+import (
+	"github.com/jinzhu/gorm"
+	"Data_Upload_Api/models/sz"
+	"github.com/astaxie/beego"
+	"Data_Upload_Api/service"
+	"Data_Upload_Api/enums"
+	"Data_Upload_Api/utils"
+	"strconv"
+	"time"
+	_"strings"
+)
+
+type SyncController struct {
+	BaseAPIController
+}
+
+func (c *SyncController)SyncToSZIC() {
+	// 第一步：到上报配置表中找到深圳需要上报的机构
+	sz_province, _ := beego.AppConfig.Int64("sz_province")
+	sz_city, _ := beego.AppConfig.Int64("sz_city")
+	configs, _ := service.FindAllDataUploadConfigOrgInfo(sz_province, sz_city, 3)
+	for _, org := range configs {
+		// 第二步：跟进配置，创建数据库连接
+		if (len(org.DbHost) > 0 && len(org.DbUser) > 0 && len(org.DbPort) > 0 && len(org.DbPass) > 0 && len(org.DbName) > 0) {
+			orgDb,err := service.CreateDB(org.DbHost,org.DbPort,org.DbUser,org.DbPass,org.DbName)
+			if err != nil {
+				utils.ErrorLog("创建数据库连接失败:%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			// 第三步：开始同步数据
+			c.SyncHospital(orgDb,org.OrgId,org.HospitalId,org.InstType,org.DepartmentName)
+
+			// 第四步：关闭数据库连接
+			service.CloseDB(orgDb)
+		}
+	}
+}
+
+// 同步医院信息
+func (c *SyncController)SyncHospital(rdb *gorm.DB,org_id int64,hospital_id int64,inst_type int64,department_name string) {
+	// 第一步：根据机构id获取上次同步时间
+	syncLastInfo,_ := service.GetSyncTimeByOrgId(org_id,1)
+	var sync_time int64
+	if syncLastInfo.ID > 0 {
+		sync_time = syncLastInfo.SyncTime
+	} else {
+		sync_time = 0
+	}
+
+	// 第二步：跟进上次同步时间找出这个时间段内增加的数据
+	org, _ := service.FindOrgData(org_id,sync_time)
+	if org.ID > 0 {
+		hospital := &sz.TempHdHospital{
+			HospitalId:     strconv.FormatInt(hospital_id, 10),
+			InstType:       strconv.FormatInt(inst_type, 10),
+			DepartMentName:	department_name,
+			AuthorizedBeds: int64(len(org.DeviceNumber)),
+			CreateTime:     time.Now(),
+			UpdateTime:     time.Now(),
+			Sjscsj:         time.Now(),
+			Xgbz:           0,
+		}
+		err := service.CreateOrgRecord(hospital)
+		if err == nil {
+			// 第三步：同步成功后，添加同步记录
+			upload := &sz.DataUpload{
+				SyncType:   		1,
+				OrgId:        		org_id,
+				SyncTime:   		time.Now().Unix(),
+				sync_result_type: 	1,
+				CreateTime:   		time.Now().Unix(),
+				UpdateTime:   		time.Now().Unix()
+			}
+			err := service.CreateUploadRecord(upload)
+			if err != nil {
+				utils.ErrorLog("%v", err)
+			}
+		}
+	}
+}
+

models/src_data.go

@@ -1,5 +1,23 @@
 package models
 
+type XTSyncInfo struct {
+	ID             	int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId       	int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	SyncType       	int64 `gorm:"column:sync_type" json:"sync_type" form:"sync_type"`
+	SyncTime       	int64 `gorm:"column:sync_time" json:"sync_time" form:"sync_time"`
+	SyncResultType  int	  `gorm:"column:sync_result_type" json:"sync_result_type" form:"sync_result_type"`
+	SyncRsultRemark string `gorm:"column:sync_result_remark" json:"sync_result_remark" form:"sync_result_remark"`
+	SyncTotalNum    int64 `gorm:"column:sync_total_num" json:"sync_total_num" form:"sync_total_num"`
+	SyncSuccessNum  int64 `gorm:"column:sync_success_num" json:"sync_success_num" form:"sync_success_num"`
+	SyncInfo      	string `gorm:"column:sync_info" json:"sync_info" form:"sync_info"`
+	CreateTime      int64 `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdateTime    	int64 `gorm:"column:update_time" json:"update_time" form:"update_time"`
+}
+
+func (XTSyncInfo) TableName() string {
+	return "xt_sync_info"
+}
+
 type UserOrg struct {
 	ID              int64           `gorm:"column:id" json:"id"`
 	Creator         int64           `gorm:"column:creator" json:"creator"`

models/sz/target_data.go

@@ -4,84 +4,198 @@ import "time"
 
 type TempHdHospital struct {
 	ID             int64     `gorm:"column:id" json:"id"`
-	HospitalId     string    `gorm:"column:hospital_id" json:"hospital_id"`
-	InstType       string    `gorm:"column:inst_type" json:"inst_type"`
-	DepartMentName string    `gorm:"column:depart_ment_name" json:"depart_ment_name"`
-	AuthorizedBeds int64     `gorm:"column:authorized_beds" json:"authorized_beds"`
-	CreateTime     time.Time `gorm:"column:create_time" json:"create_time"`
-	UpdateTime     time.Time `gorm:"column:update_time" json:"update_time"`
-	Sjscsj         time.Time `gorm:"column:sjscsj" json:"sjscsj"`
-	Mj             string    `gorm:"column:mj" json:"mj"`
-	Xgbz           int64     `gorm:"column:xgbz" json:"xgbz"`
-	Ylyl1          string    `gorm:"column:ylyl1" json:"ylyl1"`
-	Ylyl2          string    `gorm:"column:ylyl2" json:"ylyl2"`
+	HospitalId     string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	InstType       string    `gorm:"column:INST_TYPE" json:"INST_TYPE"`
+	DepartMentName string    `gorm:"column:DEPARTMENT_NAME" json:"DEPARTMENT_NAME"`
+	AuthorizedBeds int64     `gorm:"column:AUTHORIZED_BEDS" json:"AUTHORIZED_BEDS"`
+	CreateTime     time.Time `gorm:"column:CREATE_TIME" json:"CREATE_TIME"`
+	UpdateTime     time.Time `gorm:"column:UPDATE_TIME" json:"UPDATE_TIME"`
+	Sjscsj         time.Time `gorm:"column:SJSCSJ" json:"SJSCSJ"`
+	Mj             string    `gorm:"column:MJ" json:"MJ"`
+	Xgbz           int64     `gorm:"column:XGBZ" json:"XGBZ"`
+	Ylyl1          string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2          string    `gorm:"column:YLYL2" json:"YLYL2"`
 }
 
 func (TempHdHospital) TableName() string {
-	return "temp_hd_hospital"
+	return "t_hd_hospital"
 }
 
 type TempHdStaff struct {
 	ID                           int64     `gorm:"column:id" json:"id"`
-	HospitalId                   string    `gorm:"column:hospital_id" json:"hospital_id"`
-	StaffId                      string    `gorm:"column:staff_id" json:"staff_id"`
-	IdType                       string    `gorm:"column:id_type" json:"id_type"`
-	IdNo                         string    `gorm:"column:id_no" json:"id_no"`
-	StaffName                    string    `gorm:"column:staff_name" json:"staff_name"`
-	Position                     string    `gorm:"column:position" json:"position"`
-	TrainingName                 string    `gorm:"column:training_name" json:"training_name"`
-	PracticeCertificate          string    `gorm:"column:practice_certificate" json:"practice_certificate"`
-	PracticeCertificateNo        string    `gorm:"column:practice_certificate_no" json:"practice_certificate_no"`
-	QualificationCertificate     string    `gorm:"column:qualification_certificate" json:"qualification_certificate"`
-	QualificationType            string    `gorm:"column:qualification_type" json:"qualification_type"`
-	DiplomaFile                  string    `gorm:"column:diploma_file" json:"diploma_file"`
-	DegreeCertificateFile        string    `gorm:"column:degree_certificate_file" json:"degree_certificate_file"`
-	TrainingCertificateFile      string    `gorm:"column:training_certificate_file" json:"training_certificate_file"`
-	PracticeCertificateFile      string    `gorm:"column:practice_certificate_file" json:"practice_certificate_file"`
-	QualificationCertificateFile string    `gorm:"column:qualification_certificate_file" json:"qualification_certificate_file"`
-	Xgbz                         string    `gorm:"column:xgbz" json:"xgbz"`
-	TrainingDate                 time.Time `gorm:"column:training_date" json:"training_date"`
-	InDate                       time.Time `gorm:"column:in_date" json:"in_date"`
-	OutDate                      time.Time `gorm:"column:out_date" json:"out_date"`
-	CreateTime                   time.Time `gorm:"column:create_time" json:"create_time"`
-	UpdateTime                   time.Time `gorm:"column:update_time" json:"update_time"`
-	Sjscsj                       time.Time `gorm:"column:sjscsj" json:"sjscsj"`
-	Mj                           string    `gorm:"column:mj" json:"mj"`
-	Ylyl1                        string    `gorm:"column:ylyl1" json:"ylyl1"`
-	Ylyl2                        string    `gorm:"column:ylyl2" json:"ylyl2"`
-	PermanentType                string    `gorm:"column:permanent_type" json:"permanent_type"`
+	HospitalId                   string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	StaffId                      string    `gorm:"column:STAFF_ID" json:"STAFF_ID"`
+	IdType                       string    `gorm:"column:ID_TYPE" json:"ID_TYPE"`
+	IdNo                         string    `gorm:"column:ID_NO" json:"ID_NO"`
+	StaffName                    string    `gorm:"column:STAFF_NAME" json:"STAFF_NAME"`
+	Position                     string    `gorm:"column:POSITION" json:"POSITION"`
+	TrainingName                 string    `gorm:"column:TRAINING_NAME" json:"TRAINING_NAME"`
+	PracticeCertificate          string    `gorm:"column:PRACTICE_CERTIFICATE" json:"PRACTICE_CERTIFICATE"`
+	PracticeCertificateNo        string    `gorm:"column:PRACTICE_CERTIFICATE_NO" json:"PRACTICE_CERTIFICATE_NO"`
+	QualificationCertificate     string    `gorm:"column:QUALIFICATION_CERTIFICATE" json:"QUALIFICATION_CERTIFICATE"`
+	QualificationType            string    `gorm:"column:QUALIFICATION_TYPE" json:"QUALIFICATION_TYPE"`
+	PermanentType                string    `gorm:"column:PERMANENT_TYPE" json:"PERMANENT_TYPE"`
+	DiplomaFile                  string    `gorm:"column:DIPLOMA_FILE" json:"DIPLOMA_FILE"`
+	DegreeCertificateFile        string    `gorm:"column:DEGREE_CERTIFICATE_FILE" json:"DEGREE_CERTIFICATE_FILE"`
+	TrainingCertificateFile      string    `gorm:"column:TRAINING_CERTIFICATE_FILE" json:"TRAINING_CERTIFICATE_FILE"`
+	PracticeCertificateFile      string    `gorm:"column:PRACTICE_CERTIFICATE_FILE" json:"PRACTICE_CERTIFICATE_FILE"`
+	QualificationCertificateFile string    `gorm:"column:QUALIFICATION_CERTIFICATE_FILE" json:"QUALIFICATION_CERTIFICATE_FILE"`
+	Xgbz                         string    `gorm:"column:XGBZ" json:"XGBZ"`
+	TrainingDate                 time.Time `gorm:"column:TRAINING_DATE" json:"TRAINING_DATE"`
+	InDate                       time.Time `gorm:"column:IN_DATE" json:"IN_DATE"`
+	OutDate                      time.Time `gorm:"column:OUT_DATE" json:"OUT_DATE"`
+	CreateTime                   time.Time `gorm:"column:CREATE_TIME" json:"CREATE_TIME"`
+	UpdateTime                   time.Time `gorm:"column:UPDATE_TIME" json:"UPDATE_TIME"`
+	Sjscsj                       time.Time `gorm:"column:SJSCSJ" json:"SJSCSJ"`
+	Mj                           string    `gorm:"column:MJ" json:"MJ"`
+	Ylyl1                        string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2                        string    `gorm:"column:YLYL2" json:"YLYL2"`
+	
 }
 
 func (TempHdStaff) TableName() string {
-	return "temp_hd_staff"
+	return "t_hd_staff"
+}
+
+type TempHdLayout struct {
+	ID             	int64     `gorm:"column:id" json:"id"`
+	HospitalId     	string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	PartitionName   string    `gorm:"column:PARTITION_NAME" json:"PARTITION_NAME"`
+	PartitionImg 	string    `gorm:"column:PARTITION_IMG" json:"PARTITION_IMG"`
+	FunctionArea 	string    `gorm:"column:FUNCTION_AREA" json:"FUNCTION_AREA"`
+	Xgbz           	int64     `gorm:"column:XGBZ" json:"XGBZ"`
+	CreateTime     time.Time `gorm:"column:CREATE_TIME" json:"CREATE_TIME"`
+	Sjscsj         time.Time `gorm:"column:SJSCSJ" json:"SJSCSJ"`
+	Mj             string    `gorm:"column:MJ" json:"MJ"`
+	Ylyl1          string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2          string    `gorm:"column:YLYL2" json:"YLYL2"`
 }
 
+func (TempHdLayout) TableName() string {
+	return "t_hd_layout"
+}
+
+
 type TempHdDm struct {
 	ID             int64     `gorm:"column:id" json:"id"`
-	HospitalId     string    `gorm:"column:hospital_id" json:"hospital_id"`
-	EquipmentId    string    `gorm:"column:equipment_id" json:"equipment_id"`
-	SickbedNo      string    `gorm:"column:sickbed_no" json:"sickbed_no"`
-	EquipmentBrand string    `gorm:"column:equipment_brand" json:"equipment_brand"`
-	EnableTime     time.Time `gorm:"column:enable_time" json:"enable_time"`
-	DiscardedTime  time.Time `gorm:"column:discarded_time" json:"discarded_time"`
-	Status         string    `gorm:"column:status" json:"status"`
-	EquipmentType  string    `gorm:"column:equipment_type" json:"equipment_type"`
-	Temperature    string    `gorm:"column:temperature" json:"temperature"`
-	Pressure       string    `gorm:"column:pressure" json:"pressure"`
-	PressureUnit   string    `gorm:"column:pressure_unit" json:"pressure_unit"`
-	WorkingVoltage string    `gorm:"column:working_voltage" json:"working_voltage"`
-	Xgbz           string    `gorm:"column:xgbz" json:"xgbz"`
-	Bbp            string    `gorm:"column:bbp" json:"bbp"`
-	CreateTime     time.Time `gorm:"column:create_time" json:"create_time"`
-	UpdateTime     time.Time `gorm:"column:update_time" json:"update_time"`
-	Sjscsj         time.Time `gorm:"column:sjscsj" json:"sjscsj"`
-	Mj             string    `gorm:"column:mj" json:"mj"`
-	Ylyl1          string    `gorm:"column:ylyl1" json:"ylyl1"`
-	Ylyl2          string    `gorm:"column:ylyl2" json:"ylyl2"`
+	HospitalId     	string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	EquipmentId    	string    `gorm:"column:EQUIPMENT_ID" json:"EQUIPMENT_ID"`
+	SickbedNo      	string    `gorm:"column:SICKBED_NO" json:"SICKBED_NO"`
+	EquipmentBrand 	string    `gorm:"column:EQUIPMENT_BRAND" json:"EQUIPMENT_BRAND"`
+	EquipmentModel 	string    `gorm:"column:EQUIPMENT_MODEL" json:"EQUIPMENT_MODEL"`
+	EnableTime     	time.Time `gorm:"column:ENABLE_TIME" json:"ENABLE_TIME"`
+	DiscardedTime  	time.Time `gorm:"column:DISCARDED_TIME" json:"DISCARDED_TIME"`
+	Status         	string    `gorm:"column:STATUS" json:"STATUS"`
+	EquipmentType  	string    `gorm:"column:EQUIPMENT_TYPE" json:"EQUIPMENT_TYPE"`
+	Temperature    	string    `gorm:"column:TEMPERATURE" json:"TEMPERATURE"`
+	Humidity   		string    `gorm:"column:HUMIDITY" json:"HUMIDITY"`
+	Pressure       	string    `gorm:"column:PRESSURE" json:"PRESSURE"`
+	PressureUnit   	string    `gorm:"column:PRESSURE_UNIT" json:"PRESSURE_UNIT"`
+	WorkingVoltage 	string    `gorm:"column:WORKING_VOLTAGE" json:"WORKING_VOLTAGE"`
+	Xgbz           	string    `gorm:"column:XGBZ" json:"XGBZ"`
+	Bbp            	string    `gorm:"column:BBP" json:"BBP"`
+	CreateTime     	time.Time `gorm:"column:CREATE_TIME" json:"CREATE_TIME"`
+	UpdateTime     	time.Time `gorm:"column:UPDATE_TIME" json:"UPDATE_TIME"`
+	Sjscsj         	time.Time `gorm:"column:SJSCSJ" json:"SJSCSJ"`
+	Mj            	string    `gorm:"column:MJ" json:"MJ"`
+	Ylyl1          	string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2          	string    `gorm:"column:YLYL2" json:"YLYL2"`
 }
 
 func (TempHdDm) TableName() string {
-	return "temp_hd_dm"
+	return "t_hd_dm"
+}
+
+type TempHdWm struct {
+	ID             int64     `gorm:"column:id" json:"id"`
+	HospitalId     	string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	EquipmentId    	string    `gorm:"column:EQUIPMENT_ID" json:"EQUIPMENT_ID"`
+	EquipmentBrand 	string    `gorm:"column:EQUIPMENT_BRAND" json:"EQUIPMENT_BRAND"`
+	EquipmentModel 	string    `gorm:"column:EQUIPMENT_MODEL" json:"EQUIPMENT_MODEL"`
+	EnableTime     	time.Time `gorm:"column:ENABLE_TIME" json:"ENABLE_TIME"`
+	DiscardedTime  	time.Time `gorm:"column:DISCARDED_TIME" json:"DISCARDED_TIME"`
+	EquipmentType  	string    `gorm:"column:EQUIPMENT_TYPE" json:"EQUIPMENT_TYPE"`
+	Temperature    	string    `gorm:"column:TEMPERATURE" json:"TEMPERATURE"`
+	Humidity   		string    `gorm:"column:HUMIDITY" json:"HUMIDITY"`
+	Pressure       	string    `gorm:"column:PRESSURE" json:"PRESSURE"`
+	PressureUnit   	string    `gorm:"column:PRESSURE_UNIT" json:"PRESSURE_UNIT"`
+	QualityStandard string    `gorm:"column:QUALITY_STANDARD" json:"QUALITY_STANDARD"`
+	Xgbz           	string    `gorm:"column:XGBZ" json:"XGBZ"`
+	CreateTime     	time.Time `gorm:"column:CREATE_TIME" json:"CREATE_TIME"`
+	UpdateTime     	time.Time `gorm:"column:UPDATE_TIME" json:"UPDATE_TIME"`
+	Sjscsj         	time.Time `gorm:"column:SJSCSJ" json:"SJSCSJ"`
+	Mj            	string    `gorm:"column:MJ" json:"MJ"`
+	Ylyl1          	string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2          	string    `gorm:"column:YLYL2" json:"YLYL2"`
+}
+
+func (TempHdWm) TableName() string {
+	return "t_hd_wm"
+}
+
+type TempHdMaintain struct {
+	ID             	int64     `gorm:"column:id" json:"id"`
+	SN				string    `gorm:"column:SN" json:"SN"`
+	HospitalId     	string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	EquipmentId    	string    `gorm:"column:EQUIPMENT_ID" json:"EQUIPMENT_ID"`
+	EquipmentType  	string    `gorm:"column:EQUIPMENT_TYPE" json:"EQUIPMENT_TYPE"`
+	RepairTime    	time.Time `gorm:"column:REPAIR_TIME" json:"REPAIR_TIME"`
+	Xgbz           	string    `gorm:"column:XGBZ" json:"XGBZ"`
+	CreateTime     	time.Time `gorm:"column:CREATE_TIME" json:"CREATE_TIME"`
+	Sjscsj         	time.Time `gorm:"column:SJSCSJ" json:"SJSCSJ"`
+	Mj            	string    `gorm:"column:MJ" json:"MJ"`
+	Ylyl1          	string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2          	string    `gorm:"column:YLYL2" json:"YLYL2"`
+}
+
+func (TempHdMaintain) TableName() string {
+	return "t_hd_maintain"
+}
+
+type TempHdDisinfectMethod struct {
+	ID             	int64     `gorm:"column:id" json:"id"`
+	SN				string    `gorm:"column:SN" json:"SN"`
+	HospitalId     	string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	EquipmentId    	string    `gorm:"column:EQUIPMENT_ID" json:"EQUIPMENT_ID"`
+	EquipmentType  	string    `gorm:"column:EQUIPMENT_TYPE" json:"EQUIPMENT_TYPE"`
+	EquipmentModel 	string    `gorm:"column:EQUIPMENT_MODEL" json:"EQUIPMENT_MODEL"`
+	DisinfectMethod	string    `gorm:"column:DISINFECT_METHOD" json:"DISINFECT_METHOD"`
+	Disinfector		string    `gorm:"column:DISINFECTOR" json:"DISINFECTOR"`
+	Concentration	string    `gorm:"column:CONCENTRATION" json:"CONCENTRATION"`
+	Frequency		string    `gorm:"column:FREQUENCY" json:"FREQUENCY"`
+	Xgbz           	string    `gorm:"column:XGBZ" json:"XGBZ"`
+	CreateTime     	time.Time `gorm:"column:CREATE_TIME" json:"CREATE_TIME"`
+	UpdateTime     	time.Time `gorm:"column:UPDATE_TIME" json:"UPDATE_TIME"`
+	Sjscsj         	time.Time `gorm:"column:SJSCSJ" json:"SJSCSJ"`
+	Mj            	string    `gorm:"column:MJ" json:"MJ"`
+	Ylyl1          	string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2          	string    `gorm:"column:YLYL2" json:"YLYL2"`
+}
+
+func (TempHdDisinfectMethod) TableName() string {
+	return "t_hd_disinfect_method"
+}
+
+type TempHdOtherMachine struct {
+	ID             int64     `gorm:"column:id" json:"id"`
+	HospitalId     	string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	EquipmentId    	string    `gorm:"column:EQUIPMENT_ID" json:"EQUIPMENT_ID"`
+	EquipmentBrand 	string    `gorm:"column:EQUIPMENT_BRAND" json:"EQUIPMENT_BRAND"`
+	EquipmentModel 	string    `gorm:"column:EQUIPMENT_MODEL" json:"EQUIPMENT_MODEL"`
+	EnableTime     	time.Time `gorm:"column:ENABLE_TIME" json:"ENABLE_TIME"`
+	DiscardedTime  	time.Time `gorm:"column:DISCARDED_TIME" json:"DISCARDED_TIME"`
+	Status         	string    `gorm:"column:STATUS" json:"STATUS"`
+	Xgbz           	string    `gorm:"column:XGBZ" json:"XGBZ"`
+	CreateTime     	time.Time `gorm:"column:CREATE_TIME" json:"CREATE_TIME"`
+	UpdateTime     	time.Time `gorm:"column:UPDATE_TIME" json:"UPDATE_TIME"`
+	Sjscsj         	time.Time `gorm:"column:SJSCSJ" json:"SJSCSJ"`
+	Mj            	string    `gorm:"column:MJ" json:"MJ"`
+	Ylyl1          	string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2          	string    `gorm:"column:YLYL2" json:"YLYL2"`
+}
+
+func (TempHdOtherMachine) TableName() string {
+	return "t_hd_other_machine"
 }
 
 type TempHdPatient struct {
@@ -254,13 +368,17 @@ func (TempHdOuthospital) TableName() string {
 }
 
 type DataUpload struct {
-	ID           int64 `gorm:"column:id" json:"id"`
-	ModuleType   int64 `gorm:"column:module_type" json:"module_type"`
-	OrgId        int64 `gorm:"column:org_id" json:"org_id"`
-	UploadDate   int64 `gorm:"column:upload_date" json:"upload_date"`
-	UploadStatus int64 `gorm:"column:upload_status" json:"upload_status"`
-	ReturnStatus int64 `gorm:"column:return_status" json:"return_status"`
-	UploadType   int64 `gorm:"column:upload_type" json:"upload_type"`
+	ID             	int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId       	int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	SyncType       	int64 `gorm:"column:sync_type" json:"sync_type" form:"sync_type"`
+	SyncTime       	int64 `gorm:"column:sync_time" json:"sync_time" form:"sync_time"`
+	SyncResultType  int	  `gorm:"column:sync_result_type" json:"sync_result_type" form:"sync_result_type"`
+	SyncRsultRemark string `gorm:"column:sync_result_remark" json:"sync_result_remark" form:"sync_result_remark"`
+	SyncTotalNum    int64 `gorm:"column:sync_total_num" json:"sync_total_num" form:"sync_total_num"`
+	SyncSuccessNum  int64 `gorm:"column:sync_success_num" json:"sync_success_num" form:"sync_success_num"`
+	SyncInfo      	string `gorm:"column:sync_info" json:"sync_info" form:"sync_info"`
+	CreateTime      int64 `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdateTime    	int64 `gorm:"column:update_time" json:"update_time" form:"update_time"`
 }
 
 func (DataUpload) TableName() string {
@@ -268,17 +386,25 @@ func (DataUpload) TableName() string {
 }
 
 type DataUploadConfig struct {
-	ID             int64  `gorm:"column:id" json:"id"`
-	OrgId          int64  `gorm:"column:org_id" json:"org_id"`
-	ProvinceId     int64  `gorm:"column:province_id" json:"province_id"`
-	CityId         int64  `gorm:"column:city_id" json:"city_id"`
-	GatewayAddress string `gorm:"column:gateway_address" json:"gateway_address"`
-	AppId          string `gorm:"column:app_id" json:"app_id"`
-	Key            string `gorm:"column:key" json:"key"`
-	Status         int64  `gorm:"column:status" json:"status"`
-	CreateTime     int64  `gorm:"column:create_time" json:"create_time"`
-	ModifyTime     int64  `gorm:"column:modify_time" json:"modify_time"`
-	TimeQuantum    int64  `gorm:"column:time_quantum" json:"time_quantum"`
+	ID             	int64  `gorm:"column:id" json:"id"`
+	OrgId          	int64  `gorm:"column:org_id" json:"org_id"`
+	ProvinceId     	int64  `gorm:"column:province_id" json:"province_id"`
+	CityId         	int64  `gorm:"column:city_id" json:"city_id"`
+	GatewayAddress 	string `gorm:"column:gateway_address" json:"gateway_address"`
+	AppId          	string `gorm:"column:app_id" json:"app_id"`
+	Key            	string `gorm:"column:key" json:"key"`
+	Status         	int64  `gorm:"column:status" json:"status"`
+	CreateTime     	int64  `gorm:"column:create_time" json:"create_time"`
+	ModifyTime     	int64  `gorm:"column:modify_time" json:"modify_time"`
+	TimeQuantum    	int64  `gorm:"column:time_quantum" json:"time_quantum"`
+	DepartmentName  string `gorm:"column:department_name" json:"department_name"`
+	HospitalId 		int64  `gorm:"column:hospital_id" json:"hospital_id"`
+	InstType    	int64  `gorm:"column:inst_type" json:"inst_type"`
+	DbHost			string `gorm:"column:db_host" json:"db_host"`
+	DbPort			string `gorm:"column:db_port" json:"db_port"`
+	DbUser			string `gorm:"column:db_user" json:"db_user"`
+	DbPass			string `gorm:"column:db_pass" json:"db_pass"`
+	DbName			string `gorm:"column:db_name" json:"db_name"`
 }
 
 func (DataUploadConfig) TableName() string {

service/city_data_uoload_service.go

@@ -10,8 +10,12 @@ import (
 	"strings"
 )
 
-func FindAllDataUploadConfigOrgInfo(province_id int64, city_id int64, config_type int64) (data []*sz.DataUploadConfig, err error) {
+func GetSyncTimeByOrgId(org_id int64,sync_type int64) (sync_info models.XTSyncInfo,err error) {
+	err = readDb.Model(&models.XTSyncInfo{}).Where("org_id = ? and sync_type = ? ", org_id,sync_type).Last(&sync_info).Error
+	return
+}
 
+func FindAllDataUploadConfigOrgInfo(province_id int64, city_id int64, config_type int64) (data []*sz.DataUploadConfig, err error) {
 	err = readDb.Model(&sz.DataUploadConfig{}).Where("status = 1 AND province_id = ? AND city_id = ? AND config_type = ?", province_id, city_id, config_type).Find(&data).Error
 	return
 }
@@ -21,8 +25,8 @@ func FindDataUploadOrgInfo(org_id int64, module_type int64) (data sz.DataUpload,
 	return
 }
 
-func FindOrgData(org_id int64) (org models.UserOrg, err error) {
-	err = readUserDb.Model(&models.UserOrg{}).Where("status = 1 AND id = ?", org_id).Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
+func FindOrgData(org_id int64,sync_time int64) (org models.UserOrg, err error) {
+	err = readUserDb.Model(&models.UserOrg{}).Where("status = 1 AND id = ? AND ctime > ?", org_id,sync_time).Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
 		return readDb.Where("status = 1")
 	}).Find(&org).Error
 	return

service/db.go

@@ -30,6 +30,22 @@ var writeUserDb *gorm.DB
 
 var err error
 
+func CreateDB(Host string,Port string,User string,Pass string,Name string) (rsdDb *gorm.DB,err error){
+	rdb := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", User, Pass, Host, Port, Name)
+	rsdDb, err = gorm.Open("mysql", rdb)
+	if err != nil {
+		//beego.Error(err)
+	}
+	rsdDb.DB().SetMaxIdleConns(5)
+	rsdDb.DB().SetMaxOpenConns(20)
+	rsdDb.LogMode(true)
+	return 
+}
+
+func CloseDB(DB *gorm.DB) {
+	DB.Close()
+}
+
 func ConnectDB() {
 	readHost := beego.AppConfig.String("readmysqlhost")
 	readPort := beego.AppConfig.String("readmysqlport")