jiangjiazhi / center

Download as
Browse Code »

Commit b00bf7071e6ba6bbed4952cafd7a0b8aeff95941

Authored by fangcheng
1 parent 884992e924
Exists in master

修改用户

Showing 19 changed files with 265 additions and 50 deletions

parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.java View file @ b00bf70
  1 +package com.lyms.base.common.dao.organ;
  2 +
  3 +import java.io.Serializable;
  4 +import java.util.List;
  5 +
  6 +import org.springframework.stereotype.Repository;
  7 +
  8 +import com.baomidou.mybatisplus.mapper.BaseMapper;
  9 +import com.baomidou.mybatisplus.plugins.Page;
  10 +import com.lyms.base.common.entity.organ.OrganGroup;
  11 +import com.lyms.base.common.entity.organ.OrganGroupMaps;
  12 +
  13 +/**
  14 + * <p>
  15 + * Mapper接口
  16 + * </p>
  17 + *
  18 + * @author fangcheng
  19 + * @since 2017-03-09
  20 + */
  21 +@Repository
  22 +public interface OrganGroupMapsMapper extends BaseMapper<OrganGroupMaps> {
  23 +
  24 + public Integer deleteLogicById(Serializable id);
  25 +
  26 + public List<OrganGroup> getOrgList(Page<OrganGroup> page,Serializable groupId);
  27 +
  28 +}
parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.xml View file @ b00bf70
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.lyms.base.common.dao.organ.OrganGroupMapsMapper">
  4 +
  5 + <!-- 通用查询映射结果 -->
  6 + <resultMap id="BaseResultMap" type="com.lyms.base.common.entity.organ.OrganGroupMaps">
  7 + <id column="ID" property="id" />
  8 + <result column="GROUP_ID" property="group_id" />
  9 + <result column="ORGAN_ID" property="organ_id" />
  10 + </resultMap>
  11 +
  12 + <!-- 通用查询结果列 -->
  13 + <sql id="Base_Column_List">
  14 + ID AS id, GROUP_ID AS group_id, ORGAN_ID AS organ_id
  15 + </sql>
  16 +
  17 + <select id="getOrgList" resultType="Organizations">
  18 + select o.* from SYS_ORGANIZATIONS o left join SYS_ORGAN_GROUP_MAPS g on o.ID = g.ORGAN_ID where g.GROUP_ID = #{groupId}
  19 + </select>
  20 +</mapper>
parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroupMaps.java View file @ b00bf70
  1 +package com.lyms.base.common.entity.organ;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +import com.baomidou.mybatisplus.annotations.TableField;
  6 +import com.baomidou.mybatisplus.annotations.TableId;
  7 +import com.baomidou.mybatisplus.annotations.TableName;
  8 +
  9 +/**
  10 + * <p>
  11 + *
  12 + * </p>
  13 + *
  14 + * @author fangcheng
  15 + * @since 2017-04-02
  16 + */
  17 +@TableName("SYS_ORGAN_GROUP_MAPS")
  18 +public class OrganGroupMaps implements Serializable {
  19 +
  20 + private static final long serialVersionUID = 1L;
  21 +
  22 + /**
  23 + *
  24 + */
  25 + @TableId(value = "ID")
  26 + private String id;
  27 + /**
  28 + *
  29 + */
  30 + @TableField(value = "GROUP_ID")
  31 + private String groupId;
  32 + /**
  33 + * 建档方式
  34 + */
  35 + @TableField(value = "ORGAN_ID")
  36 + private String organId;
  37 + public String getId() {
  38 + return id;
  39 + }
  40 + public void setId(String id) {
  41 + this.id = id;
  42 + }
  43 + public String getGroupId() {
  44 + return groupId;
  45 + }
  46 + public void setGroupId(String groupId) {
  47 + this.groupId = groupId;
  48 + }
  49 + public String getOrganId() {
  50 + return organId;
  51 + }
  52 + public void setOrganId(String organId) {
  53 + this.organId = organId;
  54 + }
  55 +
  56 +
  57 +}
