diff --git a/build/classes/com/hangxin/web/ZqlAction.class b/build/classes/com/hangxin/web/ZqlAction.class
index 16aa3fe..178bd4f 100644
Binary files a/build/classes/com/hangxin/web/ZqlAction.class and b/build/classes/com/hangxin/web/ZqlAction.class differ
diff --git a/build/classes/html/tick/hfcounttj.html b/build/classes/html/tick/hfcounttj.html
index 9cb4d21..6d65fa7 100644
--- a/build/classes/html/tick/hfcounttj.html
+++ b/build/classes/html/tick/hfcounttj.html
@@ -29,7 +29,8 @@
-
+
+
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/ZqlAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/ZqlAction.class
index 16aa3fe..178bd4f 100644
Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/ZqlAction.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/ZqlAction.class differ
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/hfcounttj.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/hfcounttj.html
index 9cb4d21..6d65fa7 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/hfcounttj.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/hfcounttj.html
@@ -29,7 +29,8 @@
-
+
+
diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
index 9a5751a..18ccbc2 100644
--- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini
+++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
@@ -1,3 +1,3 @@
#save ini
-#Sun Mar 19 23:25:21 CST 2023
+#Mon Apr 03 21:21:37 CST 2023
deploystamp=1612237236000
diff --git a/resource/html/tick/hfcounttj.html b/resource/html/tick/hfcounttj.html
index 9cb4d21..6d65fa7 100644
--- a/resource/html/tick/hfcounttj.html
+++ b/resource/html/tick/hfcounttj.html
@@ -29,7 +29,8 @@
-
+
+
diff --git a/src/com/hangxin/web/ZqlAction.java b/src/com/hangxin/web/ZqlAction.java
index 974f6ec..4460211 100644
--- a/src/com/hangxin/web/ZqlAction.java
+++ b/src/com/hangxin/web/ZqlAction.java
@@ -249,11 +249,12 @@ public class ZqlAction {
" left join ( select addtime,kpxm,kphjje,ghf_custid from einvoice_fpkjxx_fptxx where to_char（addtime,'yyyy-mm-dd'）>='"+jftime+"') c on b.customer_id=c.ghf_custid" +
" left join customer_info u on b.customer_id=u.customer_id where 1=1 "+sqljy+sqlmz +") group by num order by num ";*/
- String sql="select num ,count(1) sl, sum( case when jftime is not null then 1 else 0 end ) jfsl," +
+ String sql="select num ,count(1) sl, sum( case when (kphjje='280.00' or kphjje='300.00' or kphjje='398.00' ) and jftime is not null then 1 else 0 end ) jfsl," +
" sum( case when kphjje='280.00' and jftime is not null then 1 else 0 end ) fwf , " +
- " sum ( case when kphjje!='280.00' and jftime is not null then 1 else 0 end) tg," +
- " round(sum(case when kphjje!='280.00' and jftime is not null then 1 else 0 end)/count(1) ,4)*100 ||'%' tgbl," +
- " round(sum(case when jftime is not null then 1 else 0 end)/count(1) ,4)*100 ||'%' jfbl" +
+ " sum ( case when kphjje='300.00' and jftime is not null then 1 else 0 end) tg," +
+ " sum ( case when kphjje='398.00' and jftime is not null then 1 else 0 end) sanjiuba," +
+ " round(sum(case when kphjje='300.00' and jftime is not null then 1 else 0 end)/count(1) ,4)*100 ||'%' tgbl," +
+ " round(sum(case when (kphjje='280.00' or kphjje='300.00' or kphjje='398.00' ) and jftime is not null then 1 else 0 end)/count(1) ,4)*100 ||'%' jfbl" +
" from (" +
" select to_char(c.addtime,'yyyy-mm-dd') jftime ,c.kpxm ,c.kphjje ," +
" (select count(1) from rush_log where obj_id=b.id ) num ,a.custtype " +