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

controllers/hb/hbyb_controller.go

@@ -13,6 +13,7 @@ import (
 	"gdyb/utils"
 	"github.com/astaxie/beego"
 	"io/ioutil"
+
 )
 
 type HBybController struct {
@@ -992,8 +993,7 @@ func (c *HBybController) PostTen() {
 		SetlId:  setlId,
 	}
 	var result string
-	if mdtrtarea_admvs == "421182"{
-
+	if mdtrtarea_admvs == "421182" || mdtrtarea_admvs == "420902"{
 
 		result = service.Hbyb5203(baseParams, businessParams,med_type)
 
@@ -1056,3 +1056,6 @@ func saveJsLog(result string, request string, infno string, desc string, org_nam
 	}
 
 }
+
+
+

controllers/zh/zh_his_api_controller.go

@@ -4330,7 +4330,6 @@ func (c *ZHHisApiController) ZHRefund() {
 			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 			result_byte, _ := json.Marshal(respJSON)
 			result = string(result_byte)
-			//saveLog(result, requestLog, "2404", "入院登记撤销")
 			saveLog(result, requestLog, "2305", "退费")
 
 		} else if miConfig.MdtrtareaAdmvs == "360399" {

main.go

@@ -26,13 +26,13 @@ import (
 func init() {
 	//service.ConnectNMMSDB()
 	service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//////CreateLog(miConfig)
-	//////UploadLog(miConfig)31
-	//if org_id == 10191 {
-	//	service.GetFjAuthorizationInfo(miConfig.Code)
-	//}
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	////CreateLog(miConfig)
+	////UploadLog(miConfig)31
+	if org_id == 10191 {
+		service.GetFjAuthorizationInfo(miConfig.Code)
+	}
 
 
 

models/new_stock_models.go

@@ -263,6 +263,9 @@ type NewDrugWarehouseInfo struct {
 
 	IsPc int64 `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
 	IsBg int64 `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
+	Bchno string `gorm:"column:bchno" json:"bchno" form:"bchno"`
+
+
 }
 
 func (NewDrugWarehouseInfo) TableName() string {

service/fj_service.go

@@ -1006,7 +1006,7 @@ func FJyb6201(org_name string, doctor string, fixmedins_code string, insuplc_adm
 }
 
 // 医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
-func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams, med string, fund string) (string, string, string) {
+func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams, med string, fund string,acct string) (string, string, string) {
 
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
@@ -1040,7 +1040,7 @@ func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
 	inputData["medfee_sumamt"] = med                                  //医疗费总额
 	inputData["fund_pay_sumamt"] = fund                               //基金支付总额
-	inputData["acct_pay"] = businessParams.AcctPay                    //个人账户支付金额
+	inputData["acct_pay"] = acct                    //个人账户支付金额
 	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt //定点医药机构结算笔数
 	inputData["refd_setl_flag"] = "0"                                 // 就诊 ID（来自2201接口返回）
 
@@ -3037,7 +3037,7 @@ func FJyb3501(struct3501 models.Struct3501) (string, string, string) {
 	inputData["manu_date"] = struct3501.ManuDate                    // 人员编号 （来自1101接口返回）
 	inputData["expy_end"] = struct3501.ExpyEnd                      // 人员编号 （来自1101接口返回）
 	inputData["memo"] = struct3501.Memo                             // 人员编号 （来自1101接口返回）
-	druginputData["drug_trac_codg"] = "123"
+	druginputData["drug_trac_codg"] = "12345678912345678901"
 	//druginputData2["drugtracinfo"] = druginputData
 	inputData["drug_trac_info"] = druginputData
 	input["invinfo"] = inputData
@@ -3054,7 +3054,6 @@ func FJyb3501(struct3501 models.Struct3501) (string, string, string) {
 
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-
 	return output, requestLog, err_msg
 }
 
@@ -3070,31 +3069,23 @@ func FJyb3502(struct3502 models.Struct3502) (string, string, string) {
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	druginputData := make(map[string]interface{})
-	//druginputData2 := make(map[string]interface{})
-
 	inputMessage["infno"] = "3502"                      // 交易编码
 	inputData["med_list_codg"] = struct3502.MedListCodg // 定点医药机构目录编号
 	inputData["inv_chg_type"] = struct3502.InvChgType   // 定点医药机构目录编号
-
 	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsCode // 定点医药机构目录编号
 	inputData["fixmedins_hilist_name"] = struct3502.OrgName     // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno    // 人员编号 （来自1101接口返回）
 	inputData["pric"] = struct3502.Pric                         // 人员编号 （来自1101接口返回）
 	inputData["cnt"] = struct3502.Cnt                           // 人员编号 （来自1101接口返回）
 	inputData["rx_flag"] = struct3502.RxFlag                    //
-
 	inputData["inv_chg_time"] = struct3502.InvChgTime // 人员编号 （来自1101接口返回）
 	inputData["inv_chg_opter_name"] = ""              // 人员编号 （来自1101接口返回）
 	inputData["memo"] = struct3502.Memo               // 人员编号 （来自1101接口返回）
 	inputData["trdn_flag"] = ""                       // 人员编号 （来自1101接口返回）
-
-	druginputData["drug_trac_codg"] = "123"
-	//druginputData2["drugtracinfo"] = druginputData
+	druginputData["drug_trac_codg"] = "12345678912345678901"
 	inputData["drug_trac_info"] = druginputData
-
 	input["invinfo"] = inputData
 	inputMessage["input"] = input //交易输入
-
 	bytesData, err := json.Marshal(inputMessage)
 	var requestLog string
 	//bytesData, err := json.Marshal(inputMessage)
@@ -3104,7 +3095,6 @@ func FJyb3502(struct3502 models.Struct3502) (string, string, string) {
 		fmt.Println(err.Error())
 		return err.Error(), "", ""
 	}
-
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	return output, requestLog, err_msg

service/hbyb_service.go

@@ -14,7 +14,8 @@ import (
 	"strings"
 	"time"
 	"encoding/xml"
-
+	"github.com/go-ole/go-ole/oleutil"
+	"github.com/go-ole/go-ole"
 
 )
 
@@ -86,15 +87,16 @@ func Hbyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		return err.Error(), ""
 	}
 
-	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())
-	}
+	//var json2 string
 
-	fmt.Println(string(out))
-	return ConvertToString(string(out), "gbk", "utf-8"), inputLog
+	out := GetoleInfo("1101",string(bytesData))
+
+	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
+	//out, err := cmd.CombinedOutput()
+	//if err != nil {
+	//	fmt.Println("error:", err.Error())
+	//}
+	return out, inputLog
 
 }
 
@@ -145,16 +147,18 @@ func Hbyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
+	out := GetoleInfo("2201",string(bytesData))
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2201", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
+	//var json2 string
+	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2201", string(bytesData), json2)
+	//out, err := cmd.Output()
+	//if err != nil {
+	//	fmt.Println("error:", err.Error())
+	//}
 	fmt.Println(string(out))
 
-	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
+
+	return string(out), requestLog
 
 }
 
@@ -185,16 +189,17 @@ func Hbyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
+	out := GetoleInfo("2202",string(bytesData))
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2202", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
+	//var json2 string
+	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2202", string(bytesData), json2)
+	//out, err := cmd.Output()
+	//if err != nil {
+	//	fmt.Println("error:", err.Error())
+	//}
+	//fmt.Println(string(out))
 
-	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
+	return string(out), requestLog
 
 }
 
@@ -260,15 +265,16 @@ func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		return err.Error(), ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2203", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
+	//var json2 string
+	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2203", string(bytesData), json2)
+	//out, err := cmd.Output()
+	//if err != nil {
+	//	fmt.Println("error:", err.Error())
+	//}
+	//fmt.Println(string(out))
+	out := GetoleInfo("2203",string(bytesData))
 
-	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
+	return out, requestLog
 
 }
 
@@ -438,15 +444,17 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		return "", ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2204", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
+	//var json2 string
+	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2204", string(bytesData), json2)
+	//out, err := cmd.Output()
+	//if err != nil {
+	//	fmt.Println("error:", err.Error())
+	//}
+	//fmt.Println(string(out))
+	out := GetoleInfo("2204",string(bytesData))
+
+	return out, requestLog
 
-	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
 
 }
 
