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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10106
+org_id = 9919
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -57,8 +57,8 @@ gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 # gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
 # gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
-# gdyb_paasid = "sg03_prd"
-gdyb_paasid = "jm_sc_yjyy"
+gdyb_paasid = "sg03_prd"
+# gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yjyy"
 #gdyb_paasid = "sz_prd_yjyy"
 #gdyb_paasid = "zq_prd_yjyy"

controllers/sg/gdyb_controller.go

@@ -404,6 +404,11 @@ func (c *GdybController) PostTen() {
 	fmt.Println(stmtEnddate)
 	fmt.Println(medfeeSumamt)
 
+	if len(clrType) == 0 {
+		clrType = "11"
+	} else {
+		clrType = "9903"
+	}
 	baseParams := models.BaseParams{
 		SecretKey:      secret_key,
 		FixmedinsCode:  fixmedins_code,

controllers/sg/his_api_controller.go

@@ -6402,7 +6402,7 @@ func (c *HisApiController) GetCheckAccount() {
 	loc, _ := time.LoadLocation("Local")
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_org)
+	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_org, clr_type)
 	//orders_two, _ := service.GetOrderByTimeThree(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_type)
 	fixmedins_setl_cnt := int64(len(orders))
 	//

controllers/zh/zh_his_api_controller.go

@@ -10,10 +10,12 @@ import (
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
+	"github.com/axgle/mahonia"
 	"io/ioutil"
 	"math"
 	"math/rand"
 	"net/http"
+	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -623,8 +625,9 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
 	role, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
 	result, request_log, result_log := service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates, name)
-	fmt.Println(request_log)
-	fmt.Println(result_log)
+	//fmt.Println(request_log)
+	//fmt.Println(result_log)
+	saveLog(result_log, request_log, "1101", "人员基本信息获取")
 
 	doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
 
@@ -836,7 +839,8 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			dises = append(dises, dise)
 		}
 		struct2401.Diseinfo = dises
