111

conf/app.conf

 appname = 血透
-httpport = 9550
+httpport = 9555
 runmode = prod
 
 copyrequestbody = true
 writeuserpass = 1Q2W3e4r!@#$
 writeusername = sgj_users
 
-redishost = 120.77.235.13
+redishost = 112.74.16.180
 redisport = 6379
 redispasswrod = syh@#$%123456!
 redisdb = 0

models/src_data.go

 	Nation                       string            `gorm:"column:nation" json:"nation"`
 	NativePlace                  string            `gorm:"column:native_place" json:"native_place"`
 	Age                          int64             `gorm:"column:age" json:"age"`
-	PatientLapseto               []*PatientLapseto `gorm:"ForeignKey:PatientId,LapsetoType;AssociationForeignKey:ID,Lapseto" json:"lapseto"`
+	PatientLapseto               PatientLapseto	   `gorm:"ForeignKey:PatientId,LapsetoType;AssociationForeignKey:ID,Lapseto" json:"patient_lapseto"`
+	InfectiousDiseases			 []*InfectiousDiseases   `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"infectious_diseases"`
 }
 
 func (Patients) TableName() string {
 	return "xt_patients"
 }
 
+type InfectiousDiseases struct {
+	ID          int64 `gorm:"column:id" json:"id" form:"id"`
+	PatientId   int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	DiseaseId   int64 `gorm:"column:disease_id" json:"disease_id" form:"disease_id"`
+	Status      int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+}
+
+func (InfectiousDiseases) TableName() string {
+	return "xt_patients_infectious_diseases"
+}
+
 type Device struct {
 	ID             int64  `gorm:"column:id" json:"id"`
 	OrgId          int64  `gorm:"column:org_id" json:"org_id"`
 	return "xt_doctor_advice"
 }
 
+type DoctorAdviceTemplate struct {
+	ID                      int64                   `gorm:"column:id" json:"id" form:"id"`
+	OrgId                   int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AdviceName              string                  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc              string                  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	SingleDose              float64                 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit          string                  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber       float64                 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit   string                  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay             string                  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency      string                  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor            int64                   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                  int64                   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime             int64                   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime             int64                   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	TemplateId              int64                   `gorm:"column:template_id" json:"template_id"`
+	DrugSpec                string                  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit            string                  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	ParentId                int64                   `gorm:"column:parent_id" json:"parent_id"`
+	AdviceType              int64                   `gorm:"column:advice_type" json:"advice_type"`
+	DayCount                int64                   `gorm:"column:day_count" json:"day_count"`
+	WeekDays                string                  `gorm:"column:week_days" json:"week_days"`
+	FrequencyType           int64                   `gorm:"column:frequency_type" json:"frequency_type"`
+	SubDoctorAdviceTemplate []*DoctorAdviceTemplate `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
+}
+
+func (DoctorAdviceTemplate) TableName() string {
+	return "xt_doctor_advice_template"
+}
+
 type AssessmentAfterDislysis struct {
 	ID                              int64   `gorm:"column:id" json:"id"`
 	UserOrgId                       int64   `gorm:"column:user_org_id" json:"user_org_id"`
 	CreatedTime                    int64   `gorm:"column:created_time" json:"created_time"`
 	UpdatedTime                    int64   `gorm:"column:updated_time" json:"updated_time"`
 	Modifier                       int64   `gorm:"column:modifier" json:"modifier"`
-	BloodAccessPartId              int64   `gorm:"column:blood_access_part_id" json:"blood_access_part_id"`
+	BloodAccessPartId              string   `gorm:"column:blood_access_part_id" json:"blood_access_part_id"`
 	BloodAccessPartOperaId         int64   `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id"`
 	IsHemorrhage                   int64   `gorm:"column:is_hemorrhage" json:"is_hemorrhage"`
 	Hemorrhage                     string  `gorm:"column:hemorrhage" json:"hemorrhage"`
 	BloodAccessInternalFistula     string  `gorm:"column:blood_access_internal_fistula" json:"blood_access_internal_fistula"`
 	InternalFistulaOther           string  `gorm:"column:internal_fistula_other" json:"internal_fistula_other"`
 	BloodAccessNoise               int64   `gorm:"column:blood_access_noise" json:"blood_access_noise"`
-	PunctureWay                    int64   `gorm:"column:puncture_way" json:"puncture_way"`
+	PunctureWay                    string   `gorm:"column:puncture_way" json:"puncture_way"`
 	VenousCatheterization          int64   `gorm:"column:venous_catheterization" json:"venous_catheterization"`
 	VenousCatheterizationPart      int64   `gorm:"column:venous_catheterization_part" json:"venous_catheterization_part"`
 	VenousCatheterizationPartOther string  `gorm:"column:venous_catheterization_part_other" json:"venous_catheterization_part_other"`
 	MachineType                    string  `gorm:"column:machine_type" json:"machine_type"`
 	IsInfect                       int64   `gorm:"column:is_infect" json:"is_infect"`
 	Exposed                        float64 `gorm:"column:exposed" json:"exposed"`
-	Skin                           int64   `gorm:"column:skin" json:"skin"`
+	Skin                           string   `gorm:"column:skin" json:"skin"`
 	SkinOther                      string  `gorm:"column:skin_other" json:"skin_other"`
 	InfectOther                    string  `gorm:"column:infect_other" json:"infect_other"`
 	DuctusArantiiOther             string  `gorm:"column:ductus_arantii_other" json:"ductus_arantii_other"`
 func (DeviceRepair) TableName() string {
 	return "xt_device_repair"
 }
+
+type XtInspectionReference struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectName      string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Project          string `gorm:"column:project" json:"project" form:"project"`
+	ProjectId        int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemName         string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ItemNameAddition string `gorm:"column:item_name_addition" json:"item_name_addition" form:"item_name_addition"`
+	ItemId           int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	Item             string `gorm:"column:item" json:"item" form:"item"`
+	RangeType        int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
+	RangeMin         string `gorm:"column:range_min" json:"range_min" form:"range_min"`
+	RangeMax         string `gorm:"column:range_max" json:"range_max" form:"range_max"`
+	RangeValue       string `gorm:"column:range_value" json:"range_value" form:"range_value"`
+	RangeOptions     string `gorm:"column:range_options" json:"range_options" form:"range_options"`
+	Unit             string `gorm:"column:unit" json:"unit" form:"unit"`
+	Status           int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime      int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime      int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+}
+
+func (XtInspectionReference) TableName() string {
+
+	return "xt_inspection_reference"
+}
+
+type XtInspection struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId    int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId       int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName     string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName  string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Patients 	 Patients `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId"`
+	XtInspectionReference XtInspectionReference `gorm:"ForeignKey:ProjectId,ItemId;AssociationForeignKey:ProjectId,ItemId;"`
+}
+
+func (XtInspection) TableName() string {
+
+	return "xt_inspection"
+}

models/sz/target_data.go

 import "time"
 
 type TempHdHospital struct {
-	ID             int64     `gorm:"column:id" json:"id" form:"id"`
 	HospitalId     string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
 	InstType       string    `gorm:"column:inst_type" json:"inst_type" form:"inst_type"`
 	DepartmentName string    `gorm:"column:department_name" json:"department_name" form:"department_name"`
 	return "t_hd_layout"
 }
 