parent/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java View file @ b00bf70
... ... @@ -182,5 +182,13 @@
182 182 this.enable = enable;
183 183 }
184 184  
  185 + public String getGrouporgId() {
  186 + return grouporgId;
  187 + }
  188 +
  189 + public void setGrouporgId(String grouporgId) {
  190 + this.grouporgId = grouporgId;
  191 + }
  192 +
185 193 }
parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupMapsService.java View file @ b00bf70
  1 +package com.lyms.base.common.service.organ;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +import com.baomidou.mybatisplus.plugins.Page;
  6 +import com.lyms.base.common.entity.organ.OrganGroup;
  7 +import com.lyms.base.common.entity.organ.OrganGroupMaps;
  8 +import com.lyms.web.service.BaseService;
  9 +
  10 +/**
  11 + * <p>
  12 + * 服务类
  13 + * </p>
  14 + *
  15 + * @author fangcheng
  16 + * @since 2017-04-02
  17 + */
  18 +public interface OrganGroupMapsService extends BaseService<OrganGroupMaps> {
  19 +
  20 + /**
  21 + * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
  22 + * <li>@param id 删除主键id
  23 + * <li>@return 大于0修改成功，否则为失败
  24 + */
  25 + public Integer deleteLogicById(Serializable id);
  26 +
  27 + /**
  28 + * <li>@Description:根据groupid获取所有机构
  29 + * <li>@param groupId
  30 + * <li>@return
  31 + * <li>创建人：方承
  32 + * <li>创建时间：2017年4月2日
  33 + * <li>修改人：
  34 + * <li>修改时间：
  35 + */
  36 + public Page<OrganGroup> getOrgList(Page<OrganGroup> page,Serializable groupId);
  37 +
  38 +}
parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupMapsServiceImpl.java View file @ b00bf70
  1 +package com.lyms.base.common.service.organ.impl;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +import org.springframework.stereotype.Service;
  6 +
  7 +import com.baomidou.mybatisplus.plugins.Page;
  8 +import com.baomidou.mybatisplus.service.impl.ServiceImpl;
  9 +import com.lyms.base.common.dao.organ.OrganGroupMapsMapper;
  10 +import com.lyms.base.common.entity.organ.OrganGroup;
  11 +import com.lyms.base.common.entity.organ.OrganGroupMaps;
  12 +import com.lyms.base.common.service.organ.OrganGroupMapsService;
  13 +
  14 +/**
  15 + * <p>
  16 + * 服务实现类
  17 + * </p>
  18 + *
  19 + * @author fancgheng
  20 + * @since 2017-04-02
  21 + */
  22 +@Service
  23 +public class OrganGroupMapsServiceImpl extends ServiceImpl<OrganGroupMapsMapper, OrganGroupMaps> implements OrganGroupMapsService {
  24 +
  25 + public Integer deleteLogicById(Serializable id) {
  26 + return baseMapper.deleteLogicById(id);
  27 + }
  28 +
  29 + @Override
  30 + public Page<OrganGroup> getOrgList(Page<OrganGroup> page,Serializable groupId) {
  31 + page.setRecords(baseMapper.getOrgList(page,groupId));
  32 + return page;
  33 + }
  34 +
  35 +}
parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java View file @ b00bf70
... ... @@ -64,8 +64,10 @@
64 64 String id = getParameter("id");
65 65 String name = getParameter("name");
66 66 String type = getParameter("type");
  67 + String orgId = getParameter("orgId");
  68 + String grouprgId = getParameter("grouprgId");
67 69 if (StrUtils.isNotEmpty(id)) {
68   - ew.and("id like {0}", name.trim() + "%");
  70 + ew.and("id like {0}", id.trim() + "%");
69 71 }
70 72 if (StrUtils.isNotEmpty(name)) {
71 73 ew.and("name like {0}", name.trim() + "%");
... ... @@ -73,6 +75,12 @@
73 75 if (StrUtils.isNotEmpty(type)) {
74 76 ew.and("type={0}", type);
75 77 }
  78 + if (StrUtils.isNotEmpty(orgId)) {
  79 + ew.and("org_Id={0}", orgId);
  80 + }
  81 + if (StrUtils.isNotEmpty(grouprgId)) {
  82 + ew.and("grouprg_Id={0}", grouprgId);
  83 + }
76 84 return toGridData(sysRolesService.selectPage(page, ew));
77 85 }
78 86  
parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java View file @ b00bf70
... ... @@ -94,6 +94,8 @@
94 94 String searchName = getParameter("name");
95 95 String searchAccount = getParameter("account");
96 96 String searchPhone = getParameter("phone");
  97 + String searchOrgId = getParameter("orgId");
  98 + String searchDeptId = getParameter("deptId");
