结算单只查询有效的

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/UpIdCollectionDao.java

@@ -227,7 +227,7 @@ public interface UpIdCollectionDao {
             "       outDeptName=(select rtrim(name) from zd_unit_code where code=small_dept), " +
             "       setl_list_id,datediff(day ,b.admiss_date ,b.dis_date) as act_ipt_days,b.operation " +
             "from t_si_setlinfo a left join  zy_inactpatient b on (a.pat_no = b.inpatient_no and a.times = b.admiss_times) " +
-            "where 1=1 " +
+            "where revoked = 0 " +
             "<if test=\"startTime !=null and startTime != '' \">" +
             " and setl_time &gt;= #{startTime} and setl_time &lt;= #{endTime} " +
             "</if>" +
@@ -273,6 +273,9 @@ public interface UpIdCollectionDao {
             "<if test=\"flag == 2 \">" +
             " and a.setl_list_id is not null " +
             "</if>" +
+            "<if test=\"referPhysician != null and  referPhysician != '' \">" +
+            " and b.refer_physician = #{referPhysician} " +
+            "</if>" +
             " ) temp where rowNumber > ${pageSize} * (${currentPage} - 1)" +
             "</script>")
     List<TSiSetlinfo> huoQuJieSuanRenYuan(@Param("startTime") String startTime,
@@ -285,6 +288,7 @@ public interface UpIdCollectionDao {
                                           @Param("psnTypes") List<String> psnTypes,
                                           @Param("clrOptins") List<String> clrOptins,
                                           @Param("flag") Integer flag,
+                                          @Param("referPhysician") String referPhysician,
                                           @Param("currentPage") long currentPage,
                                           @Param("pageSize") long pageSize);
 
@@ -292,7 +296,7 @@ public interface UpIdCollectionDao {
     @Select("<script>" +
             "select count(*) " +
             "from t_si_setlinfo a left join  zy_inactpatient b on (a.pat_no = b.inpatient_no and a.times = b.admiss_times) " +
-            "where 1=1 " +
+            "where revoked = 0 " +
             "<if test=\"startTime !=null and startTime != '' \">" +
             " and setl_time &gt;= #{startTime} and setl_time &lt;= #{endTime} " +
             "</if>" +
@@ -338,6 +342,9 @@ public interface UpIdCollectionDao {
             "<if test=\"flag == 2 \">" +
             " and a.setl_list_id is not null " +
             "</if>" +
+            "<if test=\"referPhysician != null and referPhysician != '' \">" +
+            " and b.refer_physician = #{referPhysician} " +
+            "</if>" +
             "</script>")
     long huoQuJieSuanRenYuanTotal(@Param("startTime") String startTime,
                                   @Param("endTime") String endTime,
@@ -348,7 +355,8 @@ public interface UpIdCollectionDao {
                                   @Param("medTypes") List<String> medTypes,
                                   @Param("psnTypes") List<String> psnTypes,
                                   @Param("clrOptins") List<String> clrOptins,
-                                  @Param("flag") Integer flag);
+                                  @Param("flag") Integer flag,
+                                  @Param("referPhysician") String referPhysician);
 
 
     @Select("select opName = (select top(1) rtrim(name) from a_employee_mi where code = op_id_code),* " +