+type TempHdDivision struct{
+	ID             int64     `gorm:"column:id" json:"id"`
+	DivisionId     string    `gorm:"column:division_id" json:"division_id"`
+	HospitalId     string    `gorm:"column:hospital_id" json:"hospital_id"`
+	DivisionName   string    `gorm:"column:division_name" json:"division_name"`
+	Xgbz           string    `gorm:"column:xgbz" json:"xgbz"`
+	DivisionType   string    `gorm:"column:division_type" json:"division_type"`
+	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 (TempHdDivision) TableName() string {
+	return "t_hd_division"
+}
+
+
 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"`
-	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"`
+	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"`
+	SickbedType    string    `gorm:"column:sickbed_type" json:"sickbed_type"`
+	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 {
 	EnableTime     time.Time `gorm:"column:enable_time" json:"enable_time" form:"enable_time"`
 	DiscardedTime  time.Time `gorm:"column:discarded_time" json:"discarded_time" form:"discarded_time"`
 	Status         int64     `gorm:"column:status" json:"status" form:"status"`
+	EquipmentType  int64     `gorm:"column:equipment_type" json:"equipment_type" form:"equipment_type"`
 	Xgbz           string    `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
 	CreateTime     time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
 	UpdateTime     time.Time `gorm:"column:update_time" json:"update_time" form:"update_time"`
 	Mj             int64     `gorm:"column:mj" json:"mj" form:"mj"`
 	Ylyl1          string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
 	Ylyl2          string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
-	EquipmentType  int64     `gorm:"column:equipment_type" json:"equipment_type" form:"equipment_type"`
+	
 }
 
 func (TempHdOtherMachine) TableName() string {
 	PatientName        string    `gorm:"column:patient_name" json:"patient_name" form:"patient_name"`
 	Gender             string    `gorm:"column:gender" json:"gender" form:"gender"`
 	BornDate           time.Time `gorm:"column:born_date" json:"born_date" form:"born_date"`
-	OutpatientNo       string    `gorm:"column:outpatient_no" json:"outpatient_no" form:"outpatient_no"`
 	DiagnosisSummary   string    `gorm:"column:diagnosis_summary" json:"diagnosis_summary" form:"diagnosis_summary"`
 	IsCrf              string    `gorm:"column:is_crf" json:"is_crf" form:"is_crf"`
 	AllergyHistory     string    `gorm:"column:allergy_history" json:"allergy_history" form:"allergy_history"`
 	PayMethod          string    `gorm:"column:pay_method" json:"pay_method" form:"pay_method"`
-	RrtStartTime       time.Time `gorm:"column:rrt_start_time" json:"rrt_start_time" form:"rrt_start_time"`
+	LocalInsurance     int64     `gorm:"column:local_insurance" json:"local_insurance" form:"local_insurance"`
 	DialysisStartTime  time.Time `gorm:"column:dialysis_start_time" json:"dialysis_start_time" form:"dialysis_start_time"`
 	LocalStartTime     time.Time `gorm:"column:local_start_time" json:"local_start_time" form:"local_start_time"`
+	OutpatientNo       string    `gorm:"column:outpatient_no" json:"outpatient_no" form:"outpatient_no"`
+	HospitalizedNo     string    `gorm:"column:hospitalized_no" json:"hospitalized_no" form:"hospitalized_no"`
+	Height      	   int64     `gorm:"column:height" json:"height" form:"height"`
+	Xgbz               int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
 	CreateTime         time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
 	UpdateTime         time.Time `gorm:"column:update_time" json:"update_time" form:"update_time"`
 	Sjscsj             time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
 	Mj                 int64     `gorm:"column:mj" json:"mj" form:"mj"`
 	Ylyl1              int64     `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
-	Ylyl2              int64     `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
-	PatientPhoneNo     string    `gorm:"column:patient_phone_no" json:"patient_phone_no" form:"patient_phone_no"`
-	FolkPhoneNo        string    `gorm:"column:folk_phone_no" json:"folk_phone_no" form:"folk_phone_no"`
-	PatientNationality int64     `gorm:"column:patient_nationality" json:"patient_nationality" form:"patient_nationality"`
-	Province           int64     `gorm:"column:province" json:"province" form:"province"`
-	City               int64     `gorm:"column:city" json:"city" form:"city"`
-	District           int64     `gorm:"column:district" json:"district" form:"district"`
-	Subdistrict        int64     `gorm:"column:subdistrict" json:"subdistrict" form:"subdistrict"`
-	DetailAddress      string    `gorm:"column:detail_address" json:"detail_address" form:"detail_address"`
-	PatientHeight      int64     `gorm:"column:patient_height" json:"patient_height" form:"patient_height"`
-	HospitalizedNo     string    `gorm:"column:hospitalized_no" json:"hospitalized_no" form:"hospitalized_no"`
-	IsTerminated       int64     `gorm:"column:is_terminated" json:"is_terminated" form:"is_terminated"`
-	InCrrtDate         time.Time `gorm:"column:in_crrt_date" json:"in_crrt_date" form:"in_crrt_date"`
-	Xgbz               int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
-	LocalInsurance     int64     `gorm:"column:local_insurance" json:"local_insurance" form:"local_insurance"`
+	Ylyl2              int64     `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`	
 }
 
 func (TempHdPatient) TableName() string {
 	SequelaeDate    time.Time `gorm:"column:sequelae_date" json:"sequelae_date" form:"sequelae_date"`
 	SequelaeType    string    `gorm:"column:sequelae_type" json:"sequelae_type" form:"sequelae_type"`
 	SequelaeSubType string    `gorm:"column:sequelae_sub_type" json:"sequelae_sub_type" form:"sequelae_sub_type"`
-	ExtReason       string    `gorm:"column:ext_reason" json:"ext_reason" form:"ext_reason"`
 	CreateTime      time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	DeathReason     string    `gorm:"column:death_reason" json:"death_reason" form:"death_reason"`
+	ExtReason       string    `gorm:"column:ext_reason" json:"ext_reason" form:"ext_reason"`
 	Sjscsj          time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
 	Mj              string    `gorm:"column:mj" json:"mj" form:"mj"`
 	Xgbz            int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
 }
 
 type TempHdPs struct {
-	ID                   int64     `gorm:"column:id" json:"id" form:"id"`
-	HospitalId           string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
 	PrescribeId          string    `gorm:"column:prescribe_id" json:"prescribe_id" form:"prescribe_id"`
+	HospitalId           string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
 	PatientNk            string    `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
 	MedicalId            string    `gorm:"column:medical_id" json:"medical_id" form:"medical_id"`
 	DrId                 int64     `gorm:"column:dr_id" json:"dr_id" form:"dr_id"`
-	Sn                   string    `gorm:"column:sn" json:"sn" form:"sn"`
+	RrtType              int64     `gorm:"column:rrt_type" json:"rrt_type" form:"rrt_type"`
+	RrtTypeName           string    `gorm:"column:rrt_type_name" json:"rrt_type_name" form:"rrt_type_name"`
 	DialysisFrequency    int64     `gorm:"column:dialysis_frequency" json:"dialysis_frequency" form:"dialysis_frequency"`
 	FrequencyUnit        int64     `gorm:"column:frequency_unit" json:"frequency_unit" form:"frequency_unit"`
-	DialysisDuration     float64   `gorm:"column:dialysis_duration" json:"dialysis_duration" form:"dialysis_duration"`
-	Hdf                  string    `gorm:"column:hdf" json:"hdf" form:"hdf"`
-	HdfFrequencyUnit     int64     `gorm:"column:hdf_frequency_unit" json:"hdf_frequency_unit" form:"hdf_frequency_unit"`
-	HdfFrequency         int64     `gorm:"column:hdf_frequency" json:"hdf_frequency" form:"hdf_frequency"`
-	HdfDuration          float64   `gorm:"column:hdf_duration" json:"hdf_duration" form:"hdf_duration"`
-	Hp                   string    `gorm:"column:hp" json:"hp" form:"hp"`
-	HpFrequency          int64     `gorm:"column:hp_frequency" json:"hp_frequency" form:"hp_frequency"`
-	HpFrequencyUnit      int64     `gorm:"column:hp_frequency_unit" json:"hp_frequency_unit" form:"hp_frequency_unit"`
-	HpDuration           float64   `gorm:"column:hp_duration" json:"hp_duration" form:"hp_duration"`
-	K                    float64   `gorm:"column:k" json:"k" form:"k"`
-	DialysisId           int64     `gorm:"column:dialysis_id" json:"dialysis_id" form:"dialysis_id"`
-	MedicineTypeId       int64     `gorm:"column:medicine_type_id" json:"medicine_type_id" form:"medicine_type_id"`
-	Ca                   float64   `gorm:"column:ca" json:"ca" form:"ca"`
-	Na                   float64   `gorm:"column:na" json:"na" form:"na"`
-	Glucose              int64     `gorm:"column:glucose" json:"glucose" form:"glucose"`
-	FluxLevel            int64     `gorm:"column:flux_level" json:"flux_level" form:"flux_level"`
-	FluxValue            string    `gorm:"column:flux_value" json:"flux_value" form:"flux_value"`
-	UseType              int64     `gorm:"column:use_type" json:"use_type" form:"use_type"`
 	PrescribeTime        time.Time `gorm:"column:prescribe_time" json:"prescribe_time" form:"prescribe_time"`
-	DialysisMembrane     int64     `gorm:"column:dialysis_membrane" json:"dialysis_membrane" form:"dialysis_membrane"`
 	CreateTime           time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
-	PatientNo            int64     `gorm:"column:patient_no" json:"patient_no" form:"patient_no"`
 	Sjscsj               time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
 	Mj                   int64     `gorm:"column:mj" json:"mj" form:"mj"`
 	Xgbz                 int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
-	AType                int64     `gorm:"column:a_type" json:"a_type" form:"a_type"`
 	Ylyl1                string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
 	Ylyl2                string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
-	RrtType              int64     `gorm:"column:rrt_type" json:"rrt_type" form:"rrt_type"`
-	MedicineId           int64     `gorm:"column:medicine_id" json:"medicine_id" form:"medicine_id"`
-	ABSource             int64     `gorm:"column:a_b_source" json:"a_b_source" form:"a_b_source"`
-	B                    int64     `gorm:"column:b" json:"b" form:"b"`
-	EquipmentType        int64     `gorm:"column:equipment_type" json:"equipment_type" form:"equipment_type"`
-	DialysisMembraneSize int64     `gorm:"column:dialysis_membrane_size" json:"dialysis_membrane_size" form:"dialysis_membrane_size"`
-	UpdateTime           time.Time `gorm:"column:update_time" json:"update_time" form:"update_time"`
 }
 
 func (TempHdPs) TableName() string {
 
 type TempHdPsMedicine struct {
 	ID             int64     `gorm:"column:id" json:"id" form:"id"`
-	Sn             string    `gorm:"column:sn" json:"sn" form:"sn"`
-	PrescribeId    string    `gorm:"column:prescribe_id" json:"prescribe_id" form:"prescribe_id"`
+	Sn             int64    `gorm:"column:sn" json:"sn" form:"sn"`
 	HospitalId     string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
 	MedicineTypeId string    `gorm:"column:medicine_type_id" json:"medicine_type_id" form:"medicine_type_id"`
 	MedicineId     string    `gorm:"column:medicine_id" json:"medicine_id" form:"medicine_id"`
 	Mj             string    `gorm:"column:mj" json:"mj" form:"mj"`
 	Xgbz           int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
 	Ylyl1          string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
-	Ylyl2          string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
+	Ylyl2          string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`	
 }
 
 func (TempHdPsMedicine) TableName() string {
 }
 
 type TempHdInfection struct {
-	ID         int64     `gorm:"column:id" json:"id" form:"id"`
 	Sn         string    `gorm:"column:sn" json:"sn" form:"sn"`
 	HospitalId string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
 	PatientNk  string    `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
-	Hbv        string    `gorm:"column:hbv" json:"hbv" form:"hbv"`
-	Hcv        string    `gorm:"column:hcv" json:"hcv" form:"hcv"`
-	Rpr        string    `gorm:"column:rpr" json:"rpr" form:"rpr"`
-	Hiv        string    `gorm:"column:hiv" json:"hiv" form:"hiv"`
-	Hbsag      string    `gorm:"column:hbsag" json:"hbsag" form:"hbsag"`
-	Hbs        string    `gorm:"column:hbs" json:"hbs" form:"hbs"`
-	Hbeag      string    `gorm:"column:hbeag" json:"hbeag" form:"hbeag"`
-	Hbe        string    `gorm:"column:hbe" json:"hbe" form:"hbe"`
-	Hbc        string    `gorm:"column:hbc" json:"hbc" form:"hbc"`
+	Hbv        int64     `gorm:"column:hbv" json:"hbv" form:"hbv"`
+	Hcv        int64     `gorm:"column:hcv" json:"hcv" form:"hcv"`
+	Rpr        int64     `gorm:"column:rpr" json:"rpr" form:"rpr"`
+	Hiv        int64     `gorm:"column:hiv" json:"hiv" form:"hiv"`
+	Hbsag      int64     `gorm:"column:hbsag" json:"hbsag" form:"hbsag"`
+	Hbsab      int64     `gorm:"column:hbsab" json:"hbsab" form:"hbsab"`
+	Hbeag      int64     `gorm:"column:hbeag" json:"hbeag" form:"hbeag"`
+	Hbeab      int64     `gorm:"column:hbeab" json:"hbeab" form:"hbeab"`
+	Hbcab      int64     `gorm:"column:hbcab" json:"hbcab" form:"hbcab"`
 	CheckDate  time.Time `gorm:"column:check_date" json:"check_date" form:"check_date"`
 	CreateTime time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	DoctorId   string    `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
 	Sjscsj     time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
 	Mj         string    `gorm:"column:mj" json:"mj" form:"mj"`
 	Xgbz       int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
 	Ylyl1      string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
 	Ylyl2      string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
-	Hbsab      string    `gorm:"column:hbsab" json:"hbsab" form:"hbsab"`
-	Hbeab      string    `gorm:"column:hbeab" json:"hbeab" form:"hbeab"`
-	Hbcab      string    `gorm:"column:hbcab" json:"hbcab" form:"hbcab"`
 }
 
 func (TempHdInfection) TableName() string {
 	PatientNk      string    `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
 	ScheduleDate   time.Time `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
 	ShiftType      string    `gorm:"column:shift_type" json:"shift_type" form:"shift_type"`
-	SickbedNo      string    `gorm:"column:sickbed_no" json:"sickbed_no" form:"sickbed_no"`
+	SickbedNo      int64    `gorm:"column:sickbed_no" json:"sickbed_no" form:"sickbed_no"`
 	ScheduleStatus string    `gorm:"column:schedule_status" json:"schedule_status" form:"schedule_status"`
 	CreateTime     time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
 	Sjscsj         time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
 	DialysisId            string    `gorm:"column:dialysis_id" json:"dialysis_id" form:"dialysis_id"`
 	OrderType             string    `gorm:"column:order_type" json:"order_type" form:"order_type"`
 	RrtType               int64     `gorm:"column:rrt_type" json:"rrt_type" form:"rrt_type"`
+	RrtTypeName           string    `gorm:"column:rrt_type_name" json:"rrt_type_name" form:"rrt_type_name"`
 	PatientNk             string    `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
 	DialysisDuration      int64     `gorm:"column:dialysis_duration" json:"dialysis_duration" form:"dialysis_duration"`
 	BloodVol              int64     `gorm:"column:blood_vol" json:"blood_vol" form:"blood_vol"`
 	DryWeight             float64   `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
-	CreateTime            time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
-	Sjscsj                time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
-	Mj                    string    `gorm:"column:mj" json:"mj" form:"mj"`
-	Xgbz                  int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
-	Ylyl1                 string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
-	Ylyl2                 string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
-	HospitalizationNo     string    `gorm:"column:hospitalization_no" json:"hospitalization_no" form:"hospitalization_no"`
-	OutpatientNo          string    `gorm:"column:outpatient_no" json:"outpatient_no" form:"outpatient_no"`
-	RrtTypeName           string    `gorm:"column:rrt_type_name" json:"rrt_type_name" form:"rrt_type_name"`
 	Txq                   int64     `gorm:"column:txq" json:"txq" form:"txq"`
 	FluxLevel             int64     `gorm:"column:flux_level" json:"flux_level" form:"flux_level"`
 	ReuseFlag             int64     `gorm:"column:reuse_flag" json:"reuse_flag" form:"reuse_flag"`
 	Conductivity          int64     `gorm:"column:conductivity" json:"conductivity" form:"conductivity"`
 	DlCalcium             int64     `gorm:"column:dl_calcium" json:"dl_calcium" form:"dl_calcium"`
 	ExecuteOrder          int64     `gorm:"column:execute_order" json:"execute_order" form:"execute_order"`
-	UpdateTime            time.Time `gorm:"column:update_time" json:"update_time" form:"update_time"`
+	CreateTime            time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	Sjscsj                time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
+	Mj                    string    `gorm:"column:mj" json:"mj" form:"mj"`
+	Xgbz                  int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
+	Ylyl1                 string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
+	Ylyl2                 string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
+	
 }
 
 func (TempHdDoctorsAdvice) TableName() string {
 	AccessId              string    `gorm:"column:access_id" json:"access_id" form:"access_id"`
 	DialyzerId            string    `gorm:"column:dialyzer_id" json:"dialyzer_id" form:"dialyzer_id"`
 	Ktv                   float64   `gorm:"column:ktv" json:"ktv" form:"ktv"`
+	Urr					  float64   `gorm:"column:urr" json:"urr" form:"urr"`
+	BeforeBun			  float64   `gorm:"column:before_bun" json:"before_bun" form:"before_bun"`
+	AfterBun			  float64   `gorm:"column:after_bun" json:"after_bun" form:"after_bun"`
+	ChargeDoctorId        string    `gorm:"column:charge_doctor_id" json:"charge_doctor_id" form:"charge_doctor_id"`
+	ChargeNurseId         string    `gorm:"column:charge_nurse_id" json:"charge_nurse_id" form:"charge_nurse_id"`
+	UpNurseId             string    `gorm:"column:up_nurse_id" json:"up_nurse_id" form:"up_nurse_id"`
+	DownNurseId           string    `gorm:"column:down_nurse_id" json:"down_nurse_id" form:"down_nurse_id"`
+	CheckNurseId          string    `gorm:"column:check_nurse_id" json:"check_nurse_id" form:"check_nurse_id"`
+	PunctureNurseId       string    `gorm:"column:puncture_nurse_id" json:"puncture_nurse_id" form:"puncture_nurse_id"`
 	StartTime             time.Time `gorm:"column:start_time" json:"start_time" form:"start_time"`
 	EndTime               time.Time `gorm:"column:end_time" json:"end_time" form:"end_time"`
 	CreateTime            time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
 	Xgbz                  int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
 	Ylyl1                 string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
 	Ylyl2                 string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
-	UpdateTime            time.Time `gorm:"column:update_time" json:"update_time" form:"update_time"`
-	ChargeDoctorId        string    `gorm:"column:charge_doctor_id" json:"charge_doctor_id" form:"charge_doctor_id"`
-	ChargeNurseId         string    `gorm:"column:charge_nurse_id" json:"charge_nurse_id" form:"charge_nurse_id"`
-	UpNurseId             string    `gorm:"column:up_nurse_id" json:"up_nurse_id" form:"up_nurse_id"`
-	DownNurseId           string    `gorm:"column:down_nurse_id" json:"down_nurse_id" form:"down_nurse_id"`
-	CheckNurseId          string    `gorm:"column:check_nurse_id" json:"check_nurse_id" form:"check_nurse_id"`
-	PunctureNurseId       string    `gorm:"column:puncture_nurse_id" json:"puncture_nurse_id" form:"puncture_nurse_id"`
 }
 
 func (TempHdDialysis) TableName() string {
 
 type TempHdMiddle struct {
 	ID             int64     `gorm:"column:id" json:"id" form:"id"`
-	Sn             string    `gorm:"column:sn" json:"sn" form:"sn"`
+	Sn             int64    `gorm:"column:sn" json:"sn" form:"sn"`
 	HospitalId     string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
 	PatientNk      string    `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
 	DialysisId     string    `gorm:"column:dialysis_id" json:"dialysis_id" form:"dialysis_id"`
 	Ufv            int64     `gorm:"column:ufv" json:"ufv" form:"ufv"`
 	OnLine         int64     `gorm:"column:on_line" json:"on_line" form:"on_line"`
 	Spo2           float64   `gorm:"column:spo2" json:"spo2" form:"spo2"`
-	R              int64     `gorm:"column:r" json:"r" form:"r"`
+	RespiratorySystem              int64     `gorm:"column:respiratory_system" json:"respiratory_system" form:"respiratory_system"`
 	OtherSituation string    `gorm:"column:other_situation" json:"other_situation" form:"other_situation"`
 	Nurse          string    `gorm:"column:nurse" json:"nurse" form:"nurse"`
 	CreateTime     time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
 	Xgbz           int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
 	Ylyl1          string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
 	Ylyl2          string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
-	UpdateBy       int64     `gorm:"column:update_by" json:"update_by" form:"update_by"`
-	UpdateTime     time.Time `gorm:"column:update_time" json:"update_time" form:"update_time"`
 }
 
 func (TempHdMiddle) TableName() string {
 	return "t_hd_middle"
 }
 
-type TempHdDivision struct {
-	ID           int64     `gorm:"column:id" json:"id" form:"id"`
-	DivisionId   int64     `gorm:"column:division_id" json:"division_id" form:"division_id"`
-	HospitalId   string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
-	DivisionName string    `gorm:"column:division_name" json:"division_name" form:"division_name"`
-	UpdateFlag   int64     `gorm:"column:update_flag" json:"update_flag" form:"update_flag"`
-	UpdateTime   time.Time `gorm:"column:update_time" json:"update_time" form:"update_time"`
-	CreateTime   time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
-	Sjscsj       time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
-	Mj           string    `gorm:"column:mj" json:"mj" form:"mj"`
-	Xgbz         int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
-	Ylyl1        string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
-	Ylyl2        string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
-	DivisionType int64     `gorm:"column:division_type" json:"division_type" form:"division_type"`
-}
-
-func (TempHdDivision) TableName() string {
-	return "t_hd_division"
-}
+type TempHdAccess struct {
+	AccessId       		int64     `gorm:"column:access_id" json:"access_id" form:"access_id"`
+	HospitalId     		string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
+	PatientNk      		string    `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
+	AccessType			int64     `gorm:"column:access_type" json:"access_type" form:"access_type"`
+	AccessTypeName		string    `gorm:"column:access_type_name" json:"access_type_name" form:"access_type_name"`
+	AccessStatus		int64     `gorm:"column:access_status" json:"access_status" form:"access_status"`
+	ChannelPosition		int64     `gorm:"column:channel_position" json:"channel_position" form:"channel_position"`
+	CatheterSite		int64     `gorm:"column:catheter_site" json:"catheter_site" form:"catheter_site"`
+	RemoveTime			time.Time `gorm:"column:remove_time" json:"remove_time" form:"remove_time"`
+	RemoveReason		int64     `gorm:"column:remove_reason" json:"remove_reason" form:"remove_reason"`
+	RemoveReasonDesc	string     `gorm:"column:remove_reason_desc" json:"remove_reason_desc" form:"remove_reason_desc"`
+	SetupDate			time.Time     `gorm:"column:setup_date" json:"setup_date" form:"setup_date"`
+	FirstUseTime		time.Time     `gorm:"column:first_use_time" json:"first_use_time" form:"first_use_time"`
+	CreateTime     		time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdateTime     		time.Time `gorm:"column:update_time" json:"update_time" form:"update_time"`
+	Sjscsj         		time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
+	Mj             		string    `gorm:"column:mj" json:"mj" form:"mj"`
+	Xgbz           		int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
+	Ylyl1          		string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
+	Ylyl2          		string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
+}
+
+func (TempHdAccess) TableName() string {
+	return "t_hd_access"
+}
+
+type TempHdSickbed struct {
+	SickbedNo       	int64     `gorm:"column:sickbed_no" json:"sickbed_no" form:"sickbed_no"`
+	HospitalId     		string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
+	DivisionId     		string    `gorm:"column:division_id" json:"division_id" form:"division_id"`
+	SickbedCode     	string    `gorm:"column:sickbed_code" json:"sickbed_code" form:"sickbed_code"`
+	SickbedType     	string    `gorm:"column:sickbed_type" json:"sickbed_type" form:"sickbed_type"`
+	CreateTime     		time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdateTime     		time.Time `gorm:"column:update_time" json:"update_time" form:"update_time"`
+	Sjscsj         		time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
+	Mj             		string    `gorm:"column:mj" json:"mj" form:"mj"`
+	Xgbz           		int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
+	Ylyl1          		string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
+	Ylyl2          		string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
+}
+
+func (TempHdSickbed) TableName() string {
+	return "t_hd_sickbed"
+}
+
+type TempHdDiagnosis struct {
+	DiagnosisId       		int64     `gorm:"column:diagnosis_id" json:"diagnosis_id" form:"diagnosis_id"`
+	HospitalId     			string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
+	PatientNk      			string    `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
+	DiagnosisTime     		time.Time `gorm:"column:diagnosis_time" json:"diagnosis_time" form:"diagnosis_time"`
+	DiagnosisType     		string    `gorm:"column:diagnosis_type" json:"diagnosis_type" form:"diagnosis_type"`
+	DiagnosisTypeItem    	string    `gorm:"column:diagnosis_type_item" json:"diagnosis_type_item" form:"diagnosis_type_item"`
+	DiagnosisTypeDetail		string    `gorm:"column:diagnosis_type_detail" json:"diagnosis_type_detail" form:"diagnosis_type_detail"`
+	CreateTime     			time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdateTime     			time.Time `gorm:"column:update_time" json:"update_time" form:"update_time"`
+	Sjscsj         			time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
+	Mj             			string    `gorm:"column:mj" json:"mj" form:"mj"`
+	Xgbz           			int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
+	Ylyl1          			string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
+	Ylyl2          			string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
+}
+
+func (TempHdDiagnosis) TableName() string {
+	return "t_hd_diagnosis"
+}
+
+type TempHdComplication struct {
+	Sn       		string     `gorm:"column:sn" json:"sn" form:"sn"`
+	HospitalId		string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
+	PatientNk		string    `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
+	DialysisId		int64     `gorm:"column:dialysis_id" json:"dialysis_id" form:"dialysis_id"`
+	MonitorId		int64     `gorm:"column:monitor_id" json:"monitor_id" form:"monitor_id"`
+	NeopathyTime	int64     `gorm:"column:neopathy_time" json:"neopathy_time" form:"neopathy_time"`
+	NeopathyType	string    `gorm:"column:neopathy_type" json:"neopathy_type" form:"neopathy_type"`
+	NeopathyDesc	string 	  `gorm:"column:neopathy_desc" json:"neopathy_desc" form:"neopathy_desc"`
+	CreateTime		time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	Sjscsj			time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
+	Mj				string    `gorm:"column:mj" json:"mj" form:"mj"`
+	Xgbz			int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
+	Ylyl1			string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
+	Ylyl2			string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
+}
+
+func (TempHdComplication) TableName() string {
+	return "t_hd_complication"
+}
+
+type TempHdLisReport struct {
+	LabSno			string    `gorm:"column:lab_sno" json:"lab_sno" form:"lab_sno"`
+	HospitalId		string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
+	PatientNk		string    `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
+	ReportDate		time.Time `gorm:"column:report_date" json:"report_date" form:"report_date"`
+	CheckDate		string    `gorm:"column:check_date" json:"check_date" form:"check_date"`
+	JzNo			string    `gorm:"column:jz_no" json:"jz_no" form:"jz_no"`
+	MzFlag			string    `gorm:"column:mz_flag" json:"mz_flag" form:"mz_flag"`
+	ZyNo			string    `gorm:"column:zy_no" json:"zy_no" form:"zy_no"`
+	MzNo			string    `gorm:"column:mz_no" json:"mz_no" form:"mz_no"`
+	DepartmentCode	string    `gorm:"column:department_code" json:"department_code" form:"department_code"`
+	DepartmentName	string    `gorm:"column:department_name" json:"department_name" form:"department_name"`
+	CardNo			string    `gorm:"column:card_no" json:"card_no" form:"card_no"`
+	CardType		string    `gorm:"column:card_type" json:"card_type" form:"card_type"`
+	PatientName		string    `gorm:"column:patient_name" json:"patient_name" form:"patient_name"`
+	DepCode			string    `gorm:"column:dep_code" json:"dep_code" form:"dep_code"`
+	DepName			string    `gorm:"column:dep_name" json:"dep_name" form:"dep_name"`
+	InspectedType	string    `gorm:"column:inspected_type" json:"inspected_type" form:"inspected_type"`
+	ReportCategry	string    `gorm:"column:report_categry" json:"report_categry" form:"report_categry"`
+	ApplicationName	string    `gorm:"column:application_name" json:"application_name" form:"application_name"`
+	ApplicationType	string    `gorm:"column:application_type" json:"application_type" form:"application_type"`
+	CheckName		string    `gorm:"column:check_name" json:"check_name" form:"check_name"`
+	CheckItemName	string    `gorm:"column:check_item_name" json:"check_item_name" form:"check_item_name"`
+	CheckItemCode	string    `gorm:"column:check_item_code" json:"check_item_code" form:"check_item_code"`
+	RecordCcount	int64    `gorm:"column:record_ccount" json:"record_ccount" form:"record_ccount"`
+	CheckResult		string    `gorm:"column:check_result" json:"check_result" form:"check_result"`
+	DiagnoseCode	string    `gorm:"column:diagnose_code" json:"diagnose_code" form:"diagnose_code"`
+	DiagnoseName	string    `gorm:"column:diagnose_name" json:"diagnose_name" form:"diagnose_name"`
+	CreateTime		time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	Sjscsj			time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
+	Mj				string    `gorm:"column:mj" json:"mj" form:"mj"`
+	Xgbz			int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
+	Ylyl1			string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
+	Ylyl2			string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
+}
+
+func (TempHdLisReport) TableName() string {
+	return "t_hd_lis_report"
+}
+
+type TempHdLisIndicators struct {
+	InspectedResultNo		string    `gorm:"column:inspected_result_no" json:"inspected_result_no" form:"inspected_result_no"`
+	HospitalId				string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
+	LabSno					string    `gorm:"column:lab_sno" json:"lab_sno" form:"lab_sno"`
+	ReportDate				time.Time `gorm:"column:report_date" json:"report_date" form:"report_date"`
+	CheckDate				time.Time `gorm:"column:check_date" json:"check_date" form:"check_date"`
+	InspectedIndicate		string    `gorm:"column:inspected_indicate" json:"inspected_indicate" form:"inspected_indicate"`
+	InspectedItemEnName		string    `gorm:"column:inspected_item_en_name" json:"inspected_item_en_name" form:"inspected_item_en_name"`
+	Method					string    `gorm:"column:method" json:"method" form:"method"`
+	InspectedItemCnName		string    `gorm:"column:inspected_item_cn_name" json:"inspected_item_cn_name" form:"inspected_item_cn_name"`
+	InspectedResultDesc		string    `gorm:"column:inspected_result_desc" json:"inspected_result_desc" form:"inspected_result_desc"`
+	InspectedResultValue	string    `gorm:"column:inspected_result_value" json:"inspected_result_value" form:"inspected_result_value"`
+	InspectedResultUnit		string    `gorm:"column:inspected_result_unit" json:"inspected_result_unit" form:"inspected_result_unit"`
+	Loinc					string    `gorm:"column:loinc" json:"loinc" form:"loinc"`
+	RefRange				string    `gorm:"column:ref_range" json:"ref_range" form:"ref_range"`
+	UnitType				string    `gorm:"column:unit_type" json:"unit_type" form:"unit_type"`
+	InspectedResult			int64     `gorm:"column:inspected_result" json:"inspected_result" form:"inspected_result"`
+	Yctssm					string    `gorm:"column:yctssm" json:"yctssm" form:"yctssm"`
+	Sfwjz					string    `gorm:"column:sfwjz" json:"sfwjz" form:"sfwjz"`
+	Sorting					int64     `gorm:"column:sorting" json:"sorting" form:"sorting"`
+	PrintGroup				int64     `gorm:"column:print_group" json:"print_group" form:"print_group"`
+	CreateTime				time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	Sjscsj					time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
+	Mj						string    `gorm:"column:mj" json:"mj" form:"mj"`
+	Xgbz					int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
+	Ylyl1					string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
+	Ylyl2					string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
+}
+
+func (TempHdLisIndicators) TableName() string {
+	return "t_hd_lis_indicators"
+}

service/city_data_uoload_service.go

 	return
 }
 
+func FindOrgPatientInfectious(org_id int64, lastUploadTime int64, nowTime int64) (patient []*models.Patients, err error) {
+	db := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? AND lapseto = 2 ", org_id).Preload("InfectiousDiseases", "status = 1")
+	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime)
+	err = db.Find(&patient).Error
+	return
+}
+
+func FindOrgDeviceNumber(org_id int64, lastUploadTime int64, nowTime int64) (devices []*models.DeviceNumber, err error) {
+	db := readDb.Model(&models.DeviceNumber{}).Where("status = 1 AND org_id = ?", org_id)
+	db = db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
+	err = db.Find(&devices).Error
+
+	return
+}
+
 func FindOrgPatientOutData(org_id int64, lastUploadTime int64, nowTime int64) (patient []*models.Patients, err error) {
 	db := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? AND lapseto = 2 ", org_id).Preload("PatientLapseto", "status = 1")
 	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime)
 }
 
 func FindOrgDialysisPrescriptionData(org_id int64, lastUploadTime int64, nowTime int64) (ps []*models.DialysisPrescription, err error) {
-	db := readDb.Model(&models.DialysisPrescription{}).Where("status = 1 AND user_org_id = ?", org_id).Preload("AssessmentBeforeDislysis", "status = 1").Preload("DialysisOrder", "status = 1")
+	db := readDb.Model(&models.DialysisPrescription{}).Where("status = 1 AND user_org_id = ?", org_id).Preload("DialysisOrder", "status = 1")
 	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime)
 	err = db.Find(&ps).Error
 	return
 }
 
+func FindOrgDoctorAdviceTemplateData(org_id int64, lastUploadTime int64, nowTime int64) (advice []*models.DoctorAdviceTemplate, err error) {
+	db := readDb.Model(&models.DoctorAdviceTemplate{}).Where("status = 1 AND org_id = ? and advice_type = 0 ", org_id)
+	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime)
+	err = db.Find(&advice).Error
+	return
+}
+
+func FindAssessmentBeforeDislysis(org_id int64, patient_id int64) (before models.AssessmentBeforeDislysis, err error) {
+	db := readDb.Model(&models.AssessmentBeforeDislysis{}).Where("status = 1 AND user_org_id = ? and patient_id = ? ", org_id,patient_id)
+	err = db.Last(&before).Error
+	return
+}
+
 func FindOrgMonitorRecordData(org_id int64, lastUploadTime int64, nowTime int64) (monitor []*models.MonitoringRecord, err error) {
-	db := readDb.Model(&models.MonitoringRecord{}).Where("status = 1 AND user_org_id = ?", org_id)
+	db := readDb.Model(&models.MonitoringRecord{}).Where("status = 1 AND user_org_id = ?", org_id).Preload("DialysisOrder", "status = 1")
+	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime)
+	err = db.Find(&monitor).Error
+	return
+}
 
+func FindOrgMonitorRecordByLike(org_id int64, keyword string, lastUploadTime int64, nowTime int64) (monitor []*models.MonitoringRecord, err error) {
+	db := readDb.Model(&models.MonitoringRecord{}).Where("status = 1 AND user_org_id = ? AND symptom like ?", org_id,keyword)
 	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime)
 	err = db.Find(&monitor).Error
+	return
+}
+
+func FindOrgInspection(org_id int64,  lastUploadTime int64, nowTime int64) (inspection []*models.XtInspection, err error) {
+	db := readDb.Model(&models.XtInspection{}).Where("status = 1 AND org_id = ? ", org_id).Preload("Patients", "status = 1")
+	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime)
+	err = db.Find(&inspection).Error
+	return
+}
 
+func FindOrgInspectionReference(org_id int64,  lastUploadTime int64, nowTime int64) (inspection []*models.XtInspection, err error) {
+	db := readDb.Model(&models.XtInspection{}).Where("status = 1 AND org_id = ? ", org_id).Preload("XtInspectionReference", "status = 1")
+	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime)
+	err = db.Find(&inspection).Error
 	return
 }
 
 
 func BatchCreateWMsRecord(wms []*sz.TempHdWm, rdb *gorm.DB) (err error) {
 	if len(wms) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(wms) > 0 {
 			thisSQL := "INSERT INTO t_hd_wm (hospital_id, equipment_id, equipment_brand, equipment_model, enable_time,discarded_time,equipment_type,xgbz,create_time,update_time,sjscsj) VALUES "
 			insertParams := make([]string, 0)
 
 			}
 			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
-			}
+			// err = utx.Exec(thisSQL, insertData...).Error
+			// if err != nil {
+			// 	utx.Rollback()
+			// 	return
+			// }
+			utx.Exec(thisSQL, insertData...)
 		}
 		utx.Commit()
 	}
 
 func BatchCreateStaffRecord(staffs []*sz.TempHdStaff, rdb *gorm.DB) (err error) {
 	if len(staffs) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(staffs) > 0 {
-			thisSQL := "INSERT INTO t_hd_staff (hospital_id, staff_id, staff_name, position, permanent_type,create_time,update_time,sjscsj,mj) VALUES "
-			insertParams := make([]string, 0)
-			insertData := make([]interface{}, 0)
+			id_no := 429001198701091670
 			for _, info := range staffs {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?)")
+				thisSQL := "INSERT INTO t_hd_staff (hospital_id,staff_id, id_no,id_type,staff_name,  position,  staff_status, staff_no, permanent_type, in_date ,create_time, update_time, sjscsj, xgbz) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+
 				insertData = append(insertData, info.HospitalId)
 				insertData = append(insertData, info.StaffId)
+				insertData = append(insertData, id_no)
+				insertData = append(insertData, "01")
 				insertData = append(insertData, info.StaffName)
 				insertData = append(insertData, info.Position)
+				insertData = append(insertData, "0")
+				insertData = append(insertData, info.StaffId)
 				insertData = append(insertData, info.PermanentType)
+				insertData = append(insertData, "2019-09-01")
 				insertData = append(insertData, info.CreateTime)
 				insertData = append(insertData, info.UpdateTime)
 				insertData = append(insertData, info.Sjscsj)
 				insertData = append(insertData, info.Xgbz)
+				thisSQL += strings.Join(insertParams, ", ")
+				utx.Exec(thisSQL, insertData...)
+				id_no++
 			}
-			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
-			}
+			
 		}
