核酸混检与混检列表查询

src/main/java/cn/hnthyy/thmz/controller/NavigationController.java

@@ -1,6 +1,5 @@
 package cn.hnthyy.thmz.controller;
 
-import cn.hnthyy.thmz.Utils.HttpUtil;
 import cn.hnthyy.thmz.Utils.TokenUtil;
 import cn.hnthyy.thmz.entity.thmz.*;
 import cn.hnthyy.thmz.service.thmz.MenuService;
@@ -1033,6 +1032,17 @@ public class NavigationController {
         return "mz/hybrid_test";
     }
 
+
+    /**
+     * 打开核酸混采列表页面
+     *
+     * @return
+     */
+    @RequestMapping("/hybrid-test-list")
+    public String hybridTestList() {
+        return "mz/hybrid_test_list";
+    }
+
     /**
      * 打开评价器欢迎页面
      *

src/main/java/cn/hnthyy/thmz/controller/api/MedicalViewApiController.java

@@ -15,6 +15,7 @@ import cn.hnthyy.thmz.entity.his.zd.ZdUnitCode;
 import cn.hnthyy.thmz.entity.his.zy.ZyActpatient;
 import cn.hnthyy.thmz.entity.his.zy.ZyDepositFile;
 import cn.hnthyy.thmz.entity.thmz.Clinic;
+import cn.hnthyy.thmz.entity.thmz.HybirdTest;
 import cn.hnthyy.thmz.entity.thmz.User;
 import cn.hnthyy.thmz.enums.*;
 import cn.hnthyy.thmz.pageDto.MzChargeDetailPageDto;
@@ -27,6 +28,7 @@ import cn.hnthyy.thmz.service.his.zd.ZdUnitCodeService;
 import cn.hnthyy.thmz.service.his.zy.APatientMiService;
 import cn.hnthyy.thmz.service.his.zy.ZyActpatientService;
 import cn.hnthyy.thmz.service.his.zy.ZyDepositFileService;
+import cn.hnthyy.thmz.service.thmz.HybirdTestService;
 import cn.hnthyy.thmz.service.thmz.UserService;
 import cn.hnthyy.thmz.vo.*;
 import lombok.extern.slf4j.Slf4j;
@@ -82,6 +84,9 @@ public class MedicalViewApiController {
     private ZyDepositFileService zyDepositFileService;
     @Autowired
     private MzReceiptSerialService mzReceiptSerialService;
+    @Autowired
+    private HybirdTestService hybirdTestService;
+
     //海慈身份证类型
     private static final String ID_CARD_TYPE = "11";
     //诊疗卡类型
@@ -2420,4 +2425,54 @@ public class MedicalViewApiController {
         }
     }
 
+
+
+    /**
+     * 根据父id查询所有的子id集合
+     *
+     * @return
+     */
+    @RequestMapping(value = "/getPatientIdByParentId", method = {RequestMethod.GET})
+    public Map<String, Object> getPatientIdByParentId(@RequestParam("patientId") String patientId) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if (StringUtils.isBlank(patientId)) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "混检主体ID不能为空");
+                return resultMap;
+            }
+            List<String> parentIds = hybirdTestService.queryPatientIdByParentId(patientId);
+            if (parentIds == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "没有查询到对应的实际被检人集");
+                return resultMap;
+            }
+            List<MzPatientMi> mzPatientMiList= mzPatientMiService.queryByPatientIds(parentIds);
+            if (mzPatientMiList == null || mzPatientMiList.size()==0) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "没有查询到对应的实际被检人集");
+                return resultMap;
+            }
+            List<Map<String,String>> resultList =new ArrayList<>();
+            for(MzPatientMi mzPatientMi:mzPatientMiList){
+                if(mzPatientMi!=null){
+                    Map<String,String> map = new HashMap<>();
+                    map.put("name",mzPatientMi.getName());
+                    map.put("socialNo",mzPatientMi.getSocialNo());
+                    resultList.add(map);
+                }
+            }
+            resultMap.put("code", 0);
+            resultMap.put("message", "信息查询成功");
+            resultMap.put("data", resultList);
+            return resultMap;
+        } catch (Exception e) {
+            log.error("信息查询失败，错误信息{}", e);
+            resultMap.put("code", -1);
+            resultMap.put("message", "信息查询失败");
+            return resultMap;
+        }
+    }
+
+
 }

src/main/java/cn/hnthyy/thmz/controller/mz/MzPatientMiController.java

