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

controllers/sg/his_api_controller.go

@@ -2,7 +2,7 @@ package sg
 
 import (
 	"archive/zip"
-	"bytes"
+	//"bytes"
 	"encoding/json"
 	"fmt"
 	"gdyb/controllers"
@@ -2159,30 +2159,16 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 			config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 			if config.IsOpen == 1 { //对接了医保，走医保流程
-				bytesData, _ := json.Marshal(data)
-				req, _ := http.NewRequest("POST", "http://127.0.0.1:9532/"+"gdyb/five", bytes.NewReader(bytesData))
-				resp, _ := client.Do(req)
-				defer resp.Body.Close()
-				body, ioErr := ioutil.ReadAll(resp.Body)
-				if ioErr != nil {
-					utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
-				var respJSON map[string]interface{}
-				if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
-					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
-
-				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-				userJSONBytes, _ := json.Marshal(respJSON)
-
-				request_respJSON := respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
-				requestJSONBytes, _ := json.Marshal(request_respJSON)
 
-				saveLog(string(userJSONBytes), string(requestJSONBytes), "2204")
+				result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, data["dept"].(string), data["fixmedins_code"].(string), data["dept_code"].(string), data["doctor_id"].(string), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["balance_accounts_type"].(string))
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(result), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
+				saveLog(result, request_log, "2204")
+				userJSONBytes, _ := json.Marshal(dat)
 
 				var res ResultFour
 				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
@@ -3365,31 +3351,16 @@ func (c *HisApiController) GetPreUploadInfo() {
 		}
 		config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 		if config.IsOpen == 1 { //对接了医保，走医保流程
-			bytesData, _ := json.Marshal(data)
-			req, _ := http.NewRequest("POST", "http://127.0.0.1:9532/"+"gdyb/five", bytes.NewReader(bytesData))
-			resp, _ := client.Do(req)
-			defer resp.Body.Close()
-			body, ioErr := ioutil.ReadAll(resp.Body)
-			if ioErr != nil {
-				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			var respJSON map[string]interface{}
-			if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
-				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-			userJSONBytes, _ := json.Marshal(respJSON)
-
-			//request_respJSON := respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
-			//requestJSONBytes, _ := json.Marshal(request_respJSON)
-
-			//saveLog(string(userJSONBytes), string(requestJSONBytes), "2204")
 
+			result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, data["dept"].(string), data["fixmedins_code"].(string), data["dept_code"].(string), data["doctor_id"].(string), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["balance_accounts_type"].(string))
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			saveLog(result, request_log, "2204")
+			userJSONBytes, _ := json.Marshal(dat)
 			var res ResultFour
 			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)

service/hb_his_service.go

@@ -0,0 +1,61 @@
+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
+//}