-		utx.Commit()
+		// utx.Commit()
 	}
 	return
 }
 
 func BatchCreatePatinet(patients []*sz.TempHdPatient, rdb *gorm.DB) (err error) {
 	if len(patients) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(patients) > 0 {
-			thisSQL := "INSERT INTO t_hd_patient (hospital_id, patient_nk, card_no, card_type, id_no,id_type,patient_name,gender,born_date,diagnosis_summary,is_crf,create_time,update_time,sjscsj,xgbz) VALUES "
-			insertParams := make([]string, 0)
-			insertData := make([]interface{}, 0)
+			
 			for _, info := range patients {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				thisSQL := "INSERT INTO t_hd_patient ( hospital_id, patient_nk,  card_no,  card_type,  id_no, id_type, patient_name, gender, born_date, diagnosis_summary, is_crf, pay_method, local_insurance, dialysis_start_time, local_start_time, outpatient_no, hospitalized_no, xgbz, create_time, update_time, sjscsj) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.HospitalId)
 				insertData = append(insertData, info.PatientNk)
 				insertData = append(insertData, info.CardNo)
 				insertData = append(insertData, info.BornDate)
 				insertData = append(insertData, info.DiagnosisSummary)
 				insertData = append(insertData, info.IsCrf)
+				insertData = append(insertData, "02")
+				insertData = append(insertData, "1")
+				insertData = append(insertData, info.DialysisStartTime)
+				insertData = append(insertData, info.LocalStartTime)
+				insertData = append(insertData, info.OutpatientNo)
+				insertData = append(insertData, info.HospitalizedNo)
+				insertData = append(insertData, info.Xgbz)
 				insertData = append(insertData, info.CreateTime)
 				insertData = append(insertData, info.UpdateTime)
 				insertData = append(insertData, info.Sjscsj)
-				insertData = append(insertData, info.Xgbz)
-
-			}
-			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
+				thisSQL += strings.Join(insertParams, ", ")
+				utx.Exec(thisSQL, insertData...)
 			}
+			
+		
+			
 		}
