1111

main.go

@@ -4,8 +4,6 @@ import (
 	_ "Data_Upload_Api/routers"
 	"Data_Upload_Api/service"
 	"Data_Upload_Api/service/city"
-	_ "Data_Upload_Api/service/city"
-
 	"github.com/astaxie/beego"
 )
 
@@ -15,6 +13,6 @@ func init() {
 
 func main() {
 	city.BeginAutoJob()
-
+	city.SyncToLhblYxxxzx()
 	beego.Run()
 }

models/src_data.go

@@ -81,6 +81,29 @@ func (UserAdminRole) TableName() string {
 	return "sgj_user_admin_role"
 }
 
+type DeviceZone struct {
+	ID         int64  `gorm:"column:id" json:"id"`
+	OrgID      int64  `gorm:"column:org_id" json:"-"`
+	Name       string `json:"name"`
+	Type       int64  `json:"type"`
+	Status     int8   `json:"-"`
+	CreateTime int64  `gorm:"column:ctime" json:"-"`
+	ModifyTime int64  `gorm:"column:mtime" json:"-"`
+}
+
+func (DeviceZone) TableName() string {
+	return "xt_device_zone"
+}
+
+type ResultOne struct {
+	Sumamt float64 `gorm:"column:sumamt" json:"sumamt" form:"sumamt"`
+	Amt    float64 `gorm:"column:amt" json:"amt" form:"amt"`
+}
+
+func (ResultOne) TableName() string {
+	return "ResultOne"
+}
+
 type HisPatient struct {
 	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
 	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
@@ -125,7 +148,7 @@ type HisPatient struct {
 	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
 	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
-	Diagnosis              string   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 }
 
@@ -261,19 +284,19 @@ func (DeviceNumber) TableName() string {
 	return "xt_device_number"
 }
 
-type DeviceZone struct {
-	ID     int64  `gorm:"column:id" json:"id"`
-	OrgId  int64  `gorm:"column:org_id" json:"org_id"`
-	Name   string `gorm:"column:name" json:"name"`
-	Type   int64  `gorm:"column:type" json:"type"`
-	Status int64  `gorm:"column:status" json:"status"`
-	Ctime  int64  `gorm:"column:ctime" json:"ctime"`
-	Mtime  int64  `gorm:"column:mtime" json:"mtime"`
-}
+// type DeviceZone struct {
+// 	ID     int64  `gorm:"column:id" json:"id"`
+// 	OrgId  int64  `gorm:"column:org_id" json:"org_id"`
+// 	Name   string `gorm:"column:name" json:"name"`
+// 	Type   int64  `gorm:"column:type" json:"type"`
+// 	Status int64  `gorm:"column:status" json:"status"`
+// 	Ctime  int64  `gorm:"column:ctime" json:"ctime"`
+// 	Mtime  int64  `gorm:"column:mtime" json:"mtime"`
+// }
 
-func (DeviceZone) TableName() string {
-	return "xt_device_zone"
-}
+// func (DeviceZone) TableName() string {
+// 	return "xt_device_zone"
+// }
 
 type Schedule struct {
 	ID           int64        `gorm:"column:id" json:"id"`
@@ -448,66 +471,68 @@ func (DoctorAdviceTemplate) TableName() string {
 }
 
 type AssessmentAfterDislysis struct {
-	ID                              int64   `gorm:"column:id" json:"id"`
-	UserOrgId                       int64   `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId                       int64   `gorm:"column:patient_id" json:"patient_id"`
-	AssessmentDate                  int64   `gorm:"column:assessment_date" json:"assessment_date"`
-	DialysisOrderId                 int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
-	Temperature                     float64 `gorm:"column:temperature" json:"temperature"`
-	PulseFrequency                  float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate                   float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
-	SystolicBloodPressure           float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
-	DiastolicBloodPressure          float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
-	BloodPressureType               int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
-	ActualUltrafiltration           float64 `gorm:"column:actual_ultrafiltration" json:"actual_ultrafiltration"`
-	ActualDisplacement              float64 `gorm:"column:actual_displacement" json:"actual_displacement"`
-	ActualTreatmentHour             int64   `gorm:"column:actual_treatment_hour" json:"actual_treatment_hour"`
-	ActualTreatmentMinute           int64   `gorm:"column:actual_treatment_minute" json:"actual_treatment_minute"`
-	WeighingWay                     string  `gorm:"column:weighing_way" json:"weighing_way"`
-	WeightAfter                     float64 `gorm:"column:weight_after" json:"weight_after"`
-	WeightLoss                      float64 `gorm:"column:weight_loss" json:"weight_loss"`
-	Cruor                           string  `gorm:"column:cruor" json:"cruor"`
-	SymptomAfterDialysis            string  `gorm:"column:symptom_after_dialysis" json:"symptom_after_dialysis"`
-	InternalFistula                 string  `gorm:"column:internal_fistula" json:"internal_fistula"`
-	Catheter                        string  `gorm:"column:catheter" json:"catheter"`
-	Complication                    string  `gorm:"column:complication" json:"complication"`
-	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator"`
-	Remark                          string  `gorm:"column:remark" json:"remark"`
-	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
-	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed"`
-	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion"`
-	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion"`
-	DialysisIntakesWashpipe         int64   `gorm:"column:dialysis_intakes_washpipe" json:"dialysis_intakes_washpipe"`
-	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"`
-	Creater                         int64   `gorm:"column:creater" json:"creater"`
-	Modifier                        int64   `gorm:"column:modifier" json:"modifier"`
-	BloodAccessPartId               int64   `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"`
-	PuncturePointOozingBlood        int64   `gorm:"column:puncture_point_oozing_blood" json:"puncture_point_oozing_blood"`
-	PuncturePointHaematoma          int64   `gorm:"column:puncture_point_haematoma" json:"puncture_point_haematoma"`
-	InternalFistulaTremorAc         int64   `gorm:"column:internal_fistula_tremor_ac" json:"internal_fistula_tremor_ac"`
-	PatientGose                     int64   `gorm:"column:patient_gose" json:"patient_gose"`
-	InpatientDepartment             string  `gorm:"column:inpatient_department" json:"inpatient_department"`
-	ObservationContent              string  `gorm:"column:observation_content" json:"observation_content"`
-	ObservationContentOther         string  `gorm:"column:observation_content_other" json:"observation_content_other"`
-	DryWeight                       float64 `gorm:"column:dry_weight" json:"dry_weight"`
-	DialysisProcess                 int64   `gorm:"column:dialysis_process" json:"dialysis_process"`
-	InAdvanceMinute                 float64 `gorm:"column:in_advance_minute" json:"in_advance_minute"`
-	InAdvanceReason                 string  `gorm:"column:in_advance_reason" json:"in_advance_reason"`
-	HemostasisMinute                int64   `gorm:"column:hemostasis_minute" json:"hemostasis_minute"`
-	HemostasisOpera                 int64   `gorm:"column:hemostasis_opera" json:"hemostasis_opera"`
-	TremorNoise                     int64   `gorm:"column:tremor_noise" json:"tremor_noise"`
-	DisequilibriumSyndrome          int64   `gorm:"column:disequilibrium_syndrome" json:"disequilibrium_syndrome"`
-	DisequilibriumSyndromeOption    string  `gorm:"column:disequilibrium_syndrome_option" json:"disequilibrium_syndrome_option"`
-	ArterialTube                    int64   `gorm:"column:arterial_tube" json:"arterial_tube"`
-	IntravenousTube                 int64   `gorm:"column:intravenous_tube" json:"intravenous_tube"`
-	Dialyzer                        int64   `gorm:"column:dialyzer" json:"dialyzer"`
-	InAdvanceReasonOther            string  `gorm:"column:in_advance_reason_other" json:"in_advance_reason_other"`
-	AssessmentDoctor                int64   `gorm:"column:assessment_doctor" json:"assessment_doctor"`
-	AssessmentTime                  int64   `gorm:"column:assessment_time" json:"assessment_time"`
-	IsEat                           int64   `gorm:"column:is_eat" json:"is_eat"`
+	ID                     int64   `gorm:"column:id" json:"id"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId              int64   `gorm:"column:patient_id" json:"patient_id"`
+	AssessmentDate         int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	DialysisOrderId        int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
+	Temperature            float64 `gorm:"column:temperature" json:"temperature"`
+	PulseFrequency         float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
+	BreathingRate          string  `gorm:"column:breathing_rate" json:"breathing_rate"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	BloodPressureType      int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
+	ActualUltrafiltration  float64 `gorm:"column:actual_ultrafiltration" json:"actual_ultrafiltration"`
+	ActualDisplacement     float64 `gorm:"column:actual_displacement" json:"actual_displacement"`
+	ActualTreatmentHour    int64   `gorm:"column:actual_treatment_hour" json:"actual_treatment_hour"`
+	ActualTreatmentMinute  int64   `gorm:"column:actual_treatment_minute" json:"actual_treatment_minute"`
+	WeighingWay            string  `gorm:"column:weighing_way" json:"weighing_way"`
+	WeightAfter            float64 `gorm:"column:weight_after" json:"weight_after"`
+	WeightLoss             float64 `gorm:"column:weight_loss" json:"weight_loss"`
+	Cruor                  string  `gorm:"column:cruor" json:"cruor"`
+	SymptomAfterDialysis   string  `gorm:"column:symptom_after_dialysis" json:"symptom_after_dialysis"`
+	InternalFistula        string  `gorm:"column:internal_fistula" json:"internal_fistula"`
+	Catheter               string  `gorm:"column:catheter" json:"catheter"`
+	Complication           string  `gorm:"column:complication" json:"complication"`
+	Evaluator              int64   `gorm:"column:evaluator" json:"evaluator"`
+	Remark                 string  `gorm:"column:remark" json:"remark"`
+	// DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
+	// DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed"`
+	// DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion"`
+	// DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion"`
+	// DialysisIntakesWashpipe         int64   `gorm:"column:dialysis_intakes_washpipe" json:"dialysis_intakes_washpipe"`
+	Ktv                          string  `gorm:"column:ktv" json:"ktv"`
+	Urr                          string  `gorm:"column:urr" json:"urr"`
+	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"`
+	Creater                      int64   `gorm:"column:creater" json:"creater"`
+	Modifier                     int64   `gorm:"column:modifier" json:"modifier"`
+	BloodAccessPartId            int64   `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"`
+	PuncturePointOozingBlood     int64   `gorm:"column:puncture_point_oozing_blood" json:"puncture_point_oozing_blood"`
+	PuncturePointHaematoma       int64   `gorm:"column:puncture_point_haematoma" json:"puncture_point_haematoma"`
+	InternalFistulaTremorAc      int64   `gorm:"column:internal_fistula_tremor_ac" json:"internal_fistula_tremor_ac"`
+	PatientGose                  int64   `gorm:"column:patient_gose" json:"patient_gose"`
+	InpatientDepartment          string  `gorm:"column:inpatient_department" json:"inpatient_department"`
+	ObservationContent           string  `gorm:"column:observation_content" json:"observation_content"`
+	ObservationContentOther      string  `gorm:"column:observation_content_other" json:"observation_content_other"`
+	DryWeight                    float64 `gorm:"column:dry_weight" json:"dry_weight"`
+	DialysisProcess              int64   `gorm:"column:dialysis_process" json:"dialysis_process"`
+	InAdvanceMinute              float64 `gorm:"column:in_advance_minute" json:"in_advance_minute"`
+	InAdvanceReason              string  `gorm:"column:in_advance_reason" json:"in_advance_reason"`
+	HemostasisMinute             int64   `gorm:"column:hemostasis_minute" json:"hemostasis_minute"`
+	HemostasisOpera              int64   `gorm:"column:hemostasis_opera" json:"hemostasis_opera"`
+	TremorNoise                  int64   `gorm:"column:tremor_noise" json:"tremor_noise"`
+	DisequilibriumSyndrome       int64   `gorm:"column:disequilibrium_syndrome" json:"disequilibrium_syndrome"`
+	DisequilibriumSyndromeOption string  `gorm:"column:disequilibrium_syndrome_option" json:"disequilibrium_syndrome_option"`
+	ArterialTube                 int64   `gorm:"column:arterial_tube" json:"arterial_tube"`
+	IntravenousTube              int64   `gorm:"column:intravenous_tube" json:"intravenous_tube"`
+	Dialyzer                     int64   `gorm:"column:dialyzer" json:"dialyzer"`
+	InAdvanceReasonOther         string  `gorm:"column:in_advance_reason_other" json:"in_advance_reason_other"`
+	AssessmentDoctor             int64   `gorm:"column:assessment_doctor" json:"assessment_doctor"`
+	AssessmentTime               int64   `gorm:"column:assessment_time" json:"assessment_time"`
+	IsEat                        int64   `gorm:"column:is_eat" json:"is_eat"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {
@@ -522,7 +547,7 @@ type AssessmentBeforeDislysis struct {
 	DialysisOrderId                int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
 	Temperature                    float64 `gorm:"column:temperature" json:"temperature"`
 	PulseFrequency                 float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate                  float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
+	BreathingRate                  string  `gorm:"column:breathing_rate" json:"breathing_rate"`
 	SystolicBloodPressure          float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
 	DiastolicBloodPressure         float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 	BloodPressureType              int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
@@ -566,7 +591,7 @@ type AssessmentBeforeDislysis struct {
 	DuctusArantii                  string  `gorm:"column:ductus_arantii" json:"ductus_arantii"`
 	EmergencyTreatment             int64   `gorm:"column:emergency_treatment" json:"emergency_treatment"`
 	EmergencyTreatmentOther        string  `gorm:"column:emergency_treatment_other" json:"emergency_treatment_other"`
-	DialysisCount                  int64   `gorm:"column:dialysis_count" json:"dialysis_count"`
+	DialysisCount                  string  `gorm:"column:dialysis_count" json:"dialysis_count"`
 	AssessmentDoctor               int64   `gorm:"column:assessment_doctor" json:"assessment_doctor"`
 	AssessmentTime                 int64   `gorm:"column:assessment_time" json:"assessment_time"`
 	MachineType                    string  `gorm:"column:machine_type" json:"machine_type"`
@@ -590,7 +615,7 @@ type MonitoringRecord struct {
 	MonitoringDate            int64         `gorm:"column:monitoring_date" json:"monitoring_date"`
 	MonitoringTime            string        `gorm:"column:monitoring_time" json:"monitoring_time"`
 	PulseFrequency            float64       `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate             float64       `gorm:"column:breathing_rate" json:"breathing_rate"`
+	BreathingRate             string        `gorm:"column:breathing_rate" json:"breathing_rate"`
 	SystolicBloodPressure     float64       `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
 	DiastolicBloodPressure    float64       `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 	BloodPressureType         int64         `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
@@ -640,6 +665,24 @@ func (PatientLapseto) TableName() string {
 	return "xt_patient_lapseto"
 }
 
+type XtPatientAllergic struct {
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId      int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	StartTime      int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime        int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	PatientSource  int64  `gorm:"column:patient_source" json:"patient_source" form:"patient_source"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime          int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Remake         string `gorm:"column:remake" json:"remake" form:"remake"`
+	PatientAddress string `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
+}
+
+func (XtPatientAllergic) TableName() string {
+	return "xt_patient_allergic"
+}
+
 type DialysisOrder struct {
 	ID             int64  `gorm:"column:id" json:"id"`
 	DialysisDate   int64  `gorm:"column:dialysis_date" json:"dialysis_date"`
@@ -801,6 +844,61 @@ func (VMDialysisPrescription) TableName() string {
 	return "xt_dialysis_prescription"
 }
 
+type DeviceInformation struct {
+	ID                    int64             `gorm:"column:id" json:"id" form:"id"`
+	Date                  int64             `gorm:"column:date" json:"date" form:"date"`
+	Class                 int64             `gorm:"column:class" json:"class" form:"class"`
+	Zone                  int64             `gorm:"column:zone" json:"zone" form:"zone"`
+	BedNumber             int64             `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	PatientId             int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Contagion             string            `gorm:"column:contagion" json:"contagion" form:"contagion"`
+	DialysisMode          int64             `gorm:"column:dialysis_mode" json:"dialysis_mode" form:"dialysis_mode"`
+	StartTime             int64             `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime               int64             `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	DialysisHour          string            `gorm:"column:dialysis_hour" json:"dialysis_hour" form:"dialysis_hour"`
+	Hyperfiltratio        float64           `gorm:"column:hyperfiltratio" json:"hyperfiltratio" form:"hyperfiltratio"`
+	WeightLoss            float64           `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
+	WarningValue          string            `gorm:"column:warning_value" json:"warning_value" form:"warning_value"`
+	UserTotal             string            `gorm:"column:user_total" json:"user_total" form:"user_total"`
+	Move                  int64             `gorm:"column:move" json:"move" form:"move"`
+	FailureStage          int64             `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
+	FaultDescription      string            `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
+	CodeInformation       string            `gorm:"column:code_information" json:"code_information" form:"code_information"`
+	DisinfectType         int64             `gorm:"column:disinfect_type" json:"disinfect_type" form:"disinfect_type"`
+	DisinfectantType      int64             `gorm:"column:disinfectant_type" json:"disinfectant_type" form:"disinfectant_type"`
+	Disinfection          int64             `gorm:"column:disinfection" json:"disinfection" form:"disinfection"`
+	MachineRun            int64             `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
+	FluidPath             int64             `gorm:"column:fluid_path" json:"fluid_path" form:"fluid_path"`
+	Disinfectant          int64             `gorm:"column:disinfectant" json:"disinfectant" form:"disinfectant"`
+	DisinfectionStatus    int64             `gorm:"column:disinfection_status" json:"disinfection_status" form:"disinfection_status"`
+	DisinfectionResidue   int64             `gorm:"column:disinfection_residue" json:"disinfection_residue" form:"disinfection_residue"`
+	LongTime              string            `gorm:"column:long_time" json:"long_time" form:"long_time"`
+	DisinfecStartime      int64             `gorm:"column:disinfec_startime" json:"disinfec_startime" form:"disinfec_startime"`
+	DisinfecEndtime       int64             `gorm:"column:disinfec_endtime" json:"disinfec_endtime" form:"disinfec_endtime"`
+	DialysisChecked       int64             `gorm:"column:dialysis_checked" json:"dialysis_checked" form:"dialysis_checked"`
+	DialysisName          int64             `gorm:"column:dialysis_name" json:"dialysis_name" form:"dialysis_name"`
+	Norms                 string            `gorm:"column:norms" json:"norms" form:"norms"`
+	DialysisConcentration int64             `gorm:"column:dialysis_concentration" json:"dialysis_concentration" form:"dialysis_concentration"`
+	GermChecked           int64             `gorm:"column:germ_checked" json:"germ_checked" form:"germ_checked"`
+	GermName              int64             `gorm:"column:germ_name" json:"germ_name" form:"germ_name"`
+	GermNumber            string            `gorm:"column:germ_number" json:"germ_number" form:"germ_number"`
+	Clean                 int64             `gorm:"column:clean" json:"clean" form:"clean"`
+	SignName              int64             `gorm:"column:sign_name" json:"sign_name" form:"sign_name"`
+	Status                int64             `gorm:"column:status" json:"status" form:"status"`
+	Ctime                 int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserOrgId             int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	EquimentId            int64             `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
+	Bed                   string            `gorm:"column:bed" json:"bed" form:"bed"`
+	Stime                 int64             `gorm:"column:stime" json:"stime" form:"stime"`
+	VMDeviceAddmacher     VMDeviceAddmacher `gorm:"ForeignKey:ID;AssociationForeignKey:EquimentId"`
+}
+
+func (DeviceInformation) TableName() string {
+
+	return "xt_device_information"
+}
+
 type VMDeviceAddmacher struct {
 	ID                  int64        `gorm:"column:id" json:"id" form:"id"`
 	SerialNumber        string       `gorm:"column:serial_number" json:"serial_number" form:"serial_number"`
@@ -840,6 +938,30 @@ func (VMDeviceAddmacher) TableName() string {
 	return "xt_device_addmacher"
 }
 
+type DevicePlan struct {
+	ID                  int64             `gorm:"column:id" json:"id" form:"id"`
+	DeviceType          int64             `gorm:"column:device_type" json:"device_type" form:"device_type"`
+	DisinfecTime        int64             `gorm:"column:disinfec_time" json:"disinfec_time" form:"disinfec_time"`
+	Time                int64             `gorm:"column:time" json:"time" form:"time"`
+	Classtime           int64             `gorm:"column:classtime" json:"classtime" form:"classtime"`
+	Way                 int64             `gorm:"column:way" json:"way" form:"way"`
+	MachineDisinfectant int64             `gorm:"column:machine_disinfectant" json:"machine_disinfectant" form:"machine_disinfectant"`
+	DisinfectanWay      int64             `gorm:"column:disinfectan_way" json:"disinfectan_way" form:"disinfectan_way"`
+	Disinfectant        int64             `gorm:"column:disinfectant" json:"disinfectant" form:"disinfectant"`
+	Status              int64             `gorm:"column:status" json:"status" form:"status"`
+	Ctime               int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime               int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserOrgId           int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	EquimentId          int64             `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
+	BedId               int64             `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	VMDeviceAddmacher   VMDeviceAddmacher `gorm:"ForeignKey:ID;AssociationForeignKey:EquimentId"`
+}
+
+func (DevicePlan) TableName() string {
+
+	return "xt_device_plan"
+}
+
 type DeviceRepair struct {
 	ID                int64             `gorm:"column:id" json:"id" form:"id"`
 	GuaranteeDate     int64             `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
@@ -1047,6 +1169,41 @@ func (XtDeviceWater) TableName() string {
 	return "xt_device_water"
 }
 
+//透析液离子浓度检测
+type DeviceIon struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	SamplingDate    int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
+	Samplerc        int64  `gorm:"column:samplerc" json:"samplerc" form:"samplerc"`
+	DetectionUnit   string `gorm:"column:detection_unit" json:"detection_unit" form:"detection_unit"`
+	ConcentrateNof  string `gorm:"column:concentrate_nof" json:"concentrate_nof" form:"concentrate_nof"`
+	ConcentrateNog  string `gorm:"column:concentrate_nog" json:"concentrate_nog" form:"concentrate_nog"`
+	DateReportc     int64  `gorm:"column:date_reportc" json:"date_reportc" form:"date_reportc"`
+	ActualNa        string `gorm:"column:actual_na" json:"actual_na" form:"actual_na"`
+	ActualPna       string `gorm:"column:actual_pna" json:"actual_pna" form:"actual_pna"`
+	ActualK         string `gorm:"column:actual_k" json:"actual_k" form:"actual_k"`
+	ActualCa        string `gorm:"column:actual_ca" json:"actual_ca" form:"actual_ca"`
+	ActualCi        string `gorm:"column:actual_ci" json:"actual_ci" form:"actual_ci"`
+	ActualHco       string `gorm:"column:actual_hco" json:"actual_hco" form:"actual_hco"`
+	ActualMg        string `gorm:"column:actual_mg" json:"actual_mg" form:"actual_mg"`
+	ActualPh        string `gorm:"column:actual_ph" json:"actual_ph" form:"actual_ph"`
+	Remakes         string `gorm:"column:remakes" json:"remakes" form:"remakes"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime           int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	BedId           int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId     int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	Bed             string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort            string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications   int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
+}
+
+func (DeviceIon) TableName() string {
+
+	return "xt_device_ion"
+}
+
 type XtDeviceOxygenates struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
 	SamplingDate      int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
@@ -1158,21 +1315,21 @@ func (XtPatientVascularAccess) TableName() string {
 }
 
 type App_Role struct {
-	Id            int64     `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
-	AdminUserId   int64     `gorm:"column:admin_user_id" json:"admin_user_id"`
-	OrgId         int64     `gorm:"column:org_id" json:"org_id"`
-	AppId         int64     `gorm:"column:app_id" json:"app_id"`
-	RoleId        int64     `gorm:"column:role_id" json:"role_id"`
-	Avatar        string    `json:"avatar" json:"avatar"`
-	UserName      string    `gorm:"column:user_name" json:"user_name"`   // 用户名称
-	Intro         string    `json:"intro"`                               // 简介
-	UserType      int8      `gorm:"column:user_type" json:"user_type"`   // 用户类型（1.管理员；2.医生；3.护士；4.运营）
-	UserTitle     int8      `gorm:"column:user_title" json:"user_title"` // 用户职称（1.医士；2.医师；3.住院医师；4.主治医师；5.副主任医师；6.主任医师；7.护士；8.护师；9.主管护师；10.副主任护师；11.主任护师；12.运营专员；13.运营主管）
-	Status        int8      `json:"status"`                              // 状态 0.无效 1.有效
-	CreateTime    int64     `gorm:"column:ctime" json:"ctime"`           // 创建时间
-	ModifyTime    int64     `gorm:"column:mtime" json:"mtime"`           // 修改时间UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
-	UserTitleName string    `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
-	RoleIds       string    `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Id              int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	AdminUserId     int64  `gorm:"column:admin_user_id" json:"admin_user_id"`
+	OrgId           int64  `gorm:"column:org_id" json:"org_id"`
+	AppId           int64  `gorm:"column:app_id" json:"app_id"`
+	RoleId          int64  `gorm:"column:role_id" json:"role_id"`
+	Avatar          string `json:"avatar" json:"avatar"`
+	UserName        string `gorm:"column:user_name" json:"user_name"`   // 用户名称
+	Intro           string `json:"intro"`                               // 简介
+	UserType        int8   `gorm:"column:user_type" json:"user_type"`   // 用户类型（1.管理员；2.医生；3.护士；4.运营）
+	UserTitle       int8   `gorm:"column:user_title" json:"user_title"` // 用户职称（1.医士；2.医师；3.住院医师；4.主治医师；5.副主任医师；6.主任医师；7.护士；8.护师；9.主管护师；10.副主任护师；11.主任护师；12.运营专员；13.运营主管）
+	Status          int8   `json:"status"`                              // 状态 0.无效 1.有效
+	CreateTime      int64  `gorm:"column:ctime" json:"ctime"`           // 创建时间
+	ModifyTime      int64  `gorm:"column:mtime" json:"mtime"`           // 修改时间UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	UserTitleName   string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds         string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
 	IsSubSuperAdmin bool   `gorm:"-" json:"is_sub_super_admin" form:"is_sub_super_admin"`
 	Message         string `gorm:"column:message" json:"message" form:"message"`
 	Sex             int64  `gorm:"column:sex" json:"sex" form:"sex"`
@@ -1214,28 +1371,27 @@ func (App_Role) TableName() string {
 	return "sgj_user_admin_role"
 }
 
-
 type HisPrescriptionInfo struct {
-	ID                 int64           `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId          int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	RecordDate         int64           `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PatientId          int64           `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64           `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	Status             int64           `gorm:"column:status" json:"status" form:"status"`
-	Ctime              int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Creator            int64           `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier           int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          int64           `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	RegisterType       int64           `gorm:"column:register_type" json:"register_type" form:"register_type"`
-	Doctor             string          `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Departments        int64           `gorm:"column:departments" json:"departments" form:"departments"`
-	SickHistory        string          `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
-	PrescriptionNumber string          `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
-	PrescriptionStatus int64           `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
-	BatchNumber        string          `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	DoctorId           int64           `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
-	SickType           int64           `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate         int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	RegisterType       int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Departments        int64  `gorm:"column:departments" json:"departments" form:"departments"`
+	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
+	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
+	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	SickType           int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -1243,22 +1399,22 @@ func (HisPrescriptionInfo) TableName() string {
 }
 
 type HisPrescription struct {
-	ID                     int64                     `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId              int64                     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	RecordDate             int64                     `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PatientId              int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId           int64                     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	Status                 int64                     `gorm:"column:status" json:"status" form:"status"`
-	Ctime                  int64                     `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                  int64                     `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Number                 string                    `gorm:"column:number" json:"number" form:"number"`
-	Type                   int64                     `gorm:"column:type" json:"type" form:"type"`
-	Doctor                 string                    `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Creator                int64                     `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier               int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	OrderStatus            int64                     `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	BatchNumber            string                    `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate         int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number             string `gorm:"column:number" json:"number" form:"number"`
+	Type               int64  `gorm:"column:type" json:"type" form:"type"`
+	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus        int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
 }
 
 func (HisPrescription) TableName() string {
@@ -1323,6 +1479,184 @@ func (HisDoctorAdviceInfo) TableName() string {
 	return "his_doctor_advice_info"
 }
 
+type HisPrescriptionProject struct {
+	ID                 int64      `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64    `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64      `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64      `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              string     `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string     `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string     `gorm:"column:day" json:"day" form:"day"`
+	HisProject         HisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	GoodInfo           GoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+
+	Remark string `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit   string `gorm:"column:unit" json:"unit" form:"unit"`
+	Type   int64  `gorm:"column:type" json:"type" form:"type"`
+
+	Doctor         int64  `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime  int64  `gborm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff int64  `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState int64  `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime      int64  `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState     int64  `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker        int64  `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime      int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId         int64  `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	FrequencyType  int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount       int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay        string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam    int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
+}
+
+func (HisPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}
+
+type GoodInfo struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodCode               string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName      string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId             int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit               int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice               float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice              float64 `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark                 string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                 int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount int64   `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount         int64   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                int64   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	FilmArea               string  `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                  int64   `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality    string  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier               int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName               string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind               int64   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode          string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+
+	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	GoodStatus                  string  `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	DefaultCount                int64   `gorm:"column:default_count" json:"default_count" form:"default_count"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsDoctorUse                 int64   `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
+	GoodNumber                  string  `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	CommdityCode                string  `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	ProductionType              string  `gorm:"column:production_type" json:"production_type" form:"production_type"`
+	SpecialMedical              string  `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DefaultCountUnit            string  `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
+
+	RegisterNumber string `gorm:"column:register_number" json:"register_number" form:"register_number"`
+
+	IsUser          int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	Number          string  `gorm:"column:number" json:"number" form:"number"`
+	IsWarehouse     int64   `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
+	SumCount        int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	BatchRetaiPrice float64 `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumInCount      int64   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+}
+
+func (GoodInfo) TableName() string {
+	return "xt_good_information"
+}
+
+type HisProject struct {
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName                 string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	Price                       float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit                        string  `gorm:"column:unit" json:"unit" form:"unit"`
+	CostClassify                int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	ExecutiveSection            int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
+	MedicalCoverage             int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
+	StatisticalClassification   int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
+	DiseaseDirectory            int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	MedicalCode                 string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+	TubeColor                   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	MedicalStatus               int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	DefaultNumber               string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsCharge                    int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
+	IsEstimate                  int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
+	IsWorkload                  int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
+	Sort                        string  `gorm:"column:sort" json:"sort" form:"sort"`
+	DoctorAdvice                int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	NumberDays                  string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
+	Total                       string  `gorm:"column:total" json:"total" form:"total"`
+	Category                    int64   `gorm:"column:category" json:"category" form:"category"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+}
+
+func (HisProject) TableName() string {
+	return "xt_his_project"
+}
+
+type HisChargeDoctorAdviceInfo struct {
+	ID                    int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceName            string `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	PrescribingNumberUnit string `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	Status                int64  `gorm:"column:status" json:"status" form:"status"`
+	DrugId                int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Remark                string `gorm:"column:remark" json:"remark" form:"remark"`
+	AdviceDate            int64  `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+}
+
+func (HisChargeDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}
+
 type BaseDrugLib struct {
 	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
 	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
@@ -1389,105 +1723,123 @@ func (BaseDrugLib) TableName() string {
 	return "xt_base_drug"
 }
 
-type HisPrescriptionProject struct {
-	ID                 int64      `gorm:"column:id" json:"id" form:"id"`
-	ProjectId          int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price              float64    `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId          int64      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status             int64      `gorm:"column:status" json:"status" form:"status"`
-	Ctime              int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	PatientId          int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64      `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              int64      `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	DeliveryWay        string     `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Day                string     `gorm:"column:day" json:"day" form:"day"`
-	Remark             string     `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit               string     `gorm:"column:unit" json:"unit" form:"unit"`
+type XtHisProject struct {
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName                 string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	Price                       float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit                        string  `gorm:"column:unit" json:"unit" form:"unit"`
+	CostClassify                int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	ExecutiveSection            int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
+	MedicalCoverage             int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
+	StatisticalClassification   int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
+	DiseaseDirectory            int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	MedicalCode                 string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+	TubeColor                   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	MedicalStatus               int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	DefaultNumber               string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsCharge                    int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
+	IsEstimate                  int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
+	IsWorkload                  int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
+	Sort                        string  `gorm:"column:sort" json:"sort" form:"sort"`
+	DoctorAdvice                int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
+	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	NumberDays                  string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
+	Total                       string  `gorm:"column:total" json:"total" form:"total"`
+	Category                    int64   `gorm:"column:category" json:"category" form:"category"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
 }
 
-func (HisPrescriptionProject) TableName() string {
-	return "his_prescription_project"
+func (XtHisProject) TableName() string {
+	return "xt_his_project"
 }
 
 type HisOrder struct {
-	ID                    int64     `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId             int64     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	HisPatientId          int64     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	SettleAccountsDate    int64     `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
-	Ctime                 int64     `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                 int64     `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status                int64     `gorm:"column:status" json:"status" form:"status"`
-	Number                string    `gorm:"column:number" json:"number" form:"number"`
-	PatientId             int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Infcode               int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
-	WarnMsg               string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
-	Cainfo                string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
-	ErrMsg                string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
-	RespondTime           string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
-	InfRefmsgid           string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
-	OrderStatus           int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	MdtrtId               string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
-	SetlId                string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
-	PsnNo                 string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
-	PsnName               string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
-	PsnCertType           string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
-	Certno                string    `gorm:"column:certno" json:"certno" form:"certno"`
-	Gend                  string    `gorm:"column:gend" json:"gend" form:"gend"`
-	Naty                  string    `gorm:"column:naty" json:"naty" form:"naty"`
-	Brdy                  string 	`gorm:"column:brdy" json:"brdy" form:"brdy"`
-	Age                   float64   `gorm:"column:age" json:"age" form:"age"`
-	Insutype              string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
-	PsnType               string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
-	CvlservFlag           string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
-	SetlTime              string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
-	MdtrtCertType         string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
-	MedType               string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
-	MedfeeSumamt          float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
-	FulamtOwnpayAmt       float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
-	OverlmtSelfPay        float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
-	PreselfpayAmt         float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
-	InscpScpAmt           float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
-	ActPayDedc            float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
-	HifpPay               float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
-	CvlservPay            float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
-	PoolPropSelfpay       float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
-	HifesPay              float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
-	HifmiPay              float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
-	HifobPay              float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
-	MafPay                float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
-	OthPay                float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
-	FundPaySumamt         float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
-	PsnPartAmt            float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
-	AcctPay               float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
-	PsnCashPay            float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
-	HospPartAmt           float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
-	Balc                  float64   `gorm:"column:balc" json:"balc" form:"balc"`
-	AcctMulaidPay         float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
-	MedinsSetlId          string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
-	ClrOptins             string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
-	ClrWay                string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
-	ClrType               string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
-	SetlDetail            string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
-	IsMedicineInsurance   int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
-	PayWay                int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
-	PayPrice              float64   `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
-	PayCardNo             string    `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
-	DiscountPrice         float64   `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
-	PreferentialPrice     float64   `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
-	RealityPrice          float64   `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
-	FoundPrice            float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
-	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
-	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
-	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
-	Modify                int64     `gorm:"column:modify" json:"modify" form:"modify"`
-	AccountPrice          float64   `gorm:"column:account_price" json:"account_price" form:"account_price"`
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId          int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate    int64   `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime                 int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	Number                string  `gorm:"column:number" json:"number" form:"number"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode               int64   `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg               string  `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo                string  `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg                string  `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime           string  `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid           string  `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus           int64   `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId               string  `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId                string  `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo                 string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName               string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType           string  `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                string  `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                  string  `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                  string  `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                  string  `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                   float64 `gorm:"column:age" json:"age" form:"age"`
+	Insutype              string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType               string  `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag           string  `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime              string  `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType         string  `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType               string  `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt          float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt       float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay        float64 `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt         float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt           float64 `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc            float64 `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay               float64 `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay            float64 `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay       float64 `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay              float64 `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay              float64 `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay              float64 `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                float64 `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                float64 `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt         float64 `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt            float64 `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay               float64 `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay            float64 `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt           float64 `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                  float64 `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay         float64 `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId          string  `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins             string  `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                string  `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType               string  `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail            string  `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	IsMedicineInsurance   int64   `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	PayWay                int64   `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice              float64 `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo             string  `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice         float64 `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice     float64 `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice          float64 `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice            float64 `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice float64 `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice          float64 `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	Creator               int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	AccountPrice          float64 `gorm:"column:account_price" json:"account_price" form:"account_price"`
 
 	SzChargeInfo            string `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
 	SzProjectInfo           string `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`

routers/router.go

@@ -1,16 +1,16 @@
 package routers
 
 import (
+	"Data_Upload_Api/controllers"
 	admin_api "Data_Upload_Api/controllers/admin_api_controllers"
 	"github.com/astaxie/beego"
-	"Data_Upload_Api/controllers"
 	"github.com/astaxie/beego/plugins/cors"
 )
 
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		// AllowAllOrigins:  true,
-		AllowOrigins:     []string{"http://api.szjkhd.com", "http://admin.xt.test.szjkhd.com", "http://admin.xt.szjkhd.com", "http://localhost:9527"},
+		AllowOrigins:     []string{"http://api.szjkhd.com", "http://admin.xt.test.szjkhd.com", "http://127.0.0.1:9555", "http://localhost:9527"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},

service/db.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
-	 _"github.com/jinzhu/gorm/dialects/mssql"
+	_ "github.com/jinzhu/gorm/dialects/mssql"
 	_ "github.com/jinzhu/gorm/dialects/mysql" // mysql
 )
 
@@ -62,28 +62,28 @@ func CloseDB(DB *gorm.DB) {
 }
 
 func ConnectDB() {
-	readHost := beego.AppConfig.String("readmysqlhost")
+	readHost := "kuyicloud2024lt.mysql.rds.aliyuncs.com"
 	readPort := beego.AppConfig.String("readmysqlport")
-	readUser := beego.AppConfig.String("readmysqluser")
-	readPass := beego.AppConfig.String("readmysqlpass")
+	readUser := "syh"
+	readPass := "Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4"
 	readName := beego.AppConfig.String("readmysqlname")
 
-	writeHost := beego.AppConfig.String("writemysqlhost")
+	writeHost := "kuyicloud2024lt.mysql.rds.aliyuncs.com"
 	writePort := beego.AppConfig.String("writemysqlport")
-	writeUser := beego.AppConfig.String("writemysqluser")
-	writePass := beego.AppConfig.String("writemysqlpass")
+	writeUser := "syh"
+	writePass := "Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4"
 	writeName := beego.AppConfig.String("writemysqlname")
 
-	readUserHost := beego.AppConfig.String("readuserhost")
+	readUserHost := "kuyicloud2024lt.mysql.rds.aliyuncs.com"
 	readUserPort := beego.AppConfig.String("readuserport")
-	readUserUser := beego.AppConfig.String("readuseruser")
-	readUserPass := beego.AppConfig.String("readuserpass")
+	readUserUser := "syh"
+	readUserPass := "Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4"
 	readUserName := beego.AppConfig.String("readusername")
 
-	writeUserHost := beego.AppConfig.String("writeuserhost")
+	writeUserHost := "kuyicloud2024lt.mysql.rds.aliyuncs.com"
 	writeUserPort := beego.AppConfig.String("writeuserport")
-	writeUserUser := beego.AppConfig.String("writeuseruser")
-	writeUserPass := beego.AppConfig.String("writeuserpass")
+	writeUserUser := "syh"
+	writeUserPass := "Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4"
 	writeUserName := beego.AppConfig.String("writeusername")
 
 	rdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser, readPass, readHost, readPort, readName)