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

controllers/nm/nm_controller.go

 
 		}
 		break
-	case "3": //电子凭证
+	case "4": //电子凭证
 		_, pBusiCardInfo := c.GetELeInfo(fixmedins_code, operator_id, operator)
 		//fmt.Println(pCardInfo)
 		fmt.Println(pBusiCardInfo)
 	}
 
 }
-func (c *NmController) TestGetBasBaseInit(code string, secret_key string, ak string) {
+
+var initFlag int64 = 0
+
+func (c *NmController) TestGetBasBaseInit() {
 	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
 	Iinit := DllDef.MustFindProc("Init")
 	//miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	str := make([]byte, 2048)
 	inputData := make(map[string]interface{})
-	inputData["IP"] = "10.72.3.87"
-	inputData["PORT"] = "8086"
-	inputData["TIMEOUT"] = "180"
+	inputData["IP"] = "10.144.211.75"
+	inputData["PORT"] = 7021
+	inputData["TIMEOUT"] = 180
 	inputData["LOG_PATH"] = "C:\\log\\"
-	//
-	inputData["EC_URL"] = "http://10.72.3.127:10086/localcfc/api/hsecfc/localQrCodeQuery"
-	inputData["CARD_PASSTYPE"] = "1"
-	inputData["API_NAME"] = "hssServives"
-	inputData["API_VERSION"] = "1.0.0"
-	inputData["ACCESS_KEY"] = ak
-
-	inputData["SECRETKEY"] = secret_key
-	inputData["ORG_ID"] = code
-	inputData["EXT"] = ""
+	//inputData["SFZ_DRIVER_TYPE"] = 0
+	inputData["URL"] = "/call1"
+
 	bytesData, _ := json.Marshal(inputData)
 	fmt.Println(inputData)
 	fmt.Println(bytesData)
 	//initFlag = 1
 	return
 }
-func (c *NmController) GetBasBaseInfo() (string, string) {
+
+func (c *NmController) GetSFZBaseInfo() string {
+	DllDef := syscall.MustLoadDLL("SSCard.dll")
+	readCard := DllDef.MustFindProc("ReadSFZ")
+	if readCard == nil {
+		fmt.Println("readcard is nil")
+		readCard = DllDef.MustFindProc("ReadSFZ")
+	}
+
+	str := make([]byte, 256)
+	str1 := make([]byte, 256)
+	r, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
+
+	fmt.Println(r)
+	return string(str)
+}
+
+func (c *NmController) GetBasBaseInfo(fixmedins_code string, mdtrtarea_admvs string, opter_name string, opter_id string, fixmedins_name string) string {
 	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
 	readCard := DllDef.MustFindProc("ReadCardBas")
 	fmt.Println(readCard)
 	fmt.Println("!!!!!")
-	pCardInfo := make([]byte, 2048)
+
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	month = time.Now().Format("01")
+	day := time.Now().Format("02")
+
+	hour := time.Now().Format("15")
+	min := time.Now().Format("04")
+	sec := time.Now().Format("05")
+
+	msec := time.Now().Format("000")
+	timestamp := time.Now().Unix()
+
+	tempTime := time.Unix(timestamp, 0)
+	//timeFormat := tempTime.Format("20060102150405")
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//randNum := rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000)
+
+	inputData := make(map[string]interface{})
+	inputData["infno"] = "1199"
+	//inputData["msgid"] = "7021"
+	inputData["msgid"] = fixmedins_code + year + month + day + hour + min + sec + msec + "0" // 发送方报文 ID
+	inputData["mdtrtarea_admvs"] = mdtrtarea_admvs                                           // 发送方报文 ID
+	inputData["recer_sys_code"] = "01"
+	inputData["infver"] = "V1.0"
+	inputData["opter_type"] = "1"
+	inputData["opter"] = opter_id
+	inputData["opter_name"] = opter_name
+	inputData["inf_time"] = timeFormatOne
+	inputData["fixmedins_code"] = fixmedins_code
+	inputData["fixmedins_name"] = fixmedins_name
+
+	inputData["dev_no"] = ""
+	inputData["dev_safe_info"] = ""
+	inputData["cainfo"] = ""
+	inputData["signtype"] = ""
+	inputData["sign_no"] = ""
+
+	bytesData, _ := json.Marshal(inputData)
+	fmt.Println(string(bytesData))
 	pBusiCardInfo := make([]byte, 8192)
-	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&bytesData[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
 	fmt.Println(ret2)
-	fmt.Println(DeleteExtraSpace(string(pCardInfo)))
 	fmt.Println(DeleteExtraSpace(string(pBusiCardInfo)))
-	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pCardInfo)), "gbk", "utf-8"))
 	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
 	if ret2 != 0 {
-		return "", ""
+		return ""
 	}