-		utx.Commit()
+		// utx.Commit()
 	}
 	return
 }
 
 func BatchCreateSchedual(patients []*sz.TempHdShift, rdb *gorm.DB) (err error) {
 	if len(patients) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(patients) > 0 {
-			thisSQL := "INSERT INTO t_hd_shift (ps_id, hospital_id, patient_nk, schedule_date, shift_type,sickbed_no,schedule_status,create_time,sjscsj,xgbz) VALUES "
-			insertParams := make([]string, 0)
-			insertData := make([]interface{}, 0)
 			for _, info := range patients {
+				thisSQL := "INSERT INTO t_hd_shift (ps_id, hospital_id, patient_nk, schedule_date, shift_type,sickbed_no,schedule_status,create_time,sjscsj,xgbz) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
 				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.PsId)
 				insertData = append(insertData, info.HospitalId)
 				insertData = append(insertData, info.CreateTime)
 				insertData = append(insertData, info.Sjscsj)
 				insertData = append(insertData, info.Xgbz)
-
-			}
-			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
+				thisSQL += strings.Join(insertParams, ", ")
+				utx.Exec(thisSQL, insertData...)
 			}
+		
+			
 		}
-		utx.Commit()
+		// utx.Commit()
 	}
 	return
 }
 
 func BatchCreatePs(patients []*sz.TempHdPs, rdb *gorm.DB) (err error) {
 	if len(patients) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(patients) > 0 {
-			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 "
+			thisSQL := "INSERT INTO t_hd_ps (prescribe_id,hospital_id,patient_nk,rrt_type,rrt_type_name,dialysis_frequency,frequency_unit,prescribe_time,create_time,sjscsj,xgbz) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range patients {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.PrescribeId)
 				insertData = append(insertData, info.HospitalId)
 				insertData = append(insertData, info.PatientNk)
-				insertData = append(insertData, info.K)
-				insertData = append(insertData, info.Ca)
-				insertData = append(insertData, info.Na)
+				insertData = append(insertData, info.RrtType)
+				insertData = append(insertData, info.RrtTypeName)
 				insertData = append(insertData, info.DialysisFrequency)
 				insertData = append(insertData, info.FrequencyUnit)
-				insertData = append(insertData, info.DialysisDuration)
-				insertData = append(insertData, info.Hdf)
-				insertData = append(insertData, info.Hp)
-				insertData = append(insertData, info.HpFrequency)
-				insertData = append(insertData, info.HpFrequencyUnit)
-				insertData = append(insertData, info.HpDuration)
-				insertData = append(insertData, info.HdfFrequencyUnit)
-				insertData = append(insertData, info.HdfFrequency)
-				insertData = append(insertData, info.HdfDuration)
+				insertData = append(insertData, info.PrescribeTime)
 				insertData = append(insertData, info.CreateTime)
 				insertData = append(insertData, info.Sjscsj)
 				insertData = append(insertData, info.Xgbz)
 
+
 			}
 			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
-			}
+			// err = utx.Exec(thisSQL, insertData...).Error
+			// if err != nil {
+			// 	utx.Rollback()
+			// 	return
+			// }
+			utx.Exec(thisSQL, insertData...)
 		}
-		utx.Commit()
+		// utx.Commit()
 	}
 	return
 }
 
+func BatchCreatePsOther(ps *sz.TempHdPs, rdb *gorm.DB)(err error){
+	err = rdb.Create(&ps).Error
+	return err
+}
+
 func BatchCreatePsm(psms []*sz.TempHdPsMedicine, rdb *gorm.DB) (err error) {
 	if len(psms) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(psms) > 0 {
-			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 {
+				thisSQL := "INSERT INTO t_hd_ps_medicine (hospital_id, medicine_type_id,medicine_id,create_time,sjscsj,xgbz,sn) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
 				insertParams = append(insertParams, "(?,?,?,?,?,?,?)")
-				insertData = append(insertData, psm.PrescribeId)
 				insertData = append(insertData, psm.HospitalId)
 				insertData = append(insertData, psm.MedicineTypeId)
 				insertData = append(insertData, psm.MedicineId)
 				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
+				insertData = append(insertData, psm.Sn)
+				thisSQL += strings.Join(insertParams, ", ")
+				// err = utx.Exec(thisSQL, insertData...).Error
+				 utx.Exec(thisSQL, insertData...)
 			}
+			
+			// if err != nil {
+			// 	utx.Rollback()
+			// 	return
+			// }
 		}
-		utx.Commit()
+		// utx.Commit()
 	}
 	return
 }
 
 func BatchCreateDialysis(psms []*sz.TempHdDialysis, rdb *gorm.DB) (err error) {
 	if len(psms) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		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, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				thisSQL := "INSERT INTO t_hd_dialysis (dialysis_id,hospital_id,patient_nk,ps_id,dialysis_date,sickbed_no,division_id,equipment_id,mix_dialysis,ufv,total_treat_duration,is_hospitalization,is_emergency,is_perioperative_period,before_sbp,before_dbp,after_sbp,after_dbp,before_weight,after_weight,up_nurse_id,down_nurse_id,check_nurse_id,puncture_nurse_id,start_time,end_time,create_time,sjscsj,xgbz) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, psm.DialysisId)
 				insertData = append(insertData, psm.HospitalId)
 				insertData = append(insertData, psm.PatientNk)
 				insertData = append(insertData, psm.SickbedNo)
 				insertData = append(insertData, psm.DivisionId)
 				insertData = append(insertData, psm.EquipmentId)
-				insertData = append(insertData, psm.ActualufMl)
+				insertData = append(insertData, psm.MixDialysis)
 				insertData = append(insertData, psm.Ufv)
-				insertData = append(insertData, psm.TotalReplace)
 				insertData = append(insertData, psm.TotalTreatDuration)
+				insertData = append(insertData, psm.IsHospitalization)
+				insertData = append(insertData, psm.IsEmergency)
+				insertData = append(insertData, psm.IsPerioperativePeriod)
 				insertData = append(insertData, psm.BeforeSbp)
 				insertData = append(insertData, psm.BeforeDbp)
 				insertData = append(insertData, psm.AfterSbp)
 				insertData = append(insertData, psm.AfterDbp)
+				insertData = append(insertData, psm.BeforeWeight)
+				insertData = append(insertData, psm.AfterWeight)
+				insertData = append(insertData, psm.UpNurseId)
+				insertData = append(insertData, psm.DownNurseId)
+				insertData = append(insertData, psm.CheckNurseId)
+				insertData = append(insertData, psm.PunctureNurseId)
 				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, ", ")
+				utx.Exec(thisSQL, insertData...)
 
 			}
-			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
-			}
+		
+			// if err != nil {
+			// 	utx.Rollback()
+			// 	return
+			// }
 		}
-		utx.Commit()
+		// utx.Commit()
 	}
 	return
 }
 
 func BatchCreatePatientOut(patientOuts []*sz.TempHdPatientOut, rdb *gorm.DB) (err error) {
 	if len(patientOuts) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(patientOuts) > 0 {
-			thisSQL := "INSERT INTO t_hd_patient_out (HOSPITAL_ID, PATIENT_NK,SEQUELAE_DATE,SEQUELAE_TYPE,CREATE_TIME,SJSCSJ,XGBZ) VALUES "
+			thisSQL := "INSERT INTO t_hd_patient_quit (sn,hospital_id,patient_nk,sequelae_date,sequelae_type,create_time,death_reason,ext_reason,sjscsj,xgbz) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, out := range patientOuts {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, out.Sn)
 				insertData = append(insertData, out.HospitalId)
 				insertData = append(insertData, out.PatientNk)
 				insertData = append(insertData, out.SequelaeDate)
 				insertData = append(insertData, out.SequelaeType)
 				insertData = append(insertData, out.CreateTime)
+				insertData = append(insertData, out.DeathReason)
+				insertData = append(insertData, out.ExtReason)
 				insertData = append(insertData, out.Sjscsj)
 				insertData = append(insertData, out.Xgbz)
 
 			}
 			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
-			}
+			 utx.Exec(thisSQL, insertData...)
+			// if err != nil {
+			// 	utx.Rollback()
+			// 	return
+			// }
 		}
