Commit 08b48f32 by Suvalue

更新文档更新

parent 8ab081e6
......@@ -2,6 +2,7 @@ package com.bsoft.api.controller;
import com.bsoft.api.common.Result;
import com.bsoft.api.model.reqmodel.CodeAndPwd;
import com.bsoft.api.model.respmodel.LoginInfo;
import com.bsoft.api.service.LoginService;
import com.bsoft.common.utils.HttpUtil;
import io.swagger.annotations.Api;
......@@ -30,10 +31,10 @@ public class LoginController {
*/
@PostMapping("login")
@ApiOperation(value = "Result«LoginService.LoginInfo»登录")
public Result<LoginService.LoginInfo> login(@RequestBody CodeAndPwd codeAndPwd, HttpServletRequest request) {
public Result login(@RequestBody CodeAndPwd codeAndPwd, HttpServletRequest request) {
String ip = HttpUtil.getIP(request);
LoginService.LoginInfo loginInfo = loginServiceImpl.login(
codeAndPwd.getLoginName(), codeAndPwd.getPassword(), ip);
LoginInfo loginInfo = loginServiceImpl.login(
codeAndPwd.getLoginName(), codeAndPwd.getPassword(), codeAndPwd.getMacAddress(), ip);
if (loginInfo == null) {
return Result.error(Result.ErrorCode.USERERROR);
}
......
......@@ -33,6 +33,8 @@ public class SysUser {
private String lastIp;
private String macAddress;
public Long getId() {
return id;
}
......@@ -152,4 +154,12 @@ public class SysUser {
public void setLastIp(String lastIp) {
this.lastIp = lastIp;
}
public String getMacAddress() {
return macAddress;
}
public void setMacAddress(String macAddress) {
this.macAddress = macAddress;
}
}
\ No newline at end of file
......@@ -15,4 +15,7 @@ public class CodeAndPwd {
@NotNull(message = "密码 参数必传")
@ApiModelProperty(value = "密码", required = true)
String password;
@NotNull(message = "MAC 参数必传")
@ApiModelProperty(value = "MAC", required = true)
String macAddress;
}
package com.bsoft.api.model.respmodel;
import com.bsoft.api.model.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
@ApiModel(description = "登录信息")
public class LoginInfo {
@ApiModelProperty("token")
private String token;
@ApiModelProperty("用户信息")
private SysUser user;
@ApiModelProperty("用户角色信息")
private SysRole role;
@ApiModelProperty("用户机构信息")
private List<DicOrg> org;
@ApiModelProperty("用户科室信息")
private SerDepartment dept;
@ApiModelProperty("病案信息")
private SysVersion version;
public LoginInfo() {
}
public LoginInfo(String token, SysUser user, List<DicOrg> org) {
this.token = token;
this.user = user;
this.org = org;
}
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
public SysUser getUser() {
return user;
}
public void setUser(SysUser user) {
this.user = user;
}
public List<DicOrg> getOrg() {
return org;
}
public void setOrg(List<DicOrg> org) {
this.org = org;
}
public SerDepartment getDept() {
return dept;
}
public void setDept(SerDepartment dept) {
this.dept = dept;
}
public SysRole getRole() {
return role;
}
public void setRole(SysRole role) {
this.role = role;
}
public SysVersion getVersion() {
return version;
}
public void setVersion(SysVersion version) {
this.version = version;
}
@Override
public String toString() {
return "LoginInfo{" +
"token='" + token + '\'' +
", user=" + user +
", role=" + role +
", org=" + org +
", dept=" + dept +
", version=" + version +
'}';
}
}
package com.bsoft.api.service.Impl;
import com.bsoft.api.common.exceptions.DBConfigurationError;
import com.bsoft.api.common.utils.TokenUtil;
import com.bsoft.api.mapper.DicOrgMapper;
import com.bsoft.api.mapper.SysRoleMapper;
import com.bsoft.api.mapper.SysUserMapper;
import com.bsoft.api.mapper.SysVersionMapper;
import com.bsoft.api.model.*;
import com.bsoft.api.model.respmodel.LoginInfo;
import com.bsoft.api.service.LoginService;
import com.bsoft.api.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -32,16 +34,17 @@ public class LoginServiceImpl implements LoginService {
private SysVersionMapper sysVersionMapper;
@Override
public LoginInfo login(String logName, String password, String ip) {
public LoginInfo login(String logName, String password, String macAddrss, String ip) {
LoginInfo loginInfo = new LoginInfo();
SysUser user = userServiceImpl.findByLoginName(logName);
if (user != null && user.getPassword().equals(password)) {
if (user != null && user.getPassword().equals(password) && (user.getMacAddress().equals(macAddrss) || user.getMacAddress() == null)) {
String token = TokenUtil.getToken(password, user);
//修改ip以及最后登录时间
//修改ip以及最后登录时间、MAC地址
user.setLastIp(ip);
user.setLastTime(new Date());
user.setMacAddress(macAddrss);
sysUserMapper.updateByPrimaryKey(user);
user.setPassword(null);
......@@ -61,6 +64,8 @@ public class LoginServiceImpl implements LoginService {
//查询病案信息
SysVersion version = sysVersionMapper.selectLastDate();
loginInfo.setVersion(version);
} else {
throw new DBConfigurationError("账号、密码或者MAC地址错误!");
}
return loginInfo;
}
......
package com.bsoft.api.service;
import com.bsoft.api.model.*;
import com.bsoft.api.model.respmodel.LoginInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
public interface LoginService {
LoginInfo login(String loginName, String password, String ip);
LoginInfo login(String logName, String password, String macAddrss, String ip);
String refreshToken(String oldToken);
@ApiModel(description = "登录信息")
class LoginInfo {
@ApiModelProperty("token")
private String token;
@ApiModelProperty("用户信息")
private SysUser user;
@ApiModelProperty("用户角色信息")
private SysRole role;
@ApiModelProperty("用户机构信息")
private List<DicOrg> org;
@ApiModelProperty("用户科室信息")
private SerDepartment dept;
@ApiModelProperty("病案信息")
private SysVersion version;
public LoginInfo() {
}
public LoginInfo(String token, SysUser user, List<DicOrg> org) {
this.token = token;
this.user = user;
this.org = org;
}
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
public SysUser getUser() {
return user;
}
public void setUser(SysUser user) {
this.user = user;
}
public List<DicOrg> getOrg() {
return org;
}
public void setOrg(List<DicOrg> org) {
this.org = org;
}
public SerDepartment getDept() {
return dept;
}
public void setDept(SerDepartment dept) {
this.dept = dept;
}
public SysRole getRole() {
return role;
}
public void setRole(SysRole role) {
this.role = role;
}
public SysVersion getVersion() {
return version;
}
public void setVersion(SysVersion version) {
this.version = version;
}
@Override
public String toString() {
return "LoginInfo{" +
"token='" + token + '\'' +
", user=" + user +
", role=" + role +
", org=" + org +
", dept=" + dept +
", version=" + version +
'}';
}
}
}
......@@ -70,7 +70,7 @@
and d.MDC_CODE = #{code,jdbcType=VARCHAR}
</select>
<select id="selectByMdcName" resultMap="BaseResultMap">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
from dic_disease d
where 1 = 1 and STATE=1
......@@ -80,18 +80,18 @@
order by d.MDC_NUM
</select>
<select id="selectByLevel" resultMap="DiseaseLevel">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
from dic_disease d
<if test="deptCode!=null">
join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
join (select ZBZBM,KSBM,ZLS as ZLS
from val_block_values_1_2_2
where `TIME`=#{date} and ZLS>0
and KSBM=#{deptCode,jdbcType=VARCHAR}
group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE
</if>
<if test="deptCode==null">
join (select ZBZBM,SUM(ZLS) as ZLS
join (select ZBZBM,ZLS as ZLS
from val_block_values_1_1_2
where `TIME`=#{date} and ZLS>0
group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
......@@ -103,7 +103,7 @@
order by val.ZLS desc
</select>
<select id="selectByLevelNoZBZ" resultMap="DiseaseLevel">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
from dic_disease d
where 1 = 1 and STATE=1
......@@ -113,11 +113,11 @@
order by d.MDC_NUM
</select>
<select id="selectByParentId" resultMap="DiseaseLevel">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
from dic_disease d
<if test="deptCode!=null">
join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
join (select ZBZBM,KSBM,ZLS as ZLS
from val_block_values_1_2_2
where `TIME`=#{date} and ZLS>0
and KSBM=#{deptCode,jdbcType=VARCHAR}
......@@ -136,21 +136,21 @@
order by val.ZLS desc
</select>
<select id="selectByParentIdNoZbz" resultMap="DiseaseLevel">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
from dic_disease d
<if test="deptCode!=null">
join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
join (select YJBZBM,KSBM,ZLS as ZLS
from val_block_values_1_5_2
where `TIME`=#{date}
and KSBM=#{deptCode,jdbcType=VARCHAR}
group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE
group by YJBZBM,KSBM) val on val.YJBZBM = d.MDC_CODE
</if>
<if test="deptCode==null">
join (select ZBZBM,SUM(ZLS) as ZLS
join (select YJBZBM,ZLS as ZLS
from val_block_values_1_3_2
where `TIME`=#{date}
group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
group by YJBZBM) val on val.YJBZBM = d.MDC_CODE
</if>
where 1 = 1 and STATE=1 and STATE=1
<if test="parentId!=null">
......@@ -161,7 +161,7 @@
<select id="selectParentById" resultMap="DiseaseLevel">
select d.*,val.ZLS
from dic_disease d
join (select ZBZBM,SUM(ZLS) as ZLS
join (select ZBZBM,ZLS as ZLS
from val_block_values_1_1_2
where `TIME`=#{date} and ZLS>0
group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
......@@ -173,17 +173,26 @@
<select id="selectParentByIdNoZbz" resultMap="DiseaseLevel">
select d.*,val.ZLS
from dic_disease d
join val_block_values_1_3_1 val on val.ZBZBM = d.MDC_CODE and val.`TIME`=#{date}
left join val_block_values_1_3_1 val on val.ZBZBM = d.MDC_CODE and val.time=#{date}
where 1 = 1 and d.STATE=1
<if test="diseaseId!=null">
and d.id=(select PARENT_ID from dic_disease where id = #{diseaseId,jdbcType=DECIMAL} )
</if>
</select>
<select id="selectSonById" resultMap="DiseaseLevel">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
from dic_disease d
left join val_block_values_1_3_1 val on val.ZBZBM = d.MDC_CODE and val.time=#{date}
<if test="deptCode!=null">
left join (select YJBZBM,KSBM,ZLS as ZLS
from val_block_values_1_5_2
where `TIME`=#{date}
and KSBM=#{deptCode,jdbcType=VARCHAR}
group by YJBZBM,KSBM) val on val.YJBZBM = d.MDC_CODE
</if>
<if test="deptCode==null">
left join val_block_values_1_3_2 val on val.YJBZBM = d.MDC_CODE and val.time=#{date}
</if>
where 1 = 1 and d.STATE=1
<if test="diseaseId!=null">
and d.PARENT_ID=#{diseaseId,jdbcType=DECIMAL}
......
......@@ -73,5 +73,6 @@
`TABLE_NAME`
from dic_page_block_rs
where PAGE_ID = #{pageID,jdbcType=DECIMAL}
and `STATE` = 1
</select>
</mapper>
\ No newline at end of file
......@@ -17,6 +17,7 @@
<result column="ERROR_TIME" jdbcType="TIMESTAMP" property="errorTime"/>
<result column="LAST_TIME" jdbcType="TIMESTAMP" property="lastTime"/>
<result column="LAST_IP" jdbcType="VARCHAR" property="lastIp"/>
<result column="MAC_ADDRESS" jdbcType="VARCHAR" property="macAddress"/>
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete
......@@ -31,12 +32,12 @@
USER_CODE, USER_NAME, `PASSWORD`,
IDCARD, SEX, MOBILE,
PAGE_COUNT, ERROR_COUNT, ERROR_TIME,
LAST_TIME, LAST_IP)
LAST_TIME, LAST_IP,MAC_ADDRESS)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
#{idcard,jdbcType=VARCHAR}, #{sex,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
#{pageCount,jdbcType=DECIMAL}, #{errorCount,jdbcType=DECIMAL}, #{errorTime,jdbcType=TIMESTAMP},
#{lastTime,jdbcType=TIMESTAMP}, #{lastIp,jdbcType=VARCHAR})
#{lastTime,jdbcType=TIMESTAMP}, #{lastIp,jdbcType=VARCHAR}, #{macAddress,jdbcType=VARCHAR})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUser">
update SYS_USER
......@@ -53,7 +54,8 @@
ERROR_COUNT = #{errorCount,jdbcType=DECIMAL},
ERROR_TIME = #{errorTime,jdbcType=TIMESTAMP},
LAST_TIME = #{lastTime,jdbcType=TIMESTAMP},
LAST_IP = #{lastIp,jdbcType=VARCHAR}
LAST_IP = #{lastIp,jdbcType=VARCHAR},
MAC_ADDRESS = #{macAddress,jdbcType=VARCHAR}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
......@@ -71,7 +73,8 @@
ERROR_COUNT,
ERROR_TIME,
LAST_TIME,
LAST_IP
LAST_IP,
MAC_ADDRESS
from SYS_USER
where ID = #{id,jdbcType=DECIMAL}
</select>
......@@ -90,7 +93,8 @@
ERROR_COUNT,
ERROR_TIME,
LAST_TIME,
LAST_IP
LAST_IP,
MAC_ADDRESS
from SYS_USER
</select>
<select id="selectByCode" resultMap="BaseResultMap">
......@@ -108,7 +112,8 @@
ERROR_COUNT,
ERROR_TIME,
LAST_TIME,
LAST_IP
LAST_IP,
MAC_ADDRESS
from SYS_USER
where USER_CODE = #{userCode,jdbcType=VARCHAR}
and `STATE` != 0
......
时间:2020.07.16 版本号:2.02.0716001
时间:2020.07.21 版本号:2.02.0721001
时间:2020.07.21 版本号:2.02.0721001
前端更新说明:
515 全院得能级一级,二级,三级病组层列表右上角点击“转图表”后得图界面,左下病组目录无法点击
516 绩效科室的每个病组层去掉主体为要素的趋势图 ,与右下的病组高亮联动,主体的序号为病组的序号
517 全院的病组层 成本,绩效 “转图表”隐藏
519 薪酬双坐标
521 全院某个科室能级的三级病组层=》右上筛选全院=》上一页=》“列表下钻某个科室”或者“直接切换病组”,应该是主病组而不是三级病组,视频已发
496的成本的病组层右下切换月份,只有趋势图在刷新数据
509 全院以及科室的病组层右上角环优化
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.07.20 版本号:2.02.0720001
前端更新说明:
496 成本,绩效的科室病组层分析,右上角筛选月份,未生效,绩效已改,成本未改
500 PC状态下 15--》BN---》AK,AK点不开相应的下一级病组,全院层
508 科室绩效的列表切换到全院的绩效列表慢,绩效的列表右上角筛选单击没反应,双击才有反应,错
515 全院得能级一级,二级,三级病组层列表右上角点击“转图表”后得图界面,左下病组目录无法点击
516 绩效科室的每个病组层去掉主体为要素的趋势图 ,与右下的病组高亮联动,主体的序号为病组的序号
354 病组层(一级,二级,三级)的列表,右上角筛选科室的弹出框,只显示当前科室名(选中状态),还有全院
数据更新说明:
1.2020 年的指单,优质区间成本,和药耗人优质区间成本的标准值更改
2.全院层疾病 子级病组例数的加和与父级例数 不一致问题
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.07.17 版本号:2.02.0717001
后端更新说明:
1.病组接口优化
2.登录添加mac地址验证
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.07.16 版本号:2.02.0716002
前端更新说明:
461 科室无但标准目录下有的病组的弹框数据优化
422 总览下筛选具体科室,然后下钻到能级列表,列表表头应显示具体的科室名,而不是全院
421 总览下,右上角筛选具体科室,列表应只出现该科室
418 清单界面,多次点击筛选,弹出层重复出现,弹出层的阴影效果逐渐盖住整个页面
400 (视频已发)绩效的右下科室下钻=》右下主病组下钻=》右上“上一页”=》右下主病组下钻=》右上“上一页”,界面显示undefined
262 在问题261回退的基础上,切换和一级病组同级的其他一级病组,列表宽度不稳定,宽度会变化
504 所有维度的列表rw上方加横杠
503 主病组目录不要往后缩 能级的全院层:94------->A
502 列表汇总的那条病组,如果是综合病组,也要加“*”
501 目录不管哪一级,固定宽度
500 PC状态下 15--》BN---》AK,AK点不开相应的下一级病组,全院层
499 忘记密码弹框
496绩效的科室病组层分析,右上角筛选月份,未生效
494 科室内得三级病组层点转图表,趋势图未显示折线,
486 浏览器清空,点绩效,然后整个界面数据出不来
470 成本模块 增加收支比偏 全院的趋势图
461 科室无但标准目录下有的病组的弹框数据优化
495 滚动病组时,“无”相同方向移动,参考预算编制里的效果
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.07.16 版本号:2.02.0716001
后端更新说明:
1.病组目录添加总例数字段
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment