jiangs/blood
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

兼容输血系统架构

Browse Source
This commit is contained in:
jiangs 2026-06-18 17:52:21 +08:00
parent 39fd22454d
commit f1b36f8ff1
15 changed files with 288 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
blood_bus/src/main/java/com/czblood/bus/pojo/XkOperatorInfo.java
View File

@ -1,6 +1,7 @@
package com.czblood.bus.pojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -10,15 +11,25 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@ApiModel("员工信息表")
public class XkOperatorInfo {
@ApiModelProperty("员工ID")
private String operator_id;
@ApiModelProperty("员工姓名")
private String operator_name;
@ApiModelProperty("员工密码")
private String pwd;
@ApiModelProperty("工作组")
private String work_group;
@ApiModelProperty("部门")
private String dept;
@ApiModelProperty("员工类型")
private String operator_type;
@ApiModelProperty("拼音")
private String py;
@ApiModelProperty("输血科主任")
private String is_bank_director;
@ApiModelProperty("医务部负责人")
private String is_medical_director;
@ApiModelProperty("职称")
private String postname;
private String sign_pic;
private String vshiscode;

76
blood_bus/src/main/java/com/czblood/bus/system/BloodExtInterfaceService.java
View File

@ -2,15 +2,19 @@ package com.czblood.bus.system;
import com.czblood.bus.mapper.XkHosInfoMapper;
import com.czblood.bus.mapper.XkOperatorInfoMapper;
import com.czblood.bus.pojo.XkDmzd;
import com.czblood.bus.pojo.XkHosInfo;
import com.czblood.bus.pojo.XkOperatorInfo;
import com.czblood.bus.utils.BloodBankUtil;
import com.czblood.common.core.domain.Result;
import com.czblood.common.core.domain.entity.SysDept;
import com.czblood.common.core.domain.entity.SysLoginParam;
import com.czblood.common.core.domain.entity.SysUser;
import com.czblood.common.core.domain.model.LoginParam;
import com.czblood.common.core.domain.model.LoginUser;
import com.czblood.common.utils.SecurityUtils;
import com.czblood.common.utils.StringUtils;
import com.czblood.system.mapper.SysDeptMapper;
import com.czblood.system.mapper.SysUserMapper;
import com.czblood.system.service.ExtSystemInterface;
import com.czblood.system.service.ISysConfigService;
@ -19,6 +23,7 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;
/**
* 登录接口
@ -32,37 +37,57 @@ public class BloodExtInterfaceService implements ExtSystemInterface {
XkOperatorInfoMapper xkOperatorInfoMapper;
@Autowired
private SysUserMapper userMapper;
@Autowired
private ISysConfigService configService;
// @Autowired
// private ISysConfigService configService;
@Resource
SysDeptMapper sysDeptMapper;
@Resource
BloodBankUtil bloodBankUtil;
@Override
public Result syncUser() {
public Result syncUser(String loginYLJG) {
//同步科室
Result result = syncDept();
if(!result.getCode().equals("0")) return result;
int deptCount = Integer.parseInt(result.getData().toString());
//同步用户
XkOperatorInfo xkOperatorInfo = new XkOperatorInfo();
List<XkOperatorInfo> xkOperatorInfoList = xkOperatorInfoMapper.queryList(xkOperatorInfo);
SysUser sysUser2 = new SysUser();
List<SysUser> sysUserList = userMapper.selectUserList(sysUser2);
SysDept sysDept = new SysDept();
List<SysDept> sysDeptList = sysDeptMapper.selectDeptList(sysDept);
int j = 0;
long deptId = 0L;
for (XkOperatorInfo operatorInfo : xkOperatorInfoList) {
// 验证是否存在这个用户
SysUser u = userMapper.selectUserByUserName(operatorInfo.getOperator_id());
if(!StringUtils.isNull(u)) continue;
List<SysUser> collect = sysUserList.stream().filter(sysUser1 -> BloodBankUtil.isBank(sysUser1.getUserName()).equals(operatorInfo.getOperator_id())).collect(Collectors.toList());
if(!collect.isEmpty()) continue;
SysUser sysUser = new SysUser();
sysUser.setDeptId(101L);
//查询科室ID
SysDept sysDept1 = sysDeptList.stream().filter(sysDept2 -> BloodBankUtil.isBank(sysDept2.getDeptCode()).equals(operatorInfo.getDept())).findFirst().orElse(null);
if(sysDept1 != null) deptId = sysDept1.getDeptId();
sysUser.setDeptId(deptId);
sysUser.setUserName(operatorInfo.getOperator_id());
sysUser.setNickName(operatorInfo.getOperator_name());
sysUser.setUserType("00");
sysUser.setSex("1");
String password = configService.selectConfigByKey("sys.user.initPassword");
sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser.setPassword(SecurityUtils.encryptPassword(operatorInfo.getPwd()));
sysUser.setStatus("0");
sysUser.setCreateBy("admin");
sysUser.setVshisuser(operatorInfo.getVshiscode());
sysUser.setHos_id("602"); //以前老的输血系统没有医疗机构的概念，所以这里先给个之前的默认值
sysUser.setPostname(operatorInfo.getPostname());
sysUser.setWorkgroup(operatorInfo.getWork_group());
sysUser.setOperator_type(operatorInfo.getOperator_type());
sysUser.setIs_bank_director(operatorInfo.getIs_bank_director());
sysUser.setIs_medical_director(operatorInfo.getIs_medical_director());
//sysUser.setVshisuser(operatorInfo.getVshiscode());
sysUser.setHos_id(loginYLJG);
sysUser.setDelFlag("0");
userMapper.insertUser(sysUser);
j++;
}
return new Result("0","导入成功，共有："+j+"条数据导入！");
return new Result("0","导入成功，员工共有："+j+"条数据导入，科室：共有："+deptCount+"条数据导入！");
}
@ -87,6 +112,33 @@ public class BloodExtInterfaceService implements ExtSystemInterface {
* @return
*/
public Result syncDept(){
return null;
int j = 0;
List<XkDmzd> xkDmzdList = bloodBankUtil.setDictCacheList("ks");
SysDept sysDept = new SysDept();
List<SysDept> sysDeptList = sysDeptMapper.selectDeptList(sysDept);
for (XkDmzd xkDmzd : xkDmzdList) {
List<SysDept> collect = sysDeptList.stream().filter(sysDept1 -> BloodBankUtil.isBank(sysDept1.getDeptCode()).equals(xkDmzd.getWordbook_code())).collect(Collectors.toList());
if(!collect.isEmpty()) continue;
sysDept = new SysDept();
sysDept.setParentId(100L);
sysDept.setAncestors("0,100");
sysDept.setDeptName(xkDmzd.getWordbook_name());
sysDept.setOrderNum(1);
sysDept.setDelFlag("0");
String useSign = xkDmzd.getUse_sign();
sysDept.setDeptCode(xkDmzd.getWordbook_code());
if(useSign.equals("Y")) {
useSign = "1";
}else{
useSign = "0";
}
sysDept.setStatus(useSign);
sysDept.setCreateBy("admin");
sysDept.setCreateTime(bloodBankUtil.getCurrentTimeDate());
sysDeptMapper.insertDept(sysDept);
j++;
}
return new Result("0","导入成功，共有："+j+"条数据导入！",j);
}
}

