修改bug

6 years ago · f76e2e1ac6
parent b95e8cf081
commit f76e2e1ac6
10 changed files with 713 additions and 586 deletions
--- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
+++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
@ -197,6 +197,18 @@ public class CommomSearchController {
        }
    }

+    @RequestMapping("getCommonInfo")
+    @ResponseBody
+    public String getCommonInfo(){
+        try {
+            List<CommomVo> commomVoList = commomMapper.selectAllInfo();
+            return JSON.toJSONString(commomVoList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
    @RequestMapping("getDept174")
    @ResponseBody
    public String getDept174(){
--- a/src/main/java/com/emr/dao/CommomMapper.java
+++ b/src/main/java/com/emr/dao/CommomMapper.java
@ -88,4 +88,10 @@ public interface CommomMapper {
     * 按病案号查询patientId,name,admissId
     * */
    List<CommomVo> selectCommomByInpatientNo(@Param("inpatientNo")String inpatientNo);
+
+    /**
+     * 查询病案信息的病案号和病人名称
+     * @return
+     */
+    List<CommomVo> selectAllInfo();
 }
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@ -5,7 +5,7 @@ jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver

 jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=qf_record
 jdbc.username=sa
-jdbc.password=docus702
+jdbc.password=123456

 #dataSource2
 jdbc.url2=jdbc\:sqlserver\://localhost:1433;databaseName=blgd_java
--- a/src/main/resources/mapper/CommomMapper.xml
+++ b/src/main/resources/mapper/CommomMapper.xml
@ -109,6 +109,12 @@
      WHERE
          patient_id in (${patientIds})
  </select>
+    <select id="selectAllInfo" resultType="com.emr.vo.commomSearch.CommomVo">
+        select
+        inpatient_no,
+        name
+        from commomtable
+    </select>
  <!--根据住院次数和病案号和姓名查询patientId-->
  <select id="selectPatientIdByAdmissTimesAndInpatientNoAndName" resultType="java.lang.String" parameterType="java.lang.String">
      SELECT
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
@ -13,6 +13,8 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta http-equiv=X-UA-Compatible IE=EmulateIE7>
    <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.4/css/select2.min.css" rel="stylesheet" />
+
    <!--[if lt IE 9]>
    <script type="text/javascript" src="${path}/static/js/html5shiv.min.js"></script>
    <script type="text/javascript" src="${path}/static/js/jquery-1.11.3.min.js"></script>
@ -20,6 +22,7 @@
    <![endif]-->
    <script type="text/javascript" src="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.js?time=2019-12-25"></script>
    <script type="text/javascript" src="${path}/static/js/pinying.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.4/js/select2.min.js"></script>
    <script>
        var path = "${path}";
    </script>
@ -28,6 +31,9 @@
            margin-right: -15px;
            margin-bottom: -15px;
        }
+        .collapse{
+            overflow-y:scroll;
+        }
        .labelDiv{
            padding-top: 2%;
            padding-right: 0;
@ -37,10 +43,10 @@
            padding-top: 2%;
        }
        /*搜索区域*/
-        .panel-group{
+        /*.panel-group{
            height: 254px;
            margin-bottom: 0!important;
-        }
+        }*/
        /*按钮组*/
        .btns{
            width:102%;
@ -254,13 +260,14 @@
                                        <label class="control-label">病案号：</label>
                                    </div>
                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm inputValue" id="inpatient_no" onkeyup="getInpatientNoContents('inpatient_no')" onfocus="getInpatientNoContents('inpatient_no')" onblur="clearContent('inpatient_no')">
-                                        <div id="inpatient_noDiv">
+                                        <select class="selectpicker form-control input-sm inputValue"  id="inpatient_no" style="max-height:400px!important;overflow:scroll;" data-live-search="true"></select>
+                                        <%--<input type="text" class="form-control input-sm inputValue" id="inpatient_no" onkeyup="getInpatientNoContents('inpatient_no')" onfocus="getInpatientNoContents('inpatient_no')" onblur="clearContent('inpatient_no')">
+                                        <div id="inpatient_noDiv" style="overflow:auto;">
                                            <table id="inpatient_noContent_table" bgcolor="#FFFAFA" border="0"
                                                   cellspacing="0" cellpadding="0">
-                                                <tbody id="inpatient_noContent"> </tbody>
+                                                <tbody id="inpatient_noContent"></tbody>
                                            </table>
-                                        </div>
+                                        </div>--%>
                                    </div>
                                </div>
                            </div>
--- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp
@ -1,3 +1,4 @@
+<%@ page import="java.util.ArrayList" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <c:set var="path" value="${pageContext.request.contextPath}"/>
@ -17,6 +18,14 @@
    <![endif]-->
    <script>
        var path = "${path}";
+        var array = new Array();
+        var nameArray = new Array();
+        <c:forEach items="${relateds}" var="related">
+        array.push("${related.id}");
+        </c:forEach>
+        <c:forEach items="${relateds}" var="related">
+        nameArray.push("${related.name}");
+        </c:forEach>
    </script>
    <style type="text/css">
        body {
@ -137,6 +146,9 @@
                <a data-toggle="collapse" href="#b">
                    可收缩
                </a>
+                <a data-toggle="collapse" onclick="checkCancel(array, nameArray)">
+                    取消
+                </a>
            </h5>
        </div>
        <div id="b" class="panel-collapse collapse in">
@ -152,7 +164,7 @@
    </div>
 </div>
 <div class="bottomDiv">
-    <div class="blockDiv">
+    <div class="blockDiv" id="blockDiv">
        <form id="block">

        </form>
--- a/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js
+++ b/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js
@ -1251,6 +1251,7 @@
            '</div>',
            '<div class="pull-' + this.options.paginationHAlign + ' pagination">',
            '<ul class="pagination' + sprintf(' pagination-%s', this.options.iconSize) + '">',
+            '<li class="page-first"><a href="javascript:void(0)" rel="external nofollow" rel="external nofollow" >' + this.options.paginationFirstText + '</a></li>',
            '<li class="page-pre"><a href="javascript:void(0)" rel="external nofollow" rel="external nofollow" >' + this.options.paginationPreText + '</a></li>');

        if (this.totalPages < 5) {
--- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
--- a/src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js
@ -417,3 +417,22 @@ function dynamicCheck(checked,idVal,val,name,options,inputs){
 		initDateInput(idVal)
 	}
 }
+
+//全不选
+function checkCancel(array, nameArray) {
+    if (array.length){
+		for (var i = 0; i < array.length; i++){
+            document.getElementById(array[i]).checked = false;
+		}
+	}
+    if (nameArray.length){
+        for (var i = 0; i < nameArray.length; i++){
+            var nameVal = nameArray[i].replace(".","");
+            if($("#div"+nameVal).text() == ($("#div"+nameVal).parent().find('>div:last').text())){
+                $("#div"+nameVal).prev("div").children("div:last-child").remove();
+            }
+            $("#div"+nameVal).remove();
+		}
+	}
+    $("#checks").val('');
+}
--- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
@ -146,6 +146,8 @@ function freshTable(){
 		sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
 		paginationPreText : '上一页',
 		paginationNextText : '下一页',
+        paginationFirstText: '<',
+        paginationLastText: '>',
 		detailView: flag,
 		pageNumber: 1,                       //初始化加载第一页，默认第一页
 		pageSize: 5,                       //每页的记录行数（*）