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

controllers/sg/his_api_controller.go

@@ -4107,9 +4107,12 @@ func (c *HisApiController) GetRegisterInfo() {
 			} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 				psn_info, _ := service.GetPsnByPatientId(id)
 				bas := strings.Split(psn_info.CardInfo, "|")
-
 				psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 
+				if id_card_type == 3 {
+					psn_info.VerifyNumber = IdCardNo + "|" + psn_info.VerifyNumber
+				}
+
 				var api string
 				if miConfig.MdtrtareaAdmvs == "320921" {
 

service/jsyb_service.go

@@ -251,8 +251,8 @@ func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 		inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 	} else if id_card_type == 3 {
-		inputData["mdtrt_cert_type"] = "04"                                     // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = "320822197705194836" + "｜" + verify_number // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 	} else {
 		inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号