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

service/gdyb_service.go

@@ -212,7 +212,6 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	url := gdyb_url + "1101"
 
 	if insuplc_admdvs == "421300" {
-		bytesData, err := json.Marshal(inputMessage)
 		var json2 string
 		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
 		out, err := cmd.Output()
@@ -291,8 +290,6 @@ func Gdyb1101A(certNo string, org_name string, doctor string, fixmedins_code str
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 
 	if insuplc_admdvs == "421300" {
-		inputMessage["infver"] = "V2.0"
-		bytesData, err := json.Marshal(inputMessage)
 		var json2 string
 		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101A", string(bytesData), json2)
 		out, err := cmd.Output()
@@ -386,8 +383,6 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	url := gdyb_url + "2201"
 
 	if insuplc_admdvs == "421300" {
-		inputMessage["infver"] = "V2.0"
-		bytesData, err := json.Marshal(inputMessage)
 		var json2 string
 		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2201", string(bytesData), json2)
 		out, err := cmd.Output()
@@ -468,8 +463,6 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2202"
 	if insuplc_admdvs == "421300" {
-		inputMessage["infver"] = "V2.0"
-		bytesData, err := json.Marshal(inputMessage)
 		var json2 string
 		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2202", string(bytesData), json2)
 		out, err := cmd.Output()
@@ -573,8 +566,6 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	url := gdyb_url + "2203"
 
 	if insuplc_admdvs == "421300" {
-		inputMessage["infver"] = "V2.0"
-		bytesData, err := json.Marshal(inputMessage)
 		var json2 string
 		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2203", string(bytesData), json2)
 		out, err := cmd.Output()
@@ -683,8 +674,6 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 	url := gdyb_url + "2203A"
 
 	if insuplc_admdvs == "421300" {
-		inputMessage["infver"] = "V2.0"
-		bytesData, err := json.Marshal(inputMessage)
 		var json2 string
 		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2203A", string(bytesData), json2)
 		out, err := cmd.Output()
@@ -958,8 +947,6 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2204"
 
 	if insuplc_admdvs == "421300" {
-		inputMessage["infver"] = "V2.0"
-		bytesData, err := json.Marshal(inputMessage)
 		var json2 string
 		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2204", string(bytesData), json2)
 		out, err := cmd.Output()
@@ -1045,8 +1032,6 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2205"
 
 	if insuplc_admdvs == "421300" {
-		inputMessage["infver"] = "V2.0"
-		bytesData, err := json.Marshal(inputMessage)
 		var json2 string
 		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2205", string(bytesData), json2)
 		out, err := cmd.Output()
@@ -1154,8 +1139,6 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2206"
 
 	if insuplc_admdvs == "421300" {
-		inputMessage["infver"] = "V2.0"
-		bytesData, err := json.Marshal(inputMessage)
 		var json2 string
 		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2206", string(bytesData), json2)
 		out, err := cmd.Output()
@@ -1259,8 +1242,6 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
 
 	if insuplc_admdvs == "421300" {
-		inputMessage["infver"] = "V2.0"
-		bytesData, err := json.Marshal(inputMessage)
 		var json2 string
 		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2207", string(bytesData), json2)
 		out, err := cmd.Output()
@@ -1347,8 +1328,6 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2208"
 
 	if insuplc_admdvs == "421300" {
-		inputMessage["infver"] = "V2.0"
-		bytesData, err := json.Marshal(inputMessage)
 		var json2 string
 		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2208", string(bytesData), json2)
 		out, err := cmd.Output()