9
blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java
View File

@ -17,6 +17,7 @@ import org.springframework.data.redis.connection.ReactiveSubscription;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -132,4 +133,12 @@ public class BloodBankUtil {
}
public String getCurrentTime(){
return commonUtil.getCurrentTime();
}
public Date getCurrentTimeDate(){
return commonUtil.getCurrentTimeDate();
}
}

20
blood_bus/src/main/resources/mapper/XkHosInfoMapper.xml
View File

@ -39,16 +39,16 @@
<update id="update">
update xk_hos_info set
<if test="address != null and address != ''">address = #{address},</if>
<if test="post_code != null and post_code != ''">post_code = #{post_code},</if>
<if test="telno != null and telno != ''">telno = #{telno},</if>
<if test="link_person != null and link_person != ''">link_person = #{link_person},</if>
<if test="org_kind != null and org_kind != ''">org_kind = #{org_kind},</if>
<if test="foot_mode != null and foot_mode != ''">foot_mode = #{foot_mode},</if>
<if test="org_zone != null and org_zone != ''">org_zone = #{org_zone},</if>
<if test="org_street != null and org_street != ''">org_street = #{org_street},</if>
<if test="hospital_name != null and hospital_name != ''">hospital_name = #{hospital_name},</if>
<if test="sfby != null and sfby != ''">sfby = #{sfby},</if>
<if test="address != null">address = #{address},</if>
<if test="post_code != null">post_code = #{post_code},</if>
<if test="telno != null">telno = #{telno},</if>
<if test="link_person != null">link_person = #{link_person},</if>
<if test="org_kind != null">org_kind = #{org_kind},</if>
<if test="foot_mode != null">foot_mode = #{foot_mode},</if>
<if test="org_zone != null">org_zone = #{org_zone},</if>
<if test="org_street != null">org_street = #{org_street},</if>
<if test="hospital_name != null">hospital_name = #{hospital_name},</if>
<if test="sfby != null">sfby = #{sfby},</if>
hospital_code = #{hospital_code}
where hospital_code = #{hospital_code}
</update>

