111

controllers/js/jsyb_controller.go

@@ -664,7 +664,11 @@ func (c *JSybController) PostSeven() {
 	url := c.GetString("url")
 	ak := c.GetString("ak")
 
-	result, request_log := service.Jsyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates, url, ak, verify_number, cainfo)
+	var result string
+	var request_log string
+
+	result, request_log = service.Jsyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates, url, ak, verify_number, cainfo)
+
 	saveJsLog(result, request_log, "2206", "预结算", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -713,7 +717,25 @@ func (c *JSybController) PostEight() {
 	verify_number := c.GetString("verify_number")
 	cainfo := c.GetString("cainfo")
 
-	result, request_log := service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number, cainfo)
+	var result string
+	var request_log string
+	if id_card_type == 4 {
+		_, pBusiCardInfo := GetELeCertInfoSettle(fixmedins_code, "", "")
+		pBusiCardInfo = Remove0000(pBusiCardInfo)
+		var ele ELeData
+		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+		if err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+		}
+		token := ele.Data.EcCardToken
+		if len(token) > 0 {
+			result, request_log = service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, token, cainfo)
+		}
+	} else {
+		result, request_log = service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number, cainfo)
+
+	}
+
 	saveJsLog(result, request_log, "2207", "结算", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -1024,12 +1046,14 @@ func (c *JSybController) ReadCard() {
 		token := ele.Data.EcToken
 		fmt.Println(token)
 		if len(token) > 0 {
-			userName := ConvertByte2String([]byte(ele.Data.UserName), GB18030)
+			userName := ele.Data.UserName
+			fmt.Println(userName)
 			userName = Remove0000(userName)
+			userName = DeleteExtraSpace(userName)
 			fmt.Println(userName)
 			enc := mahonia.NewEncoder("gbk")
 			fmt.Println(enc.ConvertString(userName))
-			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, enc.ConvertString(userName))
+			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, userName)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -1183,6 +1207,38 @@ func (c *JSybController) GetELeCertInfo(code string, operator_id string, operato
 	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
 }
 
+func GetELeCertInfoSettle(code string, operator_id string, operator_name string) (string, string) {
+	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
+	readCard := DllDef.MustFindProc("GetPersonInfo")
+
+	pCardInfo := make([]byte, 8192)
+	pBusiCardInfo := make([]byte, 8192)
+	data := make(map[string]interface{})
+
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["businessType"] = "01301"
+	inputData["operatorId"] = "1"
+	inputData["operatorName"] = "admin"
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "admin"
+	data["data"] = inputData
+	data["transType"] = "ec.query"
+	data["orgId"] = code
+	bytesData, _ := json.Marshal(data)
+	pCardInfo = bytesData
+	pCardInfo = []byte(ConvertByte2String(pCardInfo, GB18030))
+
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	fmt.Println(ret2)
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
+	if ret2 != 0 {
+		return "", ""
+	}
+	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
+}
+
 func IntPtr(n int) uintptr {
 	return uintptr(n)
 }

controllers/sg/his_api_controller.go

@@ -3101,8 +3101,8 @@ func (c *HisApiController) GetSettleListHospital() {
 		HiType:         order.Insutype,
 		Insuplc:        miConfig.InsuplcAdmdvs,
 		MaindiagFlag:   "1",
-		BillCode:       order.FaPiaoCode,
-		BillNo:         order.FaPiaoCode,
+		BillCode:       order.FaPiaoNumber,
+		BillNo:         order.FaPiaoNumber,
 		BizSn:          order.Number,
 		PsnSelfPay:     order.PsnPartAmt,
 		PsnOwnPay:      order.PsnPartAmt,
@@ -3666,8 +3666,8 @@ func (c *HisApiController) GetBatchSettleList() {
 			HiType:         order.Insutype,
 			Insuplc:        his.InsuplcAdmdvs,
 			MaindiagFlag:   "1",
-			BillCode:       order.FaPiaoCode,
-			BillNo:         order.FaPiaoNumber,
+			BillCode:       order.SetlId,
+			BillNo:         order.SetlId,
 			BizSn:          order.Number,
 			PsnSelfPay:     order.PsnPartAmt,
 			PsnOwnPay:      order.PsnPartAmt,
@@ -13157,8 +13157,8 @@ func (c *HisApiController) Post3202() {
 	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.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, "390", "", clr_type)
-	orders_two, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, "310", "", clr_type)
+	orders, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId)
+	//orders_two, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, "310", "", clr_type)
 
 	//fixmedins_setl_cnt := int64(len(orders))
 	var medfee_sumamt float64
@@ -13172,15 +13172,15 @@ func (c *HisApiController) Post3202() {
 
 	}
 
-	var medfee_sumamt_two float64
-	var acct_pay_two float64
-	var fund_pay_sumamt_two float64
+	//var medfee_sumamt_two float64
+	//var acct_pay_two float64
+	//var fund_pay_sumamt_two float64
 
-	for _, item := range orders_two {
-		medfee_sumamt_two = medfee_sumamt_two + item.MedfeeSumamt
-		acct_pay_two = acct_pay_two + item.AcctPay
-		fund_pay_sumamt_two = fund_pay_sumamt_two + item.FundPaySumamt
-	}
+	//for _, item := range orders_two {
+	//	medfee_sumamt_two = medfee_sumamt_two + item.MedfeeSumamt
+	//	acct_pay_two = acct_pay_two + item.AcctPay
+	//	fund_pay_sumamt_two = fund_pay_sumamt_two + item.FundPaySumamt
+	//}
 
 	//var user_name string
 	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
@@ -13207,22 +13207,6 @@ func (c *HisApiController) Post3202() {
 		bp.StmtEnddate = end_time
 		bps = append(bps, &bp)
 
-		medfee_sumamt_two_str := fmt.Sprintf("%.2f", medfee_sumamt_two)
-		acct_pay_two_str := fmt.Sprintf("%.2f", acct_pay_two)
-		fund_pay_sumamt_two_str := fmt.Sprintf("%.2f", fund_pay_sumamt_two)
-
-		var bp2 models.BusinessParamsTwo
-		bp2.MedfeeSumamt = medfee_sumamt_two_str
-		bp2.AcctPay = acct_pay_two_str
-		bp2.FundPaySumamt = fund_pay_sumamt_two_str
-		bp2.Insutype = "310"
-		bp2.StmtBegndate = start_time
-		bp2.StmtEnddate = end_time
-		bp2.ClrType = clr_type
-		bp2.SetlOptins = clr_org
-		bps = append(bps, &bp2)
-		fmt.Println(bps)
-
 		data := make(map[string]interface{})
 		data["bps"] = bps
 		data["org_name"] = miConfig.OrgName

main.go

@@ -6,15 +6,13 @@ import (
 
 	//"gdyb/models"
 	_ "gdyb/routers"
-	"gdyb/service"
-
 	//"github.com/qiniu/api.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 
 	//"github.com/qiniu/roapi.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 
-	//"gdyb/service"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	//"strconv"
 	//"time"

service/fj_service.go

@@ -2398,7 +2398,7 @@ func GetFjBusinessHandleInfo(inputStr []byte) (string, string) {
 		fmt.Println("readcard is nil")
 		readCard = DllDef.MustFindProc("read_cardinfo")
 	}
-	outputStr := make([]byte, 12288)
+	outputStr := make([]byte, 1002288)
 	errMessageStr := make([]byte, 2048)
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&inputStr[0])), uintptr(20000), (uintptr)(unsafe.Pointer(&outputStr[0])), (uintptr)(unsafe.Pointer(&errMessageStr[0])))
 

