diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/IndexController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/IndexController.java
index 1f20b59..6ac75c6 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/IndexController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/IndexController.java
@@ -1,14 +1,18 @@
 package com.lyms.talkonlineweb.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.lyms.talkonlineweb.domain.*;
 import com.lyms.talkonlineweb.result.BaseResponse;
 import com.lyms.talkonlineweb.service.IndexService;
+import com.lyms.talkonlineweb.service.LymsHospitalService;
 import com.lyms.talkonlineweb.service.TkRecordStatService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -22,6 +26,7 @@ public class IndexController {
     @Autowired
     private TkRecordStatService tkRecordStatService;
 
+
     /**
      * 访问统计
      * @return
@@ -107,5 +112,21 @@ public class IndexController {
         baseResponse.setObject(tkRecordStatRanking);
         return baseResponse;
     }
+    /**
+     * 首页-转化率-按医院分时段筛选
+     * @param
+     * @return
+     */
+    @GetMapping("getLogsRecordVisitsInfo")
+    public BaseResponse getLogsRecordVisitsInfo(String startdate,String enddate,Integer hid){
+        BaseResponse baseResponse=new BaseResponse();
+        Map<String,Object>map=new HashMap<>();
+        List<LogsRecordVisitsInfo> listVisits = tkRecordStatService.getLogsRecordVisits(startdate,enddate);
+        List<LogsRecordVisitsInfo> listRecord = tkRecordStatService.getLogsRecordRecord(startdate,enddate,hid);
+        map.put("listVisits",listVisits);
+        map.put("listRecord",listRecord);
+        baseResponse.setObject(map);
+        return baseResponse;
+    }
 
 }
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LogsRecordVisitsInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LogsRecordVisitsInfo.java
new file mode 100644
index 0000000..66cfe3e
--- /dev/null
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LogsRecordVisitsInfo.java
@@ -0,0 +1,52 @@
+package com.lyms.talkonlineweb.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *首页-转化率-按医院分时段筛选统计图
+ * @TableName logsRecord_Visits_info
+ */
+@Data
+@TableName(value ="logsRecord_Visits_info")
+public class LogsRecordVisitsInfo implements Serializable {
+
+  /**
+   * 筛选时间
+   */
+  @TableField(value = "ldate")
+  private String ldate;
+  /**
+   * 医院ID
+   */
+  @TableField(value = "hid")
+  private long hid;
+  /**
+   * 医院名称
+   */
+  @TableField(value = "hname")
+  private String hname;
+  /**
+   * 访问量
+   */
+  @TableField(value = "visits")
+  private long visits;
+  /**
+   * 问诊量
+   */
+  @TableField(value = "dcount")
+  private long dcount;
+  /**
+   * 转化率
+   */
+  @TableField(exist = false)
+  private long conversion;
+
+
+
+}
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatDateInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatDateInfo.java
index 3013e7d..c038ff4 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatDateInfo.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatDateInfo.java
@@ -4,13 +4,15 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  *首页-日期筛选问诊量视图
  * @TableName tkRecordStat_date_info
  */
 @Data
 @TableName(value ="tkRecordStat_date_info")
