test_user 2 years ago
parent
commit
051e26a0d4
3 changed files with 15 additions and 11 deletions
  1. 5 5
      conf/app.conf
  2. 4 0
      controllers/sg/his_api_controller.go
  3. 6 6
      service/fj_service.go

+ 5 - 5
conf/app.conf View File

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
45 45
 
46 46
 
47 47
 [prod]
48
-org_id = 10191
48
+org_id = 10215
49 49
 
50 50
 mobile_token_expiration_second = 86400
51 51
 httpdomain = https://api.xt.kuyicloud.com
@@ -54,10 +54,10 @@ call_domain = https://hf.sgjyun.com
54 54
 front_end_domain = "https://xt.kuyicloud.com/#"
55 55
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
56 56
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
57
-#gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
57
+gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
58 58
 #test
59 59
 # gdyb_url = http://10.97.240.206/ebus/gdyb_inf/poc/hsa/hgs/
60
-gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
60
+#gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
61 61
 #gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
62 62
 #内蒙古
63 63
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
@@ -71,9 +71,9 @@ gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
71 71
 #珠海
72 72
 # gdyb_paasid="zh_prd_yrojyy"
73 73
 #深圳
74
-gdyb_paasid = "sz_prd_yjyy"
74
+#gdyb_paasid = "sz_prd_yjyy"
75 75
 #肇庆
76
-#gdyb_paasid = "zq_prd_yjyy"
76
+gdyb_paasid = "zq_prd_yjyy"
77 77
 # gdyb_paasid = "sztest_hosp"
78 78
 #广州
79 79
 #gdyb_paasid = "gdyb_inf"

+ 4 - 0
controllers/sg/his_api_controller.go View File

@@ -9828,6 +9828,7 @@ func (c *HisApiController) GetCheckAccount() {
9828 9828
 			baseParams.AppSecret = miConfig.AppSecret
9829 9829
 			baseParams.SignKey = miConfig.SignKey
9830 9830
 			baseParams.AppID = miConfig.Code
9831
+			baseParams.Doctor = role.UserName
9831 9832
 			baseParams.RequestUrl = miConfig.Url
9832 9833
 
9833 9834
 			businessParams := models.BusinessParams{
@@ -9846,6 +9847,9 @@ func (c *HisApiController) GetCheckAccount() {
9846 9847
 			fmt.Println(result)
9847 9848
 
9848 9849
 		} else {
9850
+			if len(clr_type) == 0 {
9851
+				clr_type = "11"
9852
+			}
9849 9853
 			api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
9850 9854
 				"insutype=" + insutype +
9851 9855
 				"&clr_type=" + clr_type +

+ 6 - 6
service/fj_service.go View File

@@ -764,12 +764,12 @@ func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
764 764
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
765 765
 	input := make(map[string]interface{})
766 766
 	inputData := make(map[string]interface{})
767
-	inputMessage["infno"] = "3201"                 // 交易编码
768
-	inputData["url"] = baseParams.RequestUrl       // 险种
769
-	inputData["app_id"] = baseParams.AppID         // 险种
770
-	inputData["app_secret"] = baseParams.AppSecret // 险种
771
-	inputData["sign_key"] = baseParams.SignKey     // 险种
772
-	inputData["enc_key"] = baseParams.EncKey       // 险种
767
+	inputMessage["infno"] = "3201"                    // 交易编码
768
+	inputMessage["url"] = baseParams.RequestUrl       // 险种
769
+	inputMessage["app_id"] = baseParams.AppID         // 险种
770
+	inputMessage["app_secret"] = baseParams.AppSecret // 险种
771
+	inputMessage["sign_key"] = baseParams.SignKey     // 险种
772
+	inputMessage["enc_key"] = baseParams.EncKey       // 险种
773 773
 
774 774
 	inputData["insutype"] = businessParams.Insutype                   // 险种
775 775
 	inputData["clr_type"] = businessParams.ClrType                    // 就诊 ID(来自2201接口返回)