@@ -6,6 +6,7 @@ import cn.hnthyy.thmz.Utils.StringUtil;
 import cn.hnthyy.thmz.comment.UserLoginToken;
 import cn.hnthyy.thmz.entity.MzException;
 import cn.hnthyy.thmz.entity.his.mz.MzPatientMi;
+import cn.hnthyy.thmz.entity.thmz.HybirdTest;
 import cn.hnthyy.thmz.entity.thmz.fetchSpcSlwinfo;
 import cn.hnthyy.thmz.enums.CertificateTypeEnum;
 import cn.hnthyy.thmz.enums.GenderEnum;
@@ -501,7 +502,6 @@ public class MzPatientMiController {
     }
 
 
-
     /**
      * 验证病人身份证
      *
@@ -620,4 +620,121 @@ public class MzPatientMiController {
         }
     }
 
+
+
+    /**
+     * 获取混检人主体列表
+     *
+     * @return
+     */
+    @UserLoginToken
+    @RequestMapping(value = "/getHybirdTestList", method = {RequestMethod.POST})
+    public Map<String, Object> getHybirdTestList(@RequestBody HybirdTest hybirdTest) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if(hybirdTest==null){
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询参数不能为空");
+                return resultMap;
+            }
+            if (StringUtils.isBlank(hybirdTest.getParentPatientId())) {
+                hybirdTest.setParentPatientId(null);
+            } else {
+                hybirdTest.setParentPatientId("%" + hybirdTest.getParentPatientId() + "%");
+            }
+            if (StringUtils.isBlank(hybirdTest.getPatientId())) {
+                hybirdTest.setPatientId(null);
+            } else {
+                hybirdTest.setPatientId("%" + hybirdTest.getPatientId() + "%");
+            }
+            if (StringUtils.isBlank(hybirdTest.getBeginDate())) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询记录失败,开始日期参数为空");
+                return resultMap;
+            }
+            if (StringUtils.isBlank(hybirdTest.getEndDate())) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询记录失败,结束日期参数为空");
+                return resultMap;
+            }
+            if (hybirdTest.getPageSize() == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询记录失败,每页显示条数参数为空");
+                return resultMap;
+            }
+            if (hybirdTest.getOffset() == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询记录失败,当前所在页参数为空");
+                return resultMap;
+            }
+            Integer total = hybirdTestService.queryCountHybirdTest(hybirdTest);
+            List<HybirdTest> hybirdTestList = hybirdTestService.queryHybirdTestWithPage(hybirdTest);
+            if(hybirdTestList!=null && hybirdTestList.size()>0){
+                for (HybirdTest ht:hybirdTestList){
+                    MzPatientMi parentPatient= mzPatientMiService.queryByPatientId(ht.getParentPatientId());
+                    if(parentPatient==null){
+                        continue;
+                    }
+                    ht.setParentPatientName(parentPatient.getName());
+                }
+            }
+            resultMap.put("code", 0);
+            resultMap.put("message", "获取混检人主体列表成功");
+            resultMap.put("total", total);
+            resultMap.put("data", hybirdTestList);
+            return resultMap;
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultMap.put("code", -1);
+            resultMap.put("message", "系统出错，请联系管理员");
+            log.error("系统异常，错误信息{}", e);
+            return resultMap;
+        }
+    }
+
+
+
+    /**
+     * 根据父id查询所有的实际被采人
+     *
+     * @return
+     */
+    @RequestMapping(value = "/getPatientsByParentId", method = {RequestMethod.GET})
+    public Map<String, Object> getPatientsByParentId(@RequestParam("parentPatientId") String parentPatientId) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if (StringUtils.isBlank(parentPatientId)) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "混检主体ID不能为空");
+                return resultMap;
+            }
+            List<String> parentIds = hybirdTestService.queryPatientIdByParentId(parentPatientId);
+            if (parentIds == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "没有查询到对应的实际被检人集");
+                return resultMap;
+            }
+            List<MzPatientMi> resultList= mzPatientMiService.queryByPatientIds(parentIds);
+            if (resultList == null || resultList.size()==0) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "没有查询到对应的实际被检人集");
+                return resultMap;
+            }
+            for (MzPatientMi mzPatientMi:resultList){
+                mzPatientMi.setGender(GenderEnum.getGenderByCode(mzPatientMi.getSex()).name);
+                mzPatientMi.setCertificateType(CertificateTypeEnum.geteCertificateTypeByCode(mzPatientMi.getCertificateType()).name);
+            }
+            resultMap.put("code", 0);
+            resultMap.put("message", "信息查询成功");
+            resultMap.put("data", resultList);
+            return resultMap;
+        } catch (Exception e) {
+            log.error("信息查询失败，错误信息{}", e);
+            resultMap.put("code", -1);
+            resultMap.put("message", "信息查询失败");
+            return resultMap;
+        }
+    }
+
+
 }

