提交代码

controllers/his_api_controller.go

@@ -1186,6 +1186,9 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 						case 15:
 							item.MedChrgitmType = "14"
 							break
+						case 101:
+							item.MedChrgitmType = "04"
+							break
 
 						}
 
@@ -1222,6 +1225,9 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 						case 9:
 							item.MedChrgitmType = "14"
 							break
+						case 101:
+							item.MedChrgitmType = "04"
+							break
 						default:
 							item.MedChrgitmType = "14"
 							break

controllers/his_export_data_controller.go

@@ -6,7 +6,7 @@ import (
 	"XT_New/service"
 	"github.com/astaxie/beego"
 	"github.com/shopspring/decimal"
-	"strings"
+	"time"
 )
 
 type HisExportDataController struct {
@@ -19,6 +19,38 @@ func HisExportDataApiRegistRouters() {
 
 	beego.Router("/api/batchsettle/get", &HisExportDataController{}, "Get:GetExportSettleData")
 
+	beego.Router("/api/export/10726/detail", &HisExportDataController{}, "Get:Get10726DetailExportData")
+	beego.Router("/api/export/10726/summary", &HisExportDataController{}, "Get:Get10726SummaryExportData")
+	beego.Router("/api/export/10697/summary", &HisExportDataController{}, "Get:Get10697SummaryExportData")
+
+}
+
+func (c *HisExportDataController) Get10726DetailExportData() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	result, _ := service.GetHisOrderBy10726Detail(start_time, end_time)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"result": result,
+	})
+}
+
+func (c *HisExportDataController) Get10726SummaryExportData() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	result, _ := service.GetHisOrderBy10726Summary(start_time, end_time)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"result": result,
+	})
+}
+
+func (c *HisExportDataController) Get10697SummaryExportData() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	ins := c.GetString("ins")
+	result, _ := service.GetHisOrderBy10697Summary(start_time, end_time, ins)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"result": result,
+	})
 }
 
 func (c *HisExportDataController) GetExportSettleData() {
@@ -195,6 +227,15 @@ func (c *HisExportDataController) GetExportSettleData() {
 			otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 		}
 	}
+
+	t := time.Unix(orders[0].SettleAccountsDate, 0)
+	t2 := time.Unix(orders[len(orders)-1].SettleAccountsDate, 0)
+
+	// 使用Format方法将时间转换为字符串
+	// 这里以 "2006-01-02 15:04:05" 为例，它是Go的预定义常量格式
+	f_time := t.Format("2006-01-02")
+
+	l_time := t2.Format("2006-01-02")
 	c.ServeSuccessJSON(map[string]interface{}{
 		"order_infos":                                 orderInfos,
 		"number":                                      order.MdtrtId,
@@ -238,8 +279,8 @@ func (c *HisExportDataController) GetExportSettleData() {
 		"org_name": miConfig.OrgName,
 		"org_code": miConfig.Code,
 		"num":      len(orders),
-		"f_time":   strings.Split(orders[0].SetlTime, " ")[0],
-		"l_time":   strings.Split(orders[len(orders)-1].SetlTime, " ")[0],
+		"f_time":   f_time,
+		"l_time":   l_time,
 	})
 
 }

models/bwfapiao/baiwang.go

@@ -78,3 +78,150 @@ type QrcodeCertifyResultError struct {
 	SubCode    string `json:"subCode"`    // 子错误码
 	SubMessage string `json:"subMessage"` // 子错误信息
 }
+
+// 公共响应参数
+type CommonResponse struct {
+	Success       bool          `json:"success"`       // 接口调用成功或失败的标志
+	Method        string        `json:"method"`        // 接口的唯一标识
+	RequestID     string        `json:"requestId"`     // 请求唯一标识
+	Response      interface{}   `json:"response"`      // 业务接口调用成功后的具体响应信息
+	ErrorResponse ErrorResponse `json:"errorResponse"` // 错误响应信息
+}
+
+// 定义响应结构体
+type RedAddResponse struct {
+	Success       bool                `json:"success"`                 // 接口调用成功或失败的标志
+	Method        string              `json:"method"`                  // 接口的唯一标识
+	RequestId     string              `json:"requestId"`               // 请求唯一标识
+	Response      []RedAddInvoiceData `json:"response,omitempty"`      // 业务响应信息
+	ErrorResponse ErrorResponse       `json:"errorResponse,omitempty"` // 错误响应信息
+}
+
+type RedAddInvoiceData struct {
+	RedConfirmUUID     string `json:"redConfirmUuid"`
+	RedInvoiceNo       string `json:"redInvoiceNo"`
+	ConfirmState       string `json:"confirmState"`
+	RedConfirmNo       string `json:"redConfirmNo"`
+	ConfirmBillingMark string `json:"confirmBillingMark"`
+	RedConfirmSerialNo string `json:"redConfirmSerialNo"`
+}
+
+// 定义响应结构体
+type RedOperaResponse struct {
+	Success       bool                  `json:"success"`                 // 接口调用成功或失败的标志
+	Method        string                `json:"method"`                  // 接口的唯一标识
+	RequestId     string                `json:"requestId"`               // 请求唯一标识
+	Response      []RedOperaInvoiceData `json:"response,omitempty"`      // 业务响应信息
+	ErrorResponse ErrorResponse         `json:"errorResponse,omitempty"` // 错误响应信息
+}
+
+type RedOperaInvoiceData struct {
+	RedConfirmUUID     string `json:"redConfirmUuid"`
+	RedInvoiceNo       string `json:"redInvoiceNo"`
+	ConfirmState       string `json:"confirmState"`
+	RedConfirmNo       string `json:"redConfirmNo"`
+	ConfirmBillingMark string `json:"confirmBillingMark"`
+	RedConfirmSerialNo string `json:"redConfirmSerialNo"`
+}
+
+type InvoiceIssueResponse struct {
+	Method        string                   `json:"method"`
+	Success       bool                     `json:"success"`
+	RequestID     string                   `json:"requestId"`
+	Response      InvoiceIssueResponseData `json:"response"`
+	ErrorResponse ErrorResponse            `json:"errorResponse,omitempty"` // 错误响应信息
+
+}
+
+type InvoiceIssueResponseData struct {
+	Fail    []InvoiceIssueFailData    `json:"fail"`
+	Success []InvoiceIssueSuccessData `json:"success"`
+}
+
+type InvoiceIssueFailData struct {
+	InvoiceTotalPrice    float64                      `json:"invoiceTotalPrice"`
+	InvoiceTotalTax      float64                      `json:"invoiceTotalTax"`
+	InvoiceTotalPriceTax float64                      `json:"invoiceTotalPriceTax"`
+	SerialNo             string                       `json:"serialNo"`
+	InvoiceDetailsList   []InvoiceDetailsFailItemData `json:"invoiceDetailsList"`
+}
+
+type InvoiceDetailsFailItemData struct {
+	PriceTaxMark         string  `json:"priceTaxMark"`
+	GoodsTaxRate         float64 `json:"goodsTaxRate"`
+	InvoiceLineNature    string  `json:"invoiceLineNature"`
+	GoodsTotalPrice      float64 `json:"goodsTotalPrice"`
+	GoodsSpecification   string  `json:"goodsSpecification"`
+	GoodsPrice           float64 `json:"goodsPrice"`
+	FreeTaxMark          string  `json:"freeTaxMark"`
+	GoodsQuantity        string  `json:"goodsQuantity"`
+	GoodsUnit            string  `json:"goodsUnit"`
+	GoodsTotalTax        float64 `json:"goodsTotalTax"`
+	GoodsCode            string  `json:"goodsCode"`
+	PreferentialMark     string  `json:"preferentialMark"`
+	GoodsName            string  `json:"goodsName"`
+	GoodsLineNo          string  `json:"goodsLineNo"`
+	VatSpecialManagement string  `json:"vatSpecialManagement"`
+}
+
+type InvoiceIssueSuccessData struct {
+	PaperInvoiceCode     string                          `json:"paperInvoiceCode"`
+	EInvoiceUrl          string                          `json:"eInvoiceUrl"`
+	InvoiceTotalTax      float64                         `json:"invoiceTotalTax"`
+	InvoiceDate          string                          `json:"invoiceDate"`
+	InvoiceCode          string                          `json:"invoiceCode"`
+	InvoiceTotalPriceTax float64                         `json:"invoiceTotalPriceTax"`
+	SerialNo             string                          `json:"serialNo"`
+	MulPurchaserList     []MulPurchaserItemData          `json:"mulPurchaserList"`
+	TaxControlCode       string                          `json:"taxControlCode"`
+	InvoiceCheckCode     string                          `json:"invoiceCheckCode"`
+	InvoiceQrCode        string                          `json:"invoiceQrCode"`
+	InvoiceTotalPrice    float64                         `json:"invoiceTotalPrice"`
+	InvoiceDetailsList   []InvoiceDetailsSuccessItemData `json:"invoiceDetailsList"`
+	InvoiceTypeCode      string                          `json:"invoiceTypeCode"`
+	PaperInvoiceNo       string                          `json:"paperInvoiceNo"`
+	InvoiceNo            string                          `json:"invoiceNo"`
+	MulPurchaserMark     string                          `json:"mulPurchaserMark"`
+}
+
+type MulPurchaserItemData struct {
+	Purchaser       string `json:"purchaser"`
+	CertificateNo   string `json:"certificateNo"`
+	CertificateType string `json:"certificateType"`
+}
+
+type InvoiceDetailsSuccessItemData struct {
+	PriceTaxMark       string  `json:"priceTaxMark"`
+	GoodsTaxRate       float64 `json:"goodsTaxRate"`
+	GoodsSpecification string  `json:"goodsSpecification"`
+	GoodsPrice         float64 `json:"goodsPrice"`
+	GoodsQuantity      float64 `json:"goodsQuantity"`
+	GoodsUnit          string  `json:"goodsUnit"`
+	GoodsTotalTax      float64 `json:"goodsTotalTax"`
+	GoodsCode          string  `json:"goodsCode"`
+	GoodsName          string  `json:"goodsName"`
+	GoodsLineNo        int     `json:"goodsLineNo"`
+	GoodsTotalPrice    float64 `json:"goodsTotalPrice"`
+}
+
+// 定义响应结构体
+type BanShiResponse struct {
+	Success       bool              `json:"success"`                 // 接口调用成功或失败的标志
+	Method        string            `json:"method"`                  // 接口的唯一标识
+	RequestId     string            `json:"requestId"`               // 请求唯一标识
+	Response      BanShiInvoiceData `json:"response,omitempty"`      // 业务响应信息
+	ErrorResponse ErrorResponse     `json:"errorResponse,omitempty"` // 错误响应信息
+}
+
+type BanShiInvoiceData struct {
+	EInvoiceUrl  string `json:"eInvoiceUrl"`
+	FileType     string `json:"fileType"`
+	ConfirmState string `json:"confirmState"`
+	UrlMap       Urls   `json:"urlMap"`
+}
+
+type Urls struct {
+	PdfUrl string `json:"pdfUrl"`
+	OfdUrl string `json:"ofdUrl"`
+	XmlUrl string `json:"xmlUrl"`
+}

