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

service/hbyb_service.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"bytes"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"gdyb/models"
@@ -68,7 +67,7 @@ func Hbyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		fmt.Println("error:", err.Error())
 	}
 	fmt.Println(string(out))
-	return hex.EncodeToString(out), inputLog
+	return string(out), inputLog
 
 }
 
@@ -125,7 +124,7 @@ func Hbyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	}
 	fmt.Println(string(out))
 
-	return hex.EncodeToString(out), requestLog
+	return string(out), requestLog
 
 }
 
@@ -165,7 +164,7 @@ func Hbyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	}
 	fmt.Println(string(out))
 
-	return hex.EncodeToString(out), requestLog
+	return string(out), requestLog
 
 }
 
@@ -229,7 +228,7 @@ func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	}
 	fmt.Println(string(out))
 
-	return hex.EncodeToString(out), requestLog
+	return string(out), requestLog
 
 }
 
@@ -398,7 +397,7 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	}
 	fmt.Println(string(out))
 
-	return hex.EncodeToString(out), requestLog
+	return string(out), requestLog
 
 }
 
@@ -438,7 +437,7 @@ func Hbyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	}
 	fmt.Println(string(out))
 
-	return hex.EncodeToString(out), requestLog
+	return string(out), requestLog
 
 }
 
@@ -508,7 +507,7 @@ func Hbyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	}
 	fmt.Println(string(out))
 
-	return hex.EncodeToString(out), requestLog
+	return string(out), requestLog
 
 }
 
@@ -578,7 +577,7 @@ func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	str2 := string(mjson)
 	fmt.Println(string(out))
 
-	return hex.EncodeToString(out), str2
+	return string(out), str2
 
 }
 
@@ -618,7 +617,7 @@ func Hbyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	str2 := string(mjson)
 	fmt.Println(string(out))
 
-	return hex.EncodeToString(out), str2
+	return string(out), str2
 
 }
 
@@ -654,7 +653,7 @@ func Hbyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	//str2 := string(mjson)
 	fmt.Println(string(out))
 
-	return hex.EncodeToString(out)
+	return string(out)
 }
 
 //确认订单