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

conf/app.conf

@@ -3,9 +3,6 @@ httpport = 9532
 runmode = prod
 
 
-
-            ###
-
 #
 copyrequestbody = true
 sessionon = true

service/gdyb_service.go

@@ -8,8 +8,11 @@ import (
 	"fmt"
 	"gdyb/models"
 	"github.com/astaxie/beego"
+	"github.com/go-ole/go-ole"
+	"github.com/go-ole/go-ole/oleutil"
 	"io"
 	"io/ioutil"
+	"log"
 	"math/rand"
 	"mime/multipart"
 	"net/http"
@@ -60,14 +63,18 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 
 	//var x interface{}
 	//s3 := make([]byte, 256)
-	//ole.CoInitialize(0)
-	//unknown, err := oleutil.CreateObject("yinhai.yh_hb_sctr")
-	//if err != nil {
-	//	log.Fatal("CreateObject: ", err)
-	//}
-	//
-	//xxxx := unknown.MustQueryInterface(ole.IID_IDispatch)
-	//
+	ole.CoInitialize(0)
+	unknown, err := oleutil.CreateObject("yinhai.yh_hb_sctr")
+	if err != nil {
+		log.Fatal("CreateObject: ", err)
+	}
+
+	xxxx := unknown.MustQueryInterface(ole.IID_IDispatch)
+
+	var str6 map[string]interface{}
+
+	//str6 = ""
+
 	////p := (*string)(unsafe.Pointer(str))
 	////var str6 *string
 	//var str6 *ole.VARIANT
@@ -76,16 +83,16 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 	//	log.Fatal("QueryInterface: ", err)
 	//}
 	//
-	//r, err1 := xxxx.CallMethod("yh_hb_call", "1201", string(bytesData), str6)
+	r, err1 := xxxx.CallMethod("yh_hb_call", "1201", string(bytesData), str6)
 	////result := oleutil.MustGetProperty(xxxx, "astr_jysc")
 	//
-	//if err1 != nil {
-	//	log.Fatal("CallMethod: ", err1, " | ", r)
-	//}
-	//fmt.Println("~~~~~~~")
+	if err1 != nil {
+		log.Fatal("CallMethod: ", err1, " | ", r)
+	}
+	fmt.Println("~~~~~~~")
 	//fmt.Println(str6.ToString())
-	//fmt.Println(r.ToString())
-	//fmt.Println("~~~~~~~")
+	fmt.Println(r.ToString())
+	fmt.Println("~~~~~~~")
 	//
 	//xxxx.Release()
 	//
@@ -219,7 +226,7 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 			fmt.Println("error:", err.Error())
 		}
 		fmt.Println(string(out))
-		return string(out), inputLog
+		return hex.EncodeToString(out), inputLog
 	} else {
 
 		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
@@ -297,7 +304,7 @@ func Gdyb1101A(certNo string, org_name string, doctor string, fixmedins_code str
 			fmt.Println("error:", err.Error())
 		}
 		fmt.Println(string(out))
-		return string(out)
+		return hex.EncodeToString(out)
 	} else {
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
@@ -391,7 +398,7 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 		}
 		fmt.Println(string(out))
 
-		return string(out), requestLog
+		return hex.EncodeToString(out), requestLog
 	} else {
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
@@ -471,7 +478,7 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 		}
 		fmt.Println(string(out))
 
-		return string(out), requestLog
+		return hex.EncodeToString(out), requestLog
 	} else {
 
 		request, err := http.NewRequest("POST", url, reader)
@@ -574,7 +581,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		}
 		fmt.Println(string(out))
 
-		return string(out), requestLog
+		return hex.EncodeToString(out), requestLog
 	} else {
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
@@ -682,7 +689,7 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 		}
 		fmt.Println(string(out))
 
-		return string(out), requestLog
+		return hex.EncodeToString(out), requestLog
 	} else {
 
 		request, err := http.NewRequest("POST", url, reader)
@@ -955,7 +962,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		}
 		fmt.Println(string(out))
 
-		return string(out), requestLog
+		return hex.EncodeToString(out), requestLog
 	} else {
 
 		request, err := http.NewRequest("POST", url, reader)
@@ -1040,7 +1047,7 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 		}
 		fmt.Println(string(out))
 
-		return string(out), requestLog
+		return hex.EncodeToString(out), requestLog
 	} else {
 		request, err := http.NewRequest("POST", url, reader)
 		fmt.Println(err)
@@ -1106,15 +1113,11 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	if insuplc_admdvs == "421300" {
 		if med_type == "11" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
-
-		} else {
-
-			inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
+		} else if med_type == "14" {
+			inputData["med_type"] = "140110" // 医疗类别 11 普通门诊  12 门诊挂号
 		}
-
 	} else {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
-
 	}
 
 	inputData["medfee_sumamt"] = total  // 医疗费总额
@@ -1160,7 +1163,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		}
 		fmt.Println(string(out))
 
-		return string(out), requestLog
+		return hex.EncodeToString(out), requestLog
 	} else {
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
@@ -1222,15 +1225,11 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	if insuplc_admdvs == "421300" {
 		if med_type == "11" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
-
-		} else {
-
-			inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
+		} else if med_type == "14" {
+			inputData["med_type"] = "140110" // 医疗类别 11 普通门诊  12 门诊挂号
 		}
-
 	} else {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
-
 	}
 	inputData["medfee_sumamt"] = total  // 医疗费总额
 	inputData["psn_setlway"] = "01"     // 个人结算方式 01 按项目结 02 按定额结算
@@ -1277,7 +1276,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		str2 := string(mjson)
 		fmt.Println(string(out))
 
-		return string(out), str2
+		return hex.EncodeToString(out), str2
 	} else {
 
 		request, err := http.NewRequest("POST", url, reader)
@@ -1363,7 +1362,7 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 		str2 := string(mjson)
 		fmt.Println(string(out))
 
-		return string(out), str2
+		return hex.EncodeToString(out), str2
 	} else {
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {