From f1f213fd8ab97bb70c624d202ff039b8bfb57128 Mon Sep 17 00:00:00 2001
From: wengjx <2365319070@qq.com>
Date: Fri, 5 Aug 2022 18:51:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E7=90=86=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/Archive_MasterMapper.xml | 49 ++++++++++++++++---
 .../views/pathological/pathologicalReport.jsp | 41 +++++++++-------
 2 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 0b9cb3de..41cc91d9 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -2210,12 +2210,49 @@
         <if test="name != null and name != ''">
                 AND name LIKE '%' + #{name} + '%'
         </if>
-        <if test="startDate != null and startDate != ''">
-                and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
-        </if>
-        <if test="endDate != null and endDate != ''">
-                and m.discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
-        </if>
+            <if test="visitId != null and visitId != ''">
+                AND visit_id LIKE '%' + #{visitId} + '%'
+            </if>
+<!--        <if test="startDate != null and startDate != ''">-->
+<!--                and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)-->
+<!--        </if>-->
+<!--        <if test="endDate != null and endDate != ''">-->
+<!--                and m.discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'-->
+<!--        </if>-->
+
+            <if test="dischargeDateTime != null">
+                and m.discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR}
+            </if>
+            <choose>
+                <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
+                    and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and
+                    #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59'
+                </when>
+                <when test="startDateTo != null and startDateTo != ''">
+                    and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120)
+                </when>
+                <when test="endDateTo != null and endDateTo != ''">
+                    and m.discharge_date_time &lt;= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59'
+                </when>
+            </choose>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         </where>
 
     </select>
diff --git a/src/main/webapp/WEB-INF/views/pathological/pathologicalReport.jsp b/src/main/webapp/WEB-INF/views/pathological/pathologicalReport.jsp
index 1aab7d39..7760fe01 100644
--- a/src/main/webapp/WEB-INF/views/pathological/pathologicalReport.jsp
+++ b/src/main/webapp/WEB-INF/views/pathological/pathologicalReport.jsp
@@ -62,25 +62,25 @@
                         <label for="inpNo">&emsp;住院号:</label>
                         <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
                     </div>
-<%--                    <div class="form-group divCss8">--%>
-<%--                        <label for="visitId">住院次数:</label>--%>
-<%--                        <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数"--%>
-<%--                               maxlength="2">--%>
-<%--                    </div>--%>
+                    <div class="form-group divCss8">
+                        <label for="visitId">住院次数:</label>
+                        <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数"
+                               maxlength="2">
+                    </div>
                     <div class="form-group divCss8">
                         <label for="name">姓名:</label>
                         <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
                     </div>
-<%--                    <div class="form-group divCss8">--%>
-<%--                        <label>出院时间:</label>--%>
-<%--                        <div class="input-group input-daterange">--%>
-<%--                            <input type="text" class="input-sm form-control" name="start" id="startDateTo"--%>
-<%--                                   maxlength="10" autocomplete="off"/>--%>
-<%--                            <span class="input-group-addon">-</span>--%>
-<%--                            <input type="text" class="input-sm form-control" name="end" id="endDateTo" maxlength="10"--%>
-<%--                                   autocomplete="off"/>--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
+                    <div class="form-group divCss8">
+                        <label>出院时间:</label>
+                        <div class="input-group input-daterange">
+                            <input type="text" class="input-sm form-control" name="start" id="startDateTo"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endDateTo" maxlength="10"
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
 
 
                     <div class="form-group divCss8">
@@ -161,9 +161,12 @@
                         offset: offset,   //页码
                         order: params.order,      //排位命令（desc，asc）
                         inpNo: "" + $("#inpNo").val(),
+                        visitId : "" + $("#visitId").val(),
                         startDate: $("#startDate").val(),
                         endDate: $("#endDate").val(),
-                        name: "" + $("#name").val()
+                        name: "" + $("#name").val(),
+                        startDateTo: $("#startDateTo").val(),
+                        endDateTo: $("#endDateTo").val(),
                     };
                     return temp;
                 },
@@ -279,7 +282,11 @@
         //刷新
         $('#table').bootstrapTable('refresh');
     });
-
+    //日期控件
+    $(".input-daterange").datepicker({
+        format: "yyyy-mm-dd",
+        language: "zh-CN"
+    });
 
 </script>
 </html>
\ No newline at end of file