src/main/java/cn/hnthyy/thmz/controller/mz/PatientMiSzController.java

@@ -17,12 +17,8 @@ import java.util.Map;
 @Slf4j
 @RestController
 public class PatientMiSzController {
-
     @Autowired
     private PatientMiSfzService patientMiSfzService;
-
-
-
     /**
      * 查询用户的身份证信息
      * @return

src/main/java/cn/hnthyy/thmz/entity/thmz/HybirdTest.java

@@ -1,6 +1,8 @@
 package cn.hnthyy.thmz.entity.thmz;
 
 import java.io.Serializable;
+
+import cn.hnthyy.thmz.vo.PageParams;
 import lombok.Data;
 import java.util.Date;
 
@@ -11,7 +13,7 @@ import java.util.Date;
  */
 
 @Data
-public class HybirdTest implements Serializable {
+public class HybirdTest extends PageParams implements Serializable {
 
 	private static final long serialVersionUID =  796620737906457569L;
 
@@ -35,4 +37,18 @@ public class HybirdTest implements Serializable {
 	 */
 	private Date createDate;
 
+
+	/**
+	 * 开始时间 查询参数
+	 */
+	private String beginDate;
+	/**
+	 * 结束时间 查询参数
+	 */
+	private String endDate;
+
+	/**
+	 * 混检主体名称
+	 */
+	private String parentPatientName;
 }

src/main/java/cn/hnthyy/thmz/enums/CertificateTypeEnum.java

@@ -46,6 +46,6 @@ public enum CertificateTypeEnum {
                 return classCode;
             }
         }
-        return null;
+        return JMSFZ;
     }
 }

src/main/java/cn/hnthyy/thmz/mapper/thmz/HybirdTestMapper.java

@@ -42,5 +42,57 @@ public interface HybirdTestMapper {
      * @return
      */
     @Select("select patient_id from t_hybird_test where parent_patient_id=#{parentPatientId}")
-    List<HybirdTest> selectPatientIdByParentId(@Param("parentPatientId") String parentPatientId);
+    List<String> selectPatientIdByParentId(@Param("parentPatientId") String parentPatientId);
+
+
+
+    /**
+     * 查询符合条件的总数
+     *
+     * @param hybirdTest
+     * @return
+     */
+    @Select({"<script>" +
+            "select count(DISTINCT parent_patient_id) from t_hybird_test where 1=1" +
+            "<when test='beginDate!=null'>" +
+            " and create_date  <![CDATA[>=]]>#{beginDate} " +
+            "</when>" +
+            "<when test='endDate!=null'>" +
+            " and create_date  <![CDATA[<=]]>#{endDate}" +
+            "</when>" +
+            "<when test='parentPatientId!=null'>" +
+            " and parent_patient_id like #{parentPatientId}" +
+            "</when>" +
+            "<when test='patientId!=null'>" +
+            " and patient_id like #{patientId}" +
+            "</when>" +
+            "</script>"})
+    Integer selectCountHybirdTest(HybirdTest hybirdTest);
+
+
+    /**
+     * 分页查询记录
+     *
+     * @param hybirdTest
+     * @return
+     */
+    @Select({"<script>" +
+            "select a.id,parent_patient_id, patient_id, create_date from t_hybird_test a join  (" +
+            "select id from t_hybird_test where 1=1" +
+            "<when test='beginDate!=null'>" +
+            " and create_date  <![CDATA[>=]]>#{beginDate} " +
+            "</when>" +
+            "<when test='endDate!=null'>" +
+            " and create_date  <![CDATA[<=]]>#{endDate}" +
+            "</when>" +
+            "<when test='parentPatientId!=null'>" +
+            " and parent_patient_id like #{parentPatientId}" +
+            "</when>" +
+            "<when test='patientId!=null'>" +
+            " and patient_id like #{patientId}" +
+            "</when>" +
+            " GROUP BY parent_patient_id "+
+            " order by create_date desc limit #{offset},#{pageSize} )b on a.id=b.id"
+            + "</script>"})
+    List<HybirdTest> selectHybirdTestWithPage(HybirdTest hybirdTest);
 }

