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

service/fj_service.go

@@ -89,7 +89,7 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	fmt.Println(output)
 	fmt.Println("错误信息：")
 	fmt.Println(err_msg)
-	return ConvertToString(output, "gbk", "utf-8"), inputLog
+	return output, inputLog
 }
 
 // 门诊挂号