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

controllers/sg/his_api_controller.go

 
 				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 			} else if miConfig.MdtrtareaAdmvs == "350500" {
+
 				psn_info, _ := service.GetPsnByPatientId(id)
 				var cert_no string
 				if id_card_type == 1 {
 					cert_no = strings.Split(psn_info.CardInfo, "|")[0]
+				} else {
+					cert_no = strings.Split(psn_info.CardInfo, "|")[1]
+
 				}
 				fmt.Println(cert_no)
 				result, requestLog, _ := service.FJyb2201(psn_info.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)

service/fj_service.go

 		inputData["mdtrt_cert_type"] = "01"      // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = card_number // 就诊凭证编号
 	} else {
-		inputData["mdtrt_cert_type"] = "03"      // 就诊凭证类型
+		inputData["mdtrt_cert_type"] = "02"      // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = card_number // 就诊凭证编号
 	}