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

controllers/sg/his_api_controller.go

@@ -1090,6 +1090,22 @@ func (c *HisApiController) CheckCardPWDTwo() {
 
 }
 
+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:"OutData"`
+}
+
 func (c *HisApiController) ReadCard() {
 	id_card_type, _ := c.GetInt64("id_card_type")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -1936,7 +1952,65 @@ func (c *HisApiController) ReadCard() {
 				return
 			}
 		} else if miConfig.MdtrtareaAdmvs == "440300" || miConfig.MdtrtareaAdmvs == "440305" {
-			service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+			result, requestLog := service.Gdyb6101(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+			saveLog(result, requestLog, "6101", "电子凭证")
+			var ele ELeCertData
+			err := json.Unmarshal([]byte(result), &ele)
+			if err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+			}
+			result2, requestLog2 := service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, ele.Data.EcToken)
+			saveLog(result2, requestLog2, "1101", "获取人员信息")
+
+			var res ResultTwo
+			if err := json.Unmarshal([]byte(result2), &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
+
+				} 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:     "",
+						VerifyNumber: ele.Data.EcToken,
+					}
+					service.CreateHisPsn(psn)
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"patient": patient,
+						"number":  ele.Data.EcToken,
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
+
 		}
 		break
 	}
@@ -5170,7 +5244,12 @@ func (c *HisApiController) GetRegisterInfo() {
 			var result string
 			var requestLog string
 			if miConfig.UserOrgId == 10138 {
-				result, requestLog = service.Gdyb1101D(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name, record_time)
+				if id_card_type == 4 {
+					psn_info, _ := service.GetPsnByPatientId(id)
+					result, requestLog = service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, psn_info.VerifyNumber)
+				} else {
+					result, requestLog = service.Gdyb1101D(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name, record_time)
+				}
 			} else {
 				result, requestLog = service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
 			}
@@ -5469,7 +5548,8 @@ func (c *HisApiController) GetRegisterInfo() {
 				}
 				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 			} else {
-				result, requestLog := service.Gdyb2201A(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time)
+				psn_info, _ := service.GetPsnByPatientId(id)
+				result, requestLog := service.Gdyb2201A(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time, psn_info.VerifyNumber)
 				saveLog(result, requestLog, "2201A", "挂号")
 				if miConfig.Code == "H15049901371" {
 

service/gdyb_service.go

@@ -354,7 +354,7 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 
 }
 
-func Gdyb2201A(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, record_time string) (string, string) {
+func Gdyb2201A(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, record_time string, token string) (string, string) {
 	fmt.Println(opera)
 
 	// 生成签名
@@ -376,6 +376,10 @@ func Gdyb2201A(psnNo string, insutype string, certNo string, org_name string, op
 	if id_card_type == 1 {
 		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else if id_card_type == 4 {
+
+		inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = token  // 就诊凭证编号
 	} else {
 		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
@@ -3829,7 +3833,7 @@ func Gdyb1101G(certNo string, org_name string, doctor string, fixmedins_code str
 	return str
 }
 
-func Gdyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
+func Gdyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, token string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -3845,9 +3849,9 @@ func Gdyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 	inputData["certno"] = ""            // 证件号码
 	inputData["psn_cert_type"] = "01"   // 人员证件类型
 
-	inputData["mdtrt_cert_no"] = "" // 就诊凭证编号
-	inputData["begntime"] = ""      // 开始时间
-	inputData["psn_name"] = ""      // 人员姓名
+	inputData["mdtrt_cert_no"] = token // 就诊凭证编号
+	inputData["begntime"] = ""         // 开始时间
+	inputData["psn_name"] = ""         // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -3855,7 +3859,7 @@ func Gdyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 	gdyb_url := beego.AppConfig.String("gdyb_url")
@@ -3877,7 +3881,7 @@ func Gdyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -3890,16 +3894,90 @@ func Gdyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	fmt.Println(string(respBytes))
 	str := string(respBytes)
-	return str
+	return str, string(bytesData)
+
+}
+
+func Gdyb6101(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) (string, string) {
+	//生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	//生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "6101" // 交易编码
+
+	inputData["orgId"] = fixmedins_code  // 就诊凭证类型
+	inputData["businessType"] = "01101"  // 卡识别码
+	inputData["businessInfo"] = ""       // 证件号码
+	inputData["operateorId"] = "01"      // 人员证件类型
+	inputData["operateornName"] = doctor // 就诊凭证编号
+	inputData["officeId"] = "01"         // 开始时间
+	inputData["officeName"] = "血透"       // 人员姓名
+	inputData["deviceType"] = ""         // 人员姓名
+	input["InData"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	//url := gdyb_url + "1101"
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "1101"
+	}
+
+	fmt.Println(url)
+	fmt.Println(gdyb_paasid)
+	fmt.Println(secret_key)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, string(bytesData)
 
 }