Merge remote-tracking branch 'upstream/master'

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

@@ -23,7 +23,11 @@ public interface SiLogDao extends BaseMapper<SiLog> {
             "</if>" +
             "<if test=\"ftclg.patNo!=null and ftclg.patNo!=''\">" +
             "and pat_no=#{ftclg.patNo} " +
-            "</if> order by create_datetime" +
+            "</if> " +
+            "<if test=\"ftclg.times!=null\">" +
+            "and times=#{ftclg.times} " +
+            "</if> " +
+            "order by create_datetime" +
             "</script>")
     IPage<SiLog> selectSiLogs(IPage<SiLog> iPage,
                               @Param("ftclg") FetchLog ftclg);
@@ -40,6 +44,9 @@ public interface SiLogDao extends BaseMapper<SiLog> {
             "<if test=\"ftclg.patNo!=null and ftclg.patNo!=''\">" +
             "and pat_no=#{ftclg.patNo} " +
             "</if>" +
+            "<if test=\"ftclg.times!=null\">" +
+            "and times=#{ftclg.times} " +
+            "</if> " +
             "</script>")
     Integer selectSuccessSiLogCount(@Param("ftclg") FetchLog ftclg);
 }

src/main/java/thyyxxk/webserver/dao/lis/CovidExamDao.java

@@ -11,7 +11,7 @@ public interface CovidExamDao {
 
     @Select("select " +
             "a.ptnt_name as ptntName, a.id_card as idCard, c.itm_str_value as itmStrValue, " +
-            "a.ptnt_no as ptntNo, b.audt_time as ordrCreateDate " +
+            "a.ptnt_no as ptntNo, b.ordr_create_date as ordrCreateDate " +
             "from m_ordr_info(nolock) as a " +
             "inner join m_ordr(nolock) as b on a.ordr_info_id = b.ordr_info_id " +
             "inner join m_ordr_item(nolock) as c on b.ordr_id = c.ordr_id " +
@@ -25,7 +25,7 @@ public interface CovidExamDao {
 
     @Select("select " +
             "a.ptnt_name as ptntName, a.id_card as idCard, c.itm_str_value as itmStrValue, " +
-            "a.ptnt_no as ptntNo, b.audt_time as ordrCreateDate " +
+            "a.ptnt_no as ptntNo, b.ordr_create_date as ordrCreateDate " +
             "from m_ordr_info(nolock) as a " +
             "inner join m_ordr(nolock) as b on a.ordr_info_id = b.ordr_info_id " +
             "inner join m_ordr_item(nolock) as c on b.ordr_id = c.ordr_id " +

src/main/java/thyyxxk/webserver/entity/medicalinsurance/log/FetchLog.java

@@ -11,6 +11,7 @@ public class FetchLog {
     private Date begntime;
     private Date endtime;
     private String patNo;
+    private Integer times;
     private Boolean needCalTips;
     private Integer currentPage;
     private Integer pageSize;