@@ -478,15 +486,17 @@ func Hbyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 		return err.Error(), ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2205", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
+	//var json2 string
+	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2205", string(bytesData), json2)
+	//out, err := cmd.Output()
+	//if err != nil {
+	//	fmt.Println("error:", err.Error())
+	//}
+	//fmt.Println(string(out))
+
+	out := GetoleInfo("2205",string(bytesData))
 
-	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
+	return out, requestLog
 
 }
 
@@ -553,15 +563,16 @@ func Hbyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error(), ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2206", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
+	//var json2 string
+	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2206", string(bytesData), json2)
+	//out, err := cmd.Output()
+	//if err != nil {
+	//	fmt.Println("error:", err.Error())
+	//}
+	//fmt.Println(string(out))
+	out := GetoleInfo("2206",string(bytesData))
 
-	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
+	return out, requestLog
 
 }
 
@@ -624,17 +635,19 @@ func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error(), ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2207", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
+	//var json2 string
+	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2207", string(bytesData), json2)
+	//out, err := cmd.Output()
+	//if err != nil {
+	//	fmt.Println("error:", err.Error())
+	//}
 	mjson, _ := json.Marshal(inputMessage)
 	str2 := string(mjson)
-	fmt.Println(string(out))
 
-	return ConvertToString(string(out), "gbk", "utf-8"), str2
+	out := GetoleInfo("2207",string(bytesData))
+
+
+	return out, str2
 
 }
 
