emr_medicalrecord_record2.0
/
EMR_Medical_Record
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改工号显示为姓名等

Browse Source
master
hujl 4 years ago
parent 3c237fb76d
commit 56246bf398
4 changed files with 199 additions and 135 deletions
Show Stats Download Patch File Download Diff File

258
src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
Unescape Escape View File

@ -387,28 +387,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
@Override
public List<Archive_Master_Vo> selectOverdue(Archive_Master_Vo archiveMasterVo) {
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue(archiveMasterVo);
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
if(list!=null && list.size()>0){
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
}
}
}
}
@ -420,29 +422,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
public OffsetLimitPage selectOverdue(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit);
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue(archiveMasterVo);
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
if(list!=null && list.size()>0) {
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
}
}
}
}
@ -453,28 +456,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
@Override
public List<Archive_Master_Vo> selectOverdue2(Archive_Master_Vo archiveMasterVo) {
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue2(archiveMasterVo);
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
if(list!=null && list.size()>0) {
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
}
}
}
}
@ -486,29 +491,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
public OffsetLimitPage selectOverdue2(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit);
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue2(archiveMasterVo);
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
if(list!=null && list.size()>0) {
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
}
}
}
}
@ -645,23 +651,25 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
@Override
public List<Archive_Master_Vo> copyDetailList(Archive_Master_Vo archiveMasterVo) {
List<Archive_Master_Vo> list = archiveMasterMapper.copyDetailList(archiveMasterVo);
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
if(list!=null && list.size()>0) {
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
}
}
}
@ -673,23 +681,25 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
public OffsetLimitPage copyDetailList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit);
List<Archive_Master_Vo> list = archiveMasterMapper.copyDetailList(archiveMasterVo);
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
if(list!=null && list.size()>0) {
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
}
}
}

55
src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java
Unescape Escape View File

@ -15,6 +15,7 @@ import com.emr.service.Emr_DictionaryService;
import com.emr.service.Emr_Fault_DetailService;
import com.emr.service.Emr_Fault_TypeService;
import com.emr.service.PowerUserService;
import com.emr.vo.Power_User_Dto;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.google.common.base.Function;
@ -22,6 +23,7 @@ import com.google.common.collect.Maps;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@ -123,13 +125,64 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService {
@Override
public List<Emr_Fault_Vo> selectByColumn(Emr_Fault_Detail emrFaultDetail) {
return emrFaultDetailMapper.selectByColumn(emrFaultDetail);
List<Emr_Fault_Vo> list=emrFaultDetailMapper.selectByColumn(emrFaultDetail);
if(list!=null && list.size()>0){
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Emr_Fault_Vo emrFaultVo : list) {
if (null != powerUserList) {
//获取处理人
String dealPerson = emrFaultVo.getDealPerson();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(dealPerson) && powerUserDto.getUserName().equals(dealPerson)) {
emrFaultVo.setDealPerson(name);
}
}
}
}
}
return list;
}
@Override
public OffsetLimitPage selectByColumn(Emr_Fault_Detail emrFaultDetail, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit);
List<Emr_Fault_Vo> list = emrFaultDetailMapper.selectByColumn(emrFaultDetail);
if(list!=null && list.size()>0){
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Emr_Fault_Vo emrFaultVo : list) {
if (null != powerUserList) {
//获取处理人
String dealPerson = emrFaultVo.getDealPerson();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(dealPerson) && powerUserDto.getUserName().equals(dealPerson)) {
emrFaultVo.setDealPerson(name);
}
}
}
}
}
return new OffsetLimitPage((Page) list);
}

2
src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp
Unescape Escape View File

@ -155,7 +155,7 @@
</div>
<form id="form1" style="margin-top: 0px">
<div class="row form-inline form-group" id="btnDiv">
<button type="button" class="btn btn-info btn-sm" id="addBtn">添加叶子</button>
<button type="button" class="btn btn-warning btn-sm" id="addBtn">添加叶子</button>
<button type="button" class="btn btn-danger btn-sm" id="delBtn">删除类别</button>
<button type="button" class="btn btn-primary btn-sm" id="saveBtn">保存类别</button>
<%--<button type="button" class="btn btn-warning btn-sm" id="addTypeBtn">添加类别</button>--%>

19
src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp
Unescape Escape View File

@ -147,9 +147,9 @@
</div>
<form id="form1" style=" margin-top: 0px;">
<div class="row form-inline form-group">
<button type="button" class="btn btn-primary btn-sm" id="saveBtn">保存类别</button>
<button type="button" class="btn btn-danger btn-sm " id="delBtn">删除类别</button>
<button type="button" class="btn btn-warning btn-sm " id="addBtn">添加类别</button>
<button type="button" class="btn btn-danger btn-sm " id="delBtn">删除类别</button>
<button type="button" class="btn btn-primary btn-sm" id="saveBtn">保存类别</button>
</div>
<div id="contentDiv" hidden>
<div class="row divCss">
@ -241,6 +241,7 @@
if(obj.typeFlag==$("#typeFlag").val() && $("#typeFlag").val()!=undefined && $("#typeFlag").val()!=""){
currId=obj.id;
$("#id").val(obj.id);
}else if($("#id").val()!="" && $("#id").val()!=undefined){
currId = $("#id").val();
}
@ -252,7 +253,7 @@
}
$.fn.zTree.init($("#ztree"), setting, zNodes);
var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
$("#delBtn").hide();
//$("#delBtn").hide();
var node;
//console.log("====currId====="+currId);
if (currId != "" && currId != null) {
@ -310,7 +311,7 @@
$("#typeFlag").val(treeNode.typeFlag);
if (treeNode.typeFlag == "defined") {
$("#typeFlag").attr("readonly", true);
$("#delBtn").hide();
// $("#delBtn").hide();
} else {
$("#typeFlag").attr("readonly", false);
@ -323,7 +324,7 @@
$("#remark").val(treeNode.remark);
} else {
//$("#contentDiv").hide();
$("#delBtn").hide();
// $("#delBtn").hide();
emptyEntity();
}
}
@ -468,7 +469,7 @@
$("#delBtn").click(function () {
if ($("#id").val() == null || $("#id").val() == "") {
toastr.warning("请选中一个缺陷类");
toastr.warning("请选中一个缺陷类!");
return;
}
$.ajax({
@ -487,7 +488,7 @@
var node = ztree.getNodeByParam("id", 0);
ztree.selectNode(node, true);//将指定ID的节点选中
$("#contentDiv").hide();
$("#delBtn").hide();
// $("#delBtn").hide();
// $("#"+currNode.tId+"_a").click();//触发ztree点击事件
toastr.success("删除成功!")
} else {
@ -510,13 +511,13 @@
toastr.warning("代码长度不超过32!");
return;
} else if (entity.typeName == null || entity.typeName == "") {
toastr.warning("名称必填");
toastr.warning("名称必填!");
return;
} else if (entity.typeName.length > 200) {
toastr.warning("名称长度不超过200!");
return;
} else if (entity.typeSort == null || entity.typeSort == "") {
toastr.warning("排序必填");
toastr.warning("排序必填!");
return;
}
if (entity.price == null || entity.price == "") {

Write Preview
Loading…
Cancel
Save