-	return DeleteExtraSpace(string(pCardInfo)), DeleteExtraSpace(string(pBusiCardInfo))
+	return DeleteExtraSpace(string(pBusiCardInfo))
 }
+
 func (c *NmController) GetELeInfo(code string, operator_id string, operator_name string) (string, string) {
-	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
-	readCard := DllDef.MustFindProc("EcCardQuery")
+	DllDef := syscall.MustLoadDLL("NationECCode.dll")
+	readCard := DllDef.MustFindProc("NationEcTrans")
 	fmt.Println(readCard)
 	fmt.Println("!!!!!")
-	//pCardInfo := make([]byte, 8192)
 	pBusiCardInfo := make([]byte, 8192)
-
-	//data := make(map[string]interface{})
-	//pData := make(map[string]interface{})
-
-	//inputData := make(map[string]interface{})
-	//inputData["orgId"] = code
-	//inputData["businessType"] = "01101"
-	//inputData["operatorId"] = operator_id
-	//inputData["operatorName"] = operator_name
-	//inputData["officeId"] = "001"
-	//inputData["officeName"] = "血透室"
-
-	//data["data"] = inputData
-	//data["transType"] = "ec.query"
-	//data["orgId"] = code
-	//bytesData, _ := json.Marshal(data)
-	//pCardInfo = bytesData
-	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["businessType"] = "01101"
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "血透室"
+	inputData["deviceType"] = ""
+	input["data"] = inputData
+	input["orgId"] = code
+	input["transType"] = "ec.query"
+
+	bytesData, _ := json.Marshal(input)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+
+	url := gdyb_url + "/localcfc/api/hsecfc/localQrCodeQuery"
+	ret2, _, _ := readCard.Call(StrPtr(url), StrPtr(string(bytesData)), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
 	fmt.Println(ret2)
-	//fmt.Println(DeleteExtraSpace(string(bytesData)))
 	fmt.Println(DeleteExtraSpace(string(pBusiCardInfo)))
-	//fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
 	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
 	if ret2 != 0 {
 		return "", ""
 	}
 	return DeleteExtraSpace(""), DeleteExtraSpace(string(pBusiCardInfo))
 }
+
 func IntPtr(n int) uintptr {
 	return uintptr(n)
 }

controllers/sg/his_api_controller.go

 			bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 		}
 
