Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -5355,9 +5355,10 @@ func (c *HisApiController) GetPreUploadInfo() {
 			return
 		}
 
-		//time_stamp = int64(respJSON["data"].(map[string]interface{})["time_stamp"].(float64))
-		fmt.Println(respJSON["data"].(map[string]interface{})["time_stamp"].(string))
-		time_stamp = respJSON["data"].(map[string]interface{})["time_stamp"].(string)
+		time_stamp = strconv.FormatInt(int64(respJSON["data"].(map[string]interface{})["time_stamp"].(float64)), 10)
+
+		//fmt.Println(respJSON["data"].(map[string]interface{})["time_stamp"].(string))
+		//time_stamp = respJSON["data"].(map[string]interface{})["time_stamp"].(string)
 		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 		userJSONBytes, _ := json.Marshal(respJSON)
 		fmt.Println("log")