@@ -664,17 +677,17 @@ func Hbyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 		return err.Error(), ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2208", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
+	//var json2 string
+	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2208", string(bytesData), json2)
+	//out, err := cmd.Output()
+	//if err != nil {
+	//	fmt.Println("error:", err.Error())
+	//}
 	mjson, _ := json.Marshal(inputMessage)
 	str2 := string(mjson)
-	fmt.Println(string(out))
-
-	return ConvertToString(string(out), "gbk", "utf-8"), str2
+	//fmt.Println(string(out))
+	out := GetoleInfo("2208",string(bytesData))
+	return out, str2
 
 }
 
@@ -702,17 +715,19 @@ func Hbyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error()
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "YH03", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
+	//var json2 string
+	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "YH03", string(bytesData), json2)
+	//out, err := cmd.Output()
+	//if err != nil {
+	//	fmt.Println("error:", err.Error())
+	//}
+	out := GetoleInfo("YH03",string(bytesData))
+
 	//mjson, _ := json.Marshal(inputMessage)
 	//str2 := string(mjson)
 	fmt.Println(string(out))
 
-	return ConvertToString(string(out), "gbk", "utf-8")
+	return out
 }
 
 func Hbyb5203aa(baseParams models.BaseParams, businessParams models.BusinessParams) string {
@@ -1910,14 +1925,9 @@ func Hbyb5301(psnNo string, insutype string, org_name string, doctor string, fix
 		return err.Error()
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "5301", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
-	return ConvertToString(string(out), "gbk", "utf-8")
+	out := GetoleInfo("5301",string(bytesData))
+	return out
+	//return ConvertToString(string(out), "gbk", "utf-8")
 
 }
 
@@ -3199,3 +3209,50 @@ func Hb2305(psnNo string, mdtrtId string, setlId string, org_name string, doctor
 
 	//return string(out), string(bytesData)
 }
+
+
+func  GetoleInfo(code string,data string) string {
+	ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED)
+	defer ole.CoUninitialize()
+
+	// Replace with the ProgID or CLSID of your COM object
+	progID := "yinhai.yh_hb_sctr"
+
+	// Create COM object
+	unknown, err := oleutil.CreateObject(progID)
+	if err != nil {
+		fmt.Println("Unable to create COM object:", err)
+	}
+	defer unknown.Release()
+
+	// Query for the IDispatch interface
+	dispatch, err := unknown.QueryInterface(ole.IID_IDispatch)
+	if err != nil {
+		fmt.Println("Unable to get IDispatch interface:", err)
+	}
+	defer dispatch.Release()
+
+	// Prepare parameters
+	//transNo := "1401"
+	//transType := "passwordCheck"
+	//timestamp := time.Now().Unix()
+	//fixmedinsCode := "H45072101171"
+	//psnNo := ""
+	//data := fmt.Sprintf(`{"transNo":"%s","transType":"%s","timestamp":"%s","data":{"fixmedinsCode":"%s","psnNo":"%s"}}`, transNo, transType, timestamp, fixmedinsCode, psnNo)
+	result2 := ""
+	// Call COM object's method using the IDispatch interface
+	resulr, err := oleutil.CallMethod(dispatch, "yh_hb_call", code, data, &result2)
+	fmt.Println(resulr)
+	fmt.Println(result2)
+
+	if err != nil {
+		fmt.Println("调用COM对象方法失败:", err)
+	}
+
+	//var response Response
+	//err2 := json.Unmarshal([]byte(result2), &response)
+	//if err2 != nil {
+	//	fmt.Println("解析JSON失败:", err)
+	//}
+	return result2
+}