修改

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9550
-runmode = dev
+runmode = prod
 
 copyrequestbody = true
 sessionon = true

controllers/sync.go

@@ -12,12 +12,18 @@ import (
 	"strings"
 	_ "strings"
 	"time"
+	"fmt"
 )
 
 type SyncController struct {
 	BaseAPIController
 }
 
+func SyncAPIRegisterRouters() {
+	beego.Router("/sync/upload", &SyncController{}, "get:SyncToSZIC")
+
+}
+
 func (c *SyncController) SyncToSZIC() {
 	// 第一步：到上报配置表中找到深圳需要上报的机构
 	sz_province, _ := beego.AppConfig.Int64("sz_province")
@@ -33,16 +39,47 @@ func (c *SyncController) SyncToSZIC() {
 				return
 			}
 			// 第三步：开始同步数据
+			// 同步医院信息  t_hd_hospital
 			c.SyncHospital(orgDb, org.OrgId, org.HospitalId, org.InstType, org.DepartmentName)
-
+			// 同步水处理器  t_hd_wm
+			c.SyncWMS(orgDb,org.OrgId, org.HospitalId)
+			// 同步员工 t_hd_staff
+			c.SyncStaff(orgDb,org.OrgId, org.HospitalId)
+			// 同步病人 t_hd_patient
+			c.SyncPatient(orgDb,org.OrgId, org.HospitalId)
+			// 同步排班  t_hd_shift
+			c.SyncShift(orgDb,org.OrgId, org.HospitalId)
+			// 同步处方 t_hd_ps
+			c.SyncPs(orgDb,org.OrgId, org.HospitalId)
+			// 同步处方药品 t_hd_ps
+			c.SyncPsMedicine(orgDb,org.OrgId, org.HospitalId)
+			// 同步转院信息 t_hd_patient_out
+			c.SyncPatientOut(orgDb,org.OrgId, org.HospitalId)
+			// 同步处方信息 t_hd_doctors_advice
+			c.SyncDoctorAdvice(orgDb,org.OrgId, org.HospitalId)
+			// 同步透中信息 t_hd_middle
+			c.SyncMiddle(orgDb,org.OrgId, org.HospitalId)
+			// // 同步设备 t_hd_other_machine
+			c.SyncOtherMachine(orgDb,org.OrgId, org.HospitalId)
+			// // 同步维修 t_hd_maintain
+			c.SyncMachineRepair(orgDb,org.OrgId, org.HospitalId)
+			// // 同步设备 t_hd_dm
+			c.SyncDM(orgDb,org.OrgId, org.HospitalId)
+			// // 同步患者透析记录 t_hd_dialysis
+			c.SyncDialysis(orgDb,org.OrgId, org.HospitalId)
+			
 			// 第四步：关闭数据库连接
 			service.CloseDB(orgDb)
 		}
 	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"resultList": "12345",
+	})
+	return
 }
 
 // 同步医院信息
