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

controllers/js/jsyb_controller.go

@@ -252,7 +252,7 @@ func (c *JSybController) PostFive() {
 	}
 	fmt.Println("2203A的time_stamp=" + respJSON["time_stamp"].(string))
 	result, request_log := service.Jsyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
-		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["diag_code"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string), respJSON["url"].(string), respJSON["ak"].(string), respJSON["new_doctor_name"].(string), respJSON["time_stamp"].(int64))
+		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["diag_code"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string), respJSON["url"].(string), respJSON["ak"].(string), respJSON["new_doctor_name"].(string), respJSON["time_stamp"].(string))
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/sg/his_api_controller.go

@@ -5264,7 +5264,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 	var res2 ResultSix
 	var resSix10265 ResultSix10265
-	var time_stamp int64
+	var time_stamp string
 	if miConfig.InsuplcAdmdvs == "421300" {
 		data := make(map[string]interface{})
 		client := &http.Client{}
@@ -5354,14 +5354,10 @@ func (c *HisApiController) GetPreUploadInfo() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-		fmt.Println("-------")
-		fmt.Println(respJSON["data"])
-		fmt.Println(respJSON["data"].(map[string]interface{})["time_stamp"])
-		//fmt.Println(respJSON["data"].(map[string]interface{})["time_stamp"].(float64))
-		fmt.Println("-------")
 
 		//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)
 		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 		userJSONBytes, _ := json.Marshal(respJSON)
 		fmt.Println("log")

service/jsyb_service.go

@@ -303,7 +303,7 @@ func Jsyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 }
 
 //  门诊费用明细信息上传
-func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string, diag_code string, request_url string, access_key string, new_doctor_name string, time_stamp_2203 int64) (string, string) {
+func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string, diag_code string, request_url string, access_key string, new_doctor_name string, time_stamp_2203 string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
@@ -482,7 +482,8 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		return "", ""
 	}
 	request_url = request_url + "2204"
-	return HttpRequest(request_url, access_key, secret_key, time_stamp_2203, string(bytesData)), requestLog
+	time_stamp, _ := strconv.ParseInt(time_stamp_2203, 10, 64)
+	return HttpRequest(request_url, access_key, secret_key, time_stamp, string(bytesData)), requestLog
 }
 
 //  门诊费用明细信息撤销