src/main/java/cn/hnthyy/thmz/service/impl/thmz/HybirdTestServiceImpl.java

@@ -48,7 +48,17 @@ public class HybirdTestServiceImpl implements HybirdTestService {
 
 
     @Override
-    public List<HybirdTest> queryPatientIdByParentId(String parentPatientId) {
+    public List<String> queryPatientIdByParentId(String parentPatientId) {
         return hybirdTestMapper.selectPatientIdByParentId(parentPatientId);
     }
+
+    @Override
+    public Integer queryCountHybirdTest(HybirdTest hybirdTest) {
+        return hybirdTestMapper.selectCountHybirdTest(hybirdTest);
+    }
+
+    @Override
+    public List<HybirdTest> queryHybirdTestWithPage(HybirdTest hybirdTest) {
+        return hybirdTestMapper.selectHybirdTestWithPage(hybirdTest);
+    }
 }

src/main/java/cn/hnthyy/thmz/service/thmz/HybirdTestService.java

@@ -20,7 +20,23 @@ public interface HybirdTestService {
      * @param parentPatientId
      * @return
      */
-    List<HybirdTest> queryPatientIdByParentId(String parentPatientId);
+    List<String> queryPatientIdByParentId(String parentPatientId);
 
 
+    /**
+     * 查询符合条件的总数
+     *
+     * @param hybirdTest
+     * @return
+     */
+    Integer queryCountHybirdTest(HybirdTest hybirdTest);
+
+
+    /**
+     * 分页查询记录
+     *
+     * @param hybirdTest
+     * @return
+     */
+    List<HybirdTest> queryHybirdTestWithPage(HybirdTest hybirdTest);
 }

src/main/resources/static/js/mz/hybrid_test_list.js

@@ -0,0 +1,238 @@
+//@ sourceURL=hybrid_test_list.js
+$(function () {
+    daterangepicker(initHybirdTestList);
+    //initHybirdTestList();
+    //重置查询参数
+    $('#btn_clean').click(function () {
+        $("#parentPatientId").val(null);
+        $("#patientId").val(null);
+        $('#reportrange span').html(moment().format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
+        initHybirdTestList();
+    });
+
+
+});
+
+/**
+ * 获取时间选择器的时间数组
+ * @returns {string[]}
+ */
+function getRePortRangeArr() {
+    var rePortRange = $('#reportrange span').html();
+    var rePortRangeArr = rePortRange.split(" - ");
+    rePortRangeArr[0] = rePortRangeArr[0] + " 00:00:00"
+    rePortRangeArr[1] = rePortRangeArr[1] + " 23:59:59"
+    return rePortRangeArr;
+}
+
+
+
+
+
+/**
+ * 获取混检人主体列表
+ */
+function initHybirdTestList() {
+    $('#tb_table').bootstrapTable("destroy");
+    $('#tb_table').bootstrapTable({
+        url: '/thmz/getHybirdTestList',         //请求后台的URL（*）
+        method: 'post',                      //请求方式（*）
+        toolbar: '#toolbar',                //工具按钮用哪个容器
+        striped: true,                      //是否显示行间隔色
+        cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        pagination: true,                   //是否显示分页（*）
+        sortable: true,                     //是否启用排序
+        sortOrder: "desc",                   //排序方式
+        queryParams: queryParams,           //传递参数（*）
+        sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
+        pageNumber: 1,                       //初始化加载第一页，默认第一页
+        pageSize: 5,                       //每页的记录行数（*）
+        pageList: [10, 15, 25, 50, 100],        //可供选择的每页的行数（*）
+        search: false,                       //是否显示表格搜索，此搜索是客户端搜索，不会进服务端，所以，个人感觉意义不大
+        strictSearch: true,
+        showColumns: false,                  //是否显示所有的列
+        showRefresh: false,                  //是否显示刷新按钮
+        minimumCountColumns: 2,             //最少允许的列数
+        clickToSelect: true,                //是否启用点击选中行
+        uniqueId: "ID",                     //每一行的唯一标识，一般为主键列
+        showToggle: false,                    //是否显示详细视图和列表视图的切换按钮
+        cardView: false,                    //是否显示详细视图
+        detailView: false,
+        //rowStyle:rowStyle,//通过自定义函数设置行样式
+        ajaxOptions: {
+            headers: {
+                'Accept': 'application/json',
+                'Authorization': 'Bearer ' + localStorage.getItem("token")
+            }
+        },
+        columns: [
+            {
+                title: '操作',
+                field: 'op',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    var str = '<button type="button" class="btn btn-primary  btn-sm" onclick="showPatientModal(\'' + row.parentPatientId + '\')">被检人列表<i class="fa fa-area-chart" style="margin-left: 10px;"></i></button>';
+                    return [str].join('');
+                }
+            },
+            {
+                field: 'parentPatientId',
+                title: '混检主体ID',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'parentPatientName',
+                title: '混检类型',
+                align: "center",
+                valign: 'middle'
+            }
+            , {
+                field: 'createDate',
+                title: '采样时间',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    if (value == null || value == "") {
+                        return "";
+                    }
+                    return format(value, "yyyy-MM-dd HH:mm:ss");
+                }
+            }
+        ],
+        responseHandler: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            var ress = eval(res);
+            if (ress.code == -1) {
+                if (ress.message != null && ress.message != '') {
+                   errorMesage(ress);
+                }
+                return {
+                    "total": 0,//总页数
+                    "rows": {}   //数据
+                };
+            }
+            return {
+                "total": ress.total,//总页数
+                "rows": ress.data   //数据
+            };
+        },
+    });
+}
+
+
+/**
+ * 构建列表查询参数
+ * @param params
+ * @returns {{mzChargeDetail: {patientId: string | number | string[] | undefined | jQuery, warnDept: string | number | string[] | undefined | jQuery, doctorCode: string | number | string[] | undefined | jQuery, name: string | number | string[] | undefined | jQuery, payMark: number}, beginTime: Date, endTime: Date, pageSize: *, pageIndex: number}}
+ */
+function queryParams(params) {
+    var rePortRangeArr = getRePortRangeArr();
+    var temp = {   //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
+        parentPatientId: $("#parentPatientId").val(),
+        patientId: $("#patientId").val(),
+        beginDate: rePortRangeArr[0],
+        endDate: rePortRangeArr[1],
+        pageSize: params.limit,   //页面大小
+        offset: params.offset
+    };
+    return temp;
+}
+
+
+/**
+ * 被检人列表
+ * @param parentPatientId
+ */
+function showPatientModal(parentPatientId) {
+    $('#patientTable').bootstrapTable("destroy");
+    $('#patientTable').bootstrapTable({
+        url: '/thmz/getPatientsByParentId?parentPatientId='+parentPatientId,         //请求后台的URL（*）
+        method: 'get',                      //请求方式（*）
+        toolbar: '#toolbar',                //工具按钮用哪个容器
+        striped: true,                      //是否显示行间隔色
+        cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        pagination: true,                   //是否显示分页（*）
+        sortable: true,                     //是否启用排序
+        sortOrder: "desc",                   //排序方式
+        //queryParams: queryParams,           //传递参数（*）
+        sidePagination: "client",           //分页方式：client客户端分页，server服务端分页（*）
+        pageNumber: 1,                       //初始化加载第一页，默认第一页
+        pageSize: 5,                       //每页的记录行数（*）
+        pageList: [10, 15, 25, 50, 100],        //可供选择的每页的行数（*）
+        search: false,                       //是否显示表格搜索，此搜索是客户端搜索，不会进服务端，所以，个人感觉意义不大
+        strictSearch: true,
+        showColumns: false,                  //是否显示所有的列
+        showRefresh: false,                  //是否显示刷新按钮
+        minimumCountColumns: 2,             //最少允许的列数
+        clickToSelect: true,                //是否启用点击选中行
+        uniqueId: "ID",                     //每一行的唯一标识，一般为主键列
+        showToggle: false,                    //是否显示详细视图和列表视图的切换按钮
+        cardView: false,                    //是否显示详细视图
+        detailView: false,
+        //rowStyle:rowStyle,//通过自定义函数设置行样式
+        ajaxOptions: {
+            headers: {
+                'Accept': 'application/json',
+                'Authorization': 'Bearer ' + localStorage.getItem("token")
+            }
+        },
+        columns: [
+            {
+                field: 'patientId',
+                title: '被采人ID',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'name',
+                title: '被采人姓名',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'gender',
+                title: '被采人性别',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'certificateType',
+                title: '被采人证件类型',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'socialNo',
+                title: '被采人证件号号',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'phoneNo',
+                title: '被采人电话号码',
+                align: "center",
+                valign: 'middle'
+            }
+        ],
+        responseHandler: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            var ress = eval(res);
+            if (ress.code == -1) {
+                if (ress.message != null && ress.message != '') {
+                    errorMesage(ress);
+                }
+                return {
+                    "total": 0,//总页数
+                    "rows": {}   //数据
+                };
+            }
+            $("#patientModal").modal();
+            return {
+                "total": ress.data.length,//总页数
+                "rows": ress.data   //数据
+            };
+        },
+    });
+}

