Browse Source

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

csx 3 years ago
parent
commit
887010c5c2
2 changed files with 186 additions and 46 deletions
  1. 179 39
      controllers/sg/his_api_controller.go
  2. 7 7
      main.go

+ 179 - 39
controllers/sg/his_api_controller.go View File

@@ -4694,7 +4694,15 @@ func (c *HisApiController) GetUploadInfo() {
4694 4694
 
4695 4695
 				} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
4696 4696
 					bytesData, _ := json.Marshal(data)
4697
-					req, _ := http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
4697
+
4698
+					var req *http.Request
4699
+					if miConfig.MdtrtareaAdmvs == "320921" {
4700
+						req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
4701
+
4702
+					} else {
4703
+						req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
4704
+					}
4705
+
4698 4706
 					resp, _ := client.Do(req)
4699 4707
 					defer resp.Body.Close()
4700 4708
 					body, ioErr := ioutil.ReadAll(resp.Body)
@@ -5072,13 +5080,29 @@ func (c *HisApiController) GetUploadInfo() {
5072 5080
 							//}
5073 5081
 							//psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
5074 5082
 
5075
-							api := "http://192.168.3.111:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
5076
-								his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
5077
-								"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
5078
-								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
5079
-								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
5080
-								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
5081
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
5083
+							var api string
5084
+							if miConfig.MdtrtareaAdmvs == "320921" {
5085
+								api = "http://192.168.3.111:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
5086
+									his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
5087
+									"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
5088
+									"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
5089
+									"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
5090
+									"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
5091
+									"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
5092
+
5093
+								//req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
5094
+
5095
+							} else {
5096
+								//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
5097
+								api = "http://192.168.5.251:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
5098
+									his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
5099
+									"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
5100
+									"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
5101
+									"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
5102
+									"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
5103
+									"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
5104
+
5105
+							}
5082 5106
 
5083 5107
 							resp, requestErr := http.Get(api)
5084 5108
 							if requestErr != nil {
@@ -5453,13 +5477,29 @@ func (c *HisApiController) GetUploadInfo() {
5453 5477
 				//	}
5454 5478
 				//}
5455 5479
 
5456
-				api := "http://192.168.3.111:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
5457
-					his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
5458
-					"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
5459
-					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
5460
-					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
5461
-					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
5462
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
5480
+				var api string
5481
+				if miConfig.MdtrtareaAdmvs == "320921" {
5482
+					api = "http://192.168.3.111:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
5483
+						his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
5484
+						"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
5485
+						"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
5486
+						"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
5487
+						"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
5488
+						"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
5489
+
5490
+					//req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
5491
+
5492
+				} else {
5493
+					//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
5494
+					api = "http://192.168.5.251:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
5495
+						his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
5496
+						"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
5497
+						"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
5498
+						"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
5499
+						"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
5500
+						"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
5501
+
5502
+				}
5463 5503
 
5464 5504
 				resp, requestErr := http.Get(api)
5465 5505
 				if requestErr != nil {
@@ -6331,7 +6371,19 @@ func (c *HisApiController) GetPreUploadInfo() {
6331 6371
 		data["cainfo"] = miConfig.Cainfo
6332 6372
 
6333 6373
 		bytesData, _ := json.Marshal(data)
6334
-		req, _ := http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2203", bytes.NewReader(bytesData))
6374
+
6375
+		var req *http.Request
6376
+		if miConfig.MdtrtareaAdmvs == "320921" {
6377
+			req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2203", bytes.NewReader(bytesData))
6378
+
6379
+			//api = "http://192.168.3.111:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.AccessKey + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName +
6380
+			//	"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo
6381
+
6382
+		} else {
6383
+			req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2203", bytes.NewReader(bytesData))
6384
+
6385
+		}
6386
+
6335 6387
 		resp, _ := client.Do(req)
6336 6388
 		defer resp.Body.Close()
6337 6389
 		body, ioErr := ioutil.ReadAll(resp.Body)
@@ -6553,7 +6605,14 @@ func (c *HisApiController) GetPreUploadInfo() {
6553 6605
 
6554 6606
 			} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
6555 6607
 				bytesData, _ := json.Marshal(data)
6556
-				req, _ := http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
6608
+				var req *http.Request
6609
+				if miConfig.MdtrtareaAdmvs == "320921" {
6610
+					req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
6611
+
6612
+				} else {
6613
+					req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
6614
+				}
6615
+
6557 6616
 				resp, _ := client.Do(req)
6558 6617
 				defer resp.Body.Close()
6559 6618
 				body, ioErr := ioutil.ReadAll(resp.Body)
@@ -6879,13 +6938,31 @@ func (c *HisApiController) GetPreUploadInfo() {
6879 6938
 						//	}
6880 6939
 						//}
6881 6940
 
6882
-						api := "http://192.168.3.111:9532/" + "jsyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
6883
-							his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
6884
-							"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
6885
-							"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
6886
-							"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
6887
-							"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
6888
-							"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
6941
+						var api string
6942
+
6943
+						if miConfig.MdtrtareaAdmvs == "320921" {
6944
+							api = "http://192.168.3.111:9532/" + "jsyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
6945
+								his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
6946
+								"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
6947
+								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
6948
+								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
6949
+								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
6950
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
6951
+
6952
+							//req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
6953
+
6954
+						} else {
6955
+							//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
6956
+							api = "http://192.168.5.251:9532/" + "jsyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
6957
+								his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
6958
+								"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
6959
+								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
6960
+								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
6961
+								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
6962
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
6963
+
6964
+						}
6965
+
6889 6966
 						resp, requestErr := http.Get(api)
6890 6967
 						if requestErr != nil {
6891 6968
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -7378,9 +7455,23 @@ func (c *HisApiController) Refund() {
7378 7455
 			}
7379 7456
 
7380 7457
 		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
7381
-			api3 := "http://192.168.3.111:9532/" + "jsyb/2208?psn_no=" + order.PsnNo +
7382
-				"&mdtrt_id=" + order.MdtrtId + "&setl_id=" + order.SetlId + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
7383
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
7458
+
7459
+			var api3 string
7460
+			if miConfig.MdtrtareaAdmvs == "320921" {
7461
+				api3 = "http://192.168.3.111:9532/" + "jsyb/2208?psn_no=" + order.PsnNo +
7462
+					"&mdtrt_id=" + order.MdtrtId + "&setl_id=" + order.SetlId + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
7463
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
7464
+
7465
+				//req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
7466
+
7467
+			} else {
7468
+				//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
7469
+				api3 = "http://192.168.5.251:9532/" + "jsyb/2208?psn_no=" + order.PsnNo +
7470
+					"&mdtrt_id=" + order.MdtrtId + "&setl_id=" + order.SetlId + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
7471
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
7472
+
7473
+			}
7474
+
7384 7475
 			resp3, requestErr3 := http.Get(api3)
7385 7476
 			if requestErr3 != nil {
7386 7477
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -7500,10 +7591,22 @@ func (c *HisApiController) Refund() {
7500 7591
 				}
7501 7592
 
7502 7593
 			} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
7594
+				var api3 string
7595
+				if miConfig.MdtrtareaAdmvs == "320921" {
7596
+					api3 = "http://192.168.3.111:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
7597
+						"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
7598
+						"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
7599
+
7600
+					//req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
7601
+
7602
+				} else {
7603
+					//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
7604
+					api3 = "http://192.168.5.251:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
7605
+						"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
7606
+						"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
7607
+
7608
+				}
7503 7609
 
7504
-				api3 := "http://192.168.3.111:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
7505
-					"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
7506
-					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
7507 7610
 				resp3, requestErr3 := http.Get(api3)
7508 7611
 				if requestErr3 != nil {
7509 7612
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -7682,10 +7785,21 @@ func (c *HisApiController) RefundNumber() {
7682 7785
 			}
7683 7786
 
7684 7787
 		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
7788
+			var api3 string
7789
+			if miConfig.MdtrtareaAdmvs == "320921" {
7790
+				api3 = "http://192.168.3.111:9532/" + "jsyb/2202?psn_no=" + his.PsnNo +
7791
+					"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
7792
+					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
7793
+
7794
+				//req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
7795
+
7796
+			} else {
7797
+				//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
7798
+				api3 = "http://192.168.5.251:9532/" + "jsyb/2202?psn_no=" + his.PsnNo +
7799
+					"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
7800
+					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
7801
+			}
7685 7802
 
7686
-			api3 := "http://192.168.3.111:9532/" + "jsyb/2202?psn_no=" + his.PsnNo +
7687
-				"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
7688
-				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
7689 7803
 			resp3, requestErr3 := http.Get(api3)
7690 7804
 			if requestErr3 != nil {
7691 7805
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -7898,9 +8012,22 @@ func (c *HisApiController) RefundDetail() {
7898 8012
 		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
7899 8013
 			var resSix10265 ResultSix10265
7900 8014
 
7901
-			api3 := "http://192.168.3.111:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
7902
-				"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
7903
-				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
8015
+			var api3 string
8016
+			if miConfig.MdtrtareaAdmvs == "320921" {
8017
+				api3 = "http://192.168.3.111:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
8018
+					"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
8019
+					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
8020
+
8021
+				//req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
8022
+
8023
+			} else {
8024
+				//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
8025
+				api3 = "http://192.168.5.251:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
8026
+					"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
8027
+					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
8028
+
8029
+			}
8030
+
7904 8031
 			resp3, requestErr3 := http.Get(api3)
7905 8032
 			if requestErr3 != nil {
7906 8033
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -8694,9 +8821,22 @@ func (c *HisApiController) GetSettleAccounts() {
8694 8821
 
8695 8822
 		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
8696 8823
 
8697
-			api := "http://192.168.3.111:9532/" + "jsyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
8698
-				"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
8699
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
8824
+			var api string
8825
+			if miConfig.MdtrtareaAdmvs == "320921" {
8826
+				api = "http://192.168.3.111:9532/" + "jsyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
8827
+					"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
8828
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
8829
+
8830
+				//req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
8831
+
8832
+			} else {
8833
+				//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
8834
+				api = "http://192.168.5.251:9532/" + "jsyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
8835
+					"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
8836
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
8837
+
8838
+			}
8839
+
8700 8840
 			resp, requestErr := http.Get(api)
8701 8841
 			if requestErr != nil {
8702 8842
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

+ 7 - 7
main.go View File

@@ -5,7 +5,7 @@ import (
5 5
 	"fmt"
6 6
 	"gdyb/models"
7 7
 	_ "gdyb/routers"
8
-	//"gdyb/service"
8
+	"gdyb/service"
9 9
 	"github.com/astaxie/beego"
10 10
 	"github.com/qiniu/api.v7/auth/qbox"
11 11
 	"github.com/qiniu/api.v7/storage"
@@ -15,13 +15,13 @@ import (
15 15
 )
16 16
 
17 17
 func init() {
18
-	//service.ConnectDB()
19
-	//org_id, _ := beego.AppConfig.Int64("org_id")
20
-	//
21
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
22
-	//CreateLog(miConfig)
23
-	//UploadLog(miConfig)
18
+	service.ConnectDB()
19
+	org_id, _ := beego.AppConfig.Int64("org_id")
24 20
 
21
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
22
+	CreateLog(miConfig)
23
+	UploadLog(miConfig)
24
+	//
25 25
 	//UploadSettleList(org_id)
26 26
 }
27 27
 func main() {