28
blood_common/src/main/java/com/czblood/common/core/domain/Result.java
View File

@ -25,17 +25,8 @@ public class Result {
@ApiModelProperty(value = "响应消息", example = "操作成功", notes = "接口返回的提示信息")
private String msg;
private Object data;
@ApiModelProperty(value = "下一步请求URL", notes = "后续需要请求的接口地址")
private String url;
@ApiModelProperty(value = "下一步请求方法", example = "GET", notes = "GET/POST/PUT/DELETE等")
private String method;
@ApiModelProperty(value = "下一步请求参数", notes = "后续请求需要携带的参数")
private Object params;
@ApiModelProperty(value = "问题ID", example = "1001", notes = "关键业务标识ID")
private Integer problemId;
public Result(String resultCode, String message) {
super();
this.code = resultCode;
@ -47,23 +38,6 @@ public class Result {
this.msg = message;
this.data = data;
}
public Result(String resultCode, String message,Integer problemId) {
this.code = resultCode;
this.msg = message;
Integer problemId0=problemId;
HttpServletRequest request = ServletUtils.getRequest();
this.url = request.getContextPath() + request.getServletPath();
this.method = request.getMethod();
if("GET".equals(this.method)){
this.params = ServletUtils.getParamMap(request);
}else {
try {
this.data = JsonParamUtils.getJsonParams(request);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
this.problemId=problemId0;
}
}

4
blood_common/src/main/java/com/czblood/common/core/domain/ResultT.java
View File

@ -72,10 +72,6 @@ public class ResultT<T> extends Result {
ResultT<T> resultT = new ResultT<>();
resultT.setCode(oldResult.getCode());
resultT.setMsg(oldResult.getMsg());
resultT.setUrl(oldResult.getUrl());
resultT.setMethod(oldResult.getMethod());
resultT.setParams(oldResult.getParams());
resultT.setProblemId(oldResult.getProblemId());
// 调用父类setData(Object)，无冲突
Object oldData = oldResult.getData();

24
blood_common/src/main/java/com/czblood/common/core/domain/entity/SysDept.java
View File

@ -52,10 +52,22 @@ public class SysDept extends BaseEntity
/** 父部门名称 */
private String parentName;
private String deptCode;
private String hos_id;
/** 子部门 */
private List<SysDept> children = new ArrayList<SysDept>();
public String getHos_id() {
return hos_id;
}
public void setHos_id(String hos_id) {
this.hos_id = hos_id;
}
public Long getDeptId()
{
return deptId;
@ -182,6 +194,14 @@ public class SysDept extends BaseEntity
this.children = children;
}
public String getDeptCode() {
return deptCode;
}
public void setDeptCode(String deptCode) {
this.deptCode = deptCode;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -199,6 +219,8 @@ public class SysDept extends BaseEntity
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("deptCode", getDeptCode())
.append("hos_id", getHos_id())
.toString();
}
}

129
blood_common/src/main/java/com/czblood/common/core/domain/entity/SysUser.java
View File

@ -88,6 +88,60 @@ public class SysUser extends BaseEntity
/** 角色ID */
private Long roleId;
/** 岗位名称 */
private String postname;
/** 工作组 */
private String workgroup;
/** 操作类型 */
private String operator_type;
/**
* 输血科主任
*/
private String is_bank_director;
/**
* 医务部负责人
*/
private String is_medical_director;
public String getPostname() {
return postname;
}
public void setPostname(String postname) {
this.postname = postname;
}
public String getWorkgroup() {
return workgroup;
}
public void setWorkgroup(String workgroup) {
this.workgroup = workgroup;
}
public String getOperator_type() {
return operator_type;
}
public void setOperator_type(String operator_type) {
this.operator_type = operator_type;
}
public String getIs_bank_director() {
return is_bank_director;
}
public void setIs_bank_director(String is_bank_director) {
this.is_bank_director = is_bank_director;
}
public String getIs_medical_director() {
return is_medical_director;
}
public void setIs_medical_director(String is_medical_director) {
this.is_medical_director = is_medical_director;
}
public String getUserType() {
return userType;
@ -98,14 +152,7 @@ public class SysUser extends BaseEntity
}
private String userType;
private String vshisuser;
private String vshisuser1;
private String vshisuser2;
private String hos_id;
private String sn;
private String snid;
private String signCert;
private String sn_pin;
private SysLoginParam sysLoginParam;
public SysLoginParam getSysLoginParam() {
@ -116,62 +163,6 @@ public class SysUser extends BaseEntity
this.sysLoginParam = sysLoginParam;
}
public String getVshisuser() {
return vshisuser;
}
public void setVshisuser(String vshisuser) {
this.vshisuser = vshisuser;
}
public String getVshisuser1() {
return vshisuser1;
}
public void setVshisuser1(String vshisuser1) {
this.vshisuser1 = vshisuser1;
}
public String getVshisuser2() {
return vshisuser2;
}
public void setVshisuser2(String vshisuser2) {
this.vshisuser2 = vshisuser2;
}
public String getSn() {
return sn;
}
public void setSn(String sn) {
this.sn = sn;
}
public String getSnid() {
return snid;
}
public void setSnid(String snid) {
this.snid = snid;
}
public String getSignCert() {
return signCert;
}
public void setSignCert(String signCert) {
this.signCert = signCert;
}
public String getSn_pin() {
return sn_pin;
}
public void setSn_pin(String sn_pin) {
this.sn_pin = sn_pin;
}
public SysUser()
{
@ -410,14 +401,12 @@ public class SysUser extends BaseEntity
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("dept", getDept())
.append("vshisuser",getVshisuser())
.append("vshisuser1",getVshisuser1())
.append("vshisuser2",getVshisuser1())
.append("hos_id",getHos_id())
.append("sn",getSn())
.append("snid",getSnid())
.append("signCert",getSignCert())
.append("sn_pin",getSn_pin())
.append("postname",getPostname())
.append("workgroup",getWorkgroup())
.append("operator_type",getOperator_type())
.append("is_bank_director",getIs_bank_director())
.append("is_medical_director",getIs_medical_director())
.toString();
}
}

2
blood_system/src/main/java/com/czblood/system/service/ExtSystemInterface.java
View File

@ -13,7 +13,7 @@ public interface ExtSystemInterface {
* 同步用户
* @return
*/
public Result syncUser() ;
public Result syncUser(String loginYLJG) ;
/**

2
blood_system/src/main/java/com/czblood/system/service/ISysUserService.java
View File

@ -206,7 +206,7 @@ public interface ISysUserService {
*/
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
Result syncUser();
Result syncUser(String loginYLJG);
public SysUser queryUserList(SysUser sysUser);
}

12
blood_system/src/main/java/com/czblood/system/service/impl/SysUserServiceImpl.java
View File

@ -6,6 +6,7 @@ import java.util.stream.Collectors;
import javax.validation.Validator;
import com.czblood.common.core.domain.Result;
import com.czblood.common.utils.HosIdHolder;
import com.czblood.system.service.ExtSystemInterface;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -243,6 +244,12 @@ public class SysUserServiceImpl implements ISysUserService {
@Override
@Transactional
public int insertUser(SysUser user) {
if (StringUtils.isEmpty(user.getHos_id())) {
String autoHosId = HosIdHolder.getHosId();
if (StringUtils.isNotEmpty(autoHosId)) {
user.setHos_id(autoHosId);
}
}
// 新增用户信息
int rows = userMapper.insertUser(user);
// 新增用户岗位关联
@ -505,8 +512,8 @@ public class SysUserServiceImpl implements ISysUserService {
* @return
*/
@Override
public Result syncUser() {
extSystemInterface.syncUser();
public Result syncUser(String loginYLJG) {
return extSystemInterface.syncUser(loginYLJG);
// List<ComUsr> comUsrList = comUsrMapper.getComUsrList("");
// int j = 0;
// for (ComUsr comUsr : comUsrList) {
@ -536,7 +543,6 @@ public class SysUserServiceImpl implements ISysUserService {
//
// }
// return new Result("0","导入成功，共有："+j+"条数据导入！");
return new Result("-1","接口为定义！");
}
@Override

3
blood_system/src/main/java/com/czblood/system/web/controller/system/SysUserController.java
View File

@ -240,6 +240,7 @@ public class SysUserController extends BaseController {
@ApiOperation("同步用户数据")
@GetMapping("/syncUser")
public Result syncUser(){
return userService.syncUser();
String loginYLJG = getLoginUser().getSysLoginParam().getLoginYLJG();
return userService.syncUser(loginYLJG);
}
}

17
blood_system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" />
<result property="deptCode" column="dept_code" />
<result property="parentId" column="parent_id" />
<result property="ancestors" column="ancestors" />
<result property="deptName" column="dept_name" />
@ -20,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="hos_id" column="hos_id" />
</resultMap>
<sql id="selectDeptVo">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time ,d.dept_code,d.hos_id
from sys_dept d
</sql>
@ -42,6 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">
AND status = #{status}
</if>
<if test="deptCode != null and deptCode != ''">
AND dept_code = #{deptCode}
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
order by d.parent_id, d.order_num
@ -83,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="checkDeptNameUnique" resultMap="SysDeptResult">
select top 1 d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
select top 1 d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,d.hos_id
from sys_dept d
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0'
</select>
@ -98,8 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="phone != null and phone != ''">phone,</if>
<if test="email != null and email != ''">email,</if>
<if test="status != null">status,</if>
<if test="deptCode != null and deptCode != ''">dept_code,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
create_time,hos_id
)values(
<if test="parentId != null and parentId != 0">#{parentId},</if>
<if test="deptName != null and deptName != ''">#{deptName},</if>
@ -109,8 +115,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="phone != null and phone != ''">#{phone},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="status != null">#{status},</if>
<if test="deptCode != null and deptCode != ''">#{deptCode},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
getdate()
getdate(),#{hos_id}
)
</insert>
@ -118,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update sys_dept
<set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
<if test="deptCode != null and deptCode != ''">dept_code = #{deptCode},</if>
<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
@ -126,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="email != null">email = #{email},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="hos_id != null and hos_id != ''">hos_id = #{hos_id},</if>
update_time = getdate()
</set>
where dept_id = #{deptId}

36
blood_system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -23,13 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="vshisuser" column="vshisuser" />
<result property="vshisuser1" column="vshisuser1" />
<result property="vshisuser2" column="vshisuser2" />
<result property="hos_id" column="hos_id" />
<result property="sn" column="sn" />
<result property="snid" column="snid" />
<result property="signCert" column="signCert" />
<result property="postname" column="postname" />
<result property="workgroup" column="workgroup" />
<result property="operator_type" column="operator_type" />
<result property="is_bank_director" column="is_bank_director" />
<result property="is_medical_director" column="is_medical_director" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@ -55,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
u.hos_id,
u.hos_id, u.postname, u.workgroup, u.operator_type, u.is_bank_director, u.is_medical_director,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
@ -65,7 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
, u.hos_id, u.postname, u.workgroup, u.operator_type, u.is_bank_director, u.is_medical_director
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0'
<if test="userId != null and userId != 0">
@ -94,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time, u.hos_id, u.postname, u.workgroup, u.operator_type, u.is_bank_director, u.is_medical_director
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@ -111,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time, u.hos_id, u.postname, u.workgroup, u.operator_type, u.is_bank_director, u.is_medical_director
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@ -170,6 +171,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="hos_id != null and hos_id != ''">hos_id,</if>
<if test="postname != null and postname != ''">postname,</if>
<if test="workgroup != null and workgroup != ''">workgroup,</if>
<if test="operator_type != null and operator_type != ''">operator_type,</if>
<if test="is_bank_director != null and is_bank_director != ''">is_bank_director,</if>
<if test="is_medical_director != null and is_medical_director != ''">is_medical_director,</if>
create_time
)values(
<if test="deptId != null and deptId != ''">#{deptId},</if>
@ -184,6 +190,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="hos_id != null and hos_id != ''">#{hos_id},</if>
<if test="postname != null and postname != ''">#{postname},</if>
<if test="workgroup != null and workgroup != ''">#{workgroup},</if>
<if test="operator_type != null and operator_type != ''">#{operator_type},</if>
<if test="is_bank_director != null and is_bank_director != ''">#{is_bank_director},</if>
<if test="is_medical_director != null and is_medical_director != ''">#{is_medical_director},</if>
getdate()
)
</insert>
@ -204,6 +215,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="hos_id != null and hos_id != ''">hos_id = #{hos_id},</if>
<if test="postname != null">postname = #{postname},</if>
<if test="workgroup != null">workgroup = #{workgroup},</if>
<if test="operator_type != null">operator_type = #{operator_type},</if>
<if test="is_bank_director != null">is_bank_director = #{is_bank_director},</if>
<if test="is_medical_director != null">is_medical_director = #{is_medical_director},</if>
update_time = getdate()
</set>
where user_id = #{userId}

60
sql/updatedb_blood.sql
View File

@ -315,6 +315,17 @@ if not exists(select 1 from dbo.xk_dmzd where wordbook_sign = 'BASE')
insert into xk_dmzd (wordbook_sign,wordbook_code,wordbook_name,use_sign) values('billApplyStatus','S','已追加配血','Y')
insert into xk_dmzd (wordbook_sign,wordbook_code,wordbook_name,use_sign) values('billApplyStatus','N','审核未通过','Y')
insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values('BASE','workgroup','工作组','Y')
insert into xk_dmzd(wordbook_sign,wordbook_code,wordbook_name,use_sign) values
('workgroup','006','临床科室','Y'),
('workgroup','001','管理员','Y'),
('workgroup','002','护士','Y'),
('workgroup','003','输血科室','Y'),
('workgroup','004','医生','Y'),
('workgroup','005','支助中心','Y')
END
IF NOT EXISTS (SELECT 1 FROM sys.key_constraints WHERE name = 'PK_xk_dmzd' AND type = 'PK' )
@ -348,4 +359,51 @@ IF NOT EXISTS (SELECT 1 FROM sys.key_constraints WHERE name = 'UQ_sys_user_user_
BEGIN
ALTER TABLE sys_user ADD CONSTRAINT UQ_sys_user_user_name UNIQUE(user_name);
END
GO
GO
if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_dept' AND COLUMN_NAME = 'dept_code')
begin
alter table sys_dept add dept_code varchar(30)
end
go
if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'postname')
begin
alter table sys_user add postname varchar(30)
end
go
if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'workgroup')
begin
alter table sys_user add workgroup varchar(30)
end
go
if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'operator_type')
begin
alter table sys_user add operator_type varchar(2)
end
go
if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'is_bank_director')
begin
alter table sys_user add is_bank_director varchar(2)
end
go
if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'is_medical_director')
begin
alter table sys_user add is_medical_director varchar(2)
end
go
if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_dept' AND COLUMN_NAME = 'hos_id')
begin
alter table sys_dept add hos_id varchar(10)
end
go