Merge branch '20200710_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20200710_xt_api_new_branch

controllers/dialysis_api_controller.go

 	venous_catheterization_part_other := c.GetString("venous_catheterization_part_other")
 	venous_catheterization_part, _ := c.GetInt64("venous_catheterization_part", 0)
 	venous_catheterization, _ := c.GetInt64("venous_catheterization", 0)
-	puncture_way, _ := c.GetInt64("puncture_way", 0)
+	//puncture_way, _ := c.GetInt64("puncture_way", 0)
+	puncture_way := c.GetString("puncture_way")
 	blood_access_noise, _ := c.GetInt64("blood_access_noise", 0)
 	internal_fistula_other := c.GetString("internal_fistula_other")
 	blood_access_internal_fistula := c.GetString("blood_access_internal_fistula")
 
 	is_infect, _ := c.GetInt64("is_infect", 0)
 	exposed, _ := c.GetFloat("exposed", 0)
-	skin, _ := c.GetInt64("skin", 0)
+	//skin, _ := c.GetInt64("skin", 0)
+	skin := c.GetString("skin")
 	skin_other := c.GetString("skin_other")
 	infect_other := c.GetString("infect_other")
 	ductus_arantii_other := c.GetString("ductus_arantii_other")

controllers/mobile_api_controllers/login_api_controller.go

 		return
 	}
 	ip := utils.GetIP(this.Ctx.Request)
-
-	//ssoDomain := beego.AppConfig.String("sso_domain")
-	ssoDomain := "http://localhost:8091"
+	ssoDomain := beego.AppConfig.String("sso_domain")
+	//ssoDomain := "http://localhost:8091"
 	api := ssoDomain + "/m/login/pwd"
 	values := make(url.Values)
 	values.Set("mobile", mobile)

controllers/mobile_api_controllers/patient_api_controller.go

 		return
 	}
 
-	fmt.Println(theTime)
-	fmt.Println(theTime.Unix())
-	fmt.Println(advice.StartTime)
-
 	if advice.StartTime > theTime.Unix() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
 		return
 	}
 
 	code := predialysisEvaluationFormData(&evaluation, c.Ctx.Input.RequestBody)
-
 	if code > 0 {
 		c.ServeFailJSONWithSGJErrorCode(code)
 		return
 		evaluation.BloodAccessNoise = blood_access_noise
 	}
 
-	if dataBody["puncture_way"] != nil && reflect.TypeOf(dataBody["puncture_way"]).String() == "float64" {
-		puncture_way := int64(dataBody["puncture_way"].(float64))
+	if dataBody["puncture_way"] != nil && reflect.TypeOf(dataBody["puncture_way"]).String() == "string" {
+		//puncture_way := int64(dataBody["puncture_way"].(float64))
+		puncture_way := dataBody["puncture_way"].(string)
 		evaluation.PunctureWay = puncture_way
 	}
 
 
 	if dataBody["skin"] != nil && reflect.TypeOf(dataBody["skin"]).String() == "string" {
 		skin, _ := dataBody["skin"].(string)
-		skins, _ := strconv.ParseInt(skin, 10, 64)
-		evaluation.Skin = skins
+		//skins, _ := strconv.ParseInt(skin, 10, 64)
+		evaluation.Skin = skin
 	}
 
 	if dataBody["skin_other"] != nil && reflect.TypeOf(dataBody["skin_other"]).String() == "string" {
 			return
 		}
 		startTime, _ := dataBody["start_time"].(string)
-		fmt.Println(startTime)
 		if len(startTime) == 0 {
 			utils.ErrorLog("len(start_time) == 0")
 			code = enums.ErrorCodeParamWrong

controllers/new_mobile_api_controllers/common_api_controller.go

 
 func (this *CommonApiController) UpdateConfiguration() {
 	id, _ := this.GetInt64("id")
-	//fmt.Println("id", id)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	//fmt.Println("err", err)
 	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
-	//fmt.Println("大项", inspectionmajor)
 	inspectionMinor := int64(dataBody["inspectionMinor"].(float64))
-	//fmt.Println("小项", inspectionMinor)
 	minrange := dataBody["min_range"].(string)
-	//fmt.Println("minragne", minrange)
 	largerange := dataBody["large_range"].(string)
-	//fmt.Println("largerange", largerange)
 	sort := int64(dataBody["sort"].(float64))
-	//fmt.Println("排序", sort)
 	rangvalue := dataBody["range_value"].(string)
-	//fmt.Println("范围", rangvalue)
 	if rangvalue == "0" {
 		rangvalue = ""
 	}

models/dialysis.go

 	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"`

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

 	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"`
 	BloodPressureType         int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
 	BloodFlowVolume           float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
 	VenousPressure            float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
-	VenousPressureType        int64  `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
+	VenousPressureType        int64   `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
 	ArterialPressure          float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
-	ArterialPressureType      int64 `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
+	ArterialPressureType      int64   `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
 	TransmembranePressure     float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
-	TransmembranePressureType int64  `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
+	TransmembranePressureType int64   `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
 	UltrafiltrationRate       float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
 	UltrafiltrationVolume     float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
 	SodiumConcentration       float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`