-public class TkRecordStatDateInfo {
+public class TkRecordStatDateInfo implements Serializable {
 
   /**
    * 医院ID
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatHInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatHInfo.java
index 878d73f..53dbb3b 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatHInfo.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatHInfo.java
@@ -4,13 +4,15 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  *首页-今日视图
  * @TableName tkRecordStat_h_info
  */
 @TableName(value ="tkRecordStat_h_info")
 @Data
-public class TkRecordStatHInfo {
+public class TkRecordStatHInfo implements Serializable {
 
   /**
    * 医院ID
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatMInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatMInfo.java
index 71d3742..a75d3e2 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatMInfo.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatMInfo.java
@@ -4,13 +4,15 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  *首页-本周视图
  * @TableName tkRecordStat_m_info
  */
 @Data
 @TableName(value ="tkRecordStat_m_info")
-public class TkRecordStatMInfo {
+public class TkRecordStatMInfo implements Serializable {
 
   /**
    * 医院ID
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatRankingInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatRankingInfo.java
index c6d4a67..788157d 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatRankingInfo.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatRankingInfo.java
@@ -5,13 +5,15 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
- *首页-日期筛选问诊量视图
+ *首页-医院问诊量排名
  * @TableName tkRecordStat_ranking_info
  */
 @Data
 @TableName(value ="tkRecordStat_ranking_info")
-public class TkRecordStatRankingInfo {
+public class TkRecordStatRankingInfo implements Serializable {
 
   /**
    * 医院ID
@@ -21,12 +23,12 @@ public class TkRecordStatRankingInfo {
   /**
    * 医院名称
    */
-  @TableField(value = "hid")
+  @TableField(value = "hname")
   private String hname;
   /**
    * 医院总问诊量
    */
-  @TableField(value = "hid")
+  @TableField(value = "total")
   private long total;
 
 
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatWInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatWInfo.java
index 175a247..55da7d4 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatWInfo.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatWInfo.java
@@ -4,13 +4,15 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  *首页-本周视图
  * @TableName tkRecordStat_w_info
  */
 @Data
 @TableName(value ="tkRecordStat_w_info")
-public class TkRecordStatWInfo {
+public class TkRecordStatWInfo implements Serializable {
 
   /**
    * 医院ID
@@ -26,7 +28,7 @@ public class TkRecordStatWInfo {
    * 问诊量
    */
   @TableField(value = "dcount")
-  private long wcount;
+  private long dcount;
 
 
 
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatYInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatYInfo.java
index 7a3358f..92d3668 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatYInfo.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/TkRecordStatYInfo.java
@@ -5,13 +5,15 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  *首页-本年视图
  * @TableName tkRecordStat_y_info
  */
 @Data
 @TableName(value ="tkRecordStat_y_info")
-public class TkRecordStatYInfo {
+public class TkRecordStatYInfo implements Serializable {
 
   /**
    * 医院ID
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/TkRecordStatMapper.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/TkRecordStatMapper.java
index f36b651..080888e 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/TkRecordStatMapper.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/TkRecordStatMapper.java
@@ -144,7 +144,8 @@ public interface TkRecordStatMapper {
             "</choose>",
             "from tkRecordStat_date_info",
             "where 1=1",
-            "<![CDATA[ and DATE(days)>=DATE(#{startdate}) and DATE(days)<=DATE(#{enddate}) ]]>",
+//            "<![CDATA[ and DATE(days)>=DATE(#{startdate}) and DATE(days)<=DATE(#{enddate}) ]]>",
+            "<![CDATA[ and (days between #{startdate} and #{enddate}) ]]>",
             "<choose>",
                 "<when test='hid!=null'>",
                     "and hid=#{hid}",
@@ -164,4 +165,52 @@ public interface TkRecordStatMapper {
      */
     @Select("select hid,hname,total from tkRecordStat_ranking_info")
     List<TkRecordStatRankingInfo> getTkRecordStatRanking();
+
+    /**
+     * 首页-转化率-全部医院分时段筛选转化率
+     * @return
+     */
+    @Select({"<script>",
+            "select ",
+            "ho.hid,ho.hname,a.conversion ",
+            "from lyms_hospital ho",
+            "left join (",
+                "select",
+                " ldate,hid,hname,sum(visits) as 'visits',sum(dcount) as 'dcount',TRUNCATE(sum(dcount)/sum(visits)*100,0) as 'conversion'",
+                "from logsRecord_Visits_info",
+                "where 1=1",
+                "<choose>",
+                    "<when test='startdate!=null and enddate!=null' >",
+                        "<![CDATA[ and (ldate between #{startdate} and #{enddate}) ]]>",
+                    "</when>",
+                    "<otherwise>",
+                        "<![CDATA[ and date_format(ldate,'%Y-%m') = date_format(NOW(),'%Y-%m') ]]>",
+                    "</otherwise>",
+                "</choose>",
+                "GROUP BY hid",
+                "ORDER BY ldate ASC",
+            ") a on a.hid=ho.hid",
+            "</script>"})
+    List<LogsRecordVisitsInfo> getLogsRecordVisits(@Param("startdate") String startdate,@Param("enddate") String enddate);
+
+    /**
+     * 首页-转化率-按医院分时段筛选-访问量和问诊量
+     * @return
+     */
+    @Select({"<script>",
+            "select",
+            " ldate,hid,hname,visits,dcount",
+            "from logsRecord_Visits_info",
+            "where hid=#{hid}",
+            "<choose>",
+                "<when test='startdate!=null and enddate!=null' >",
+                    "<![CDATA[ and (ldate between #{startdate} and #{enddate}) ]]>",
+                "</when>",
+                "<otherwise>",
+                    "<![CDATA[ and date_format(ldate,'%Y-%m') = date_format(NOW(),'%Y-%m') ]]>",
+                "</otherwise>",
+            "</choose>",
+            "ORDER BY ldate ASC",
+            "</script>"})
+    List<LogsRecordVisitsInfo> getLogsRecordRecord(@Param("startdate") String startdate,@Param("enddate") String enddate,@Param("hid") Integer hid);
 }
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/TkRecordStatService.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/TkRecordStatService.java
index cec722a..e1cc6bf 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/TkRecordStatService.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/TkRecordStatService.java
@@ -19,4 +19,8 @@ public interface TkRecordStatService {
     List<TkRecordStatDateInfo> getTkRecordStatDate(String startdate, String enddate, Integer hid);
 
     List<TkRecordStatRankingInfo> getTkRecordStatRanking();
+
+    List<LogsRecordVisitsInfo> getLogsRecordVisits(String startdate,String enddate);
+
+    List<LogsRecordVisitsInfo> getLogsRecordRecord(String startdate, String enddate, Integer hid);
 }
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/TkRecordStatServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/TkRecordStatServiceImpl.java
index 2291d3f..d8126ad 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/TkRecordStatServiceImpl.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/TkRecordStatServiceImpl.java
@@ -46,4 +46,14 @@ public class TkRecordStatServiceImpl implements TkRecordStatService {
     public List<TkRecordStatRankingInfo> getTkRecordStatRanking() {
         return tkRecordStatMapper.getTkRecordStatRanking();
     }
+
+    @Override
+    public List<LogsRecordVisitsInfo> getLogsRecordVisits(String startdate,String enddate) {
+        return tkRecordStatMapper.getLogsRecordVisits(startdate, enddate);
+    }
+
+    @Override
+    public List<LogsRecordVisitsInfo> getLogsRecordRecord(String startdate, String enddate, Integer hid) {
+        return tkRecordStatMapper.getLogsRecordRecord(startdate, enddate, hid);
+    }
 }