models/fapiao.go

@@ -92,6 +92,12 @@ type HisFaPiaoOrder struct {
 	Patients                Patients                   `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	SettleAccountsDateOrder []*SettleAccountsDateOrder `gorm:"-" json:"orders" form:"orders"`
 	Message                 string                     `gorm:"column:message" json:"message" form:"message"`
+	RedInvoiceUUID          string                     `gorm:"column:red_invoice_uuid" json:"red_invoice_uuid" form:"red_invoice_uuid"`
+
+	BlueRequestInfo  string `gorm:"column:blue_request_info" json:"blue_request_info" form:"blue_request_info"`
+	BlueResponseInfo string `gorm:"column:blue_response_info" json:"blue_response_info" form:"blue_response_info"`
+	RedRequestInfo   string `gorm:"column:red_request_info" json:"red_request_info" form:"red_request_info"`
+	RedResponseInfo  string `gorm:"column:red_response_info" json:"red_response_info" form:"red_response_info"`
 }
 
 func (HisFaPiaoOrder) TableName() string {

models/his_models.go

@@ -2941,3 +2941,51 @@ type XtGoodTeamList struct {
 func (XtGoodTeamList) TableName() string {
 	return "xt_good_team_list"
 }
+
+type HisOrder10726 struct {
+	ID                  uint    `gorm:"primaryKey"`
+	UserOrgID           int     `gorm:"column:user_org_id"`
+	OrderStatus         int     `gorm:"column:order_status"`
+	SetlTime            string  `gorm:"column:setl_time"`
+	IsMedicineInsurance int     `gorm:"column:is_medicine_insurance"`
+	Status              int     `gorm:"column:status"`
+	Certno              string  `gorm:"column:certno"`
+	PsnName             string  `gorm:"column:psn_name"`
+	Gend                string  `gorm:"column:gend"`
+	PsnType             string  `gorm:"column:psn_type"`
+	MedType             string  `gorm:"column:med_type"`
+	MedfeeSumamt        float64 `gorm:"column:medfee_sumamt"`
+	HifpPay             float64 `gorm:"column:hifp_pay"`
+	ActPayDedc          float64 `gorm:"column:act_pay_dedc"`
+	HifobPay            float64 `gorm:"column:hifob_pay"`
+	HifmiPay            float64 `gorm:"column:hifmi_pay"`
+	HifesPay            float64 `gorm:"column:hifes_pay"`
+	CvlservPay          float64 `gorm:"column:cvlserv_pay"`
+	MafPay              float64 `gorm:"column:maf_pay"`
+	OthPay              float64 `gorm:"column:oth_pay"`
+	HospPartAmt         float64 `gorm:"column:hosp_part_amt"`
+	AcctPay             float64 `gorm:"column:acct_pay"`
+	AcctMulaidPay       float64 `gorm:"column:acct_mulaid_pay"`
+	FundPaySumamt       float64 `gorm:"column:fund_pay_sumamt"`
+	PsnCashPay          float64 `gorm:"column:psn_cash_pay"`
+}
+
+type HisOrder10726Summary struct {
+	Insutype            string  `gorm:"column:insutype"`
+	UserOrgID           int     `gorm:"column:user_org_id"`
+	OrderStatus         int     `gorm:"column:order_status"`
+	SetlTime            string  `gorm:"column:setl_time"`
+	IsMedicineInsurance int     `gorm:"column:is_medicine_insurance"`
+	Status              int     `gorm:"column:status"`
+	PatientID           int     `gorm:"column:patient_id"`
+	ID                  int     `gorm:"column:id"`
+	MedfeeSumamt        float64 `gorm:"column:medfee_sumamt"`
+	HifpPay             float64 `gorm:"column:hifp_pay"`
+	HifmiPay            float64 `gorm:"column:hifmi_pay"`
+	CvlservPay          float64 `gorm:"column:cvlserv_pay"`
+	MafPay              float64 `gorm:"column:maf_pay"`
+	OthPay              float64 `gorm:"column:oth_pay"`
+	AcctPay             float64 `gorm:"column:acct_pay"`
+	AcctMulaidPay       float64 `gorm:"column:acct_mulaid_pay"`
+	PsnCashPay          float64 `gorm:"column:psn_cash_pay"`
+}

service/export_data_service.go

@@ -134,3 +134,199 @@ func GetBatchHisOrderInfoByNumber(order_number string) (order []models.BatchHisO
 	err = readDb.Model(&models.BatchHisOrderInfo{}).Where("order_number = ? and status = 1", order_number).Find(&order).Error
 	return
 }
+
+type Results struct {
+	SerialNo           string  `gorm:"column:序号"`
+	MedicalArea        string  `gorm:"column:医疗区划"`
+	CertNo             string  `gorm:"column:证件号码"`
+	PsnName            string  `gorm:"column:姓名"`
+	Gender             string  `gorm:"column:性别"`
+	Occupation         string  `gorm:"column:职业"`
+	MedicalType        string  `gorm:"column:医疗类别"`
+	AdmissionTime      string  `gorm:"column:入院时间"`
+	DischargeTime      string  `gorm:"column:出院时间"`
+	SettlementTime     string  `gorm:"column:结算时间"`
+	DischargeDiagnosis string  `gorm:"column:出院诊断"`
+	InpatientDays      int     `gorm:"column:住院天数"`
+	MedicalFeeTotal    float64 `gorm:"column:医疗费总额"`
+	HifpPay            float64 `gorm:"column:统筹支付金额"`
+	ActPayDedc         float64 `gorm:"column:起付线"`
+	HifobPay           float64 `gorm:"column:职工大额基金支付"`
+	HifmiPay           float64 `gorm:"column:居民大病基金支出"`
+	HifesPay           float64 `gorm:"column:企业补充"`
+	CvlservPay         float64 `gorm:"column:公务员补助"`
+	MafPay             float64 `gorm:"column:医疗救助"`
+	OthPay             float64 `gorm:"column:其他支付"`
+	HospPartAmt        float64 `gorm:"column:医院负担"`
+	AcctPay            float64 `gorm:"column:个账支付"`
+	AcctMulaidPay      float64 `gorm:"column:共济支付"`
+	FundPaySumamt      float64 `gorm:"column:基金支付金额"`
+	PsnCashPay         float64 `gorm:"column:现金支付"`
+}
+
+type SummaryResults struct {
+	InsuranceType      string  `gorm:"column:险种类型"`   // 险种类型
+	MedicalArea        string  `gorm:"column:统筹区"`    // 统筹区
+	SettlementCategory string  `gorm:"column:清算类别"`   // 清算类别
+	PeopleCount        int     `gorm:"column:人数"`     // 人数
+	VisitCount         int     `gorm:"column:人次"`     // 人次
+	TotalMedicalFee    float64 `gorm:"column:医保费用合计"` // 医保费用合计
+	PoolFundPay        float64 `gorm:"column:统筹支付金额"` // 统筹支付金额
+	BigDiseaseFundPay  float64 `gorm:"column:大病基金支付"` // 大病基金支付
+	PublicServantPay   float64 `gorm:"column:公务员补助"`  // 公务员补助
+	MedicalAssistance  float64 `gorm:"column:医疗救助"`   // 医疗救助
+	OtherPay           float64 `gorm:"column:其他支付"`   // 其他支付
+	AcctPay            float64 `gorm:"column:个账支付"`   // 个账支付
+	MutualAidPay       float64 `gorm:"column:共济支付"`   // 共济支付
+	CashPay            float64 `gorm:"column:现金支付"`   // 现金支付
+}
+
+func GetHisOrderBy10726Detail(start_time string, end_time string) ([]Results, error) {
+	//err = readDb.Model(&models.HisOrder10726{}).Select("").Where("setl_time >= ? and setl_time <= ? AND status = 1 and order_status = 2  and user_org_id = 10721", start_time+" 00:00:00", end_time+" 23:59:00").Find(&order).Error
+	var result []Results
+	readDb.Table("his_order").Select(`
+		'' AS 序号,
+		'乐安县' AS 医疗区划,
+		certno AS 证件号码,
+		psn_name AS 姓名,
+		CASE 
+			WHEN gend = '1' THEN '男' 
+			WHEN gend = '2' THEN '女' 
+		END AS 性别,
+		CASE 
+			WHEN psn_type IN ('14', '15') THEN '居民（成年）'
+		END AS 职业,
+		CASE 
+			WHEN med_type = '990101' THEN '单病种门诊'
+			WHEN med_type = '14' THEN '门诊慢特病'
+		END AS 医疗类别,
+		setl_time AS 入院时间,
+		setl_time AS 出院时间,
+		setl_time AS 结算时间,
+		CASE 
+			WHEN med_type = '990101' THEN '尿毒症(免费透析)'
+			WHEN med_type = '14' THEN '尿毒症期'
+		END AS 出院诊断,
+		1 AS 住院天数,
+		medfee_sumamt AS 医疗费总额,
+		hifp_pay AS 统筹支付金额,
+		act_pay_dedc AS 起付线,
+		hifob_pay AS 职工大额基金支付,
+		hifmi_pay AS 居民大病基金支出,
+		hifes_pay AS 企业补充,
+		cvlserv_pay AS 公务员补助,
+		maf_pay AS 医疗救助,
+		oth_pay AS 其他支付,
+		hosp_part_amt AS 医院负担,
+		acct_pay AS 个账支付,
+		acct_mulaid_pay AS 共济支付,
+		fund_pay_sumamt AS 基金支付金额,
+		psn_cash_pay AS 现金支付
+	`).Where("user_org_id = ?", 10726).
+		Where("order_status = ?", 2).
+		Where("setl_time >= ?", start_time).
+		Where("setl_time <= ?", end_time).
+		Where("is_medicine_insurance = ?", 1).
+		Where("status = ?", 1).
+		Scan(&result)
+	return result, err
+}
+
+func GetHisOrderBy10726Summary(start_time string, end_time string) ([]SummaryResults, error) {
+	var result []SummaryResults
+	err = readDb.Table("his_order").
+		Select(`
+			CASE
+				WHEN insutype = "390" THEN "城乡居民"
+				WHEN insutype = "310" THEN "职工"
+			END AS "险种类型",
+			"乐安县" AS 统筹区,
+			"门诊" AS 清算类别,
+			COUNT(DISTINCT patient_id) AS 人数,
+			COUNT(id) AS 人次,
+			SUM(medfee_sumamt) AS 医保费用合计,
+			SUM(hifp_pay) AS 统筹支付金额,
+			SUM(hifmi_pay) AS 大病基金支付,
+			SUM(cvlserv_pay) AS 公务员补助,
+			SUM(maf_pay) AS 医疗救助,
+			SUM(oth_pay) AS 其他支付,
+			SUM(acct_pay) AS 个账支付,
+			SUM(acct_mulaid_pay) AS 共济支付,
+			SUM(psn_cash_pay) AS 现金支付
+		`).
+		Where("user_org_id = ? AND order_status = ? AND setl_time >= ? AND setl_time <= ? AND is_medicine_insurance = ? AND status = ?",
+			10726, 2, start_time, end_time, 1, 1).
+		Group("insutype").
+		Scan(&result).Error
+	return result, err
+
+}
+
+type MedicalCharges struct {
+	SerialNo                 string  `gorm:"column:编号"`     // 编号
+	MedicalInsuranceNo       string  `gorm:"column:医疗保险号"`  // 医疗保险号
+	PsnName                  string  `gorm:"column:姓名"`     // 姓名
+	BedsFee                  float64 `gorm:"column:床位费"`    // 床位费
+	ConsultationFee          float64 `gorm:"column:诊察费"`    // 诊察费
+	ExaminationFee           float64 `gorm:"column:检查费"`    // 检查费
+	LaboratoryFee            float64 `gorm:"column:化验费"`    // 化验费
+	TreatmentFee             float64 `gorm:"column:治疗费"`    // 治疗费
+	NursingFee               float64 `gorm:"column:护理费"`    // 护理费
+	HealthMaterialsFee       float64 `gorm:"column:卫生材料费"`  // 卫生材料费
+	WesternMedicineFee       float64 `gorm:"column:西药费"`    // 西药费
+	ChineseMedicineFee       float64 `gorm:"column:中药饮片费"`  // 中药饮片费
+	ChinesePatentMedicineFee float64 `gorm:"column:中成药费"`   // 中成药费
+	GeneralTreatmentFee      float64 `gorm:"column:一般诊疗费"`  // 一般诊疗费
+	RegistrationFee          float64 `gorm:"column:挂号费"`    // 挂号费
+	OtherFee                 float64 `gorm:"column:其他费"`    // 其他费
+	TotalMedicalFee          float64 `gorm:"column:医疗费总额"`  // 医疗费总额
+	SelfPay                  float64 `gorm:"column:个人自付金额"` // 个人自付金额
+	AcctPay                  float64 `gorm:"column:基本账户支付"` // 基本账户支付
+	MutualAidAcctPay         float64 `gorm:"column:共济账户支付"` // 共济账户支付
+	PublicServantPay         float64 `gorm:"column:公务员补助"`  // 公务员补助
+	PoolFundPay              float64 `gorm:"column:统筹支付金额"` // 统筹支付金额
+	MedicalAssistance        float64 `gorm:"column:医疗救助"`   // 医疗救助
+	BigDiseasePay            float64 `gorm:"column:大病支付"`   // 大病支付
+	EnterpriseSupplement     float64 `gorm:"column:企业补充支付"` // 企业补充支付
+	MajorDiseaseSupplement   float64 `gorm:"column:重大疾病补充"` // 重大疾病补充 (Empty in SQL, will be left blank in Go)
+	OtherPayment             float64 `gorm:"column:其它支付"`   // 其它支付
+}
+
+func GetHisOrderBy10697Summary(start_time string, end_time string, ins string) (results []MedicalCharges, err error) {
+	err = readDb.Table("his_order").
+		Select(`
+        "" AS 编号,
+        his_order.certno AS 医疗保险号,
+        his_order.psn_name AS 姓名,
+        SUM(CASE WHEN i.med_chrgitm_type = '01' THEN i.det_item_fee_sumamt ELSE 0 END) AS 床位费,
+        SUM(CASE WHEN i.med_chrgitm_type = '02' THEN i.det_item_fee_sumamt ELSE 0 END) AS 诊察费,
+        SUM(CASE WHEN i.med_chrgitm_type = '03' THEN i.det_item_fee_sumamt ELSE 0 END) AS 检查费,
+        SUM(CASE WHEN i.med_chrgitm_type = '04' THEN i.det_item_fee_sumamt ELSE 0 END) AS 化验费,
+        SUM(CASE WHEN i.med_chrgitm_type = '05' THEN i.det_item_fee_sumamt ELSE 0 END) AS 治疗费,
+        SUM(CASE WHEN i.med_chrgitm_type = '07' THEN i.det_item_fee_sumamt ELSE 0 END) AS 护理费,
+        SUM(CASE WHEN i.med_chrgitm_type = '08' THEN i.det_item_fee_sumamt ELSE 0 END) AS 卫生材料费,
+        SUM(CASE WHEN i.med_chrgitm_type = '09' THEN i.det_item_fee_sumamt ELSE 0 END) AS 西药费,
+        SUM(CASE WHEN i.med_chrgitm_type = '10' THEN i.det_item_fee_sumamt ELSE 0 END) AS 中药饮片费,
+        SUM(CASE WHEN i.med_chrgitm_type = '11' THEN i.det_item_fee_sumamt ELSE 0 END) AS 中成药费,
+        SUM(CASE WHEN i.med_chrgitm_type = '12' THEN i.det_item_fee_sumamt ELSE 0 END) AS 一般诊疗费,
+        SUM(CASE WHEN i.med_chrgitm_type = '13' THEN i.det_item_fee_sumamt ELSE 0 END) AS 挂号费,
+        SUM(CASE WHEN i.med_chrgitm_type = '14' THEN i.det_item_fee_sumamt ELSE 0 END) AS 其他费,
+        SUM(his_order.medfee_sumamt) AS 医疗费总额,
+        SUM(his_order.psn_cash_pay) AS 个人自付金额,
+        SUM(his_order.acct_pay) AS 基本账户支付,
+        SUM(his_order.acct_mulaid_pay) AS 共济账户支付,
+        SUM(his_order.cvlserv_pay) AS 公务员补助,
+        SUM(his_order.hifp_pay) AS 统筹支付金额,
+        SUM(his_order.maf_pay) AS 医疗救助,
+        SUM(his_order.hifmi_pay) AS 大病支付,
+        SUM(his_order.hifes_pay) AS 企业补充支付,
+        "" AS 重大疾病补充,
+        SUM(his_order.oth_pay) AS 其它支付
+    `).
+		Joins("JOIN his_order_info i ON his_order.number = i.order_number").
+		Where("his_order.user_org_id = ? AND his_order.order_status = ? AND his_order.setl_time >= ? AND his_order.setl_time <= ? AND his_order.is_medicine_insurance = ? AND his_order.insutype = ? AND his_order.STATUS = ?",
+			10697, 2, start_time+" 00:00:00", end_time+" 23:59:59", 1, ins, 1).
+		Group("his_order.patient_id").
+		Scan(&results).Error
+	return
+}

service/fapiao_service.go

@@ -11,10 +11,14 @@ func FindFaPiaoConfigInfo(org_id int64) (config models.FapiaoConfig, err error)
 	return
 }
 
-func GetFaPiaoSettleList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, sort_type int64, start_time string, end_time string, is_open_fapiao int64, patient_id int64) (order []*models.HisOrderByFaPiao, err error, total int64) {
+func GetFaPiaoSettleList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, sort_type int64, start_time string, end_time string, is_open_fapiao int64, patient_id int64, keywords string) (order []*models.HisOrderByFaPiao, err error, total int64) {
 	offset := (page - 1) * limit
+	keywords = "%" + keywords + "%"
 	db := readDb.Model(&models.HisOrderByFaPiao{})
 
+	if len(keywords) > 0 {
+		db = db.Joins("join xt_patients  on xt_patients.id = his_order.patient_id and xt_patients.name like ?", keywords)
+	}
 	// Join the patients table based on user_org_id
 	db = db.Joins("join xt_patients as patient on patient.id = his_order.patient_id and patient.user_org_id = ?", user_org_id)
 
@@ -75,11 +79,13 @@ func GetFaPiaoSettleList(user_org_id int64, page int64, limit int64, start_time_
 	return
 }
 
-func GetFaPiaoList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64) (order []*models.HisFaPiaoOrder, err error, total int64) {
+func GetFaPiaoList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, keywords string) (order []*models.HisFaPiaoOrder, err error, total int64) {
 	offset := (page - 1) * limit
+	//keywords = "%" + keywords + "%"
 	db := readDb.Model(&models.HisFaPiaoOrder{})
 	db = db.Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id)
 	db = db.Where("ctime >= ? and ctime <= ? and user_org_id = ? and status = 1 and pdf_url <> ''", start_time_timestamp, end_time_timestamp, user_org_id)
+
 	// Count the total number of records
 	db = db.Count(&total)
 	// Apply pagination