-		result := service.ZHGdyb2401(struct2401, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, insuplc_admdvs, miConfig.MdtrtareaAdmvs)
+		result, request_log := service.ZHGdyb2401(struct2401, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, insuplc_admdvs, miConfig.MdtrtareaAdmvs)
+		saveLog(result, request_log, "2401", "入医登记")
 
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -874,8 +878,8 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		}
 
 		if res.Infcode == 0 {
-			result2 := service.Gdyb5301Two(res2.Output.Baseinfo.PsnNo, miConfig.OrgName, role.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
-			fmt.Println(result2)
+			//result2 := service.Gdyb5301Two(res2.Output.Baseinfo.PsnNo, miConfig.OrgName, role.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+			//fmt.Println(result2)
 			Iinfos, _ := json.Marshal(res2.Output.Iinfo)
 			Idetinfos, _ := json.Marshal(res2.Output.Idetinfo)
 			infoStr := string(Iinfos)
@@ -1023,7 +1027,9 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 	struct2402.Diseinfo = dises
 	struct2402.DiseName = sickConfig.ClassName
 	struct2402.DiseCode = sickConfig.CountryCode
-	result := service.ZHGdyb2402(struct2402, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
+	result, request_log := service.ZHGdyb2402(struct2402, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
+	//saveLog(result,request_log,"出院)
+	saveLog(result, request_log, "2402", "出院")
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -1149,6 +1155,9 @@ func (c *ZHHisApiController) GetSettleInfo() {
 	var result string
 	var src_resquest string
 	result, src_resquest = service.ZHGdyb2304(record.PsnNo, record.Number, chrg_bchno, cert_no, record.InsutypeType, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
+	//saveLog()
+	saveLog(result, src_resquest, "2304", "住院结算")
+
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -1711,6 +1720,7 @@ func (c *ZHHisApiController) ZHRefund() {
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 
 		result, src_resquest := service.Gdyb2305(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+		saveLog(result, src_resquest, "2305", "退费")
 
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -1812,7 +1822,8 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 		var isSuccess bool = true
 
 		for _, item := range infos {
-			result := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, item.FeedetlSn, 1)
+			result, requestLog := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, item.FeedetlSn, 1)
+			saveLog(result, requestLog, "2302", "日结退明细")
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -1874,7 +1885,10 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 		config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 		if config.IsOpen == 1 { //对接了医保，走医保流程
 
-			result := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
+			result, requestLog := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
+			//saveLog(result,requestLog,)
+			saveLog(result, requestLog, "2302", "月结退明细")
+
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -1940,7 +1954,9 @@ func (this *ZHHisApiController) GetZHOutHospitalUnCheck() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInHospitalNoExistDataException)
 		return
 	}
-	result := service.ZHGdyb2405(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+	result, requestLog := service.ZHGdyb2405(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+	saveLog(result, requestLog, "2405", "出院登记撤销")
+
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -1999,7 +2015,10 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInHospitalNoExistDataException)
 		return
 	}
-	result := service.ZHGdyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+	result, requestLog := service.ZHGdyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+	//saveLog()
+	saveLog(result, requestLog, "2404", "入院登记撤销")
+
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -2045,3 +2064,61 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 	}
 
 }
+
+func saveLog(result string, request string, infno string, desc string) {
+
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	dir := miConfig.OrgName + "日志"
+	utils.Mkdir(dir)
+	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")
+
+	result_time := year + "-" + month + "-" + day + " " + hour + ":" + min + ":" + sec
+
+	file := strconv.FormatInt(org_id, 10) + "_" + year + month + day + "_log"
+	file_name := file + ".txt"
+	file_path := miConfig.OrgName + "日志" + "/" + file_name
+	exist, _ := utils.PathExists(file_path)
+	if exist { //存在
+		fmt.Println("存在")
+		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
+		if err != nil {
+			fmt.Println("read fail")
+		}
+		content := "\r\n" + "\r\n" + "\r\n" + result_time + " " + "【 " + desc + infno + "入参" + " 】：" + "\r\n" + request + "\r\n" + result_time + " " + "【 " + desc + infno + "出参" + " 】：" + "\r\n" + result
+		n, _ := f.Seek(0, 2)
+		_, err = f.WriteAt([]byte(content), n)
+
+	} else { //不存在
+		fmt.Println("文件不存在，创建文件")
+		f, err := os.Create(miConfig.OrgName + "日志" + "/" + file_name)
+		defer f.Close()
+		if err != nil {
+		} else {
+			_, err = f.Write([]byte("记录日志"))
+		}
+	}
+
+}
+
+type Charset string
+
+const (
+	UTF8    = Charset("UTF-8")
+	GB18030 = Charset("GB18030")
+)
+
+func ConvertToString(src string, srcCode string, tagCode string) string {
+	srcCoder := mahonia.NewDecoder(srcCode)
+	srcResult := srcCoder.ConvertString(src)
+	tagCoder := mahonia.NewDecoder(tagCode)
+	_, cdata, _ := tagCoder.Translate([]byte(srcResult), true)
+	result := string(cdata)
+	return result
+}

service/his_service.go

@@ -964,11 +964,17 @@ func GetHisOrderInfoByNumberThree(order_number string) (order []*models.HisOrder
 	return
 }
 
-func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype string, clr_org string) (orders []*models.HisOrder, err error) {
+func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string) (orders []*models.HisOrder, err error) {
+
 	if len(clr_org) > 0 {
 		err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ? AND clr_optins = ?", org_id, end_time, start_time, insutype, clr_org).Find(&orders).Error
 	} else {
-		err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ? ", org_id, end_time, start_time, insutype).Find(&orders).Error
+		if len(clr_type) > 0 {
+			err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ? AND clr_type = ?", org_id, end_time, start_time, insutype, clr_type).Find(&orders).Error
+		} else {
+			err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ? ", org_id, end_time, start_time, insutype).Find(&orders).Error
+
+		}
 	}
 	return
 }

service/zh_his_service.go

@@ -134,7 +134,7 @@ type Struct2401 struct {
 }
 
 // 住院登记
-func ZHGdyb2401(struct2401 Struct2401, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+func ZHGdyb2401(struct2401 Struct2401, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -203,9 +203,11 @@ func ZHGdyb2401(struct2401 Struct2401, secret_key string, org_name string, fixme
 
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
+	requestLog := 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")
@@ -217,7 +219,8 @@ func ZHGdyb2401(struct2401 Struct2401, secret_key string, org_name string, fixme
 	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")
 	request.Header.Set("x-tif-paasid", gdyb_paasid)
@@ -229,20 +232,22 @@ func ZHGdyb2401(struct2401 Struct2401, secret_key string, org_name string, fixme
 	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(), ""
+
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, requestLog
 }
 
 //住院撤销
-func ZHGdyb2404(mdtrt_id string, psn_no string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+func ZHGdyb2404(mdtrt_id string, psn_no string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -259,9 +264,10 @@ func ZHGdyb2404(mdtrt_id string, psn_no string, secret_key string, org_name stri
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
+	requestLog := 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")
@@ -273,7 +279,7 @@ func ZHGdyb2404(mdtrt_id string, psn_no string, secret_key string, org_name stri
 	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")
 	request.Header.Set("x-tif-paasid", gdyb_paasid)
@@ -285,20 +291,20 @@ func ZHGdyb2404(mdtrt_id string, psn_no string, secret_key string, org_name stri
 	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(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, requestLog
 }
 
 //出院撤销
-func ZHGdyb2405(mdtrt_id string, psn_no string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+func ZHGdyb2405(mdtrt_id string, psn_no string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -315,9 +321,10 @@ func ZHGdyb2405(mdtrt_id string, psn_no string, secret_key string, org_name stri
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
+	requestLog := 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")
@@ -329,7 +336,7 @@ func ZHGdyb2405(mdtrt_id string, psn_no string, secret_key string, org_name stri
 	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")
 	request.Header.Set("x-tif-paasid", gdyb_paasid)
@@ -341,16 +348,16 @@ func ZHGdyb2405(mdtrt_id string, psn_no string, secret_key string, org_name stri
 	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(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, requestLog
 }
 
 type Diseinfo2402Struct struct {
@@ -380,7 +387,7 @@ type Struct2402 struct {
 }
 
 // 出院
-func ZHGdyb2402(struct2402 Struct2402, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) string {
+func ZHGdyb2402(struct2402 Struct2402, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) (string, string) {
 
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -445,9 +452,10 @@ func ZHGdyb2402(struct2402 Struct2402, org_name string, doctor string, insuplc_a
 
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
+	request_log := string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 
@@ -464,7 +472,7 @@ func ZHGdyb2402(struct2402 Struct2402, org_name string, doctor string, insuplc_a
 	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")
@@ -479,16 +487,16 @@ func ZHGdyb2402(struct2402 Struct2402, org_name string, doctor string, insuplc_a
 	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(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, request_log
 }
 
 type ZHCustom struct {
@@ -665,7 +673,7 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 }
 
 //  住院费用明细信息撤销
-func Gdyb2302(psnNo string, mdtrtId string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, number string, refund_type int64) string {
+func Gdyb2302(psnNo string, mdtrtId string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, number string, refund_type int64) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -691,9 +699,10 @@ func Gdyb2302(psnNo string, mdtrtId string, org_name string, doctor string, insu
 
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
+	requestLog := 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")
@@ -714,7 +723,7 @@ func Gdyb2302(psnNo string, mdtrtId string, org_name string, doctor string, insu
 	fmt.Println(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -727,16 +736,16 @@ func Gdyb2302(psnNo string, mdtrtId string, org_name string, doctor string, insu
 	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(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, requestLog
 }
 
 //  住院结算