97 99 if (StrUtils.isNotEmpty(searchName)) {
98 100 ew.and("name like {0}", searchName.trim() + "%");
99 101 }
... ... @@ -103,6 +105,12 @@
103 105 if (StrUtils.isNotEmpty(searchPhone)) {
104 106 ew.and("phone like {0}", searchPhone.trim() + "%");
105 107 }
  108 + if (StrUtils.isNotEmpty(searchOrgId)) {
  109 + ew.and("org_id = {0}", searchOrgId.trim() );
  110 + }
  111 + if (StrUtils.isNotEmpty(searchDeptId)) {
  112 + ew.and("dept_Id = {0}", searchDeptId.trim() );
  113 + }
106 114 page = userService.selectPage(page, ew);
107 115 return toGridData(page);
108 116 }
parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html View file @ b00bf70
... ... @@ -6,12 +6,12 @@
6 6 <div class="form-group">
7 7 <label class="col-sm-3 control-label">名称:</label>
8 8 <div class="col-sm-8">
9   - <input type="text" placeholder="部门名称" value="$!depart.name" aria-required="true" required="true" class="form-control" minlength="2" name="name" id="name">
  9 + <input type="text" placeholder="科室名称" value="$!depart.name" aria-required="true" required="true" class="form-control" minlength="2" name="name" id="name">
10 10 </div>
11 11 </div>
12 12  
13 13 <div class="form-group">
14   - <label class="col-sm-3 control-label">机构:</label>
  14 + <label class="col-sm-3 control-label">医院:</label>
15 15 <div class="col-sm-8">
16 16 <select class="form-control" name="orgId" id="orgs">
17 17 <option value="0">--选择--</option>
... ... @@ -20,7 +20,7 @@
20 20 </div>
21 21  
22 22 <div class="form-group">
23   - <label class="col-sm-3 control-label">上级部门:</label>
  23 + <label class="col-sm-3 control-label">上级科室:</label>
24 24 <div class="col-sm-8">
25 25 <select class="form-control" name="parentId" id="parent">
26 26 <option value="0">--选择--</option>
parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html View file @ b00bf70
... ... @@ -4,8 +4,8 @@
4 4 <div style="padding-top:30px;">
5 5 <form role="form" class="form-inline">
6 6 <div class="form-group" id="leve">
7   - <span class="form-control">机构组</span>
8   - <input type="text" placeholder="请输入机构组名称" id="usernameSearch" class="form-control">
  7 + <span class="form-control">医院组</span>
  8 + <input type="text" placeholder="请输入医院组名称" id="usernameSearch" class="form-control">
