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

controllers/sg/his_api_controller.go

@@ -5129,7 +5129,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			verify_number = psn_info.VerifyNumber
 
 		} else if miConfig.MdtrtareaAdmvs == "350500" {
-			if id_card_type == 1{
+			if id_card_type == 1 {
 				psn_info, _ := service.GetPsnByPatientId(id)
 				PsnNo = psn_info.PsnNo
 				PsnCertType = psn_info.PsnCertType
@@ -5143,19 +5143,18 @@ func (c *HisApiController) GetRegisterInfo() {
 				idetinfoStr = psn_info.Idetinfo
 				infocode = 0
 				verify_number = psn_info.VerifyNumber
-			}else if id_card_type == 2{
+			} else if id_card_type == 2 {
 
 				result, requestLog, errMsgLog := service.FJyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, patient.IdCardNo, certificates, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 				fmt.Println(errMsgLog)
 				saveLog(result, requestLog, "1101", "人员基本信息获取")
 
 				if err := json.Unmarshal([]byte(result), &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
 				}
 
-
 				PsnNo = res.Output.Baseinfo.PsnNo
 				PsnCertType = res.Output.Baseinfo.PsnCertType
 				Certno = res.Output.Baseinfo.Certno
@@ -5446,7 +5445,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				psn_info, _ := service.GetPsnByPatientId(id)
 				var cert_no string
 				if id_card_type == 1 {
-					cert_no =
+					cert_no = strings.Split(psn_info.CardInfo, "|")[0]
 				} else {
 					cert_no = strings.Split(psn_info.CardInfo, "|")[1]