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

controllers/sz/sz_his_api_controller.go

@@ -438,7 +438,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000))
 		//1.判断读卡类型
 		//2.读卡 获取交易验证码，医疗证号，发卡地区行政区划代码
-		yiliao_number, id_card_number, verifyCode, version_code, err, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
+		yiliao_number, id_card_number, verifyCode, version_code, _, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
 		fmt.Println(yiliao_number)
 		fmt.Println(id_card_number)
 		fmt.Println(verifyCode)
@@ -447,10 +447,6 @@ func (c *SZHisApiController) GetRegisterInfo() {
 
 		dept_code := "0305"
 		is_yidi = 1
-		if err != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-			return
-		}
 		tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
 		//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 		if tempPatient.ID == patient_id {