未开票统计时排除预登记中一些不该出现的情况，具体见sql修改，因为预登记时没有合同套餐金额，所以排除此种情况

controller/census/invoice_payment.go

@@ -1731,7 +1731,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 				//fmt.Println("ContractRegisterId:", v.ContractRegisterId)
 				//fmt.Println("ServiceProductId:", v.ServiceProductId)
 				//fmt.Println("RegisterId:", v.RegisterId)
-				//fmt.Println("len(NotInvoiceSummaryMap[v.RegisterId]):", len(NotInvoiceSummaryMap[v.ContractRegisterId]))
+				fmt.Println("len(NotInvoiceSummaryMap[v.RegisterId]):", len(NotInvoiceSummaryMap[v.ContractRegisterId]))
 				if (v.ProductIds == "1,2" || v.ProductIds == "2,1") && len(NotInvoiceSummaryMap[v.ContractRegisterId]) == 1 {
 					// 套餐是ficc权益都有的，但是只有一个套餐有过开票到款，手动补充另一个套餐的信息
 					if v.ServiceProductId == 1 {
@@ -1848,6 +1848,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					//fmt.Println("v.ContractRegisterId", v.ContractRegisterId)
 					//fmt.Println("v.ServiceProductId:", v.ServiceProductId)
 					//fmt.Println("v.NotInvoicedAmountTotal:", v.NotInvoicedAmountTotal)
+					//fmt.Println("registerId:",registerId)
 					if v.NotInvoicedAmountTotal == 0 {
 						if v.InvoiceAmountTotal > v.PaymentAmountTotal {
 							v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.InvoiceAmountTotal

models/fms/invoice_payment_summary.go

@@ -234,7 +234,7 @@ func GetInvoiceCensusPageList(page base.IPage, condition string, pars []interfac
 		Where(condition, pars...).Group("contract_register_id")
 
 	nq := global.DEFAULT_MYSQL.Table("(?) AS e", query).
-		Select("*").Where(" e.invoiced_amount_count <>  e.contract_amount ")
+		Select("*").Where(" (e.invoiced_amount_count <> e.contract_amount AND e.contract_amount <> 0) OR (e.contract_amount = 0 AND e.invoiced_amount_count <> e.payment_amount_count)")
 	nq.Count(&count)
 	if len(page.GetOrderItemsString()) > 0 {
 		nq = nq.Order(page.GetOrderItemsString())