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

controllers/sg/his_api_controller.go

@@ -5064,6 +5064,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 						} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+
 							psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 
 							//psn_info, _ := service.GetPsnByPatientId(id)
@@ -5071,6 +5072,9 @@ func (c *HisApiController) GetUploadInfo() {
 
 							if his.IdCardType == 1 {
 								cert_no = bas[2]
+							} else if his.IdCardType == 3 {
+								cert_no = his.Certno
+								psn_info.VerifyNumber = his.Certno + "|" + psn_info.VerifyNumber
 							} else {
 								cert_no = bas[1]
 							}

service/jsyb_service.go

@@ -736,25 +736,21 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputMessage["infno"] = "2207" // 交易编码
 	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
 
-	inputData["mdtrt_cert_type"] = "04"                                                                                                                                                                        // 就诊凭证类型
-	inputData["mdtrt_cert_no"] = "320822197705194836|Y9gJ7nijh+DzGkn2W8El9YxSR0x1/zb2+tcA4a5fsVC4RLNACwi93U4Q9xEJVKKnN6LCbomuiCuxDOI+Skz/wsjlScPKIzyXxBcKl9ZrZjCrr+cRTRRKRdz6JqhoexGR/Cxnipr62JOW2fmrI1X2XA==" // 就诊凭证编号
-
-	//if certificates == 3 {
-	//	inputData["mdtrt_cert_type"] = "99"                       // 就诊凭证类型
-	//	inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
-	//} else
-	//{
-	//	if id_card_type == 1 {
-	//		inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
-	//		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
-	//	} else if id_card_type == 4 {
-	//		inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
-	//		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
-	//	} else {
-	//		inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
-	//		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
-	//	}
-	//}
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99"                       // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+	} else {
+		if id_card_type == 1 {
+			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"] = verify_number // 就诊凭证编号
+		} else {
+			inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+		}
+	}
 	if med_type == "1111" || med_type == "1112" {
 		med_type = "11"
 	}