提交代码

service/fapiao_service.go

@@ -1,6 +1,10 @@
 package service
 
-import "XT_New/models"
+import (
+	"XT_New/models"
+	"fmt"
+	"strings"
+)
 
 func FindFaPiaoConfigInfo(org_id int64) (config models.FapiaoConfig, err error) {
 	err = readDb.Model(&models.FapiaoConfig{}).Where("status = 1 AND user_org_id = ?", org_id).First(&config).Error
@@ -46,6 +50,8 @@ func GetFaPiaoSettleList(user_org_id int64, page int64, limit int64, start_time_
 
 	}
 
+	db = db.Where("his_order.status =  1 and his_order.order_status = 2")
+
 	// Preload related data
 	db = db.Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
 		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
@@ -73,13 +79,21 @@ func GetFaPiaoList(user_org_id int64, page int64, limit int64, start_time_timest
 	offset := (page - 1) * limit
 	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", start_time_timestamp, end_time_timestamp, 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
 	db = db.Limit(limit).Offset(offset)
 	// Execute query and return results
 	err = db.Find(&order).Error
+	for _, item := range order {
+		var os []*models.SettleAccountsDateOrder
+		order_ids := strings.Split(item.OrderIds, ",")
+		err := readDb.Model(&models.SettleAccountsDateOrder{}).Where("id in (?)", order_ids).Find(&os).Error
+		if err == nil {
+			item.SettleAccountsDateOrder = append(item.SettleAccountsDateOrder, os...)
+		}
+	}
 	return
 }
 
@@ -98,7 +112,7 @@ func GetFaPiaoOrderInfoByNumbers(numbers []string) (infos []models.HisOrderInfo,
 	return
 }
 
-func SaveFaPiaoOrder(fapiao models.HisFaPiaoOrder) (err error) {
+func SaveFaPiaoOrder(fapiao *models.HisFaPiaoOrder) (err error) {
 	err = writeDb.Save(&fapiao).Error
 	return
 }
@@ -108,6 +122,14 @@ func UpdateFaPiaoNumber(number string, ids []string) (err error) {
 	return
 }
 
+func UpdateFaPiaoSN(number string, ids []string) (err error) {
+	fmt.Println(ids)
+	fmt.Println(number)
+
+	err = XTWriteDB().Model(&models.HisOrder{}).Where("id in (?)", ids).Updates(map[string]interface{}{"fa_piao_sn": number}).Error
+	return
+}
+
 func UpdateFaPiaoNumberByNumber(number string) (err error) {
 	err = XTWriteDB().Model(&models.HisOrder{}).Where("fa_piao_number = ?", number).Updates(map[string]interface{}{"fa_piao_number": ""}).Error
 	return