1111

controllers/sg/his_api_controller.go

@@ -2738,10 +2738,17 @@ func (c *HisApiController) GetCheckAccount() {
 
 	orders_two, _ := service.GetOrderByTimeThree(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_type)
 
+	fixmedins_setl_cnt := int64(len(orders_two))
+
+	//撤销的算2条数据为一笔
+	for _, item := range orders_two {
+		if item.OrderStatus == 3 {
+			fixmedins_setl_cnt = fixmedins_setl_cnt + 1
+		}
+	}
 	var medfee_sumamt float64
 	var acct_pay float64
 	var fund_pay_sumamt float64
-	fixmedins_setl_cnt := int64(len(orders_two))
 	for _, item := range orders {
 		medfee_sumamt = medfee_sumamt + item.MedfeeSumamt
 		acct_pay = acct_pay + item.AcctPay
@@ -2873,12 +2880,6 @@ func (c *HisApiController) GetCheckDetailAccount() {
 		fund_pay_sumamt = fund_pay_sumamt + item.FundPaySumamt
 	}
 
-	for _, item := range orders {
-		medfee_sumamt, _ = decimal.NewFromFloat(medfee_sumamt).Add(decimal.NewFromFloat(item.MedfeeSumamt)).Float64()
-		psn_cash_pay, _ = decimal.NewFromFloat(psn_cash_pay).Add(decimal.NewFromFloat(item.PsnCashPay)).Float64()
-		fund_pay_sumamt, _ = decimal.NewFromFloat(fund_pay_sumamt).Add(decimal.NewFromFloat(item.FundPaySumamt)).Float64()
-	}
-
 	f, err := os.Create(miConfig.OrgName + "/" + file_name)
 	defer f.Close()
 	if err != nil {

service/gdyb_service.go

@@ -1142,7 +1142,7 @@ func Gdyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3202"                                              // 交易编码
 	inputData["file_qury_no"] = "fsi/H44022900158/" + businessParams.FileQuryNo // 险种
-	inputData["setl_optins"] = baseParams.OrgName                               // 结算经办机构
+	inputData["setl_optins"] = "定点医保中心"                                         // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate                    // 对帐开始时间
 	inputData["stmt_enddate"] = businessParams.StmtEnddate                      //对帐结束时间
 	inputData["medfee_sumamt"] = businessParams.MedfeeSumamt                    //医疗费总额