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

controllers/js/jsyb_controller.go

@@ -80,6 +80,8 @@ func (c *JSybController) PostTwo() {
 	doctor := c.GetString("doctor")
 	ipt_otp_no := c.GetString("ipt_otp_no")
 	dept := c.GetString("dept")
+	verify_number := c.GetString("verify_number")
+
 	fixmedins_code := c.GetString("fixmedins_code")
 
 	dept_code := c.GetString("dept_code")
@@ -95,7 +97,7 @@ func (c *JSybController) PostTwo() {
 	ak := c.GetString("ak")
 	doctor_name := c.GetString("doctor_name")
 
-	result, request_log := service.Jsyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, doctor_name, url, ak)
+	result, request_log := service.Jsyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, doctor_name, url, ak, verify_number)
 	fmt.Println(result)
 	fmt.Println(request_log)
 	var dat map[string]interface{}
@@ -529,6 +531,7 @@ func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak s
 	inputData["API_NAME"] = "hssServives"
 	inputData["API_VERSION"] = "1.0.0"
 	inputData["ACCESS_KEY"] = ak
+
 	inputData["SECRETKEY"] = secret_key
 	inputData["ORG_ID"] = code
 	inputData["EXT"] = ""

controllers/sg/his_api_controller.go

@@ -3007,6 +3007,8 @@ func (c *HisApiController) GetRegisterInfo() {
 		var infoStr string
 		var idetinfoStr string
 		var infocode int64
+		var verify_number string
+
 		if miConfig.MdtrtareaAdmvs == "421300" {
 			psn_info, _ := service.GetPsnByPatientId(id)
 			PsnNo = psn_info.PsnNo
@@ -3034,6 +3036,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			infoStr = psn_info.Insuinfo
 			idetinfoStr = psn_info.Idetinfo
 			infocode = 0
+			verify_number = psn_info.VerifyNumber
 
 		} else {
 			result, requestLog := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
@@ -3223,7 +3226,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			} else if miConfig.MdtrtareaAdmvs == "320921" {
 				api := "http://192.168.3.111:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + Certno + "&ipt_otp_no=" + ipt_otp_no +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number" + verify_number
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

service/jsyb_service.go

@@ -106,7 +106,7 @@ func Jsyb1101A(certNo string, org_name string, doctor string, fixmedins_code str
 }
 
 // 门诊挂号
-func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, opera 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, doctor_name string, request_url string, access_key string) (string, string) {
+func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, opera 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, doctor_name string, request_url string, access_key string, verify_number string) (string, string) {
 	fmt.Println(opera)
 
 	// 生成签名
@@ -124,11 +124,11 @@ func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	inputData["begntime"] = timeFormatOne // 开始时间
 
 	if id_card_type == 1 {
-		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 	} else {
-		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 	}
 
 	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号