-		if item.MedChrgitmType == "03" { //检查费
-			checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-			checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		if c.GetAdminUserInfo().CurrentOrgId == 10188 {
+			if item.MedChrgitmType == "03" { //检查费
+				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			}
+		} else {
+
+			if item.MedChrgitmType == "03" { //检查费
+				checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			}
+
 		}
 
 		if item.MedChrgitmType == "04" { //化验费
 		}
 
 		if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+
 			treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 			treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
 		}
 
 		if item.MedChrgitmType == "06" { //手术费

controllers/zh/zh_his_api_controller.go

 func (c *ZHHisApiController) ReadCard() {
 	id_card_type, _ := c.GetInt64("id_card_type")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-	certificates, _ := c.GetInt64("certificates")
+	//certificates, _ := c.GetInt64("certificates")
 	fmt.Println(c.GetAdminUserInfo().CurrentOrgId)
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
-	switch id_card_type {
-	case 1:
-		if initFlag == 0 {
-			c.TestGetBasBaseInit()
-		}
-		basStr := c.GetBasBaseInfo(miConfig.Code, miConfig.MdtrtareaAdmvs, roles.UserName, strconv.FormatInt(roles.ID, 10), miConfig.OrgName)
-		if len(basStr) == 0 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-			return
-		}
-		fmt.Println(basStr)
-		bas := strings.Split(basStr, "|")
-		basNumber := bas[1]
-		fmt.Println(basNumber)
-		card_sn := bas[3]
-		fmt.Println(card_sn)
-		result := service.Gdyb1101B(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
+	var api string
+	api = "http://172.16.13.254:9532/" + "nmyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.AccessKey + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName +
+		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&operator_id=" + strconv.FormatInt(admin_user_id, 10) + "&operator=" + roles.UserName
+	fmt.Println(api)
 
-		userJSONBytes, _ := json.Marshal(dat)
-		var res ResultTwo
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+	resp, requestErr := http.Get(api)
+	if requestErr != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
 
-		if res.Infcode == 0 {
+	body, ioErr := ioutil.ReadAll(resp.Body)
+	if ioErr != nil {
+		utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	var status string
+	status = respJSON["data"].(map[string]interface{})["status"].(string)
+	card_type := respJSON["data"].(map[string]interface{})["type"].(string)
+	//console.log()
+	fmt.Println("type===")
 
-			var insutypes []string
-			var insutype string
-			var is390 int = 0
-			var is310 int = 0
-			for _, item := range res.Output.Iinfo {
-				if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
-					insutypes = append(insutypes, item.Insutype)
-				}
-			}
-			if len(insutypes) == 1 {
-				insutype = insutypes[0]
-			} else {
-				for _, i := range insutypes {
-					if i == "390" {
-						is390 = 1
-					}
+	fmt.Println(card_type)
 
-					if i == "310" {
-						is310 = 1
-					}
-				}
-			}
-			if is390 == 1 {
-				insutype = "390"
-			}
-			if is310 == 1 {
-				insutype = "310"
-			}
-			if len(insutypes) == 0 {
-				insutype = "310"
-			}
+	var token string
+	var res ResultTwo           //1101结果
+	var res10265 ResultTwo10265 //1101结果
+	var card_info string        //卡信息
+	var busi_card_info string
 
-			patient, err := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
-			if err == gorm.ErrRecordNotFound {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-				return
-			} else if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-				return
+	card_info = respJSON["data"].(map[string]interface{})["card_info"].(string)
+	busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
 
-			} else {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"patient":  patient,
-					"number":   basNumber,
-					"info":     res,
-					"insutype": insutype,
-				})
+	if status == "0" { //读卡成功
+		if card_type == "1" {
+
+			respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
+			result, _ := json.Marshal(respJSON)
+
+			if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
 			}
+			res.ErrMsg = res10265.ErrMsg
+			infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+			res.Infcode = infocode
+			res.Output = res10265.Output
+			res.InfRefmsgid = res10265.InfRefmsgid
+
 		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			return
-		}
-		break
-	case 2:
-		SFZStr := c.GetSFZBaseInfo()
-		id_card_str := strings.Split(SFZStr, "^")
-		id_card_number := id_card_str[0]
-		card_sn := ""
-		result := service.Gdyb1101B(id_card_number, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
+			//var card_info string //卡信息
+			//var busi_card_info string
+
+			token = respJSON["data"].(map[string]interface{})["token"].(string)
+			//busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
+
+			//fmt.Println(card_info)
+			//fmt.Println(busi_card_info)
+
+			respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
+			result, _ := json.Marshal(respJSON)
+
+			if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			res.ErrMsg = res10265.ErrMsg
+			infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+			res.Infcode = infocode
+			res.Output = res10265.Output
+			res.InfRefmsgid = res10265.InfRefmsgid
 
-		userJSONBytes, _ := json.Marshal(dat)
-		var res ResultTwo
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
 		}
 
 		if res.Infcode == 0 {
-			patient, err := service.GetPatientByNumber(id_card_number, c.GetAdminUserInfo().CurrentOrgId)
+			patient, err := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
 			if err == gorm.ErrRecordNotFound {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
 				return
 				return
 
 			} else {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"patient": patient,
-					"number":  id_card_number,
-					"info":    res,
-				})
-			}
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			return
-		}
-
-		break
-	case 4:
-		_, pBusiCardInfo := c.GetELeInfo(miConfig.Code, strconv.FormatInt(roles.ID, 10), roles.UserName)
-
-		var ele ELeData
-		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
-		if err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-		}
-		token := ele.Data.EcToken
-		fmt.Println(token)
-		if len(token) > 0 {
-			result := service.Gdyb1101ForEleCert("", miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, token, "")
-			var dat map[string]interface{}
-			if err := json.Unmarshal([]byte(result), &dat); err == nil {
-				fmt.Println(dat)
-			} else {
-				fmt.Println(err)
-			}
-			userJSONBytes, _ := json.Marshal(dat)
-			var res ResultTwo
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			if res.Infcode == 0 {
-				patient, err := service.GetPatientByNumber(ele.Data.IdNo, c.GetAdminUserInfo().CurrentOrgId)
-				if err == gorm.ErrRecordNotFound {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-					return
-				} else if err != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-					return
 
+				if card_type == "1" {
+					bas := strings.Split(card_info, "|")
+					basNumber := bas[2]
+					Iinfos, _ := json.Marshal(res.Output.Iinfo)
+					Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+					infoStr := string(Iinfos)
+					idetinfoStr := string(Idetinfos)
+					psn := &models.HisPsn{
+						PsnNo:        res.Output.Baseinfo.PsnNo,
+						Age:          res.Output.Baseinfo.Age,
+						PatientId:    patient.ID,
+						Certno:       res.Output.Baseinfo.Certno,
+						Brdy:         res.Output.Baseinfo.Brdy,
+						Gend:         res.Output.Baseinfo.Gend,
+						Naty:         res.Output.Baseinfo.Naty,
+						PsnCertType:  res.Output.Baseinfo.PsnCertType,
+						PsnName:      res.Output.Baseinfo.PsnName,
+						Idetinfo:     idetinfoStr,
+						Insuinfo:     infoStr,
+						UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+						CardInfo:     card_info,
+						VerifyNumber: busi_card_info,
+					}
+					service.CreateHisPsn(psn)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"patient": patient,
+						"number":  basNumber,
+					})
 				} else {
+					Iinfos, _ := json.Marshal(res.Output.Iinfo)
+					Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+					infoStr := string(Iinfos)
+					idetinfoStr := string(Idetinfos)
+					psn := &models.HisPsn{
+						PsnNo:        res.Output.Baseinfo.PsnNo,
+						Age:          res.Output.Baseinfo.Age,
+						PatientId:    patient.ID,
+						Certno:       res.Output.Baseinfo.Certno,
+						Brdy:         res.Output.Baseinfo.Brdy,
+						Gend:         res.Output.Baseinfo.Gend,
+						Naty:         res.Output.Baseinfo.Naty,
+						PsnCertType:  res.Output.Baseinfo.PsnCertType,
+						PsnName:      res.Output.Baseinfo.PsnName,
+						Idetinfo:     idetinfoStr,
+						Insuinfo:     infoStr,
+						UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+						CardInfo:     card_info,
+						VerifyNumber: token,
+					}
+					service.CreateHisPsn(psn)
 					c.ServeSuccessJSON(map[string]interface{}{
 						"patient": patient,
 						"number":  token,
-						"info":    res,
 					})
 				}
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-				return
 			}
 		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
 			return
 		}
-		break
-	}
+	} else { //读卡失败
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+		return
 
+	}
 }
 
 var initFlag int64 = 0