9 9 </div>
10 10 </form>
11 11 </div>
12 12  
... ... @@ -35,13 +35,13 @@
35 35 var controllerRequestMappint = "/sysDepartments/";
36 36  
37 37 function add() {
38   - popWindow("添加部门/科室", APP.PATH + controllerRequestMappint + "/toEdit?orgId=",700,550);
  38 + popWindow("添加科室/科室", APP.PATH + controllerRequestMappint + "/toEdit?orgId=",700,550);
39 39 }
40 40  
41 41 function edit(){
42 42 var id = getSingleSelectedValue("dataTable","id");
43 43 if(id){
44   - popWindow("修改部门/科室", APP.PATH + controllerRequestMappint + "toEdit?id="+id,700,550);
  44 + popWindow("修改科室/科室", APP.PATH + controllerRequestMappint + "toEdit?id="+id,700,550);
45 45 }
46 46 }
47 47  
48 48  
... ... @@ -63,10 +63,10 @@
63 63 title: '名称'
64 64 },{
65 65 field: 'orgId',
66   - title: '机构'
  66 + title: '医院'
67 67 },{
68 68 field: 'parentId',
69   - title: '上级部门'
  69 + title: '上级科室'
70 70 },{
71 71 field: 'shortCode',
72 72 title: '简码'
parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html View file @ b00bf70
... ... @@ -7,7 +7,7 @@
7 7 <div class="form-group">
8 8 <label class="col-sm-3 control-label">组名称:</label>
9 9 <div class="col-sm-8">
10   - <input type="text" placeholder="机构名称" value="$!group.name" aria-required="true" required="true" class="form-control" minlength="2" name="name" id="name">
  10 + <input type="text" placeholder="医院名称" value="$!group.name" aria-required="true" required="true" class="form-control" minlength="2" name="name" id="name">
11 11 </div>
12 12 </div>
13 13 <div class="form-group">
... ... @@ -29,7 +29,7 @@
29 29 </div>
30 30 </div>
31 31 <div class="form-group">
32   - <label class="col-sm-3 control-label">机构列表:</label>
  32 + <label class="col-sm-3 control-label">医院列表:</label>
33 33 <button class="btn btn-info " type="button" onclick="del();"><i class="fa fa-trash"></i> 移除</button>
34 34 </div>
35 35 <div class="form-group">
36 36  
... ... @@ -45,12 +45,12 @@
45 45 </div>
46 46 </form>
47 47 </div>
48   - <!-- 机构组拥有机构 -->
  48 + <!-- 医院组拥有医院 -->
49 49 <div class="col-sm-8">
50 50 <div style="padding-top:30px;">
51 51 <form class="form-inline">
52 52 <div class="form-group">
53   - <input type="text" placeholder="请输入机构名过滤" id="groupName" name="groupName" class="form-control">
  53 + <input type="text" placeholder="请输入医院名过滤" id="groupName" name="groupName" class="form-control">
54 54 </div>
55 55 <div class="form-group" onclick="search();">
56 56 <a class="btn btn-primary"><i class="fa fa-search"></i> 查询</a>
... ... @@ -195,7 +195,7 @@
195 195 #extends("/common/base_list.html")
196 196  
197 197 <script type="text/javascript">
198   -//拥有机构列表
  198 +//拥有医院列表
199 199 $(function () {
200 200 var orgListTable = new orgLostTableInit();
201 201 orgListTable.Init();
... ... @@ -234,7 +234,7 @@
234 234 visible: false
235 235 }, {
236 236 field: 'name',
237   - title: '机构名称'
  237 + title: '医院名称'
238 238 }],
239 239 onLoadSuccess: function(){ //加载成功时执行
240 240 var list = $('#orgList').bootstrapTable('getData');
parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html View file @ b00bf70
... ... @@ -45,13 +45,13 @@
45 45 var controllerRequestMappint = "/sysOrganGroup/";
46 46  
47 47 function add() {
48   - fullWindow("新增机构组", APP.PATH + controllerRequestMappint + "0/toEdit");
  48 + fullWindow("新增医院组", APP.PATH + controllerRequestMappint + "0/toEdit");
49 49 }
50 50  
51 51 function edit(){
52 52 var id = getSingleSelectedValue("dataTable","id");
53 53 if(id){
54   - fullWindow("修改机构组", APP.PATH + controllerRequestMappint + id + "/toEdit");
  54 + fullWindow("修改医院组", APP.PATH + controllerRequestMappint + id + "/toEdit");
55 55 }
56 56 }
57 57  
... ... @@ -76,7 +76,7 @@
76 76 title: '建档方式'
77 77 },{
78 78 field: 'orgnumber',
79   - title: '机构数'
  79 + title: '医院数'
80 80 },{
81 81 field: 'clientaddress',
82 82 title: '连接地址'
parent/center.manager/src/main/webapp/WEB-INF/views/organ/org_edit.html View file @ b00bf70
... ... @@ -6,7 +6,7 @@
6 6 <div class="form-group">
7 7 <label class="col-sm-3 control-label">名称:</label>
8 8 <div class="col-sm-8">
9   - <input type="text" placeholder="机构名称" value="$!org.name" aria-required="true" required="true" class="form-control" minlength="2" name="name" id="name">
  9 + <input type="text" placeholder="医院名称" value="$!org.name" aria-required="true" required="true" class="form-control" minlength="2" name="name" id="name">
10 10 </div>
11 11 </div>
12 12 <div class="form-group">
parent/center.manager/src/main/webapp/WEB-INF/views/organ/org_list.html View file @ b00bf70
... ... @@ -9,7 +9,7 @@
9 9 </div>
10 10  
11 11 <div class="form-group">
12   - <input type="text" placeholder="请输入机构名" id="usernameSearch" class="form-control">
  12 + <input type="text" placeholder="请输入医院名" id="usernameSearch" class="form-control">
13 13 </div>
14 14 <!-- <div class="form-group">
15 15 <input type="text" placeholder="请输入ID" id="idSearch" class="form-control">
16 16  
... ... @@ -42,13 +42,13 @@
42 42 var controllerRequestMappint = "/sysOrganizations/";
43 43  
44 44 function add() {
45   - fullWindow("添加机构", APP.PATH + controllerRequestMappint + "/toEdit?orgId=");
  45 + fullWindow("添加医院", APP.PATH + controllerRequestMappint + "/toEdit?orgId=");
46 46 }
47 47  
48 48 function edit(){
49 49 var id = getSingleSelectedValue("dataTable","id");
50 50 if(id){
51   - fullWindow("修改机构", APP.PATH + controllerRequestMappint + "toEdit?orgId="+id);
  51 + fullWindow("修改医院", APP.PATH + controllerRequestMappint + "toEdit?orgId="+id);
52 52 }
53 53 }
54 54  
parent/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html View file @ b00bf70
... ... @@ -141,9 +141,15 @@
141 141 </div>
142 142 </div>
143 143 <div class="form-group">
144   - <label class="col-sm-3 control-label">所属机构：</label>
  144 + <label class="col-sm-3 control-label">医院id：</label>
145 145 <div class="col-sm-8">
146   - <input type="text" placeholder="所属机构" value="$!role.orgId" aria-required="true" required="true" class="form-control" minlength="2" name="orgId" id="orgId">
  146 + <input type="text" placeholder="医院id" value="$!role.orgId" aria-required="true" required="true" class="form-control" minlength="2" name="orgId" id="orgId">
  147 + </div>
  148 + </div>
  149 + <div class="form-group">
  150 + <label class="col-sm-3 control-label">医院组：</label>
  151 + <div class="col-sm-8">
  152 + <input type="text" placeholder="医院组id" value="$!role.grouporgId" aria-required="true" required="true" class="form-control" minlength="2" name="grouporgId" id="grouporgId">
147 153 </div>
148 154 </div>
149 155 <div class="form-group">
parent/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html View file @ b00bf70
... ... @@ -7,6 +7,12 @@
7 7 <input type="text" placeholder="角色名" id="searchName" class="form-control">
8 8 </div>
9 9 <div class="form-group">
  10 + <input type="text" placeholder="医院id" id="searchOrgId" class="form-control">
  11 + </div>
  12 + <div class="form-group">
  13 + <input type="text" placeholder="医院组id" id="searchGrouporgId" class="form-control">
  14 + </div>
  15 + <div class="form-group">
10 16 <select class="form-control m-b" name="type" id="searchType" style="margin-bottom: 0;">
11 17 <option value="">所有</option>
12 18 <option value="1">用户角色</option>
... ... @@ -14,7 +20,7 @@
14 20 </select>
15 21 </div>
16 22 <div class="form-group">
17   - <input type="text" placeholder="角色id编号" id="searchId" class="form-control">
  23 + <input type="text" placeholder="编号" id="searchId" class="form-control">
18 24 </div>
19 25 </form>
20 26 </div>
... ... @@ -47,7 +53,9 @@
47 53 query:{
48 54 name: $("#searchName").val(),
49 55 id: $("#searchId").val(),
50   - type: $("#searchType").val()
  56 + type: $("#searchType").val(),
  57 + orgId: $("#searchOrgId").val(),
  58 + grouporgId: $("#searchGrouporgId").val(),
51 59 }
52 60 }
53 61 $('#dataTable').bootstrapTable('refresh', queryParams );
... ... @@ -91,7 +99,10 @@
91 99 title: '备注'
92 100 },{
93 101 field: 'orgId',
94   - title: '机构id'
  102 + title: '医院id'
  103 + },{
  104 + field: 'grouporgId',
  105 + title: '医院组id'
95 106 },{
96 107 field: 'enable',
97 108 title: '启/停用',
parent/center.manager/src/main/webapp/WEB-INF/views/role/tree_test.html View file @ b00bf70
... ... @@ -166,9 +166,9 @@
166 166 </div>
167 167 </div>
168 168 <div class="form-group">
169   - <label class="col-sm-3 control-label">所属机构：</label>
  169 + <label class="col-sm-3 control-label">所属医院：</label>
170 170 <div class="col-sm-8">
171   - <input type="text" placeholder="所属机构" value="$!role.orgId" aria-required="true" required="true" class="form-control" minlength="2" name="orgId" id="orgId">
  171 + <input type="text" placeholder="所属医院" value="$!role.orgId" aria-required="true" required="true" class="form-control" minlength="2" name="orgId" id="orgId">
172 172 </div>
173 173 </div>
174 174 <div class="form-group">
parent/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html View file @ b00bf70
... ... @@ -142,15 +142,15 @@
142 142 </div>
143 143 </div>
144 144 <div class="form-group">
145   - <label class="col-sm-3 control-label">机构：</label>
  145 + <label class="col-sm-3 control-label">医院id：</label>
146 146 <div class="col-sm-8">
147   - <input type="text" placeholder="所属机构" value="$!user.orgId" aria-required="true" required="true" class="form-control" minlength="2" name="orgId" id="orgId">
  147 + <input type="text" placeholder="医院id" value="$!user.orgId" aria-required="true" required="true" class="form-control" minlength="2" name="orgId" id="orgId">
148 148 </div>
149 149 </div>
150 150 <div class="form-group">
151   - <label class="col-sm-3 control-label">部门：</label>
  151 + <label class="col-sm-3 control-label">科室id：</label>
152 152 <div class="col-sm-8">
153   - <input type="text" placeholder="所属部门" value="$!user.deptId" aria-required="true" required="true" class="form-control" minlength="2" name="deptId" id="deptId">
  153 + <input type="text" placeholder="科室id" value="$!user.deptId" aria-required="true" required="true" class="form-control" minlength="2" name="deptId" id="deptId">
154 154 </div>
155 155 </div>
156 156 <div class="form-group">
parent/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html View file @ b00bf70
... ... @@ -12,10 +12,12 @@
12 12 <div class="form-group">
13 13 <input type="text" placeholder="手机号" id="searchPhone" class="form-control">
14 14 </div>
15   - <div class="form-group" id="leve">
16   - <span class="form-control">所属区域</span>
17   - #extends("/organ/org.html")
18   - </div>
  15 + <div class="form-group">
  16 + <input type="text" placeholder="医院id" id="searchOrgId" class="form-control">
  17 + </div>
  18 + <div class="form-group">
  19 + <input type="text" placeholder="科室id" id="searchDeptId" class="form-control">
  20 + </div>
19 21 </form>
20 22 </div>
21 23 </div>
... ... @@ -46,7 +48,9 @@
46 48 query:{
47 49 name: $("#searchName").val(),
48 50 account: $("#searchAccount").val(),
49   - phone: $("#searchPhone").val()
  51 + phone: $("#searchPhone").val(),
  52 + orgId: $("#searchOrgId").val()
  53 + deptId: $("#searchdeptId").val()
50 54 }
51 55 }
52 56 $('#dataTable').bootstrapTable('refresh', queryParams );
53 57  
... ... @@ -81,10 +85,10 @@
81 85 title: '帐号'
82 86 },{
83 87 field: 'orgId',
84   - title: '机构'
  88 + title: '医院'
85 89 },{
86 90 field: 'deptId',
87   - title: '部门'
  91 + title: '科室'
88 92 },{
89 93 field: 'phone',
90 94 title: '手机号'
... ... @@ -109,12 +113,4 @@
109 113 </script>
110 114 #end
111 115 #extends("/common/base_list.html")
112   -<script src="${ctx}/static/js/area.js"></script>
113   -<script type="text/javascript">
114   -//初始信息
115   -get("",function(data){
116   - handler(data,"leve0");
117   - //填充选择信息
118   -});
119   -</script>