service/hbyb_service.go

@@ -892,14 +892,14 @@ func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessPa
 	inputMessage["infno"] = "3202a" // 交易编码
 	for _, item := range businessParams {
 		inputData := make(map[string]interface{})
-		inputData["insutype"] = item.Insutype             // 险种
-		inputData["clr_type"] = item.ClrType              // 就诊 ID（来自2201接口返回）
-		inputData["setl_optins"] = item.SetlOptins        // 结算经办机构
+		inputData["insutype"] = ""                        // 险种
+		inputData["clr_type"] = ""                        // 就诊 ID（来自2201接口返回）
+		inputData["setl_optins"] = ""                     // 结算经办机构
 		inputData["stmt_begndate"] = item.StmtBegndate    // 对帐开始时间
 		inputData["stmt_enddate"] = item.StmtEnddate      //对帐结束时间
 		inputData["fund_pay_sumamt"] = item.FundPaySumamt //基金支付总额
 		inputData["acct_pay"] = item.AcctPay              //个人账户支付金额
-		inputData["med_type"] = "14"                      //个人账户支付金额
+		inputData["med_type"] = ""                        //个人账户支付金额
 		inputDatas = append(inputDatas, inputData)
 	}
 	input["clrdata"] = inputDatas

service/his_service.go

@@ -1004,9 +1004,9 @@ func GetOrderByTimeFive(start_time int64, end_time int64, org_id int64, insutype
 	return
 }
 
-func GetOrderByTimeFour(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string) (orders []*models.HisOrder, err error) {
+func GetOrderByTimeFour(start_time int64, end_time int64, org_id int64) (orders []*models.HisOrder, err error) {
 	db := readDb.Model(&models.HisOrder{})
-	db = db.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)
+	db = db.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) >= ? ", org_id, end_time, start_time)
 	err = db.Find(&orders).Error
 	return
 }
@@ -1412,7 +1412,7 @@ func GetPsnByPatientId(patient_id int64) (psn models.HisPsn, err error) {
 }
 
 func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> '' AND  fa_piao_code <> '' AND med_type = '14' AND setl_time >= '2022-07-30 00:00:00' AND setl_time <= '2022-07-31 23:59:59'", org_id).Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2022-07-30 00:00:00' AND setl_time <= '2022-07-31 23:59:59'", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {