Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/his_api_controller.go

@@ -10668,8 +10668,10 @@ func (c *HisApiController) GetFaPiaoData() {
 	pre_pay_money := service.GetUserMoney(order.PatientId, adminUser.CurrentOrgId)
 	sum, _ := service.RefundListSum(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime, order.PatientId)
 	admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
+	charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
 
 	c.ServeSuccessJSON(map[string]interface{}{
+		"charge_admin_name":                   charge_admin.UserName,
 		"order_number":                        order.Number, //业务流水号
 		"id_card_no":                          his.IdCardNo, //社会保障号
 		"patient":                             patient,