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

controllers/sg/his_api_controller.go

@@ -5129,20 +5129,47 @@ func (c *HisApiController) GetRegisterInfo() {
 			verify_number = psn_info.VerifyNumber
 
 		} else if miConfig.MdtrtareaAdmvs == "350500" {
-			psn_info, _ := service.GetPsnByPatientId(id)
-			PsnNo = psn_info.PsnNo
-			PsnCertType = psn_info.PsnCertType
-			Certno = psn_info.Certno
-			PsnName = psn_info.PsnName
-			Gend = psn_info.Gend
-			Naty = psn_info.Naty
-			Brdy = psn_info.Brdy
-			Age = psn_info.Age
-			infoStr = psn_info.Insuinfo
-			idetinfoStr = psn_info.Idetinfo
-			infocode = 0
-			verify_number = psn_info.VerifyNumber
+			if id_card_type == 1{
+				psn_info, _ := service.GetPsnByPatientId(id)
+				PsnNo = psn_info.PsnNo
+				PsnCertType = psn_info.PsnCertType
+				Certno = psn_info.Certno
+				PsnName = psn_info.PsnName
+				Gend = psn_info.Gend
+				Naty = psn_info.Naty
+				Brdy = psn_info.Brdy
+				Age = psn_info.Age
+				infoStr = psn_info.Insuinfo
+				idetinfoStr = psn_info.Idetinfo
+				infocode = 0
+				verify_number = psn_info.VerifyNumber
+			}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
+				}
+
 
+				PsnNo = res.Output.Baseinfo.PsnNo
+				PsnCertType = res.Output.Baseinfo.PsnCertType
+				Certno = res.Output.Baseinfo.Certno
+				PsnName = res.Output.Baseinfo.PsnName
+				Gend = res.Output.Baseinfo.Gend
+				Naty = res.Output.Baseinfo.Naty
+				Brdy = res.Output.Baseinfo.Brdy
+				Age = res.Output.Baseinfo.Age
+				Iinfos, _ := json.Marshal(res.Output.Iinfo)
+				Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+				infoStr = string(Iinfos)
+				idetinfoStr = string(Idetinfos)
+				infocode = res.Infcode
+			}
 		} else {
 			var result string
 			var requestLog string
@@ -5419,7 +5446,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				psn_info, _ := service.GetPsnByPatientId(id)
 				var cert_no string
 				if id_card_type == 1 {
-					cert_no = strings.Split(psn_info.CardInfo, "|")[0]
+					cert_no =
 				} else {
 					cert_no = strings.Split(psn_info.CardInfo, "|")[1]