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

controllers/sg/his_api_controller.go

@@ -2,7 +2,6 @@ package sg
 
 import (
 	"archive/zip"
-	//"bytes"
 	"encoding/json"
 	"fmt"
 	"gdyb/controllers"
@@ -12,8 +11,6 @@ import (
 	"gdyb/utils"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
-
-	//"github.com/jinzhu/gorm"
 	"github.com/shopspring/decimal"
 	"io"
 	"io/ioutil"
@@ -3324,7 +3321,6 @@ func (c *HisApiController) GetPreUploadInfo() {
 			reg_type = 11
 		}
 
-		client := &http.Client{}
 		data["psn_no"] = his.PsnNo
 		data["mdtrt_id"] = his.Number
 		data["chrg_bchno"] = chrg_bchno

service/gdyb_service.go

@@ -20,9 +20,6 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
-
-	"github.com/go-ole/go-ole"
-	"github.com/go-ole/go-ole/oleutil"
 )
 
 const (
@@ -47,7 +44,6 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 	inputData["fixmedins_code"] = fixmedins_code
 	input["medinsinfo"] = inputData
 	inputMessage["input"] = input //交易输入
-
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -81,37 +77,6 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 	//
 	//
 
-	unknown, _ := oleutil.CreateObject("yinhai.yh_hb_sctr")
-	xmlhttp, _ := unknown.QueryInterface(ole.IID_IDispatch)
-
-	var str3 string
-	//str := make([]byte, 256)
-	//str1 := make([]byte, 256)
-	//r, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
-
-	result, _ := oleutil.CallMethod(xmlhttp, "yh_hb_call", "1201", string(bytesData), str3)
-
-	fmt.Println(result.Val)
-	fmt.Println("~~~~~~~~")
-	fmt.Println(result)
-	fmt.Println(result.ToString())
-	fmt.Println(result.Value())
-	fmt.Println("~~~~~~~~")
-	xmlhttp.Release()
-	ole.CoUninitialize()
-	//fmt.Println("~~~~~~~~")
-	//fmt.Println(xmlhttp)
-	//fmt.Println("~~~~~~~~")
-
-	////ret, _, _ := Iinit.Call(StrPtr("1201"), StrPtr(string(bytesData)), StrPtr(str3))
-	//fmt.Println("~~~~~~~~")
-	//fmt.Println(ret)
-	//fmt.Println(str3)
-	//fmt.Println("~~~~~~~~")
-
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1201"
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1201"
-	//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())

service/hb_his_service.go

@@ -1,61 +0,0 @@
-package service
-
-import (
-//"encoding/json"
-//"syscall"
-//"time"
-//"encoding/json"
-//"syscall"
-//"time"
-)
-
-// 人员基本信息
-//func HByb1101(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 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)
-//	input := make(map[string]interface{})
-//	inputData := make(map[string]interface{})
-//	inputMessage["infno"] = "1101" // 交易编码
-//
-//	if certificates == "3" {
-//		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
-//		inputData["certno"] = certNo        // 证件号码
-//		inputData["psn_cert_type"] = "99"   // 人员证件类型
-//
-//	} else {
-//		if id_card_type == 1 {
-//			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-//			inputData["card_sn"] = card_sn      // 卡识别码
-//			inputData["certno"] = certNo        // 证件号码
-//			inputData["psn_cert_type"] = "01"   // 人员证件类型
-//
-//		} else {
-//			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-//			inputData["card_sn"] = ""           // 卡识别码
-//			inputData["certno"] = certNo        // 证件号码
-//			inputData["psn_cert_type"] = "01"   // 人员证件类型
-//		}
-//	}
-//
-//	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
-//	inputData["begntime"] = ""          // 开始时间
-//	inputData["psn_name"] = ""          // 人员姓名
-//	input["data"] = inputData
-//	inputMessage["input"] = input //交易输入
-//
-//	var inputLog string
-//	bytesData, _ := json.Marshal(inputMessage)
-//	inputLog = string(bytesData)
-//
-//
-//	DllDef := syscall.MustLoadDLL("yh_hb_sctrl.dll")
-//	Iinit := DllDef.MustFindProc("yh_hb_call")
-//	var str3 string
-//	ret, _, _ := Iinit.Call(StrPtr("1101"), StrPtr(string(bytesData)), StrPtr(str3))
-//
-//	return str, inputLog
-//}