src/main/resources/templates/mz/client_index.html

@@ -23,10 +23,13 @@
     <script src="/thmz/js/dependent/jquery.backstretch.min.js"></script>
     <script src="/thmz/js/mz/client_index.js"></script>
     <title>评价器登录后的首页</title>
+    <style>
+        body,html {margin:0; height:100%;}
+    .gao100{height:100%; background:#EBEBE4;}</style>
 </head>
 
 <body>
-<div class="col-sm-12 col-sm-12 col-xs-12" style="background: #EBEBE4;">
+<div class="col-sm-12 col-sm-12 col-xs-12 gao100">
     <div class="col-sm-3 col-sm-3 col-xs-12">
         sadfsdsdfsadf
     </div>

src/main/resources/templates/mz/hybrid_test_list.html

@@ -0,0 +1,108 @@
+<link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-select.css"/>
+<link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
+<link rel="stylesheet" href="/thmz/css/custom.min.css">
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/common/map-util.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/common/date-util.js"></script>
+<script src="/thmz/js/mz/hybrid_test_list.js"></script>
+<title>核酸混采列表</title>
+<!-- 打印的样式-->
+<style media="print">
+    @page {
+        size: auto;
+        margin: 0mm;
+    }
+</style>
+<div class="row" style="height: calc(100% - 60px);overflow-y: auto;">
+    <div class="col-md-12 col-sm-12 col-xs-12">
+        <div class="x_panel">
+            <div class="panel-body">
+                <form id="formSearch" class="form-horizontal" autocomplete="off">
+                    <div class="form-group" style="margin-top:15px">
+                        <label class="control-label col-sm-1" for="parentPatientId" style="width: 12%;">混采主体ID</label>
+                        <div class="col-md-2 col-sm-2 col-xs-12" style="width: 15%;float: left;">
+                            <input type="text" class="form-control" id="parentPatientId" onchange="initMzBlRecordList()" placeholder="混采主体ID">
+                        </div>
+                        <label class="control-label col-sm-1" for="patientId" style="width: 12%;">实际被采人ID</label>
+                        <div class="col-md-2 col-sm-2 col-xs-12" style="width: 15%;float: left;">
+                            <input type="text" class="form-control" id="patientId" onchange="initMzBlRecordList()" placeholder="实际被采人ID">
+                        </div>
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="reportrange" style="width: 75px;">
+                            混采时间
+                        </label>
+                        <div class="col-md-2 col-sm-2 col-xs-12" style="width: 220px;">
+                            <div id="reportrange" class="pull-left"
+                                 style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc;">
+                                <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
+                                <span>December 30, 2014 - January 28, 2015</span> <b class="caret"></b>
+                            </div>
+                        </div>
+                        <button type="button" style="margin-left:5px;width: 4%;" id="btn_clean" class="btn btn-primary"
+                                title="重置"><i class="fa fa-rotate-left"></i>
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+        <table id="tb_table"></table>
+    </div>
+</div>
+
+
+
+
+
+
+
+<!--提示弹窗开始-->
+<div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="messageModal"
+     style="top:20%;">
+    <div class="modal-dialog modal-sm">
+        <div class="modal-content" style="width: 480px;">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
+                </button>
+                <h4 class="modal-title modal-title-thmz">提示</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal form-label-left" novalidate>
+                    <div class="col-md-2 col-sm-2 col-xs-12">
+                        <i class="fa fa-info-circle blue fa-3x"></i>
+                    </div>
+                    <div class="col-md-10 col-sm-10 col-xs-12"
+                         style="font-size: 14px;font-weight: 700;min-height: 39px;line-height: 39px;" id="messageContent">
+                        当前有病人正在接诊，是否切换?
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" id="messageButton">确定</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<!--患者查询弹窗开始-->
+<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="patientModal">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content" style="width: 900px;">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
+                </button>
+                <h4 class="modal-title modal-title-thmz">被采人列表</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal form-label-left" novalidate>
+                    <table id="patientTable"></table>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!--患者查询弹窗结尾-->