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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10188
+org_id = 10217
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/js/jsyb_controller.go

@@ -663,6 +663,24 @@ type ELeData struct {
 	Message string `json:"message"`
 }
 
+type ELeCertData struct {
+	Data struct {
+		Extra       string `json:"extra"`
+		IDNo        string `json:"idNo"`
+		IDType      string `json:"idType"`
+		EcToken     string `json:"ecToken"`
+		InsuOrg     string `json:"insuOrg"`
+		UserName    string `json:"userName"`
+		EcIndexNo   string `json:"ecIndexNo"`
+		Gender      string `json:"gender"`
+		Birthday    string `json:"birthday"`
+		Nationality string `json:"nationality"`
+		Email       string `json:"email"`
+	} `json:"data"`
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
 func (c *JSybController) ReadCard() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	secret_key := c.GetString("secret_key")
@@ -721,7 +739,7 @@ func (c *JSybController) ReadCard() {
 
 		}
 		break
-	case "3": //电子凭证
+	case "3": //电子社保卡
 		_, pBusiCardInfo := c.GetELeInfo(fixmedins_code, operator_id, operator)
 		//fmt.Println(pCardInfo)
 		fmt.Println(pBusiCardInfo)
@@ -756,6 +774,41 @@ func (c *JSybController) ReadCard() {
 
 		}
 		break
+	case "4": //电子凭证
+		pCardInfo, pBusiCardInfo := c.GetELeCertInfo(fixmedins_code, operator_id, operator)
+		fmt.Println(pCardInfo)
+		fmt.Println(pBusiCardInfo)
+		pBusiCardInfo = Remove0000(pBusiCardInfo)
+		pCardInfo = Remove0000(pCardInfo)
+		var ele ELeCertData
+		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+		if err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+		}
+		token := ele.Data.EcToken
+		if len(token) > 0 {
+			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         "0",
+				"card_info":      pCardInfo,
+				"busi_card_info": pBusiCardInfo,
+				"token":          token,
+				"result":         dat,
+				"type":           "4",
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "-1",
+			})
+
+		}
+		break
 
 	}
 
@@ -855,6 +908,42 @@ func (c *JSybController) GetELeInfo(code string, operator_id string, operator_na
 	return DeleteExtraSpace(""), DeleteExtraSpace(string(pBusiCardInfo))
 }
 
+func (c *JSybController) GetELeCertInfo(code string, operator_id string, operator_name string) (string, string) {
+	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
+	readCard := DllDef.MustFindProc("EcQuery")
+	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(&pCardInfo[0])), (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(string(bytesData)), DeleteExtraSpace(string(pBusiCardInfo))
+}
+
 func IntPtr(n int) uintptr {
 	return uintptr(n)
 }

controllers/sg/his_api_controller.go

@@ -836,6 +836,202 @@ func (c *HisApiController) ReadCard() {
 		}
 
 		break
+	case 4:
+		if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
+			var api string
+			if miConfig.MdtrtareaAdmvs == "320921" {
+				api = "http://192.168.3.111:9532/" + "jsyb/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)
+
+			} else {
+				api = "http://192.168.5.251:9532/" + "jsyb/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)
+			}
+
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			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)
+
+			var token string
+			var res ResultTwo           //1101结果
+			var res10265 ResultTwo10265 //1101结果
+			var card_info string        //卡信息
+			var busi_card_info string
+
+			card_info = respJSON["data"].(map[string]interface{})["card_info"].(string)
+			busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
+
+			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 {
+					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)
+					card_info = respJSON["data"].(map[string]interface{})["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
+
+				}
+
+				if res.Infcode == 0 {
+					patient, err := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
+					if err == gorm.ErrRecordNotFound {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+						return
+					} else if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+						return
+
+					} else {
+
+						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 if card_type == "4" {
+							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,
+							})
+
+						} 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,
+							})
+						}
+					}
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+					return
+				}
+			} else { //读卡失败
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+
+			}
+
+		}
+
+		break
+
 	}
 
 }

service/jsyb_service.go

@@ -229,6 +229,38 @@ func Jsyb1101B(org_name string, doctor string, fixmedins_code string, insuplc_ad
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), inputLog
 }
 
+func Jsyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, request_url string, access_key string, Token string, cainfo string) (string, string) {
+	timestamp := time.Now().Unix()
+	//生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "1101" // 交易编码
+
+	inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+	inputData["card_sn"] = ""           // 卡识别码
+	inputData["certno"] = ""            // 证件号码
+	inputData["psn_cert_type"] = "01"   // 人员证件类型
+
+	inputData["mdtrt_cert_no"] = id_card_no + "|" + Token // 就诊凭证编号
+	inputData["begntime"] = ""                            // 开始时间
+	inputData["psn_name"] = ""                            // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var inputLog string
+	bytesData, _ := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "1101"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), inputLog
+}
+
 // 门诊挂号
 func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, opera string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, doctor_name string, request_url string, access_key string, verify_number string, cainfo string) (string, string) {
 	fmt.Println(opera)