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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 
 #
@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10188
+org_id = 10217
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -170,7 +170,7 @@ sso_domain = https://testsso.sgjyun.com
 call_domain = http://hf.szjkhd.com
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
-org_id = 4
+org_id = 10217
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 # gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/"
 #gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"

controllers/sg/his_api_controller.go

@@ -332,7 +332,13 @@ func (c *HisApiController) Check3101() {
 	client := &http.Client{}
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
-	req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/3101", bytes.NewReader(bytesData))
+
+	if miConfig.MdtrtareaAdmvs == "320921" {
+		req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/3101", bytes.NewReader(bytesData))
+	} else {
+		req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3101", bytes.NewReader(bytesData))
+	}
+
 	resp, _ := client.Do(req)
 	defer resp.Body.Close()
 	body, ioErr := ioutil.ReadAll(resp.Body)
@@ -694,7 +700,12 @@ func (c *HisApiController) Check3102() {
 	client := &http.Client{}
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
-	req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/3102", bytes.NewReader(bytesData))
+	if miConfig.MdtrtareaAdmvs == "320921" {
+		req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/3102", bytes.NewReader(bytesData))
+	} else {
+		req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3102", bytes.NewReader(bytesData))
+	}
+
 	resp, _ := client.Do(req)
 	defer resp.Body.Close()
 	body, ioErr := ioutil.ReadAll(resp.Body)