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

controllers/nm/nm_controller.go

@@ -40,6 +40,15 @@ func NmybRegistRouters() {
 	beego.Router("/nmyb/readcard", &NmController{}, "get:ReadCard")
 }
 
+type ReadCardResult struct {
+	Output struct {
+		CardInfo   string `json:"cardInfo"`
+		RegionCode string `json:"regionCode"`
+	} `json:"output"`
+	Code   int    `json:"CODE"`
+	ErrMsg string `json:"ERRMSG"`
+}
+
 type ELeData struct {
 	Data struct {
 		IdNo        string `json:"idNo"`
@@ -60,7 +69,7 @@ type ELeData struct {
 type ResultTwo struct {
 	ErrMsg      string `json:"err_msg"`
 	InfRefmsgid string `json:"inf_refmsgid"`
-	Infcode     int64  `json:"infcode"`
+	Infcode     string `json:"infcode"`
 	Output      struct {
 		Baseinfo struct {
 			Age         float64 `json:"age"`
@@ -487,13 +496,32 @@ func (c *NmController) ReadCard() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
 			return
 		}
+
+		var dat2 map[string]interface{}
+		if err := json.Unmarshal([]byte(basStr), &dat2); err == nil {
+			fmt.Println(dat2)
+		} else {
+			fmt.Println(err)
+		}
+
+		userJSONBytes, _ := json.Marshal(dat2)
+		var res ReadCardResult
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
 		fmt.Println(basStr)
-		bas := strings.Split(basStr, "|")
+		bas := strings.Split(res.Output.CardInfo, "|")
 		basNumber := bas[1]
 		fmt.Println(basNumber)
 		card_sn := bas[3]
 		fmt.Println(card_sn)
-		result := service.Gdyb1101B(basNumber, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, card_sn, 1)
+		cardNumber := bas[2]
+		name := bas[4]
+
+		result := service.Gdyb1101G(basNumber, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, card_sn, 1, name)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)
@@ -501,21 +529,22 @@ func (c *NmController) ReadCard() {
 			fmt.Println(err)
 		}
 
-		userJSONBytes, _ := json.Marshal(dat)
-		var res ResultTwo
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		userJSONBytes2, _ := json.Marshal(dat)
+		var res2 ResultTwo
+		if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
+		infocode, _ := strconv.ParseInt(res2.Infcode, 10, 64)
 
-		if res.Infcode == 0 {
+		if infocode == 0 {
 
 			var insutypes []string
 			var insutype string
 			var is390 int = 0
 			var is310 int = 0
-			for _, item := range res.Output.Iinfo {
+			for _, item := range res2.Output.Iinfo {
 				if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
 					insutypes = append(insutypes, item.Insutype)
 				}
@@ -553,10 +582,11 @@ func (c *NmController) ReadCard() {
 
 			} else {
 				c.ServeSuccessJSON(map[string]interface{}{
-					"patient":  patient,
-					"number":   basNumber,
-					"info":     res,
-					"insutype": insutype,
+					"patient":     patient,
+					"number":      basNumber,
+					"info":        res,
+					"insutype":    insutype,
+					"card_number": cardNumber,
 				})
 			}
 		} else {
@@ -591,7 +621,9 @@ func (c *NmController) ReadCard() {
 				return
 			}
 
-			if res.Infcode == 0 {
+			infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
+
+			if infocode == 0 {
 				patient, err := service.GetPatientByNumber(ele.Data.IdNo, c.GetAdminUserInfo().CurrentOrgId)
 				if err == gorm.ErrRecordNotFound {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)

service/gdyb_service.go

@@ -3727,6 +3727,78 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	return str
 }
 
+func Gdyb1101G(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64, name 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"] = "1101" // 交易编码
+
+	inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+	inputData["card_sn"] = card_sn      // 卡识别码
+	inputData["certno"] = certNo        // 证件号码
+	inputData["psn_cert_type"] = "01"   // 人员证件类型
+	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	inputData["begntime"] = ""          // 开始时间
+	inputData["psn_name"] = name        // 人员姓名
+	input["data"] = 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
+}
+
 func Gdyb1101ForEleCert(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, token string, name string) string {
 	//生成签名
 	nonce := GetRandomString(32)