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

controllers/sg/his_api_controller.go

@@ -9323,7 +9323,8 @@ func (c *HisApiController) GetAllopatry() {
 	adminUser := c.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	result, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month)
+
+	result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, admin_user_id)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -9331,8 +9332,23 @@ func (c *HisApiController) GetAllopatry() {
 		fmt.Println(err)
 	}
 	userJSONBytes, _ := json.Marshal(dat)
+	var res models.Result9001
+	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res.Output.Signinoutb.SignNo)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	userJSONBytes2, _ := json.Marshal(dat2)
 	var res2 models.Result3260
-	if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return

models/yb_models.go

@@ -41,3 +41,18 @@ type CustomData struct {
 	MedfeeSumamt    float64 `json:"medfee_sumamt"`
 	OptinsPaySumamt float64 `json:"optins_pay_sumamt"`
 }
+
+type Result9001 struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `json:"infcode"`
+	Output      struct {
+		Signinoutb struct {
+			SignNo string `json:"sign_no"`
+		} `json:"signinoutb"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnInfo    interface{} `json:"warn_info"`
+}

service/gdyb_service.go

@@ -15,6 +15,7 @@ import (
 	"log"
 	"math/rand"
 	"mime/multipart"
+	"net"
 	"net/http"
 	"os"
 	"os/exec"
@@ -3275,6 +3276,45 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	return inputMessage
 }
 
+func SetInputMessageTwo(nonce string, timestamp int64, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, sign_no string) map[string]interface{} {
+	// 生成签名
+	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)
+
+	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")
+
+	// 生成输入报文
+	inputMessage := make(map[string]interface{})
+	inputMessage["msgid"] = fixmedins_code + year + month + day + hour + min + sec + msec + "0" // 发送方报文 ID
+	inputMessage["mdtrtarea_admvs"] = mdtrtarea_admvs                                           // 就医地医保区划
+	inputMessage["insuplc_admdvs"] = insuplc_admdvs                                             // 参保地医保区划
+	inputMessage["recer_sys_code"] = "1"                                                        // 接收方系统代码
+	inputMessage["dev_no"] = ""                                                                 // 设备编号
+	inputMessage["dev_safe_info"] = ""                                                          // 设备安全信息
+	inputMessage["cainfo"] = ""                                                                 // 数字签名信息
+	inputMessage["signtype"] = "SM3"                                                            // 签名类型
+	inputMessage["infver"] = "V1.0"                                                             // 接收方系统代码
+	inputMessage["opter_type"] = "1"                                                            // 经办人类别
+	inputMessage["opter"] = doctor                                                              // 经办人
+	inputMessage["opter_name"] = doctor                                                         // 经办人姓名
+	inputMessage["inf_time"] = timeFormatOne                                                    // 交易时间
+	inputMessage["fixmedins_code"] = fixmedins_code                                             // 定点医药机构编号
+	inputMessage["fixmedins_name"] = org_name                                                   //定点医药机构名称
+	inputMessage["sign_no"] = sign                                                              //交易签到流水号
+	return inputMessage
+}
+
 func postFile(filename string, target_url string) (*http.Response, error) {
 	body_buf := bytes.NewBufferString("")
 	body_writer := multipart.NewWriter(body_buf)
@@ -3788,13 +3828,13 @@ func Gdyb90100(psn_no string, org_name string, doctor string, fixmedins_code str
 	return str
 }
 
-func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string) (string, string) {
+func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, sign 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)
+	inputMessage := SetInputMessageTwo(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, sign)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3260" // 交易编码
@@ -4034,3 +4074,113 @@ func Gdyb3262(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	}
 
 }
+func Gdyb9001(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, admin_user_id int64) (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"] = "9001"        // 交易编码
+	inputData["opter_no"] = admin_user_id // 就诊凭证编号
+	inputData["mac"] = GetMac()           // 开始时间
+	inputData["ip"] = GetLocalIp()
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	var inputLog string
+	bytesData, err := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	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")
+
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "3261"
+	}
+
+	if insuplc_admdvs == "421300" {
+		var json2 string
+		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
+		out, err := cmd.Output()
+		if err != nil {
+			fmt.Println("error:", err.Error())
+		}
+		fmt.Println(string(out))
+		return hex.EncodeToString(out), inputLog
+	} else {
+
+		//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, inputLog
+
+	}
+
+}
+
+//获取本机ip
+func GetLocalIp() string {
+	addrs, err := net.InterfaceAddrs()
+	if err != nil {
+		fmt.Println("get local ip failed")
+	}
+	for _, address := range addrs {
+		if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+			if ipnet.IP.To4() != nil {
+				return ipnet.IP.String()
+			}
+		}
+	}
+	return ""
+}
+
+//获取本机Mac
+func GetMac() string {
+	interfaces, err := net.Interfaces()
+	if err != nil {
+		fmt.Println("Get loacl Mac failed")
+	}
+	for _, inter := range interfaces {
+		mac := inter.HardwareAddr
+		fmt.Println("+======" + mac.String())
+		if mac.String() != "" {
+			return mac.String()
+		}
+
+	}
+	return ""
+}