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

controllers/sg/his_api_controller.go

@@ -5370,7 +5370,12 @@ func (c *HisApiController) GetRegisterInfo() {
 
 				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 			} else if miConfig.MdtrtareaAdmvs == "350500" {
-				result, requestLog := service.FJyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, doctor_info.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, roles.UserName, doctor_info.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+				psn_info, _ := service.GetPsnByPatientId(id)
+				var cert_no string
+				if id_card_type == 1 {
+					cert_no = strings.Split(psn_info.CardInfo, "|")[0]
+				}
+				result, requestLog := service.FJyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, doctor_info.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, roles.UserName, doctor_info.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, cert_no)
 				saveLog(result, requestLog, "2201", "挂号")
 				if miConfig.Code == "H15049901371" {
 

service/fj_service.go

@@ -93,7 +93,7 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 }
 
 // 门诊挂号
-func FJyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, opter string, doctor_name string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string) {
+func FJyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, opter string, doctor_name string, url string, app_id string, app_secret string, sign_key string, enc_key string, card_number string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -117,8 +117,8 @@ func FJyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 		inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	} else {
-		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "03"      // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = card_number // 就诊凭证编号
 	}
 
 	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号