-func (c *SyncController) SyncHospital(rdb *gorm.DB, org_id int64, hospital_id int64, inst_type int64, department_name string) {
+func (c *SyncController) SyncHospital(rdb *gorm.DB, org_id int64, hospital_id string, inst_type int64, department_name string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 1)
 	var sync_time int64
@@ -56,7 +93,7 @@ func (c *SyncController) SyncHospital(rdb *gorm.DB, org_id int64, hospital_id in
 	org, _ := service.FindOrgData(org_id, sync_time)
 	if org.ID > 0 {
 		hospital := &sz.TempHdHospital{
-			HospitalId:     strconv.FormatInt(hospital_id, 10),
+			HospitalId:     hospital_id,
 			InstType:       strconv.FormatInt(inst_type, 10),
 			DepartMentName: department_name,
 			AuthorizedBeds: int64(len(org.DeviceNumber)),
@@ -65,7 +102,7 @@ func (c *SyncController) SyncHospital(rdb *gorm.DB, org_id int64, hospital_id in
 			Sjscsj:         time.Now(),
 			Xgbz:           0,
 		}
-		err := service.CreateOrgRecord(hospital)
+		err := service.CreateOrgRecord(rdb,hospital)
 		if err == nil {
 			// 第三步：同步成功后，添加同步记录
 			upload := &sz.DataUpload{
@@ -82,11 +119,10 @@ func (c *SyncController) SyncHospital(rdb *gorm.DB, org_id int64, hospital_id in
 			}
 		}
 	}
-
 }
 
 // 同步水处理器
-func (c *SyncController) SyncWMS(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncWMS(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 22)
 	var sync_time int64
@@ -101,7 +137,7 @@ func (c *SyncController) SyncWMS(rdb *gorm.DB, org_id int64, hospital_id int64)
 	var wms []*sz.TempHdWm
 	for _, item := range waterMachine {
 		wm := &sz.TempHdWm{
-			HospitalId:     strconv.FormatInt(hospital_id, 10),
+			HospitalId:     hospital_id,
 			EquipmentId:    strconv.FormatInt(item.ID, 10),
 			EquipmentBrand: item.ManufactureFactory,
 			EquipmentModel: strconv.FormatInt(item.UnitType, 10),
@@ -140,7 +176,7 @@ func (c *SyncController) SyncWMS(rdb *gorm.DB, org_id int64, hospital_id int64)
 }
 
 // 同步员工
-func (c *SyncController) SyncStaff(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncStaff(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 21)
 	var sync_time int64
@@ -167,7 +203,7 @@ func (c *SyncController) SyncStaff(rdb *gorm.DB, org_id int64, hospital_id int64
 		}
 
 		staff := &sz.TempHdStaff{
-			HospitalId:    strconv.FormatInt(hospital_id, 10),
+			HospitalId:    hospital_id,
 			StaffId:       strconv.FormatInt(role.ID, 10),
 			StaffName:     role.UserName,
 			Position:      title,
@@ -204,7 +240,7 @@ func (c *SyncController) SyncStaff(rdb *gorm.DB, org_id int64, hospital_id int64
 }
 
 // 同步病人
-func (c *SyncController) SyncPatient(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncPatient(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 15)
 	var sync_time int64
@@ -223,12 +259,25 @@ func (c *SyncController) SyncPatient(rdb *gorm.DB, org_id int64, hospital_id int
 
 		idcard_year, _ := strconv.Atoi(Substr(patient.IdCardNo, 6, 4)) // 年
 		idcard_mo, _ := strconv.Atoi(Substr(patient.IdCardNo, 10, 2))  // 月
+		
 		idcard_day, _ := strconv.Atoi(Substr(patient.IdCardNo, 12, 2)) // 日
 
-		date := strconv.Itoa(idcard_year) + "-" + strconv.Itoa(idcard_mo) + "-" + strconv.Itoa(idcard_day)
+		date := strconv.Itoa(idcard_year)
+		if idcard_mo < 10 {
+			date = date + "-0" + strconv.Itoa(idcard_mo) 
+		} else {
+			date = date + "-" + strconv.Itoa(idcard_mo) 
+		}
+
+		if idcard_day < 10 {
+			date = date + "-0" + strconv.Itoa(idcard_day)
+		} else {
+			date = date + "-" + strconv.Itoa(idcard_day)
+		}
 
 		local, _ := time.LoadLocation("Local")
 		birthday, _ := time.ParseInLocation("2006-01-02", date, local)
+		fmt.Println(birthday)
 
 		var isCKD int
 
@@ -243,10 +292,10 @@ func (c *SyncController) SyncPatient(rdb *gorm.DB, org_id int64, hospital_id int
 		}
 
 		p := &sz.TempHdPatient{
-			HospitalId:       strconv.FormatInt(hospital_id, 10),
+			HospitalId:       hospital_id,
 			PatientNk:        strconv.FormatInt(patient.ID, 10),
 			CardNo:           "000000000000000000",
-			CardType:         "01",
+			CardType:         "01", 
 			IdNo:             patient.IdCardNo,
 			IdType:           "01",
 			PatientName:      patient.Name,
@@ -320,7 +369,7 @@ func Substr(str string, start, length int) string {
 }
 
 // 同步排班
-func (c *SyncController) SyncShift(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncShift(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 19)
 	var sync_time int64
@@ -372,7 +421,7 @@ func (c *SyncController) SyncShift(rdb *gorm.DB, org_id int64, hospital_id int64
 }
 
 // 同步处方
-func (c *SyncController) SyncPs(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncPs(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 17)
 	var sync_time int64
@@ -388,7 +437,7 @@ func (c *SyncController) SyncPs(rdb *gorm.DB, org_id int64, hospital_id int64) {
 
 		ps := &sz.TempHdPs{
 			PrescribeId:   strconv.FormatInt(item.ID, 10),
-			HospitalId:    strconv.FormatInt(hospital_id, 10),
+			HospitalId:    hospital_id,
 			PatientNk:     strconv.FormatInt(item.PatientId, 10),
 			K:             item.Kalium,
 			Ca:            item.Calcium,
@@ -451,7 +500,7 @@ func (c *SyncController) SyncPs(rdb *gorm.DB, org_id int64, hospital_id int64) {
 }
 
 // 同步处方药物
-func (c *SyncController) SyncPsMedicine(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncPsMedicine(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 18)
 	var sync_time int64
@@ -525,7 +574,7 @@ func (c *SyncController) SyncPsMedicine(rdb *gorm.DB, org_id int64, hospital_id
 }
 
 // 同步转院信息
-func (c *SyncController) SyncPatientOut(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncPatientOut(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 16)
 	var sync_time int64
@@ -550,7 +599,7 @@ func (c *SyncController) SyncPatientOut(rdb *gorm.DB, org_id int64, hospital_id
 		}
 
 		if len(patient.PatientLapseto) > 0 {
-			p.SequelaeDate = time.Unix(patient.PatientLapseto[len(patient.PatientLapseto)].LapsetoTime, 0)
+			p.SequelaeDate = time.Unix(patient.PatientLapseto[len(patient.PatientLapseto) - 1].LapsetoTime, 0)
 		}
 
 		hdPatientOuts = append(hdPatientOuts, p)
@@ -580,7 +629,7 @@ func (c *SyncController) SyncPatientOut(rdb *gorm.DB, org_id int64, hospital_id
 }
 
 // 同步处方信息
-func (c *SyncController) SyncDoctorAdvice(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncDoctorAdvice(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 6)
 	var sync_time int64
@@ -634,9 +683,9 @@ func (c *SyncController) SyncDoctorAdvice(rdb *gorm.DB, org_id int64, hospital_i
 }
 
 //
-func (c *SyncController) SyncMiddle(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncMiddle(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
-	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 6)
+	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 36)
 	var sync_time int64
 	if syncLastInfo.ID > 0 {
 		sync_time = syncLastInfo.SyncTime
@@ -650,7 +699,7 @@ func (c *SyncController) SyncMiddle(rdb *gorm.DB, org_id int64, hospital_id int6
 	for _, item := range monitors {
 
 		mid := &sz.TempHdMiddle{
-			HospitalId:  strconv.FormatInt(hospital_id, 10),
+			HospitalId:  hospital_id,
 			DialysisId:  strconv.FormatInt(item.DialysisOrder.ID, 10),
 			MonitorTime: time.Unix(item.OperateTime, 0),
 			Sbp:         int64(math.Floor(item.SystolicBloodPressure + 0/5)),
@@ -670,7 +719,7 @@ func (c *SyncController) SyncMiddle(rdb *gorm.DB, org_id int64, hospital_id int6
 	if err == nil {
 		// 第三步：同步成功后，添加同步记录
 		upload := &sz.DataUpload{
-			SyncType:       6,
+			SyncType:       36,
 			OrgId:          org_id,
 			SyncTime:       time.Now().Unix(),
 			SyncResultType: 1,
@@ -689,7 +738,7 @@ func (c *SyncController) SyncMiddle(rdb *gorm.DB, org_id int64, hospital_id int6
 }
 
 // 同步设备
-func (c *SyncController) SyncOtherMachine(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncOtherMachine(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 13)
 	var sync_time int64
@@ -704,7 +753,7 @@ func (c *SyncController) SyncOtherMachine(rdb *gorm.DB, org_id int64, hospital_i
 	var wms []*sz.TempHdOtherMachine
 	for _, item := range waterMachine {
 		wm := &sz.TempHdOtherMachine{
-			HospitalId:     strconv.FormatInt(hospital_id, 10),
+			HospitalId:     hospital_id,
 			EquipmentId:    strconv.FormatInt(item.ID, 10),
 			EquipmentBrand: item.ManufactureFactory,
 			EquipmentModel: strconv.FormatInt(item.UnitType, 10),
@@ -750,7 +799,7 @@ func (c *SyncController) SyncOtherMachine(rdb *gorm.DB, org_id int64, hospital_i
 }
 
 // 同步维修
-func (c *SyncController) SyncMachineRepair(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncMachineRepair(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 11)
 	var sync_time int64
@@ -765,7 +814,7 @@ func (c *SyncController) SyncMachineRepair(rdb *gorm.DB, org_id int64, hospital_
 	var maintain []*sz.TempHdMaintain
 	for _, item := range hdMaintain {
 		mt := &sz.TempHdMaintain{
-			HospitalId:  strconv.FormatInt(hospital_id, 10),
+			HospitalId:  hospital_id,
 			EquipmentId: strconv.FormatInt(item.VMDeviceAddmacher.ID, 10),
 			RepairTime:  time.Unix(item.GuaranteeDate, 0),
 			CreateTime:  time.Now(),
@@ -810,7 +859,7 @@ func (c *SyncController) SyncMachineRepair(rdb *gorm.DB, org_id int64, hospital_
 }
 
 // 同步设备
-func (c *SyncController) SyncDM(rdb *gorm.DB, org_id int64, hospital_id int64) {
+func (c *SyncController) SyncDM(rdb *gorm.DB, org_id int64, hospital_id string) {
 	// 第一步：根据机构id获取上次同步时间
 	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 5)
 	var sync_time int64
@@ -825,7 +874,7 @@ func (c *SyncController) SyncDM(rdb *gorm.DB, org_id int64, hospital_id int64) {
 	var hdms []*sz.TempHdDm
 	for _, item := range dm {
 		hdm := &sz.TempHdDm{
-			HospitalId:     strconv.FormatInt(hospital_id, 10),
+			HospitalId:     hospital_id,
 			EquipmentId:    strconv.FormatInt(item.ID, 10),
 			SickbedNo:      item.DeviceNumber.Number,
 			EquipmentBrand: item.ManufactureFactory,
@@ -883,3 +932,83 @@ func (c *SyncController) SyncDM(rdb *gorm.DB, org_id int64, hospital_id int64) {
 	}
 
 }
+
+// 同步患者透析记录
+func (c *SyncController) SyncDialysis(rdb *gorm.DB, org_id int64, hospital_id string) {
+	// 第一步：根据机构id获取上次同步时间
+	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 2)
+	var sync_time int64
+	if syncLastInfo.ID > 0 {
+		sync_time = syncLastInfo.SyncTime
+	} else {
+		sync_time = 0
+	}
+
+	var tempDialysis []*sz.TempHdDialysis
+	dialysisData, _ := service.FindOrgDialysisData(org_id, sync_time, time.Now().Unix())
+
+	for _, item := range dialysisData {
+ 
+		psm := &sz.TempHdDialysis{
+			DialysisId:		strconv.FormatInt(item.ID, 10),
+			HospitalId:     strconv.FormatInt(item.UserOrgId, 10),
+			PatientNk:      strconv.FormatInt(item.PatientId, 10),
+			PsId:			strconv.FormatInt(item.Schedule.ID, 10),
+			DialysisDate:	time.Unix(item.DialysisDate, 0),
+			SickbedNo:		item.DeviceNumber.Number,
+			DivisionId:		strconv.FormatInt(item.Schedule.PartitionId,10),
+			EquipmentId: 	strconv.FormatInt(item.DeviceNumber.ID, 10),
+			TotalTreatDuration: 	 item.AssessmentAfterDislysis.ActualTreatmentHour * 60 	+ item.AssessmentAfterDislysis.ActualTreatmentMinute,
+			BeforeSbp: 		int64(item.AssessmentBeforeDislysis.SystolicBloodPressure),
+			BeforeDbp: 		int64(item.AssessmentBeforeDislysis.DiastolicBloodPressure),
+			AfterSbp:		int64(item.AssessmentAfterDislysis.SystolicBloodPressure),
+			AfterDbp:		int64(item.AssessmentAfterDislysis.DiastolicBloodPressure),
+			StartTime:		time.Unix(item.StartTime, 0),
+			EndTime:		time.Unix(item.EndTime, 0),
+			CreateTime:		time.Unix(item.CreatedTime, 0),
+			Sjscsj:         time.Now(),
+			Xgbz:           0,
+		}
+		if item.AssessmentAfterDislysis.ActualUltrafiltration < 10 {
+			psm.ActualufMl = int64(item.AssessmentAfterDislysis.ActualUltrafiltration * 1000)
+		} else {
+			psm.ActualufMl = int64(item.AssessmentAfterDislysis.ActualUltrafiltration)
+		}
+
+		if item.VMDialysisPrescription.TargetUltrafiltration < 10 {
+			psm.Ufv = int64(item.VMDialysisPrescription.TargetUltrafiltration * 1000)
+		} else {
+			psm.Ufv = int64(item.VMDialysisPrescription.TargetUltrafiltration)
+		}
+		
+		if item.AssessmentAfterDislysis.ActualDisplacement < 10 {
+			psm.TotalReplace = int64(item.AssessmentAfterDislysis.ActualDisplacement * 1000)
+		} else {
+			psm.TotalReplace = int64(item.AssessmentAfterDislysis.ActualDisplacement)
+		}
+
+		tempDialysis = append(tempDialysis, psm)
+	}
+
+	err := service.BatchCreateDialysis(tempDialysis, rdb)
+
+	if err == nil {
+		// 第三步：同步成功后，添加同步记录
+		upload := &sz.DataUpload{
+			SyncType:       2,
+			OrgId:          org_id,
+			SyncTime:       time.Now().Unix(),
+			SyncResultType: 1,
+			CreateTime:     time.Now().Unix(),
+			UpdateTime:     time.Now().Unix(),
+		}
+		err := service.CreateUploadRecord(upload)
+		if err != nil {
+			utils.ErrorLog("%v", err)
+		}
+	} else {
+		//错误处理
+
+	}
+
+}

main.go

@@ -3,7 +3,7 @@ package main
 import (
 	_ "Data_Upload_Api/routers"
 	"Data_Upload_Api/service"
-	"Data_Upload_Api/service/city"
+	_"Data_Upload_Api/service/city"
 
 	"github.com/astaxie/beego"
 )
@@ -13,6 +13,6 @@ func init() {
 }
 
 func main() {
-	city.AutoSZUploadData()
+	// city.AutoSZUploadData()
 	beego.Run()
 }

models/src_data.go

@@ -15,7 +15,7 @@ type XTSyncInfo struct {
 }
 
 func (XTSyncInfo) TableName() string {
-	return "xt_sync_info"
+	return "data_sync_info"
 }
 
 type UserOrg struct {
@@ -571,6 +571,39 @@ func (DialysisOrder) TableName() string {
 	return "xt_dialysis_order"
 }
 
+type VMDialysisOrder struct {
+	ID             int64  `gorm:"column:id" json:"id"`
+	DialysisDate   int64  `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId      int64  `gorm:"column:patient_id" json:"patient_id"`
+	PrescriptionId int64  `gorm:"column:prescription_id" json:"prescription_id"`
+	Stage          int64  `gorm:"column:stage" json:"stage"`
+	Remark         string `gorm:"column:remark" json:"remark"`
+	BedId          int64  `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse     int64  `gorm:"column:start_nurse" json:"start_nurse"`
+	FinishNurse    int64  `gorm:"column:finish_nurse" json:"finish_nurse"`
+	Status         int64  `gorm:"column:status" json:"status"`
+	CreatedTime    int64  `gorm:"column:created_time" json:"created_time"`
+	UpdatedTime    int64  `gorm:"column:updated_time" json:"updated_time"`
+	StartTime      int64  `gorm:"column:start_time" json:"start_time"`
+	EndTime        int64  `gorm:"column:end_time" json:"end_time"`
+	PunctureNurse  int64  `gorm:"column:puncture_nurse" json:"puncture_nurse"`
+	Creator        int64  `gorm:"column:creator" json:"creator"`
+	Modifier       int64  `gorm:"column:modifier" json:"modifier"`
+	FinishCreator  int64  `gorm:"column:finish_creator" json:"finish_creator"`
+	FinishModifier int64  `gorm:"column:finish_modifier" json:"finish_modifier"`
+	DeviceNumber             DeviceNumber             `gorm:"ForeignKey:ID;AssociationForeignKey:BedId" json:"device"`
+	VMDialysisPrescription   VMDialysisPrescription   `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:DialysisDate,PatientID" json:"prescription"`
+	AssessmentBeforeDislysis AssessmentBeforeDislysis `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:DialysisDate,PatientID" json:"before"`
+	AssessmentAfterDislysis  AssessmentAfterDislysis  `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:DialysisDate,PatientID" json:"after"`
+	Schedule            	 Schedule            	  `gorm:"ForeignKey:ScheduleDate,PatientID;AssociationForeignKey:DialysisDate,PatientID" json:"schedule"`
+	MonitoringRecord         []MonitoringRecord       `gorm:"ForeignKey:MonitoringDate,PatientID;AssociationForeignKey:DialysisDate,PatientID" json:"monitor"`
+}
+
+func (VMDialysisOrder) TableName() string {
+	return "xt_dialysis_order"
+}
+
 type VMSchedule struct {
 	ID                       int64                    `gorm:"column:id" json:"id"`
 	UserOrgId                int64                    `gorm:"column:user_org_id" json:"user_org_id"`

models/sz/target_data.go

@@ -198,28 +198,28 @@ func (TempHdOtherMachine) TableName() string {
 
 type TempHdPatient struct {
 	ID                int64     `gorm:"column:id" json:"id"`
-	HospitalId        string    `gorm:"column:hospital_id" json:"hospital_id"`
-	PatientNk         string    `gorm:"column:patient_nk" json:"patient_nk"`
-	CardNo            string    `gorm:"column:card_no" json:"card_no"`
-	CardType          string    `gorm:"column:card_type" json:"card_type"`
-	IdNo              string    `gorm:"column:id_no" json:"id_no"`
-	IdType            string    `gorm:"column:id_type" json:"id_type"`
-	PatientName       string    `gorm:"column:patient_name" json:"patient_name"`
-	Gender            string    `gorm:"column:gender" json:"gender"`
-	BornDate          time.Time `gorm:"column:born_date" json:"born_date"`
-	DiagnosisSummary  string    `gorm:"column:diagnosis_summary" json:"diagnosis_summary"`
-	IsCrf             string    `gorm:"column:is_crf" json:"is_crf"`
-	AllergyHistory    string    `gorm:"column:allergy_history" json:"allergy_history"`
-	PayMethod         string    `gorm:"column:pay_method" json:"pay_method"`
-	DialysisStartTime time.Time `gorm:"column:dialysis_start_time" json:"dialysis_start_time"`
-	LocalStartTime    time.Time `gorm:"column:local_start_time" json:"local_start_time"`
-	Xgbz              string    `gorm:"column:xgbz" json:"xgbz"`
-	CreatedTime       time.Time `gorm:"column:created_time" json:"created_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"`
+	PatientNk         string    `gorm:"column:PATIENT_NK" json:"PATIENT_NK"`
+	CardNo            string    `gorm:"column:CARD_NO" json:"CARD_NO"`
+	CardType          string    `gorm:"column:CARD_TYPE" json:"CARD_TYPE"`
+	IdNo              string    `gorm:"column:ID_NO" json:"ID_NO"`
+	IdType            string    `gorm:"column:ID_TYPE" json:"ID_TYPE"`
+	PatientName       string    `gorm:"column:PATIENT_NAME" json:"PATIENT_NAME"`
+	Gender            string    `gorm:"column:GENDER" json:"GENDER"`
+	BornDate          time.Time `gorm:"column:BORN_DATE" json:"BORN_DATE"`
+	DiagnosisSummary  string    `gorm:"column:DIAGNOSIS_SUMMARY" json:"DIAGNOSIS_SUMMARY"`
+	IsCrf             string    `gorm:"column:IS_CRF" json:"IS_CRF"`
+	AllergyHistory    string    `gorm:"column:ALLERGY_HISTORY" json:"ALLERGY_HISTORY"`
+	PayMethod         string    `gorm:"column:PAY_METHOD" json:"PAY_METHOD"`
+	DialysisStartTime time.Time `gorm:"column:DIALYSIS_START_TIME" json:"DIALYSIS_START_TIME"`
+	LocalStartTime    time.Time `gorm:"column:LOCAL_START_TIME" json:"LOCAL_START_TIME"`
+	Xgbz              string    `gorm:"column:XGBZ" json:"XGBZ"`
+	CreatedTime       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 (TempHdPatient) TableName() string {
@@ -228,19 +228,19 @@ func (TempHdPatient) TableName() string {
 
 type TempHdPatientOut struct {
 	ID              int64     `gorm:"column:id" json:"id"`
-	Sn              string    `gorm:"column:sn" json:"sn"`
-	HospitalId      string    `gorm:"column:hospital_id" json:"hospital_id"`
-	PatientNk       string    `gorm:"column:patient_nk" json:"patient_nk"`
-	SequelaeDate    time.Time `gorm:"column:sequelae_date" json:"sequelae_date"`
-	SequelaeType    string    `gorm:"column:sequelae_type" json:"sequelae_type"`
-	SequelaeSubType string    `gorm:"column:sequelae_sub_type" json:"sequelae_sub_type"`
-	ExtReason       string    `gorm:"column:ext_reason" json:"ext_reason"`
-	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"`
-	Xgbz            int64     `gorm:"column:xgbz" json:"xgbz"`
-	Ylyl1           string    `gorm:"column:ylyl1" json:"ylyl1"`
-	Ylyl2           string    `gorm:"column:ylyl2" json:"ylyl2"`
+	Sn              string    `gorm:"column:SN" json:"SN"`
+	HospitalId      string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	PatientNk       string    `gorm:"column:PATIENT_NK" json:"PATIENT_NK"`
+	SequelaeDate    time.Time `gorm:"column:SEQUELAE_DATE" json:"SEQUELAE_DATE"`
+	SequelaeType    string    `gorm:"column:SEQUELAE_TYPE" json:"SEQUELAE_TYPE"`
+	SequelaeSubType string    `gorm:"column:SEQUELAE_SUB_TYPE" json:"SEQUELAE_SUB_TYPE"`
+	ExtReason       string    `gorm:"column:EXT_REASON" json:"EXT_REASON"`
+	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"`
+	Xgbz            int64     `gorm:"column:XGBZ" json:"XGBZ"`
+	Ylyl1           string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2           string    `gorm:"column:YLYL2" json:"YLYL2"`
 }
 
 func (TempHdPatientOut) TableName() string {
@@ -249,36 +249,36 @@ func (TempHdPatientOut) TableName() string {
 
 type TempHdPs struct {
 	ID                int64     `gorm:"column:id" json:"id"`
-	HospitalId        string    `gorm:"column:hospital_id" json:"hospital_id"`
-	PrescribeId       string    `gorm:"column:prescribe_id" json:"prescribe_id"`
-	PatientNk         string    `gorm:"column:patient_nk" json:"patient_nk"`
-	MedicalId         string    `gorm:"column:medical_id" json:"medical_id"`
-	DrId              string    `gorm:"column:dr_id" json:"dr_id"`
-	DialysisFrequency int64     `gorm:"column:dialysis_frequency" json:"dialysis_frequency"`
-	FrequencyUnit     int64     `gorm:"column:frequency_unit" json:"frequency_unit"`
-	DialysisDuration  float64   `gorm:"column:dialysis_duration" json:"dialysis_duration"`
-	Hdf               string    `gorm:"column:hdf" json:"hdf"`
-	HdfFrequencyUnit  int64     `gorm:"column:hdf_frequency_unit" json:"hdf_frequency_unit"`
-	HdfFrequency      int64     `gorm:"column:hdf_frequency" json:"hdf_frequency"`
-	HdfDuration       float64   `gorm:"column:hdf_duration" json:"hdf_duration"`
-	Hp                string    `gorm:"column:hp" json:"hp"`
-	HpFrequency       int64     `gorm:"column:hp_frequency" json:"hp_frequency"`
-	HpFrequencyUnit   int64     `gorm:"column:hp_frequency_unit" json:"hp_frequency_unit"`
-	HpDuration        float64   `gorm:"column:hp_duration" json:"hp_duration"`
-	K                 float64   `gorm:"column:k" json:"k"`
-	Ca                float64   `gorm:"column:ca" json:"ca"`
-	Na                float64   `gorm:"column:na" json:"na"`
-	Glucose           string    `gorm:"column:glucose" json:"glucose"`
-	FluxLevel         string    `gorm:"column:flux_level" json:"flux_level"`
-	FluxValue         string    `gorm:"column:flux_value" json:"flux_value"`
-	UseType           string    `gorm:"column:use_type" json:"use_type"`
-	PrescribeTime     time.Time `gorm:"column:prescribe_time" json:"prescribe_time"`
-	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"`
-	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"`
+	PrescribeId       string    `gorm:"column:PRESCRIBE_ID" json:"PRESCRIBE_ID"`
+	PatientNk         string    `gorm:"column:PATIENT_NK" json:"PATIENT_NK"`
+	MedicalId         string    `gorm:"column:MEDICAL_ID" json:"MEDICAL_ID"`
+	DrId              string    `gorm:"column:DR_ID" json:"DR_ID"`
+	DialysisFrequency int64     `gorm:"column:DIALYSIS_FREQUENCY" json:"DIALYSIS_FREQUENCY"`
+	FrequencyUnit     int64     `gorm:"column:FREQUENCY_UNIT" json:"FREQUENCY_UNIT"`
+	DialysisDuration  float64   `gorm:"column:DIALYSIS_DURATION" json:"DIALYSIS_DURATION"`
+	Hdf               string    `gorm:"column:HDF" json:"HDF"`
+	HdfFrequencyUnit  int64     `gorm:"column:HDF_FREQUENCY_UNIT" json:"HDF_FREQUENCY_UNIT"`
+	HdfFrequency      int64     `gorm:"column:HDF_FREQUENCY" json:"HDF_FREQUENCY"`
+	HdfDuration       float64   `gorm:"column:HDF_DURATION" json:"HDF_DURATION"`
+	Hp                string    `gorm:"column:HP" json:"HP"`
+	HpFrequency       int64     `gorm:"column:HP_FREQUENCY" json:"HP_FREQUENCY"`
+	HpFrequencyUnit   int64     `gorm:"column:HP_FREQUENCY_UNIT" json:"HP_FREQUENCY_UNIT"`
+	HpDuration        float64   `gorm:"column:HP_DURATION" json:"HP_DURATION"`
+	K                 float64   `gorm:"column:K" json:"K"`
+	Ca                float64   `gorm:"column:CA" json:"CA"`
+	Na                float64   `gorm:"column:NA" json:"NA"`
+	Glucose           string    `gorm:"column:GLUCOSE" json:"GLUCOSE"`
+	FluxLevel         string    `gorm:"column:FLUX_LEVEL" json:"FLUX_LEVEL"`
+	FluxValue         string    `gorm:"column:FLUX_VALUE" json:"FLUX_VALUE"`
+	UseType           string    `gorm:"column:USE_TYPE" json:"USE_TYPE"`
+	PrescribeTime     time.Time `gorm:"column:PRESCRIBE_TIME" json:"PRESCRIBE_TIME"`
+	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"`
+	Xgbz              int64     `gorm:"column:XGBZ" json:"XGBZ"`
+	Ylyl1             string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2             string    `gorm:"column:YLYL2" json:"YLYL2"`
 }
 
 func (TempHdPs) TableName() string {
@@ -287,17 +287,17 @@ func (TempHdPs) TableName() string {
 
 type TempHdPsMedicine struct {
 	ID             int64     `gorm:"column:id" json:"id"`
-	Sn             string    `gorm:"column:sn" json:"sn"`
-	PrescribeId    string    `gorm:"column:prescribe_id" json:"prescribe_id"`
-	HospitalId     string    `gorm:"column:hospital_id" json:"hospital_id"`
-	MedicineTypeId string    `gorm:"column:medicine_type_id" json:"medicine_type_id"`
-	MedicineId     string    `gorm:"column:medicine_id" json:"medicine_id"`
-	CreatedTime    time.Time `gorm:"column:created_time" json:"created_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"`
+	Sn             string    `gorm:"column:SN" json:"SN"`
+	PrescribeId    string    `gorm:"column:PRESCRIBE_ID" json:"PRESCRIBE_ID"`
+	HospitalId     string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	MedicineTypeId string    `gorm:"column:MEDICINE_TYPE_ID" json:"MEDICINE_TYPE_ID"`
+	MedicineId     string    `gorm:"column:MEDICINE_ID" json:"MEDICINE_ID"`
+	CreatedTime    time.Time `gorm:"column:CREATE_TIME" json:"CREATE_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 (TempHdPsMedicine) TableName() string {
@@ -396,7 +396,7 @@ type DataUploadConfig struct {
 	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"`
+	HospitalId     string `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"`
@@ -411,19 +411,19 @@ func (DataUploadConfig) TableName() string {
 
 type TempHdShift struct {
 	ID             int64     `gorm:"column:id" json:"id"`
-	PsId           string    `gorm:"column:ps_id" json:"ps_id"`
-	HospitalId     string    `gorm:"column:hospital_id" json:"hospital_id"`
-	PatientNk      string    `gorm:"column:patient_nk" json:"patient_nk"`
-	ScheduleDate   time.Time `gorm:"column:schedule_date" json:"schedule_date"`
-	ShiftType      string    `gorm:"column:shift_type" json:"shift_type"`
-	SickbedNo      string    `gorm:"column:sickbed_no" json:"sickbed_no"`
-	ScheduleStatus string    `gorm:"column:schedule_status" json:"schedule_status"`
-	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"`
-	Xgbz           int64     `gorm:"column:xgbz" json:"xgbz"`
-	Ylyl1          string    `gorm:"column:ylyl1" json:"ylyl1"`
-	Ylyl2          string    `gorm:"column:ylyl2" json:"ylyl2"`
+	PsId           string    `gorm:"column:PS_ID" json:"PS_ID"`
+	HospitalId     string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	PatientNk      string    `gorm:"column:PATIENT_NK" json:"PATIENT_NK"`
+	ScheduleDate   time.Time `gorm:"column:SCHEDULE_DATE" json:"SCHEDULE_DATE"`
+	ShiftType      string    `gorm:"column:SHIFT_TYPE" json:"SHIFT_TYPE"`
+	SickbedNo      string    `gorm:"column:SICKBED_NO" json:"SICKBED_NO"`
+	ScheduleStatus string    `gorm:"column:SCHEDULE_STATUS" json:"SCHEDULE_STATUS"`
+	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"`
+	Xgbz           int64     `gorm:"column:XGBZ" json:"XGBZ"`
+	Ylyl1          string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2          string    `gorm:"column:YLYL2" json:"YLYL2"`
 }
 
 func (TempHdShift) TableName() string {
@@ -432,21 +432,21 @@ func (TempHdShift) TableName() string {
 
 type TempHdDoctorsAdvice struct {
 	ID               int64     `gorm:"column:id" json:"id"`
-	MedicalOrDerId   string    `gorm:"column:medical_or_der_id" json:"medical_or_der_id"`
-	HospitalId       string    `gorm:"column:hospital_id" json:"hospital_id"`
-	DialysisId       string    `gorm:"column:dialysis_id" json:"dialysis_id"`
-	OrderType        string    `gorm:"column:order_type" json:"order_type"`
-	RrtType          string    `gorm:"column:rrt_type" json:"rrt_type"`
-	PatientNk        string    `gorm:"column:patient_nk" json:"patient_nk"`
-	DialysisDuration int64     `gorm:"column:dialysis_duration" json:"dialysis_duration"`
-	BloodVol         int64     `gorm:"column:blood_vol" json:"blood_vol"`
-	DryWeigh         float64   `gorm:"column:dry_weigh" json:"dry_weigh"`
-	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"`
-	Xgbz             int64     `gorm:"column:xgbz" json:"xgbz"`
-	Ylyl1            string    `gorm:"column:ylyl1" json:"ylyl1"`
-	Ylyl2            string    `gorm:"column:ylyl2" json:"ylyl2"`
+	MedicalOrDerId   string    `gorm:"column:MEDICAL_ORDER_ID" json:"MEDICAL_ORDER_ID"`
+	HospitalId       string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	DialysisId       string    `gorm:"column:DIALYSIS_ID" json:"DIALYSIS_ID"`
+	OrderType        string    `gorm:"column:ORDER_TYPE" json:"ORDER_TYPE"`
+	RrtType          string    `gorm:"column:RRT_TYPE" json:"RRT_TYPE"`
+	PatientNk        string    `gorm:"column:PATIENT_NK" json:"PATIENT_NK"`
+	DialysisDuration int64     `gorm:"column:DIALYSIS_DURATION" json:"DIALYSIS_DURATION"`
+	BloodVol         int64     `gorm:"column:BLOOD_VOL" json:"BLOOD_VOL"`
+	DryWeigh         float64   `gorm:"column:DRY_WEIGHT" json:"DRY_WEIGHT"`
+	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"`
+	Xgbz             int64     `gorm:"column:XGBZ" json:"XGBZ"`
+	Ylyl1            string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2            string    `gorm:"column:YLYL2" json:"YLYL2"`
 }
 
 func (TempHdDoctorsAdvice) TableName() string {
@@ -455,40 +455,40 @@ func (TempHdDoctorsAdvice) TableName() string {
 
 type TempHdDialysis struct {
 	ID                    int64     `gorm:"column:id" json:"id"`
-	DialysisId            string    `gorm:"column:dialysis_id" json:"dialysis_id"`
-	HospitalId            string    `gorm:"column:hospital_id" json:"hospital_id"`
-	PatientNk             string    `gorm:"column:patient_nk" json:"patient_nk"`
-	PsId                  string    `gorm:"column:ps_id" json:"ps_id"`
-	DialysisDate          time.Time `gorm:"column:dialysis_date" json:"dialysis_date"`
-	SickbedNo             string    `gorm:"column:sickbed_no" json:"sickbed_no"`
-	DivisionId            string    `gorm:"column:division_id" json:"division_id"`
-	EquipmentId           string    `gorm:"column:equipment_id" json:"equipment_id"`
-	MixDalysis            string    `gorm:"column:mix_dalysis" json:"mix_dalysis"`
-	ActualufMl            int64     `gorm:"column:actualuf_ml" json:"actualuf_ml"`
-	Ufv                   int64     `gorm:"column:ufv" json:"ufv"`
-	TotalReplace          int64     `gorm:"column:total_replace" json:"total_replace"`
-	TotalTreatDuration    int64     `gorm:"column:total_treat_duration" json:"total_treat_duration"`
-	IsHospitalozation     string    `gorm:"column:is_hospitalozation" json:"is_hospitalozation"`
-	IsEmergency           string    `gorm:"column:is_emergency" json:"is_emergency"`
-	EmergencyReason       string    `gorm:"column:emergency_reason" json:"emergency_reason"`
-	IsPerioperativePeriod string    `gorm:"column:is_perioperative_period" json:"is_perioperative_period"`
-	BeforeSbp             int64     `gorm:"column:before_sbp" json:"before_sbp"`
-	BeforeDbp             int64     `gorm:"column:before_dbp" json:"before_dbp"`
-	AfterSbp              int64     `gorm:"column:after_sbp" json:"after_sbp"`
-	AfterDbp              int64     `gorm:"column:after_dbp" json:"after_dbp"`
-	BeforeWeight          float64   `gorm:"column:before_weight" json:"before_weight"`
-	AfterWeight           float64   `gorm:"column:after_weight" json:"after_weight"`
-	AccessId              string    `gorm:"column:access_id" json:"access_id"`
-	DialyzerId            string    `gorm:"column:dialyzer_id" json:"dialyzer_id"`
-	Ktv                   float64   `gorm:"column:ktv" json:"ktv"`
-	StartTime             time.Time `gorm:"column:start_time" json:"start_time"`
-	EndTime               time.Time `gorm:"column:end_time" json:"end_time"`
-	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"`
-	Xgbz                  int64     `gorm:"column:xgbz" json:"xgbz"`
-	Ylyl1                 string    `gorm:"column:ylyl1" json:"ylyl1"`
-	Ylyl2                 string    `gorm:"column:ylyl2" json:"ylyl2"`
+	DialysisId            string    `gorm:"column:DIALYSIS_ID" json:"DIALYSIS_ID"`
+	HospitalId            string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	PatientNk             string    `gorm:"column:PATIENT_NK" json:"PATIENT_NK"`
+	PsId                  string    `gorm:"column:PS_ID" json:"PS_ID"`
+	DialysisDate          time.Time `gorm:"column:DIALYSIS_DATE" json:"DIALYSIS_DATE"`
+	SickbedNo             string    `gorm:"column:SICKBED_NO" json:"SICKBED_NO"`
+	DivisionId            string    `gorm:"column:DIVISION_ID" json:"DIVISION_ID"`
+	EquipmentId           string    `gorm:"column:EQUIPMENT_ID" json:"EQUIPMENT_ID"`
+	MixDalysis            string    `gorm:"column:MIX_DIALYSIS" json:"MIX_DIALYSIS"`
+	ActualufMl            int64     `gorm:"column:ACTUALUF_ML" json:"ACTUALUF_ML"`
+	Ufv                   int64     `gorm:"column:UFV" json:"UFV"`
+	TotalReplace          int64     `gorm:"column:TOTAL_REPLACE" json:"TOTAL_REPLACE"`
+	TotalTreatDuration    int64     `gorm:"column:TOTAL_TREAT_DURATION" json:"TOTAL_TREAT_DURATION"`
+	IsHospitalozation     string    `gorm:"column:IS_HOSPITALIZATION" json:"IS_HOSPITALIZATION"`
+	IsEmergency           string    `gorm:"column:IS_EMERGENCY" json:"IS_EMERGENCY"`
+	EmergencyReason       string    `gorm:"column:EMERGENCY_REASON" json:"EMERGENCY_REASON"`
+	IsPerioperativePeriod string    `gorm:"column:IS_PERIOPERATIVE_PERIOD" json:"IS_PERIOPERATIVE_PERIOD"`
+	BeforeSbp             int64     `gorm:"column:BEFORE_SBP" json:"BEFORE_SBP"`
+	BeforeDbp             int64     `gorm:"column:BEFORE_DBP" json:"BEFORE_DBP"`
+	AfterSbp              int64     `gorm:"column:AFTER_SBP" json:"AFTER_SBP"`
+	AfterDbp              int64     `gorm:"column:AFTER_DBP" json:"AFTER_DBP"`
+	BeforeWeight          float64   `gorm:"column:BEFORE_WEIGHT" json:"BEFORE_WEIGHT"`
+	AfterWeight           float64   `gorm:"column:AFTER_WEIGHT" json:"AFTER_WEIGHT"`
+	AccessId              string    `gorm:"column:ACCESS_ID" json:"ACCESS_ID"`
+	DialyzerId            string    `gorm:"column:DIALYZER_ID" json:"DIALYZER_ID"`
+	Ktv                   float64   `gorm:"column:KTV" json:"KTV"`
+	StartTime             time.Time `gorm:"column:START_TIME" json:"START_TIME"`
+	EndTime               time.Time `gorm:"column:END_TIME" json:"END_TIME"`
+	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"`
+	Xgbz                  int64     `gorm:"column:XGBZ" json:"XGBZ"`
+	Ylyl1                 string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2                 string    `gorm:"column:YLYL2" json:"YLYL2"`
 }
 
 func (TempHdDialysis) TableName() string {
@@ -497,32 +497,32 @@ func (TempHdDialysis) TableName() string {
 
 type TempHdMiddle struct {
 	ID             int64     `gorm:"column:id" json:"id"`
-	Sn             string    `gorm:"column:sn" json:"sn"`
-	HospitalId     string    `gorm:"column:hospital_id" json:"hospital_id"`
-	PatientNk      string    `gorm:"column:patient_nk" json:"patient_nk"`
-	DialysisId     string    `gorm:"column:dialysis_id" json:"dialysis_id"`
-	MonitorTime    time.Time `gorm:"column:monitor_time" json:"monitor_time"`
-	Sbp            int64     `gorm:"column:sbp" json:"sbp"`
-	Dbp            int64     `gorm:"column:dbp" json:"dbp"`
-	P              int64     `gorm:"column:p" json:"p"`
-	Ns             int64     `gorm:"column:ns" json:"ns"`
-	Qb             int64     `gorm:"column:qb" json:"qb"`
-	Ap             int64     `gorm:"column:ap" json:"ap"`
-	Vp             int64     `gorm:"column:vp" json:"vp"`
-	Tmp            int64     `gorm:"column:tmp" json:"tmp"`
-	Ufr            int64     `gorm:"column:ufr" json:"ufr"`
-	Ufv            int64     `gorm:"column:ufv" json:"ufv"`
-	OnLine         int64     `gorm:"column:on_line" json:"on_line"`
-	Spo2           float64   `gorm:"column:spo2" json:"spo2"`
-	R              int64     `gorm:"column:r" json:"r"`
-	OtherSituation string    `gorm:"column:other_situation" json:"other_situation"`
-	Nurse          string    `gorm:"column:nurse" json:"nurse"`
-	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"`
-	Xgbz           int64     `gorm:"column:xgbz" json:"xgbz"`
-	Ylyl1          string    `gorm:"column:ylyl1" json:"ylyl1"`
-	Ylyl2          string    `gorm:"column:ylyl2" json:"ylyl2"`
+	Sn             string    `gorm:"column:SN" json:"SN"`
+	HospitalId     string    `gorm:"column:HOSPITAL_ID" json:"HOSPITAL_ID"`
+	PatientNk      string    `gorm:"column:PATIENT_NK" json:"PATIENT_NK"`
+	DialysisId     string    `gorm:"column:DIALYSIS_ID" json:"DIALYSIS_ID"`
+	MonitorTime    time.Time `gorm:"column:MONITOR_TIME" json:"MONITOR_TIME"`
+	Sbp            int64     `gorm:"column:SBP" json:"SBP"`
+	Dbp            int64     `gorm:"column:DBP" json:"DBP"`
+	P              int64     `gorm:"column:P" json:"P"`
+	Ns             int64     `gorm:"column:NS" json:"NS"`
+	Qb             int64     `gorm:"column:QB" json:"QB"`
+	Ap             int64     `gorm:"column:AP" json:"AP"`
+	Vp             int64     `gorm:"column:VP" json:"VP"`
+	Tmp            int64     `gorm:"column:TMP" json:"TMP"`
+	Ufr            int64     `gorm:"column:UFR" json:"UFR"`
+	Ufv            int64     `gorm:"column:UFV" json:"UFV"`
+	OnLine         int64     `gorm:"column:ON_LINE" json:"ON_LINE"`
+	Spo2           float64   `gorm:"column:SPO2" json:"SPO2"`
+	R              int64     `gorm:"column:R" json:"R"`
+	OtherSituation string    `gorm:"column:OTHER_SITUATION" json:"OTHER_SITUATION"`
+	Nurse          string    `gorm:"column:NURSE" json:"NURSE"`
+	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"`
+	Xgbz           int64     `gorm:"column:XGBZ" json:"XGBZ"`
+	Ylyl1          string    `gorm:"column:YLYL1" json:"YLYL1"`
+	Ylyl2          string    `gorm:"column:YLYL2" json:"YLYL2"`
 }
 
 func (TempHdMiddle) TableName() string {

routers/router.go

@@ -3,6 +3,7 @@ package routers
 import (
 	admin_api "Data_Upload_Api/controllers/admin_api_controllers"
 	"github.com/astaxie/beego"
+	"Data_Upload_Api/controllers"
 	"github.com/astaxie/beego/plugins/cors"
 )
 
@@ -19,4 +20,5 @@ func init() {
 	// beego.Router("/", &controllers.MainController{})
 
 	admin_api.AdminAPIControllersRegisterRouters()
+	controllers.SyncAPIRegisterRouters()
 }

service/city_data_uoload_service.go

@@ -33,7 +33,7 @@ func FindOrgData(org_id int64, sync_time int64) (org models.UserOrg, err error)
 }
 func FindOrgRolesData(org_id int64, lastUploadTime int64, nowTime int64) (role []*models.UserAdminRole, err error) {
 	db := readUserDb.Model(&models.UserAdminRole{}).Where("status = 1 AND org_id = ?  ", org_id)
-	db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
+	db = db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
 	err = db.Find(&role).Error
 	return
 }
@@ -78,8 +78,8 @@ func FindOrgMonitorRecordData(org_id int64, lastUploadTime int64, nowTime int64)
 	return
 }
 
-func CreateOrgRecord(hospital *sz.TempHdHospital) (err error) {
-	err = writeDb.Model(&sz.TempHdHospital{}).Create(&hospital).Error
+func CreateOrgRecord(rdb *gorm.DB, hospital *sz.TempHdHospital) (err error) {
+	err = rdb.Model(&sz.TempHdHospital{}).Create(&hospital).Error
 	return
 }
 
@@ -88,17 +88,17 @@ func CreateUploadRecord(upload *sz.DataUpload) (err error) {
 	return
 }
 
-func FindOrgDialysisData(org_id int64, lastUploadTime int64, nowTime int64) (ps []*models.VMSchedule, err error) {
-	db := readDb.Model(&models.VMSchedule{}).Where("status = 1 AND user_org_id = ? ", org_id).
+func FindOrgDialysisData(org_id int64, lastUploadTime int64, nowTime int64) (ps []*models.VMDialysisOrder, err error) {
+	db := readDb.Model(&models.VMDialysisOrder{}).Where("status = 1 AND user_org_id = ? AND stage = 2 ", org_id).
 		Preload("DeviceNumber", "status = 1").
 		Preload("VMDialysisPrescription", "status = 1").
 		Preload("AssessmentBeforeDislysis", "status = 1").
 		Preload("AssessmentAfterDislysis", "status = 1").
-		Preload("DialysisOrder", "status = 1").
+		Preload("Schedule", "status = 1").
 		Preload("MonitoringRecord", "status = 1")
 
 	if lastUploadTime != 0 && nowTime != 0 {
-		db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime)
+		db = db.Where("updated_time >= ? AND updated_time <= ?", lastUploadTime, nowTime)
 	}
 	err = db.Find(&ps).Error
 	return
@@ -264,7 +264,7 @@ func BatchCreatePs(patients []*sz.TempHdPs, rdb *gorm.DB) (err error) {
 	if len(patients) > 0 {
 		utx := rdb.Begin()
 		if len(patients) > 0 {
-			thisSQL := "INSERT INTO t_hd_shift (PRESCRIBE_ID, HOSPITAL_ID, PATIENT_NK, K, CA,NA,DIALYSIS_FREQUENCY,FREQUENCY_UNIT,DIALYSIS_DURATION,HDF,HP,HP_FREQUENCY,HP_FREQUENCY_UNIT,HP_DURATION,HDF_FREQUENCY_UNIT,HDF_FREQUENCY,HDF_DURATION,CREATE_TIME,SJSCSJ,XGBZ) VALUES "
+			thisSQL := "INSERT INTO t_hd_ps (PRESCRIBE_ID, HOSPITAL_ID, PATIENT_NK, K, CA,NA,DIALYSIS_FREQUENCY,FREQUENCY_UNIT,DIALYSIS_DURATION,HDF,HP,HP_FREQUENCY,HP_FREQUENCY_UNIT,HP_DURATION,HDF_FREQUENCY_UNIT,HDF_FREQUENCY,HDF_DURATION,CREATE_TIME,SJSCSJ,XGBZ) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range patients {
@@ -307,7 +307,7 @@ func BatchCreatePsm(psms []*sz.TempHdPsMedicine, rdb *gorm.DB) (err error) {
 	if len(psms) > 0 {
 		utx := rdb.Begin()
 		if len(psms) > 0 {
-			thisSQL := "INSERT INTO t_hd_shift (PRESCRIBE_ID, HOSPITAL_ID, MEDICINE_TYPE_ID,MEDICINE_ID,CREATE_TIME,SJSCSJ,XGBZ) VALUES "
+			thisSQL := "INSERT INTO t_hd_ps_medicine (PRESCRIBE_ID, HOSPITAL_ID, MEDICINE_TYPE_ID,MEDICINE_ID,CREATE_TIME,SJSCSJ,XGBZ) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, psm := range psms {
@@ -333,6 +333,50 @@ func BatchCreatePsm(psms []*sz.TempHdPsMedicine, rdb *gorm.DB) (err error) {
 	return
 }
 
+func BatchCreateDialysis(psms []*sz.TempHdDialysis, rdb *gorm.DB) (err error) {
+	if len(psms) > 0 {
+		utx := rdb.Begin()
+		if len(psms) > 0 {
+			thisSQL := "INSERT INTO t_hd_dialysis (DIALYSIS_ID, HOSPITAL_ID, PATIENT_NK,PS_ID,DIALYSIS_DATE,SICKBED_NO,DIVISION_ID,EQUIPMENT_ID,ACTUALUF_ML,UFV,TOTAL_REPLACE,TOTAL_TREAT_DURATION,BEFORE_SBP,BEFORE_DBP,AFTER_SBP,AFTER_DBP,START_TIME,END_TIME,CREATE_TIME,SJSCSJ,XGBZ) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, psm := range psms {
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, psm.DialysisId)
+				insertData = append(insertData, psm.HospitalId)
+				insertData = append(insertData, psm.PatientNk)
+				insertData = append(insertData, psm.PsId)
+				insertData = append(insertData, psm.DialysisDate)
+				insertData = append(insertData, psm.SickbedNo)
+				insertData = append(insertData, psm.DivisionId)
+				insertData = append(insertData, psm.EquipmentId)
+				insertData = append(insertData, psm.ActualufMl)
+				insertData = append(insertData, psm.Ufv)
+				insertData = append(insertData, psm.TotalReplace)
+				insertData = append(insertData, psm.TotalTreatDuration)
+				insertData = append(insertData, psm.BeforeSbp)
+				insertData = append(insertData, psm.BeforeDbp)
+				insertData = append(insertData, psm.AfterSbp)
+				insertData = append(insertData, psm.AfterDbp)
+				insertData = append(insertData, psm.StartTime)
+				insertData = append(insertData, psm.EndTime)
+				insertData = append(insertData, psm.CreateTime)
+				insertData = append(insertData, psm.Sjscsj)
+				insertData = append(insertData, psm.Xgbz)
+
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+}
+
 func BatchCreatePatientOut(patientOuts []*sz.TempHdPatientOut, rdb *gorm.DB) (err error) {
 	if len(patientOuts) > 0 {
 		utx := rdb.Begin()
@@ -400,11 +444,11 @@ func BatchCreateMonitor(advices []*sz.TempHdMiddle, rdb *gorm.DB) (err error) {
 	if len(advices) > 0 {
 		utx := rdb.Begin()
 		if len(advices) > 0 {
-			thisSQL := "INSERT INTO t_hd_doctors_advice (HOSPITAL_ID, PATIENT_NK,DIALYSIS_ID,MONITOR_TIME,SBP,DBP,CREATE_TIME,SJSCSJ,XGBZ) VALUES "
+			thisSQL := "INSERT INTO t_hd_middle (HOSPITAL_ID, PATIENT_NK,DIALYSIS_ID,MONITOR_TIME,SBP,DBP,CREATE_TIME,SJSCSJ,XGBZ) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, advice := range advices {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, advice.HospitalId)
 				insertData = append(insertData, advice.PatientNk)
 				insertData = append(insertData, advice.DialysisId)
@@ -449,11 +493,11 @@ func BatchCreateOtherMachineRecord(wms []*sz.TempHdOtherMachine, rdb *gorm.DB) (
 	if len(wms) > 0 {
 		utx := rdb.Begin()
 		if len(wms) > 0 {
-			thisSQL := "INSERT INTO t_hd_wm (HOSPITAL_ID, EQUIPMENT_ID, EQUIPMENT_BRAND, EQUIPMENT_MODEL, ENABLE_TIME,DISCARDED_TIME,XGBZ,CREATE_TIME,UPDATE_TIME,SJSCSJ) VALUES "
+			thisSQL := "INSERT INTO t_hd_other_machine (HOSPITAL_ID, EQUIPMENT_ID, EQUIPMENT_BRAND, EQUIPMENT_MODEL, ENABLE_TIME,DISCARDED_TIME,XGBZ,CREATE_TIME,UPDATE_TIME,SJSCSJ) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, wm := range wms {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, wm.HospitalId)
 				insertData = append(insertData, wm.EquipmentId)
 				insertData = append(insertData, wm.EquipmentBrand)