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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10215
+org_id = 10088
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -227,7 +227,7 @@ func (c *HisApiController) ReadCard() {
 	case 1:
 		if miConfig.MdtrtareaAdmvs == "421300" {
 			var res ResultTwo
-			api := "http://192.168.3.5:9532/" + "hbyb/1101?cert_no=" + "" +
+			api := "http://192.168.124.4:9532/" + "hbyb/1101?cert_no=" + "" +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10)
 			resp, requestErr := http.Get(api)
@@ -1818,7 +1818,7 @@ func (c *HisApiController) GetRegisterInfo() {
 	if config.IsOpen == 1 {
 		var res ResultTwo
 		if miConfig.MdtrtareaAdmvs == "421300" {
-			api := "http://192.168.3.5:9532/" + "hbyb/1101?cert_no=" + id_card +
+			api := "http://192.168.124.4:9532/" + "hbyb/1101?cert_no=" + id_card +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10)
 			resp, requestErr := http.Get(api)
@@ -1958,7 +1958,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			//insutype = "390"
 			var resThree ResultThree
 			if miConfig.MdtrtareaAdmvs == "421300" {
-				api := "http://192.168.3.5:9532/" + "hbyb/2201?psn_no=" + res.Output.Baseinfo.PsnNo + "&insutype=" + insutype + "&cert_no=" + res.Output.Baseinfo.Certno + "&ipt_otp_no=" + ipt_otp_no +
+				api := "http://192.168.124.4:9532/" + "hbyb/2201?psn_no=" + res.Output.Baseinfo.PsnNo + "&insutype=" + insutype + "&cert_no=" + res.Output.Baseinfo.Certno + "&ipt_otp_no=" + ipt_otp_no +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
 					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id
 				resp, requestErr := http.Get(api)
@@ -2189,7 +2189,7 @@ func (c *HisApiController) GetUploadInfo() {
 			data["dept"] = department.ID
 			data["config"] = config
 			bytesData, _ := json.Marshal(data)
-			req, _ := http.NewRequest("POST", "http://192.168.3.5:9532/"+"hbyb/2203", bytes.NewReader(bytesData))
+			req, _ := http.NewRequest("POST", "http://192.168.124.4:9532/"+"hbyb/2203", bytes.NewReader(bytesData))
 			resp, _ := client.Do(req)
 			defer resp.Body.Close()
 			body, ioErr := ioutil.ReadAll(resp.Body)
@@ -2341,7 +2341,7 @@ func (c *HisApiController) GetUploadInfo() {
 				if miConfig.MdtrtareaAdmvs == "421300" {
 
 					bytesData, _ := json.Marshal(data)
-					req, _ := http.NewRequest("POST", "http://192.168.3.5:9532/"+"hbyb/2204", bytes.NewReader(bytesData))
+					req, _ := http.NewRequest("POST", "http://192.168.124.4:9532/"+"hbyb/2204", bytes.NewReader(bytesData))
 					resp, _ := client.Do(req)
 					defer resp.Body.Close()
 					body, ioErr := ioutil.ReadAll(resp.Body)
@@ -2801,7 +2801,7 @@ func (c *HisApiController) GetUploadInfo() {
 			var result2 string
 
 			if miConfig.MdtrtareaAdmvs == "421300" {
-				api := "http://192.168.3.5:9532/" + "hbyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
+				api := "http://192.168.124.4:9532/" + "hbyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 					his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
 					"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
 					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
@@ -3554,7 +3554,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["config"] = config
 
 		bytesData, _ := json.Marshal(data)
-		req, _ := http.NewRequest("POST", "http://192.168.3.5:9532/"+"hbyb/2203", bytes.NewReader(bytesData))
+		req, _ := http.NewRequest("POST", "http://192.168.124.4:9532/"+"hbyb/2203", bytes.NewReader(bytesData))
 		resp, _ := client.Do(req)
 		defer resp.Body.Close()
 		body, ioErr := ioutil.ReadAll(resp.Body)
@@ -3694,7 +3694,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 			var res ResultFour
 			if miConfig.MdtrtareaAdmvs == "421300" {
 				bytesData, _ := json.Marshal(data)
-				req, _ := http.NewRequest("POST", "http://192.168.3.5:9532/"+"hbyb/2204", bytes.NewReader(bytesData))
+				req, _ := http.NewRequest("POST", "http://192.168.124.4:9532/"+"hbyb/2204", bytes.NewReader(bytesData))
 				resp, _ := client.Do(req)
 				defer resp.Body.Close()
 				body, ioErr := ioutil.ReadAll(resp.Body)
@@ -3904,7 +3904,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 					if miConfig.MdtrtareaAdmvs == "421300" {
 
-						api := "http://192.168.3.5:9532/" + "hbyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
+						api := "http://192.168.124.4:9532/" + "hbyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 							his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
 							"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
 							"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
@@ -4315,7 +4315,7 @@ func (c *HisApiController) Refund() {
 		var result string
 
 		if miConfig.MdtrtareaAdmvs == "421300" {
-			api3 := "http://192.168.3.5:9532/" + "hbyb/2208?psn_no=" + order.PsnNo +
+			api3 := "http://192.168.124.4:9532/" + "hbyb/2208?psn_no=" + order.PsnNo +
 				"&mdtrt_id=" + order.Number + "&setl_id=" + order.SetlId + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp3, requestErr3 := http.Get(api3)
@@ -4368,7 +4368,7 @@ func (c *HisApiController) Refund() {
 
 			if miConfig.MdtrtareaAdmvs == "421300" {
 
-				api3 := "http://192.168.3.5:9532/" + "hbyb/2205?psn_no=" + order.PsnNo +
+				api3 := "http://192.168.124.4:9532/" + "hbyb/2205?psn_no=" + order.PsnNo +
 					"&mdtrt_id=" + order.Number + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 				resp3, requestErr3 := http.Get(api3)
@@ -4482,7 +4482,7 @@ func (c *HisApiController) RefundNumber() {
 		var res2 ResultSix
 		if miConfig.MdtrtareaAdmvs == "421300" {
 
-			api3 := "http://192.168.3.5:9532/" + "hbyb/2202?psn_no=" + his.PsnNo +
+			api3 := "http://192.168.124.4:9532/" + "hbyb/2202?psn_no=" + his.PsnNo +
 				"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp3, requestErr3 := http.Get(api3)
@@ -5253,7 +5253,7 @@ func (c *HisApiController) GetSettleAccounts() {
 	if config.IsOpen == 1 {
 		if miConfig.MdtrtareaAdmvs == "421300" {
 
-			api := "http://192.168.3.5:9532/" + "hbyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
+			api := "http://192.168.124.4:9532/" + "hbyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp, requestErr := http.Get(api)