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

service/fj_service.go

@@ -179,7 +179,8 @@ func FJyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 		return err.Error(), ""
 	}
 
-	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	fmt.Println("输出信息:")
 	fmt.Println(output)
 	fmt.Println("错误信息：")
@@ -251,12 +252,13 @@ func FJyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		return err.Error(), ""
 	}
 
-	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	fmt.Println("输出信息:")
 	fmt.Println(output)
 	fmt.Println("错误信息：")
 	fmt.Println(err_msg)
-	return ConvertToString(output, "gbk", "utf-8"), requestLog
+	return output, requestLog
 }
 
 //  门诊费用明细信息上传
@@ -427,15 +429,13 @@ func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		return "", ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2204", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
-
-	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
+	fmt.Println("输出信息:")
+	fmt.Println(output)
+	fmt.Println("错误信息：")
+	fmt.Println(err_msg)
+	return output, requestLog
 
 }
 
@@ -468,12 +468,13 @@ func FJyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 		return err.Error(), ""
 	}
 
-	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	fmt.Println("输出信息:")
 	fmt.Println(output)
 	fmt.Println("错误信息：")
 	fmt.Println(err_msg)
-	return ConvertToString(output, "gbk", "utf-8"), requestLog
+	return output, requestLog
 }
 
 //  门诊预结算
@@ -541,12 +542,13 @@ func FJyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error(), ""
 	}
 
-	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	fmt.Println("输出信息:")
 	fmt.Println(output)
 	fmt.Println("错误信息：")
 	fmt.Println(err_msg)
-	return ConvertToString(output, "gbk", "utf-8"), requestLog
+	return output, requestLog
 }
 
 //  门诊结算
@@ -610,13 +612,16 @@ func FJyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error(), ""
 	}
 
-	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	var requestLog string
+	requestLog = string(bytesData)
+
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	fmt.Println("输出信息:")
 	fmt.Println(output)
 	fmt.Println("错误信息：")
 	fmt.Println(err_msg)
-	return ConvertToString(output, "gbk", "utf-8"), string(bytesData)
-
+	return output, requestLog
 }
 
 //  门诊结算撤销
@@ -647,13 +652,13 @@ func FJyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 		return err.Error(), ""
 	}
 
-	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	fmt.Println("输出信息:")
 	fmt.Println(output)
 	fmt.Println("错误信息：")
 	fmt.Println(err_msg)
-	return ConvertToString(output, "gbk", "utf-8"), string(bytesData)
-
+	return output, requestLog
 }
 
 func FJyb5203(baseParams models.BaseParams, businessParams models.BusinessParams, url string, app_id string, app_secret string, sign_key string, enc_key string) string {
@@ -681,12 +686,13 @@ func FJyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error()
 	}
 
-	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	fmt.Println("输出信息:")
 	fmt.Println(output)
 	fmt.Println("错误信息：")
 	fmt.Println(err_msg)
-	return ConvertToString(output, "gbk", "utf-8")
+	return output
 }
 
 //确认订单