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

controllers/zh/zh_his_api_controller.go

@@ -2441,55 +2441,90 @@ func (c *ZHHisApiController) ReadCard() {
 
 	switch id_card_type {
 	case 1:
-		//if initFlag == 0 {
-		//	c.TestGetBasBaseInit()
-		//}
-		//basStr := c.GetBasBaseInfo(miConfig.Code, miConfig.MdtrtareaAdmvs, roles.UserName, strconv.FormatInt(roles.ID, 64), 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)
-		//}
-		//
-		//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(basNumber, c.GetAdminUserInfo().CurrentOrgId)
-		//	if err == gorm.ErrRecordNotFound {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-		//		return
-		//	} else if err != nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		//		return
-		//
-		//	} else {
-		//		c.ServeSuccessJSON(map[string]interface{}{
-		//			"patient": patient,
-		//			"number":  basNumber,
-		//		})
-		//	}
-		//} else {
-		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-		//	return
-		//}
+		if initFlag == 0 {
+			c.TestGetBasBaseInit()
+		}
+		basStr := c.GetBasBaseInfo(miConfig.Code, miConfig.MdtrtareaAdmvs, roles.UserName, strconv.FormatInt(roles.ID, 64), 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)
+		}
+
+		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 {
+
+			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
+					}
+
+					if i == "310" {
+						is310 = 1
+					}
+				}
+			}
+			if is390 == 1 {
+				insutype = "390"
+			}
+			if is310 == 1 {
+				insutype = "310"
+			}
+			if len(insutypes) == 0 {
+				insutype = "310"
+			}
+
+			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
+
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"patient":  patient,
+					"number":   basNumber,
+					"info":     res,
+					"insutype": insutype,
+				})
+			}
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+			return
+		}
 		break
 	case 2:
 		SFZStr := c.GetSFZBaseInfo()
@@ -2525,6 +2560,7 @@ func (c *ZHHisApiController) ReadCard() {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"patient": patient,
 					"number":  id_card_number,
+					"info":    res,
 				})
 			}
 		} else {
@@ -2533,37 +2569,56 @@ func (c *ZHHisApiController) ReadCard() {
 		}
 
 		break
-	case 3:
-		//_, pBusiCardInfo := c.GetELeInfo(miConfig.Code, strconv.FormatInt(roles.ID, 64), roles.UserName)
-		//
-		//var ele ELeData
-		//err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
-		//if err != nil {
-		//	utils.ErrorLog("解析失败：%v", err)
-		//}
-		//token := ele.Data.EcToken
-		////if len(token) > 0 {
-		////	result, _ := service.Gdyb1101B(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IdNo)
-		////	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":           "2",
-		////	})
-		////} else {
-		//	c.ServeSuccessJSON(map[string]interface{}{
-		//		"status": "-1",
-		//	})
-		//
-		//}
+	case 4:
+		_, pBusiCardInfo := c.GetELeInfo(miConfig.Code, strconv.FormatInt(roles.ID, 64), 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
+
+				} else {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"patient": patient,
+						"number":  token,
+						"info":    res,
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+			return
+		}
 		break
 	}
 

service/gdyb_service.go

@@ -3687,7 +3687,14 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
-	url := gdyb_url + "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)
@@ -3720,6 +3727,80 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	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)
+	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"] = "01" // 就诊凭证类型
+	inputData["card_sn"] = ""           // 卡识别码
+	inputData["certno"] = ""            // 证件号码
+	inputData["psn_cert_type"] = "01"   // 人员证件类型
+
+	inputData["mdtrt_cert_no"] = token // 就诊凭证编号
+	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
+
+}
+
 //人员信息版本4
 func Gdyb1101C(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) (string, string) {
 	//生成签名