-		utx.Commit()
+		// utx.Commit()
 	}
 	return
 }
 
 func BatchCreateDoctorsAdvice(advices []*sz.TempHdDoctorsAdvice, rdb *gorm.DB) (err error) {
 	if len(advices) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(advices) > 0 {
-			thisSQL := "INSERT INTO t_hd_doctors_advice (medical_order_id, hospital_id,dialysis_id,order_type,patient_nk,dialysis_duration,blood_vol,create_time,sjscsj,xgbz) VALUES "
-			insertParams := make([]string, 0)
-			insertData := make([]interface{}, 0)
 			for _, advice := range advices {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?)")
+				thisSQL := "INSERT INTO t_hd_doctors_advice (medical_order_id, hospital_id,dialysis_id,order_type,patient_nk,dialysis_duration,blood_vol,anticoagulant,create_time,sjscsj,xgbz,rrt_type,rrt_type_name,dry_weight) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, advice.MedicalOrderId)
 				insertData = append(insertData, advice.HospitalId)
 				insertData = append(insertData, advice.DialysisId)
 				insertData = append(insertData, advice.PatientNk)
 				insertData = append(insertData, advice.DialysisDuration)
 				insertData = append(insertData, advice.BloodVol)
+				insertData = append(insertData, advice.Anticoagulant)
 				insertData = append(insertData, advice.CreateTime)
 				insertData = append(insertData, advice.Sjscsj)
 				insertData = append(insertData, advice.Xgbz)
-
-			}
-			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
+				insertData = append(insertData, advice.RrtType)
+				insertData = append(insertData, advice.RrtTypeName)
+				insertData = append(insertData, advice.DryWeight)
+				thisSQL += strings.Join(insertParams, ", ")
+			 	utx.Exec(thisSQL, insertData...)
 			}
+			// if err != nil {
+			// 	utx.Rollback()
+			// 	return
+			// }
 		}
-		utx.Commit()
+		// utx.Commit()
 	}
 	return
 }
 
 func BatchCreateMonitor(advices []*sz.TempHdMiddle, rdb *gorm.DB) (err error) {
 	if len(advices) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(advices) > 0 {
-			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, "(?,?,?,?,?,?,?,?,?)")
+				thisSQL := "INSERT INTO t_hd_middle (sn,hospital_id, patient_nk,dialysis_id,monitor_time,sbp,dbp,create_time,sjscsj,xgbz) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, advice.Sn)
 				insertData = append(insertData, advice.HospitalId)
 				insertData = append(insertData, advice.PatientNk)
 				insertData = append(insertData, advice.DialysisId)
 				insertData = append(insertData, advice.CreateTime)
 				insertData = append(insertData, advice.Sjscsj)
 				insertData = append(insertData, advice.Xgbz)
+				thisSQL += strings.Join(insertParams, ", ")
+				utx.Exec(thisSQL, insertData...)
 			}
-			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
-			}
+			
+			// if err != nil {
+			// 	utx.Rollback()
+			// 	return
+			// }
 		}
-		utx.Commit()
+		// utx.Commit()
 	}
 	return
 }
 
 func BatchCreateOtherMachineRecord(wms []*sz.TempHdOtherMachine, rdb *gorm.DB) (err error) {
 	if len(wms) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(wms) > 0 {
-			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, "(?,?,?,?,?,?,?,?,?,?)")
+				thisSQL := "INSERT INTO t_hd_other_machine (hospital_id, equipment_id, equipment_brand, equipment_model, enable_time,status,equipment_type,xgbz,create_time,update_time,sjscsj) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, wm.HospitalId)
 				insertData = append(insertData, wm.EquipmentId)
-				insertData = append(insertData, wm.EquipmentType)
+				insertData = append(insertData, wm.EquipmentBrand)
 				insertData = append(insertData, wm.EquipmentModel)
 				insertData = append(insertData, wm.EnableTime)
-				insertData = append(insertData, wm.DiscardedTime)
+				insertData = append(insertData, wm.Status)
+				insertData = append(insertData, wm.EquipmentType)
 				insertData = append(insertData, wm.Xgbz)
 				insertData = append(insertData, wm.CreateTime)
 				insertData = append(insertData, wm.UpdateTime)
 				insertData = append(insertData, wm.Sjscsj)
-
-			}
-			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
+				thisSQL += strings.Join(insertParams, ", ")
+				utx.Exec(thisSQL, insertData...)
 			}
+			
 		}
-		utx.Commit()
+		// utx.Commit()
 	}
 	return
 }
 
 func BatchCreateMainTain(maintain []*sz.TempHdMaintain, rdb *gorm.DB) (err error) {
 	if len(maintain) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(maintain) > 0 {
 			thisSQL := "INSERT INTO t_hd_maintain (hospital_id, equipment_id, equipment_type, repair_time, xgbz,create_time,sjscsj) VALUES "
 			insertParams := make([]string, 0)
 				insertData = append(insertData, wm.Sjscsj)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
-			}
+		 	utx.Exec(thisSQL, insertData...)
+			// if err != nil {
+			// 	utx.Rollback()
+			// 	return
+			// }
 		}
