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

conf/app.conf

@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,8 +53,8 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-gdyb_paasid = "sg03_prd"
-#gdyb_paasid = "jm_sc_yjyy"
+#gdyb_paasid = "sg03_prd"
+gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid = "zh_prd_yjyy"
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com

controllers/sg/his_api_controller.go

@@ -1699,7 +1699,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				insutype = "310"
 			}
 
-			insutype = "390"
+			//insutype = "390"
 
 			//if count == 1 {
 			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
@@ -2387,7 +2387,7 @@ func (c *HisApiController) GetUploadInfo() {
 				insutype = "310"
 			}
 
-			insutype = "390"
+			//insutype = "390"
 			if his.IdCardType == 1 {
 				cert_no = his.MedicalInsuranceNumber
 

service/gdyb_service.go

@@ -2446,12 +2446,12 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	inputMessage["msgid"] = fixmedins_code + timeFormat + strconv.FormatInt(int64(randNum), 10) // 发送方报文 ID
 	inputMessage["mdtrtarea_admvs"] = mdtrtarea_admvs                                           // 就医地医保区划
 	inputMessage["insuplc_admdvs"] = insuplc_admdvs                                             // 参保地医保区划
-	inputMessage["recer_sys_code"] = "01"                                                       // 接收方系统代码
+	inputMessage["recer_sys_code"] = "1"                                                        // 接收方系统代码
 	inputMessage["dev_no"] = ""                                                                 // 设备编号
 	inputMessage["dev_safe_info"] = ""                                                          // 设备安全信息
 	inputMessage["cainfo"] = ""                                                                 // 数字签名信息
 	inputMessage["signtype"] = ""                                                               // 签名类型
-	inputMessage["infver"] = "V1.1"                                                             // 接收方系统代码
+	inputMessage["infver"] = "V2.0"                                                             // 接收方系统代码
 	inputMessage["opter_type"] = "1"                                                            // 经办人类别
 	inputMessage["opter"] = doctor                                                              // 经办人
 	inputMessage["opter_name"] = doctor                                                         // 经办人姓名