-		utx.Commit()
+		// utx.Commit()
 	}
 	return
 }
 
 func FindOrgMachineData(org_id int64, lastUploadTime int64, nowTime int64) (waterMachine []*models.VMDeviceAddmacher, err error) {
-
-	db := readUserDb.Model(&models.VMDeviceAddmacher{}).Where("status = 1 AND  user_org_id = ?", org_id).Preload("DeviceNumber", "status = 1")
+	db := readUserDb.Model(&models.VMDeviceAddmacher{}).Where("status = 1 AND  user_org_id = ?", org_id).Preload("DeviceNumber",func(db *gorm.DB) *gorm.DB {
+		return readDb.Model(&models.DeviceNumber{}).Where("status = 1")
+	   } )
 
 	db = db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
 
 
 func BatchCreateHDMRecord(wms []*sz.TempHdDm, rdb *gorm.DB) (err error) {
 	if len(wms) > 0 {
-		utx := rdb.Begin()
+		utx := rdb
 		if len(wms) > 0 {
-			thisSQL := "INSERT INTO t_hd_dm (hospital_id, equipment_id,sickbed_no, equipment_brand, equipment_model, enable_time,discarded_time,status,equipment_type, xgbz,create_time,update_time,sjscsj) VALUES "
+			
+			for _, wm := range wms {
+				thisSQL := "INSERT INTO t_hd_dm (hospital_id, equipment_id,sickbed_no,sickbed_type ,equipment_brand, equipment_model, enable_time,status,equipment_type, xgbz,bbp,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.SickbedNo)
+				insertData = append(insertData, wm.SickbedType)
 				insertData = append(insertData, wm.EquipmentBrand)
 				insertData = append(insertData, wm.EquipmentModel)
 				insertData = append(insertData, wm.EnableTime)
-				insertData = append(insertData, wm.DiscardedTime)
 				insertData = append(insertData, wm.Status)
 				insertData = append(insertData, wm.EquipmentType)
-
 				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.Bbp)
 				insertData = append(insertData, wm.CreateTime)
 				insertData = append(insertData, wm.UpdateTime)
 				insertData = append(insertData, wm.Sjscsj)
-
+		
+				thisSQL += strings.Join(insertParams, ", ")
+		 utx.Exec(thisSQL, insertData...)
 			}
-			thisSQL += strings.Join(insertParams, ", ")
-			err = utx.Exec(thisSQL, insertData...).Error
-			if err != nil {
-				utx.Rollback()
-				return
+			
+			// if err != nil {
+			// 	utx.Rollback()
+			// 	return
+			// }
+		}
+		// utx.Commit()
+	}
+	return
+}
+
+
+func CreateHDDivision(wms []*sz.TempHdDivision, rdb *gorm.DB) (err error) {
+	if len(wms) > 0 {
+		utx := rdb
+		if len(wms) > 0 {
+			for _, wm := range wms {
+				thisSQL := "INSERT INTO t_hd_division (division_id,hospital_id, division_name,division_type, xgbz,create_time,update_time,sjscsj) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.DivisionId)
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.DivisionName)
+				insertData = append(insertData, wm.DivisionType)
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.UpdateTime)
+				insertData = append(insertData, wm.Sjscsj)
+		
+				thisSQL += strings.Join(insertParams, ", ")
+		 		utx.Exec(thisSQL, insertData...)
 			}
+			
+		}
+	}
+	return
+}
+
+func CreateAccess(wms []*sz.TempHdAccess, rdb *gorm.DB) (err error) {
+	if len(wms) > 0 {
+		utx := rdb
+		if len(wms) > 0 {
+			for _, wm := range wms {
+				thisSQL := "INSERT INTO t_hd_access (access_id,hospital_id,patient_nk,access_type,access_type_name,access_status,setup_date,first_use_time,xgbz,create_time,update_time,sjscsj) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.AccessId)
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.PatientNk)
+				insertData = append(insertData, wm.AccessType)
+				insertData = append(insertData, wm.AccessTypeName)
+				insertData = append(insertData, wm.AccessStatus)
+				insertData = append(insertData, wm.SetupDate)
+				insertData = append(insertData, wm.FirstUseTime)
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.UpdateTime)
+				insertData = append(insertData, wm.Sjscsj)
+				thisSQL += strings.Join(insertParams, ", ")
+		 		utx.Exec(thisSQL, insertData...)
+			}	
+		}
+	}
+	return
+}
+
+func CreateSickbed(wms []*sz.TempHdSickbed, rdb *gorm.DB) (err error) {
+	if len(wms) > 0 {
+		utx := rdb
+		if len(wms) > 0 {
+			for _, wm := range wms {
+				thisSQL := "INSERT INTO t_hd_sickbed (sickbed_no,hospital_id,division_id,sickbed_code,sickbed_type,xgbz,create_time,update_time,sjscsj) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.SickbedNo)
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.DivisionId)
+				insertData = append(insertData, wm.SickbedCode)
+				insertData = append(insertData, wm.SickbedType)
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.UpdateTime)
+				insertData = append(insertData, wm.Sjscsj)
+				thisSQL += strings.Join(insertParams, ", ")
+		 		utx.Exec(thisSQL, insertData...)
+			}	
+		}
+	}
+	return
+}
+
+func CreateDiagnosis(wms []*sz.TempHdDiagnosis, rdb *gorm.DB) (err error) {
+	if len(wms) > 0 {
+		utx := rdb
+		if len(wms) > 0 {
+			for _, wm := range wms {
+				thisSQL := "INSERT INTO t_hd_diagnosis (diagnosis_id,hospital_id,patient_nk,diagnosis_time,diagnosis_type,diagnosis_type_item,diagnosis_type_detail,xgbz,create_time,update_time,sjscsj) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.DiagnosisId)
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.PatientNk)
+				insertData = append(insertData, wm.DiagnosisTime)
+				insertData = append(insertData, wm.DiagnosisType)
+				insertData = append(insertData, wm.DiagnosisTypeItem)
+				insertData = append(insertData, wm.DiagnosisTypeDetail)
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.UpdateTime)
+				insertData = append(insertData, wm.Sjscsj)
+				thisSQL += strings.Join(insertParams, ", ")
+		 		utx.Exec(thisSQL, insertData...)
+			}	
+		}
+	}
+	return
+}
+
+
+func CreateInfection(wms []*sz.TempHdInfection, rdb *gorm.DB) (err error) {
+	if len(wms) > 0 {
+		utx := rdb
+		if len(wms) > 0 {
+			for _, wm := range wms {
+				thisSQL := "INSERT INTO t_hd_infection (sn,hospital_id,patient_nk,hbv,hcv,rpr,hiv,hbsag,hbsab,hbeag,hbeab,hbcab,check_date,doctor_id,xgbz,create_time,sjscsj) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.Sn)
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.PatientNk)
+				insertData = append(insertData, wm.Hbv)
+				insertData = append(insertData, wm.Hcv)
+				insertData = append(insertData, wm.Rpr)
+				insertData = append(insertData, wm.Hiv)
+				insertData = append(insertData, wm.Hbsag)
+				insertData = append(insertData, wm.Hbsab)
+				insertData = append(insertData, wm.Hbeag)
+				insertData = append(insertData, wm.Hbeab)
+				insertData = append(insertData, wm.Hbcab)
+				insertData = append(insertData, wm.CheckDate)
+				insertData = append(insertData, wm.DoctorId)
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.Sjscsj)
+				thisSQL += strings.Join(insertParams, ", ")
+		 		utx.Exec(thisSQL, insertData...)
+			}	
+		}
+	}
+	return
+}
+
+func CreateComplication(wms []*sz.TempHdComplication, rdb *gorm.DB) (err error) {
+	if len(wms) > 0 {
+		utx := rdb
+		if len(wms) > 0 {
+			for _, wm := range wms {
+				thisSQL := "INSERT INTO t_hd_complication (sn,hospital_id,patient_nk,dialysis_id,monitor_id,neopathy_time,neopathy_type,neopathy_desc,xgbz,create_time,sjscsj) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.Sn)
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.PatientNk)
+				insertData = append(insertData, wm.DialysisId)
+				insertData = append(insertData, wm.MonitorId)
+				insertData = append(insertData, wm.NeopathyTime)
+				insertData = append(insertData, wm.NeopathyType)
+				insertData = append(insertData, wm.NeopathyDesc)
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.Sjscsj)
+				thisSQL += strings.Join(insertParams, ", ")
+		 		utx.Exec(thisSQL, insertData...)
+			}	
 		}
-		utx.Commit()
 	}
 	return
 }
+
+func CreateLisReport(wms []*sz.TempHdLisReport, rdb *gorm.DB) (err error) {
+	if len(wms) > 0 {
+		utx := rdb
+		if len(wms) > 0 {
+			for _, wm := range wms {
+				thisSQL := "INSERT INTO t_hd_lis_report (lab_sno,hospital_id,patient_nk,report_date,check_date,jz_no,mz_flag,zy_no,mz_no,department_code,department_name,card_no,card_type,patient_name,dep_code,dep_name,inspected_type,report_categry,application_name,application_type,check_name,check_item_name,check_item_code,record_ccount,check_result,diagnose_name,xgbz,create_time,sjscsj) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.LabSno)
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.PatientNk)
+				insertData = append(insertData, wm.ReportDate)
+				insertData = append(insertData, wm.CheckDate)
+				insertData = append(insertData, wm.JzNo)
+				insertData = append(insertData, wm.MzFlag)
+				insertData = append(insertData, wm.ZyNo)
+				insertData = append(insertData, wm.MzNo)
+				insertData = append(insertData, wm.DepartmentCode)
+				insertData = append(insertData, wm.DepartmentName)
+				insertData = append(insertData, wm.CardNo)
+				insertData = append(insertData, wm.CardType)
+				insertData = append(insertData, wm.PatientName)
+				insertData = append(insertData, wm.DepCode)
+				insertData = append(insertData, wm.DepName)
+				insertData = append(insertData, wm.InspectedType)
+				insertData = append(insertData, wm.ReportCategry)
+				insertData = append(insertData, wm.ApplicationName)
+				insertData = append(insertData, wm.ApplicationType)
+				insertData = append(insertData, wm.CheckName)
+				insertData = append(insertData, wm.CheckItemName)
+				insertData = append(insertData, wm.CheckItemCode)
+				insertData = append(insertData, wm.RecordCcount)
+				insertData = append(insertData, wm.CheckResult)
+				insertData = append(insertData, wm.DiagnoseName)
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.Sjscsj)
+				thisSQL += strings.Join(insertParams, ", ")
+		 		utx.Exec(thisSQL, insertData...)
+			}	
+		}
+	}
+	return
+}
+
+func CreateLisIndicators(wms []*sz.TempHdLisIndicators, rdb *gorm.DB) (err error) {
+	if len(wms) > 0 {
+		utx := rdb
+		if len(wms) > 0 {
+			for _, wm := range wms {
+				thisSQL := "INSERT INTO t_hd_lis_indicators (inspected_result_no,hospital_id,lab_sno,report_date,check_date,inspected_indicate,inspected_item_en_name,inspected_item_cn_name,inspected_result_desc,inspected_result_value,inspected_result_unit,ref_range,unit_type,inspected_result,xgbz,create_time,sjscsj) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.InspectedResultNo)
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.LabSno)
+				insertData = append(insertData, wm.ReportDate)
+				insertData = append(insertData, wm.CheckDate)
+				insertData = append(insertData, wm.InspectedIndicate)
+				insertData = append(insertData, wm.InspectedItemEnName)
+				insertData = append(insertData, wm.InspectedItemCnName)
+				insertData = append(insertData, wm.InspectedResultDesc)
+				insertData = append(insertData, wm.InspectedResultValue)
+				insertData = append(insertData, wm.InspectedResultUnit)
+				insertData = append(insertData, wm.RefRange)
+				insertData = append(insertData, wm.UnitType)
+				insertData = append(insertData, wm.InspectedResult)
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.Sjscsj)
+				thisSQL += strings.Join(insertParams, ", ")
+		 		utx.Exec(thisSQL, insertData...)
+			}	
+		}
+	}
+	return
+}

service/db.go

 	return
 }
 
-func CreateSqlServiceDB(Host string, Port string, User string, Pass string, Name string) (rsdDb *gorm.DB, err error) {
+func CreateSqlServiceDB(Host string, Port string, User string, Pass string, Name string) (mssqlDb *gorm.DB, err error) {
 	//rdb := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", User, Pass, Host, Port, Name)
-	rudsn := fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s", Host, Port, Name, User, Pass)
-	rsdDb, err = gorm.Open("mysql", rudsn)
+	mssqlstring := fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s", Host, Port, Name, User, Pass)
+	fmt.Println(mssqlstring)
+	mssqlDb, err = gorm.Open("mssql", mssqlstring)
 	if err != nil {
-		//beego.Error(err)
+		panic(err)
 	}
-	rsdDb.DB().SetMaxIdleConns(5)
-	rsdDb.DB().SetMaxOpenConns(20)
-	rsdDb.LogMode(true)
+	mssqlDb.DB().SetMaxIdleConns(5)
+	mssqlDb.DB().SetMaxOpenConns(20)
+	mssqlDb.LogMode(true)
 	return
 }