代码同步

————2021.02.01 王泽钦
master
wzqgit 5 years ago
parent f21d762bf0
commit 9117908e6e

@ -1,46 +0,0 @@
package com.emr;
public class DataSourceHolder {
/**
* sqlserver
*/
public static final String SQLSERVER_DATA_SOURCE ="sqlServerDataSource";
/**
* mysql
*/
public static final String MYSQL_DATA_SOURCE ="mysqlDataSource";
//用ThreadLocal来设置当前线程使用哪个dataSource
private static final ThreadLocal<String> contextHolder = new ThreadLocal<String>();
//设置当前线程要使用的数据源
public static void setDataSourceType(String dataSourceType) {
contextHolder.set(dataSourceType);
}
/**
* 线
*/
public static String getDataSourceType() {
return contextHolder.get();
}
/**
*
* 线
*/
public static void clearDataSourceType() {
contextHolder.remove();
}
/**
*
*/
public static void changeCurrentDataSource(String dataSourceType) {
clearDataSourceType();
setDataSourceType(dataSourceType);
}
/**
*
*/
public static void change2DefaulDataSource() {
clearDataSourceType();
}
}

@ -1,10 +0,0 @@
package com.emr;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
public class DynamicDataSource extends AbstractRoutingDataSource {
@Override
protected Object determineCurrentLookupKey() {
return DataSourceHolder.getDataSourceType();
}
}

@ -57,7 +57,7 @@ public class LoginController {
String token = request.getParameter("token"); String token = request.getParameter("token");
String userName = request.getParameter("userName"); String userName = request.getParameter("userName");
String name = request.getParameter("name"); String name = request.getParameter("name");
UsernamePasswordToken userToken = new UsernamePasswordToken(userName, "123456"); UsernamePasswordToken userToken = new UsernamePasswordToken(userName, "456789");
Subject subject = SecurityUtils.getSubject(); Subject subject = SecurityUtils.getSubject();
subject.login(userToken); subject.login(userToken);
model.addAttribute("POWER_URLHEAD", POWER_JSP); model.addAttribute("POWER_URLHEAD", POWER_JSP);

@ -8,10 +8,7 @@ package com.emr.controller;
import com.emr.annotation.OptionalLog; import com.emr.annotation.OptionalLog;
import com.emr.entity.*; import com.emr.entity.*;
import com.emr.service.Archive_MasterService; import com.emr.service.*;
import com.emr.service.Emr_DictionaryService;
import com.emr.service.Emr_Fault_DetailService;
import com.emr.service.LogService;
import com.emr.util.ExportExcelUtil; import com.emr.util.ExportExcelUtil;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.session.Session; import org.apache.shiro.session.Session;
@ -45,6 +42,9 @@ public class MedicalRecallController {
@Autowired @Autowired
private Archive_MasterService archiveMasterService; private Archive_MasterService archiveMasterService;
@Autowired(required = false)
private Archive_Master_FollowingService archive_master_followingService;
@Value("${recallReason}") @Value("${recallReason}")
private String recallReason; private String recallReason;
@ -109,6 +109,11 @@ public class MedicalRecallController {
Subject currentUser = SecurityUtils.getSubject(); Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession(); Session session = currentUser.getSession();
String username = (String) session.getAttribute("userSession");//获取前面登录的用户名 String username = (String) session.getAttribute("userSession");//获取前面登录的用户名
//2021-01-30
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
//2021-01-30
emrFaultDetail.setUpdater(username); emrFaultDetail.setUpdater(username);
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowTime = format1.format(new Date()); String nowTime = format1.format(new Date());
@ -135,6 +140,16 @@ public class MedicalRecallController {
emrFaultDetail.setFirstTrial(null); emrFaultDetail.setFirstTrial(null);
bol = emrFaultDetailService.insertSel(emrFaultDetail); bol = emrFaultDetailService.insertSel(emrFaultDetail);
} }
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
//following表中添加病案室审核操作记录
archive_master_following.setFollowingType("10");
archive_master_following.setFollowingContent("病案召回");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
} }
return bol; return bol;
} }

@ -55,6 +55,9 @@ public class beHospitaledController {
@Autowired @Autowired
private Emr_PictureService emrPictureService; private Emr_PictureService emrPictureService;
@Autowired(required = false)
private Archive_Master_FollowingService archive_master_followingService;
@Value("${HomepageDictionary}") @Value("${HomepageDictionary}")
private String HomepageDictionary; private String HomepageDictionary;
@Value("${HomepageMethod}") @Value("${HomepageMethod}")
@ -181,6 +184,19 @@ public class beHospitaledController {
archiveMasterService.updateByClo(archiveMaster); archiveMasterService.updateByClo(archiveMaster);
} }
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
//following表中添加科主任审核操作记录
archive_master_following.setFollowingType("5");
archive_master_following.setFollowingContent("科主任审核");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
return result; return result;
} }
@ -194,27 +210,27 @@ public class beHospitaledController {
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowTime = format1.format(new Date()); String nowTime = format1.format(new Date());
//修改病案归档状态 //修改病案归档状态
Archive_Master archiveMaster = new Archive_Master(); Archive_Master archiveMaster = new Archive_Master();
archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); archiveMaster.setId(emrFaultDetail.getArchiveDetailId());
archiveMaster.setArchivestate("初审"); archiveMaster.setArchivestate("初审");
archiveMaster.setCmtDoctor(1); archiveMaster.setCmtDoctor(1);
archiveMaster.setCmtNurse(1); archiveMaster.setCmtNurse(1);
archiveMaster.setFirstInstance(username); archiveMaster.setFirstInstance(username);
archiveMaster.setLockinfo(emrFaultDetail.getContent()); archiveMaster.setLockinfo(emrFaultDetail.getContent());
int bol = archiveMasterService.updateByClo(archiveMaster); int bol = archiveMasterService.updateByClo(archiveMaster);
emrFaultDetail.setCreater(username); emrFaultDetail.setCreater(username);
emrFaultDetail.setCreateTime(nowTime); emrFaultDetail.setCreateTime(nowTime);
emrFaultDetail.setArchiveState("初审"); emrFaultDetail.setArchiveState("初审");
bol = emrFaultDetailService.insertSel(emrFaultDetail);
//添加初审内容
if (bol == 1) {
//参数输入
emrFaultDetail.setState("未召回");
emrFaultDetail.setArchiveState(null);
bol = emrFaultDetailService.insertSel(emrFaultDetail); bol = emrFaultDetailService.insertSel(emrFaultDetail);
//添加初审内容 }
if (bol == 1) {
//参数输入
emrFaultDetail.setState("未召回");
emrFaultDetail.setArchiveState(null);
bol = emrFaultDetailService.insertSel(emrFaultDetail);
}
return bol+""; return bol+"";
} }
@ -238,6 +254,8 @@ public class beHospitaledController {
Subject currentUser = SecurityUtils.getSubject(); Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession(); Session session = currentUser.getSession();
String username = (String) session.getAttribute("userSession");//获取前面登录的用户名 String username = (String) session.getAttribute("userSession");//获取前面登录的用户名
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();
Archive_Master archiveMaster=new Archive_Master(); Archive_Master archiveMaster=new Archive_Master();
archiveMaster.setId(archiveMasterVo.getId()); archiveMaster.setId(archiveMasterVo.getId());
archiveMaster.setCmtDoctor(archiveMasterVo.getCmtDoctor()); archiveMaster.setCmtDoctor(archiveMasterVo.getCmtDoctor());
@ -248,6 +266,8 @@ public class beHospitaledController {
emrStaffRemark.setMasterId(archiveMasterVo.getId()); emrStaffRemark.setMasterId(archiveMasterVo.getId());
emrStaffRemark.setContent(archiveMasterVo.getContent()); emrStaffRemark.setContent(archiveMasterVo.getContent());
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(archiveMasterVo.getId());
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowTime = format1.format(new Date()); String nowTime = format1.format(new Date());
@ -284,6 +304,14 @@ public class beHospitaledController {
emrStaffRemark.setCreateTime(nowTime); emrStaffRemark.setCreateTime(nowTime);
bol=emrStaffRemarkService.insertClo(emrStaffRemark); bol=emrStaffRemarkService.insertClo(emrStaffRemark);
} }
//following表中添加归档医生提交操作记录
archive_master_following.setFollowingType("1");//followingType=1 归档医生提交
archive_master_following.setFollowingContent("主管医生提交");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
bol = archive_master_followingService.insertSelective(archive_master_following);
} else if (archiveMaster.getCmtNurse()==1) { } else if (archiveMaster.getCmtNurse()==1) {
//护士提交(医生和护士同时提交后,归档状态变更为:提交) //护士提交(医生和护士同时提交后,归档状态变更为:提交)
if (obj.getCmtDoctor()==1) { if (obj.getCmtDoctor()==1) {
@ -309,6 +337,14 @@ public class beHospitaledController {
emrStaffRemark.setCreateTime(nowTime); emrStaffRemark.setCreateTime(nowTime);
bol=emrStaffRemarkService.insertClo(emrStaffRemark); bol=emrStaffRemarkService.insertClo(emrStaffRemark);
} }
//following表中添加归档护士提交操作记录
archive_master_following.setFollowingType("3");
archive_master_following.setFollowingContent("护士长提交");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
bol = archive_master_followingService.insertSelective(archive_master_following);
} }
if(bol==1) { if(bol==1) {
result = "成功"; result = "成功";
@ -361,6 +397,73 @@ public class beHospitaledController {
//根据目前账号所在科室获取主管医生列表 //根据目前账号所在科室获取主管医生列表
return archiveMasterService.getDoctorInCharge(archiveMaster); return archiveMasterService.getDoctorInCharge(archiveMaster);
} }
@Transactional
@ResponseBody
@RequestMapping(value = "/withdrawDoctorOrNurs")
public String withdrawDoctorOrNurs(HttpServletRequest request, HttpServletResponse response,Archive_Master_Vo archiveMasterVo) {
Archive_Master archiveMaster=new Archive_Master();
archiveMaster.setId(archiveMasterVo.getId());
archiveMaster.setCmtDoctor(archiveMasterVo.getCmtDoctor());
archiveMaster.setCmtNurse(archiveMasterVo.getCmtNurse());
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String username = user.getUserName();//工号
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(archiveMasterVo.getId());
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowTime = format1.format(new Date());
String result="";
int bol =0;
//判断id 不为空
if(!archiveMaster.getId().equals("")&&!archiveMaster.getId().equals(null)) {
Archive_Master obj = archiveMasterService.selectById(archiveMaster.getId());
if (obj!=null){
if (archiveMasterVo.getCmtDoctor()==0&&archiveMasterVo.getCmtNurse()==-1){
//医生撤回操作
archiveMaster.setCmtDoctorDate("");
archiveMaster.setDoctorName("");
//following表中添加归档医生撤回操作记录
archive_master_following.setFollowingType("2");
archive_master_following.setFollowingContent("主管医生撤回提交");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
bol = archive_master_followingService.insertSelective(archive_master_following);
}
if (archiveMasterVo.getCmtNurse()==0&&archiveMasterVo.getCmtDoctor()==-1){
//护士撤回操作
archiveMaster.setCmtNurseDate("");
archiveMaster.setNurseName("");
//following表中添加归档护士撤回操作记录
archive_master_following.setFollowingType("4");
archive_master_following.setFollowingContent("护士长撤回提交");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
bol = archive_master_followingService.insertSelective(archive_master_following);
}
archiveMaster.setIsscaned(archiveMasterVo.getIsscaned());
bol=archiveMasterService.updateByClo(archiveMaster);
if (bol==1){
result = "成功";
}else{
result = "撤回失败";
}
}else{
result = "病案不存在!";
}
}else{
result="病案不存在!";
}
return result;
}
} }

@ -7,10 +7,7 @@
package com.emr.controller; package com.emr.controller;
import com.emr.entity.*; import com.emr.entity.*;
import com.emr.service.Archive_MasterService; import com.emr.service.*;
import com.emr.service.Emr_DictionaryService;
import com.emr.service.Emr_Fault_DetailService;
import com.emr.service.Emr_Fault_TypeService;
import com.emr.util.ExportExcelUtil; import com.emr.util.ExportExcelUtil;
import org.apache.axis.client.Call; import org.apache.axis.client.Call;
import org.apache.axis.client.Service; import org.apache.axis.client.Service;
@ -51,6 +48,9 @@ public class lastVerifyController {
@Autowired @Autowired
private Emr_Fault_DetailService emrFaultDetailService; private Emr_Fault_DetailService emrFaultDetailService;
@Autowired(required = false)
private Archive_Master_FollowingService archive_master_followingService;
@RequestMapping(value = "/lastVerifys") @RequestMapping(value = "/lastVerifys")
public String faults(Model model) { public String faults(Model model) {
return "lastVerifyDir/lastVerifyList"; return "lastVerifyDir/lastVerifyList";
@ -151,6 +151,44 @@ public class lastVerifyController {
emrFaultDetail.setCreateTime(nowTime); emrFaultDetail.setCreateTime(nowTime);
//插入缺陷记录 //插入缺陷记录
bol = emrFaultDetailService.insertSel(emrFaultDetail); bol = emrFaultDetailService.insertSel(emrFaultDetail);
//2021-01-30
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
if (emrFaultDetail.getState().equals("主任退回")){
for (int k = 0; k < list.size(); k++) {
if ("1".equals(list.get(k).getBackFlag()) || "5".equals(list.get(k).getBackFlag())) {
//following表中添加科主任退回主管医生操作记录
archive_master_following.setFollowingType("7");
archive_master_following.setFollowingContent("科主任退回主管医生");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
}
if ("2".equals(list.get(k).getBackFlag()) || "6".equals(list.get(k).getBackFlag())) {
//following表中添加科主任退回护士长操作记录
archive_master_following.setFollowingType("6");
archive_master_following.setFollowingContent("科主任退回护士长");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
}
}
}
if (emrFaultDetail.getState().equals("复审退回")){
//following表中添加病案室退回操作记录
archive_master_following.setFollowingType("9");
archive_master_following.setFollowingContent("病案室退回科主任");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
}
//通过病案号和标识判断是否存在记录 //通过病案号和标识判断是否存在记录
// Emr_Fault_Detail entity = emrFaultDetailService.selectByArchiveDetailId(emrFaultDetail); // Emr_Fault_Detail entity = emrFaultDetailService.selectByArchiveDetailId(emrFaultDetail);
// if (entity != null) { // if (entity != null) {
@ -228,6 +266,19 @@ public class lastVerifyController {
}else{ }else{
bol = emrFaultDetailService.insertSel(emrFaultDetail); bol = emrFaultDetailService.insertSel(emrFaultDetail);
} }
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
//following表中添加病案室审核操作记录
archive_master_following.setFollowingType("8");
archive_master_following.setFollowingContent("病案室审核(已归档)");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
} }
return bol; return bol;
} }

@ -33,6 +33,7 @@ public class pdfController {
String archiveDetailId = emrFaultDetail.getArchiveDetailId(); String archiveDetailId = emrFaultDetail.getArchiveDetailId();
//req.setAttribute("aa", "cccc"); //req.setAttribute("aa", "cccc");
req.setAttribute("archiveDetailId", archiveDetailId); req.setAttribute("archiveDetailId", archiveDetailId);
req.setAttribute("type", req.getAttribute("type"));
//req.setAttribute("roleVal","1"+ emrFaultDetail.getBackFlag()); //req.setAttribute("roleVal","1"+ emrFaultDetail.getBackFlag());
//req.setAttribute("pdfPath","1"+ emrFaultDetail.getContent()); //req.setAttribute("pdfPath","1"+ emrFaultDetail.getContent());
return "pdfDir/pdfLastDir"; return "pdfDir/pdfLastDir";

@ -43,4 +43,7 @@ public interface Archive_MasterMapper {
//power查询用户姓名 //power查询用户姓名
String getFName(String userName); String getFName(String userName);
//查询病案室操作记录
List<Archive_Master_Vo> selectHandleDetail(Archive_Master_Vo record);
} }

@ -80,6 +80,156 @@ public class Archive_Master_Vo {
private String deathFlag; private String deathFlag;
private String fid;//following表id
private String handleId;//handle_id
private String handleName;//handle_name
private String handleTime;//handle_time
private String startHandleTime;
private String endHandleTime;
private String followingType;//following_type
private String followingContent;//following_content
private String doctorName;
private String nurseName;
private String cmtDoctorDate;
private String cmtNurseDate;
private String emrDoctorCmt;
private String emrNureCmt;
private String transferDept;
public String getCmtDoctorDate() {
return cmtDoctorDate;
}
public void setCmtDoctorDate(String cmtDoctorDate) {
this.cmtDoctorDate = cmtDoctorDate;
}
public String getCmtNurseDate() {
return cmtNurseDate;
}
public void setCmtNurseDate(String cmtNurseDate) {
this.cmtNurseDate = cmtNurseDate;
}
public String getEmrDoctorCmt() {
return emrDoctorCmt;
}
public void setEmrDoctorCmt(String emrDoctorCmt) {
this.emrDoctorCmt = emrDoctorCmt;
}
public String getEmrNureCmt() {
return emrNureCmt;
}
public void setEmrNureCmt(String emrNureCmt) {
this.emrNureCmt = emrNureCmt;
}
public String getTransferDept() {
return transferDept;
}
public void setTransferDept(String transferDept) {
this.transferDept = transferDept;
}
public String getDoctorName() {
return doctorName;
}
public void setDoctorName(String doctorName) {
this.doctorName = doctorName;
}
public String getNurseName() {
return nurseName;
}
public void setNurseName(String nurseName) {
this.nurseName = nurseName;
}
public String getStartHandleTime() {
return startHandleTime;
}
public void setStartHandleTime(String startHandleTime) {
this.startHandleTime = startHandleTime;
}
public String getEndHandleTime() {
return endHandleTime;
}
public void setEndHandleTime(String endHandleTime) {
this.endHandleTime = endHandleTime;
}
public String getFid() {
return fid;
}
public void setFid(String fid) {
this.fid = fid;
}
public String getHandleId() {
return handleId;
}
public void setHandleId(String handleId) {
this.handleId = handleId;
}
public String getHandleName() {
return handleName;
}
public void setHandleName(String handleName) {
this.handleName = handleName;
}
public String getHandleTime() {
return handleTime;
}
public void setHandleTime(String handleTime) {
this.handleTime = handleTime;
}
public String getFollowingType() {
return followingType;
}
public void setFollowingType(String followingType) {
this.followingType = followingType;
}
public String getFollowingContent() {
return followingContent;
}
public void setFollowingContent(String followingContent) {
this.followingContent = followingContent;
}
public String getDeathFlag() { public String getDeathFlag() {
return deathFlag; return deathFlag;
} }

@ -166,6 +166,22 @@ public interface Archive_MasterService {
//power查询用户姓名 //power查询用户姓名
String getFullName(String userName); String getFullName(String userName);
/**
*
*
* @param archiveMasterVo
* @return
*/
List<Archive_Master_Vo> selectHandleDetail(Archive_Master_Vo archiveMasterVo);
/**
*
*
* @param archiveMasterVo
* @return
*/
OffsetLimitPage selectHandleDetail(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit);
} }

@ -154,6 +154,19 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
public String getFullName(String userName) { public String getFullName(String userName) {
return archiveMasterMapper.getFName(userName); return archiveMasterMapper.getFName(userName);
} }
@Override
public List<Archive_Master_Vo> selectHandleDetail(Archive_Master_Vo archiveMasterVo) {
List<Archive_Master_Vo> list = archiveMasterMapper.selectHandleDetail(archiveMasterVo);
return list;
}
@Override
public OffsetLimitPage selectHandleDetail(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit);
List<Archive_Master_Vo> list = archiveMasterMapper.selectHandleDetail(archiveMasterVo);
return new OffsetLimitPage((Page) list);
}
} }

@ -34,39 +34,16 @@
<!--配置数据源--> <!--配置数据源-->
<bean id="sqlServerDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close"> <bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.sqlserver.driver}"/> <!--数据库连接驱动--> <property name="driverClass" value="${jdbc.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.sqlserver.url}"/> <!--数据库地址--> <property name="jdbcUrl" value="${jdbc.url}"/> <!--数据库地址-->
<property name="user" value="${jdbc.sqlserver.username}"/> <!--用户名--> <property name="user" value="${jdbc.username}"/> <!--用户名-->
<property name="password" value="${jdbc.sqlserver.password}"/> <!--密码--> <property name="password" value="${jdbc.password}"/> <!--密码-->
<property name="maxPoolSize" value="40"/> <!-- 最大连接数--> <property name="maxPoolSize" value="40"/> <!-- 最大连接数-->
<property name="minPoolSize" value="1"/> <!--最小连接数--> <property name="minPoolSize" value="1"/> <!--最小连接数-->
<property name="initialPoolSize" value="10"/> <!-- 初始化连接池内的数据库连接--> <property name="initialPoolSize" value="10"/> <!-- 初始化连接池内的数据库连接-->
<property name="maxIdleTime" value="20"/> <!--最大空闲时间--> <property name="maxIdleTime" value="20"/> <!--最大空闲时间-->
</bean> </bean>
<!-- mysql库连接池 -->
<bean id="mysqlDataSource" class="com.alibaba.druid.pool.DruidDataSource"
init-method="init" destroy-method="close">
<!-- 基本属性 url、user、password driverClassName -->
<property name="driverClassName" value="${jdbc.mysql.driver}" />
<property name="url" value="${jdbc.mysql.url}" />
<property name="username" value="${jdbc.mysql.username}" />
<property name="password" value="${jdbc.mysql.password}" />
</bean>
<!-- 配置数据库切换类 -->
<bean id="dataSource" class="com.emr.DynamicDataSource">
<property name="targetDataSources">
<map>
<entry key="sqlServerDataSource" value-ref="sqlServerDataSource"/>
<entry key="mysqlDataSource" value-ref="mysqlDataSource"></entry>
</map>
</property>
<!-- 设置默认数据源 -->
<property name="defaultTargetDataSource" ref="sqlServerDataSource"/>
</bean>
<!-- ====================== 配置和MyBatis的整合 ======================== --> <!-- ====================== 配置和MyBatis的整合 ======================== -->

@ -1,17 +1,14 @@
jdbc.mysql.driver=com.mysql.jdbc.Driver #jdbc.mysql.driver=com.mysql.jdbc.Driver
jdbc.mysql.url=jdbc\:mysql\://10.6.1.127\:3306/power?useUnicode\=true&characterEncoding\=utf-8 #jdbc.mysql.url=jdbc\:mysql\://127.0.0.1\:3306/power?useUnicode\=true&characterEncoding\=utf-8
#jdbc.url=jdbc\:mysql\://120.27.212.36\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8 #jdbc.url=jdbc\:mysql\://120.27.212.36\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8
jdbc.mysql.username=root #jdbc.mysql.username=root
jdbc.mysql.password=docus702 #jdbc.mysql.password=root
#jdbc.driver=com.mysql.jdbc.Driver jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
#jdbc.url=jdbc\:mysql\://localhost\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8 jdbc.url=jdbc\:sqlserver\://127.0.0.1:1433;databaseName=emr_recode_test
#jdbc.url=jdbc\:mysql\://120.27.212.36\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8 #jdbc.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
jdbc.sqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver jdbc.username=sa
#jdbc.url=jdbc\:sqlserver\://120.27.212.36:1433;databaseName=emr_record_zc jdbc.password=123456
jdbc.sqlserver.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
jdbc.sqlserver.username=sa
jdbc.sqlserver.password=docus@702
#hibernate config #hibernate config
hibernate.dialect=org.hibernate.dialect.SQLServerDialect hibernate.dialect=org.hibernate.dialect.SQLServerDialect
hibernate.show_sql=true hibernate.show_sql=true
@ -21,33 +18,37 @@ hibernate.hbm2ddl.auto=update
hibernate.current_session_context_class=thread hibernate.current_session_context_class=thread
hibernate.jdbc.batch_size=50 hibernate.jdbc.batch_size=50
hibernate.enable_lazy_load_no_trans=true hibernate.enable_lazy_load_no_trans=true
#\u56FE\u7247\u5730\u5740 #图片地址
pictureUrl=C:\\Users\\HIPAA\\Desktop\\test\\uploadImage pictureUrl=C:\\Users\\HIPAA\\Desktop\\test\\uploadImage
#pictureUrl=src\\main\\webapp #pictureUrl=src\\main\\webapp
#\u672C\u5730\u81EA\u52A8\u751F\u6210PDF\u5730\u5740 #本地自动生成PDF地址
autoPdfUrl=C:/Users/HIPAA/Desktop/test/autoPdf autoPdfUrl=C:/Users/HIPAA/Desktop/test/autoPdf
#\u672C\u5730\u4E0A\u4F20PDF\u5730\u5740 #本地上传PDF地址
pdfUrl=C:\\Users\\HIPAA\\Desktop\\test\\localPdf pdfUrl=C:\\Users\\HIPAA\\Desktop\\test\\localPdf
#PDF\u6587\u4EF6\u4E0D\u5B58\u5728\u6216\u635F\u574F\u5217\u8868\u5730\u5740 #PDF文件不存在或损坏列表地址
pdfErrorUrl=C:\\Users\\HIPAA\\Desktop\\test\\error\\ pdfErrorUrl=C:\\Users\\HIPAA\\Desktop\\test\\error\\
#\u8D85\u671F\u5929\u6570 #超期天数
expired=7 expired=7
#\u6B7B\u4EA1\u8D85\u671F\u5929\u6570 #死亡超期天数
deathExpired=7 deathExpired=7
powerUrl=http://127.0.0.1:8080/power/font/getMenusByUserIdAndSysFlag powerUrl=http://127.0.0.1:8080/power/font/getMenusByUserIdAndSysFlag
POWER_URLHEAD=http://127.0.0.1:8080/power POWER_URLHEAD=http://127.0.0.1:8080/power
POWER_JSP=http://127.0.0.1:8080/power POWER_JSP=http://127.0.0.1:8080/power
recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863 recallReason=医院需要这份文档
HomepageDictionary=http://10.6.1.127:9999/WholeCheckInterface/services/HomepageDictionary?wsdl #HomepageDictionary=http://120.27.212.36:9999/WholeCheckInterface/services/HomepageDictionary?wsdl
#HomepageDictionary=http://10.6.1.127:9999/WholeCheckInterface/services/HomepageDictionary?wsdl
HomepageDictionary=http://127.0.0.1:8080/WholeCheckInterface/services/HomepageDictionary?wsdl
HomepageMethod=CheckData HomepageMethod=CheckData
powerGetUserList=http://127.0.0.1:8080/power/font/getUserList?userName=admin
#\u83DC\u5355\u63A5\u53E3http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag #菜单接口http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag
#powerUrl=http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag #powerUrl=http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag
#POWER_URLHEAD=http://120.27.212.36:8888/power #POWER_URLHEAD=http://120.27.212.36:8888/power
#power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934\u5982\uFF1Ahttp://192.168.1.3:8081/power #power权限系统的服务器地址头如:http://192.168.1.3:8081/power

@ -94,7 +94,7 @@
<if test="flag != null"> <if test="flag != null">
and t.flag = #{flag,jdbcType=NVARCHAR} and t.flag = #{flag,jdbcType=NVARCHAR}
</if> </if>
ORDER BY z.assort_sort,t.page_number ORDER BY z.assort_sort,t.page_number,t.Title,t.UpLoadDateTime
</select> </select>
<select id="selectByid" parameterType="java.lang.String" resultMap="BaseResultMap"> <select id="selectByid" parameterType="java.lang.String" resultMap="BaseResultMap">
select select

@ -23,7 +23,7 @@
<result column="DISCHARGE_DISPOSITION" jdbcType="NVARCHAR" property="dischargeDisposition" /> <result column="DISCHARGE_DISPOSITION" jdbcType="NVARCHAR" property="dischargeDisposition" />
<result column="dept_code_lend" jdbcType="NVARCHAR" property="deptCodeLend" /> <result column="dept_code_lend" jdbcType="NVARCHAR" property="deptCodeLend" />
<result column="isscaned" jdbcType="NVARCHAR" property="isscaned" /> <result column="isscaned" jdbcType="NVARCHAR" property="isscaned" />
<result column="isScanning" jdbcType="NVARCHAR" property="is_scanning" /> <result column="is_scanning" jdbcType="NVARCHAR" property="isScanning" />
<result column="bed_number" jdbcType="NVARCHAR" property="bedNumber" /> <result column="bed_number" jdbcType="NVARCHAR" property="bedNumber" />
<result column="cmt_doctor" jdbcType="INTEGER" property="cmtDoctor"/> <result column="cmt_doctor" jdbcType="INTEGER" property="cmtDoctor"/>
@ -41,30 +41,48 @@
</resultMap> </resultMap>
<!--<resultMap id="BaseResultMap2" type="com.emr.entity.Archive_MasterVo">--> <resultMap id="BaseResultMap2" type="com.emr.entity.Archive_Master_Vo">
<!--<id column="id" jdbcType="NVARCHAR" property="id"/>--> <id column="id" jdbcType="NVARCHAR" property="id" />
<!--<result column="patient_id" jdbcType="NVARCHAR" property="patientId"/>--> <result column="patient_id" jdbcType="NVARCHAR" property="patientId" />
<!--<result column="inp_no" jdbcType="NVARCHAR" property="inpNo"/>--> <result column="inp_no" jdbcType="NVARCHAR" property="inpNo" />
<!--<result column="visit_id" jdbcType="NVARCHAR" property="visitId"/>--> <result column="visit_id" jdbcType="NVARCHAR" property="visitId" />
<!--<result column="name" jdbcType="NVARCHAR" property="name"/>--> <result column="name" jdbcType="NVARCHAR" property="name" />
<!--<result column="sex" jdbcType="NVARCHAR" property="sex"/>--> <result column="sex" jdbcType="NVARCHAR" property="sex" />
<!--<result column="dept_name" jdbcType="NVARCHAR" property="deptName"/>--> <result column="dept_name" jdbcType="NVARCHAR" property="deptName" />
<!--<result column="discharge_date_time" jdbcType="NVARCHAR" property="dischargeDateTime"/>--> <result column="discharge_date_time" jdbcType="NVARCHAR" property="dischargeDateTime" />
<!--<result column="ArchiveState" jdbcType="NVARCHAR" property="archivestate"/>--> <result column="ArchiveState" jdbcType="NVARCHAR" property="archivestate" />
<!--<result column="admission_date_time" jdbcType="NVARCHAR" property="admissionDateTime"/>--> <result column="admission_date_time" jdbcType="NVARCHAR" property="admissionDateTime" />
<!--<result column="dept_admission_to" jdbcType="NVARCHAR" property="deptAdmissionTo"/>--> <result column="dept_admission_to" jdbcType="NVARCHAR" property="deptAdmissionTo" />
<!--<result column="check_doctor" jdbcType="NVARCHAR" property="checkDoctor"/>--> <result column="check_doctor" jdbcType="NVARCHAR" property="checkDoctor" />
<!--<result column="check_datetime" jdbcType="NVARCHAR" property="checkDatetime"/>--> <result column="check_datetime" jdbcType="NVARCHAR" property="checkDatetime" />
<!--<result column="checked_doctor" jdbcType="NVARCHAR" property="checkedDoctor"/>--> <result column="checked_doctor" jdbcType="NVARCHAR" property="checkedDoctor" />
<!--<result column="checked_datetime" jdbcType="NVARCHAR" property="checkedDatetime"/>--> <result column="checked_datetime" jdbcType="NVARCHAR" property="checkedDatetime" />
<!--<result column="LockInfo" jdbcType="NVARCHAR" property="lockinfo"/>--> <result column="LockInfo" jdbcType="NVARCHAR" property="lockinfo" />
<!--<result column="DOCTOR_IN_CHARGE" jdbcType="NVARCHAR" property="doctorInCharge"/>--> <result column="DOCTOR_IN_CHARGE" jdbcType="NVARCHAR" property="doctorInCharge" />
<!--<result column="ID_NO" jdbcType="NVARCHAR" property="idNo"/>--> <result column="ID_NO" jdbcType="NVARCHAR" property="idNo" />
<!--<result column="DISCHARGE_DISPOSITION" jdbcType="NVARCHAR" property="dischargeDisposition"/>--> <result column="DISCHARGE_DISPOSITION" jdbcType="NVARCHAR" property="dischargeDisposition" />
<!--<result column="dept_code_lend" jdbcType="NVARCHAR" property="deptCodeLend"/>--> <result column="dept_code_lend" jdbcType="NVARCHAR" property="deptCodeLend" />
<!--<result column="startDateTo" jdbcType="NVARCHAR" property="startDateTo"/>--> <result column="isscaned" jdbcType="NVARCHAR" property="isscaned" />
<!--<result column="endDateTo" jdbcType="NVARCHAR" property="endDateTo"/>--> <result column="is_scanning" jdbcType="NVARCHAR" property="isScanning" />
<!--</resultMap>--> <result column="bed_number" jdbcType="NVARCHAR" property="bedNumber" />
<result column="cmt_doctor" jdbcType="INTEGER" property="cmtDoctor"/>
<result column="cmt_nurse" jdbcType="INTEGER" property="cmtNurse"/>
<result column="doctor_name" jdbcType="NVARCHAR" property="doctorName"/>
<result column="nurse_name" jdbcType="NVARCHAR" property="nurseName"/>
<result column="cmt_doctor_date" jdbcType="NVARCHAR" property="cmtDoctorDate"/>
<result column="cmt_nurse_date" jdbcType="NVARCHAR" property="cmtNurseDate"/>
<result column="emr_doctor_cmt" jdbcType="NVARCHAR" property="emrDoctorCmt"/>
<result column="emr_nure_cmt" jdbcType="NVARCHAR" property="emrNureCmt"/>
<result column="first_instance" jdbcType="NVARCHAR" property="firstInstance"/>
<result column="death_flag" jdbcType="NVARCHAR" property="deathFlag"/>
<result column="transfer_dept" jdbcType="NVARCHAR" property="transferDept"/>
<result column="fid" jdbcType="NVARCHAR" property="fid"/>
<result column="handle_id" jdbcType="NVARCHAR" property="handleId"/>
<result column="handle_name" jdbcType="NVARCHAR" property="handleName"/>
<result column="handle_time" jdbcType="NVARCHAR" property="handleTime"/>
<result column="following_type" jdbcType="NVARCHAR" property="followingType"/>
<result column="following_content" jdbcType="NVARCHAR" property="followingContent"/>
</resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState, id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState,
admission_date_time, dept_admission_to, check_doctor, check_datetime, checked_doctor, transfer_dept, admission_date_time, dept_admission_to, check_doctor, check_datetime, checked_doctor, transfer_dept,
@ -921,10 +939,10 @@
<if test="isScanning != null and isScanning != ''"> <if test="isScanning != null and isScanning != ''">
is_scanning = #{isScanning,jdbcType=NVARCHAR}, is_scanning = #{isScanning,jdbcType=NVARCHAR},
</if> </if>
<if test="cmtDoctor != null"> <if test="cmtDoctor >-1">
cmt_doctor = #{cmtDoctor,jdbcType=INTEGER}, cmt_doctor = #{cmtDoctor,jdbcType=INTEGER},
</if> </if>
<if test="cmtNurse != null"> <if test="cmtNurse >-1">
cmt_nurse = #{cmtNurse,jdbcType=INTEGER}, cmt_nurse = #{cmtNurse,jdbcType=INTEGER},
</if> </if>
<if test="doctorName != null " > <if test="doctorName != null " >
@ -981,4 +999,97 @@
<select id="getFName" parameterType="java.lang.String" resultType="java.lang.String"> <select id="getFName" parameterType="java.lang.String" resultType="java.lang.String">
SELECT `name` FROM `power_user` WHERE user_name = #{userName} SELECT `name` FROM `power_user` WHERE user_name = #{userName}
</select> </select>
<select id="selectHandleDetail" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
SELECT m.id
,m.patient_id
,m.inp_no
,m.visit_id
,m.name
,m.sex
,g.name dept_name
,CONVERT(varchar(10),m.discharge_date_time, 120)discharge_date_time
,m.ArchiveState
,CONVERT(varchar(10),m.admission_date_time, 120)admission_date_time
,d.name dept_admission_to
,m.check_doctor
,m.check_datetime
,m.checked_doctor
,m.checked_datetime
,m.LockInfo
,m.DOCTOR_IN_CHARGE
,m.ID_NO
,m.DISCHARGE_DISPOSITION
,m.dept_code_lend
,m.cmt_doctor
,m.cmt_nurse
,m.doctor_name
,m.nurse_name
,m.cmt_doctor_date
,m.cmt_nurse_date
,m.emr_doctor_cmt
,m.emr_nure_cmt
,m.death_flag
,m.first_instance
,m.transfer_dept
,m.IsScaned
,m.bed_number
,m.is_scanning
,f.id as fid
,f.following_type
,f.following_content
,CONVERT(varchar(10),f.handle_time, 120)handle_time
,f.handle_id
,f.handle_name
,f.remark
FROM archive_master m
LEFT JOIN Archive_Master_Following f
on m.id=f.master_id
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
on m.dept_admission_to=d.code
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) g
on m.dept_name=g.code
where 1=1
<if test="id != null and id != ''">
and m.id = #{id,jdbcType=NVARCHAR}
</if>
<if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR}
</if>
<if test="name != null and name != ''">
and m.name like '%'+#{name,jdbcType=NCHAR}+'%'
</if>
<if test="deptName!= null and deptName!= ''">
and m.dept_name in
<foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="handleTime != null">
and f.handle_time = #{handleTime,jdbcType=NVARCHAR}
</if>
<choose>
<when test="startHandleTime != null and startHandleTime != '' and endHandleTime != null and endHandleTime != ''">
and f.handle_time between CONVERT(VARCHAR(10),#{startHandleTime,jdbcType=NCHAR},120) and
#{endHandleTime,jdbcType=NCHAR}+ ' 23:59:59'
</when>
<when test="startHandleTime != null and startHandleTime != ''">
and f.handle_time >= CONVERT(VARCHAR(10),#{startHandleTime,jdbcType=NCHAR},120)
</when>
<when test="endHandleTime != null and endHandleTime != ''">
and f.handle_time &lt;= #{endHandleTime,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
<if test="handleName != null and handleName != ''">
and f.handle_name like '%'+#{handleName,jdbcType=NCHAR}+'%'
</if>
<if test="followingType != null and followingType != ''">
and f.following_type in(#{followingType,jdbcType=NVARCHAR})
</if>
ORDER BY f.handle_time desc
</select>
</mapper> </mapper>

@ -1,4 +1,4 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %> <%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<c:set value="${pageContext.request.contextPath}" var="path" scope="page"/> <c:set value="${pageContext.request.contextPath}" var="path" scope="page"/>
<% <%
@ -915,7 +915,13 @@
<textarea id="doctorText" rows="5" style="width:95%;" ></textarea> <textarea id="doctorText" rows="5" style="width:95%;" ></textarea>
</div> </div>
<div class="row divCss2"> <div class="row divCss2">
<input type="checkbox" id="isScanedChk" />归档病历已全部无纸化无扫描件 <%--<input type="checkbox" id="isScanedChk" />归档病历已全部无纸化无扫描件--%>
归档病历是否已全部无纸化无扫描件
<input type="checkbox" name="isScanedChk" id="isScanedChk" onclick="checkedThis(this,this);">是
<input type="checkbox" name="isScanedChk" onclick="checkedThis(this,this);">否
<label style="color: red">(必填)</label>
<%--<input type="checkbox" id="isScanedChk"/>归档病历已全部无纸化无扫描件--%>
</div> </div>
</div> </div>
</form> </form>
@ -957,7 +963,12 @@
<textarea id="nures2Text" rows="5" style="width:95%;"></textarea> <textarea id="nures2Text" rows="5" style="width:95%;"></textarea>
</div> </div>
<div class="row divCss2"> <div class="row divCss2">
<input type="checkbox" id="isScanedChk2" />归档病历已全部无纸化无扫描件 <%--<input type="checkbox" id="isScanedChk2" />归档病历已全部无纸化无扫描件--%>
归档病历是否已全部无纸化无扫描件
<input type="checkbox" name="isScanedChk2" id="isScanedChk2" onclick="checkedThis(this,this);">是
<input type="checkbox" name="isScanedChk2" onclick="checkedThis(this,this);">否
<label style="color: red">(必填)</label>
</div> </div>
</div> </div>
</form> </form>
@ -2897,6 +2908,12 @@
html = html + '<button type="button" class="btn btn-sm btn-warning nursInfo">归档护士提交</button>' html = html + '<button type="button" class="btn btn-sm btn-warning nursInfo">归档护士提交</button>'
} }
} }
if (row.archivestate != '初审' && row.archivestate != '提交' && row.cmtDoctor == 1) {
html = html + '<button type="button" class="btn btn-sm btn-primary doctorInfoBack">归档医生撤回</button>'
}
if (row.archivestate != '初审' && row.archivestate != '提交' && row.cmtNurse == 1) {
html = html + '<button type="button" class="btn btn-sm btn-primary nursInfoBack">归档护士撤回</button>'
}
} }
return html; return html;
}, },
@ -2968,6 +2985,25 @@
} }
} }
}, },
'click .doctorInfoBack': function (e, value, row, index) {
if (confirm("您确定要撤回提交吗?")) {
var doctorFlag = 0;
var nurseFlag = -1;
$.ajax({
url: "${path}/beHosp/withdrawDoctorOrNurs",
type: "POST",
data: {cmtDoctor: doctorFlag, id: row.id,cmtNurse: nurseFlag},
success: function (result) {
if (result == "成功") {
$("#table").bootstrapTable("refresh");
toastr.success("归档医生撤回成功!");
} else {
toastr.error("归档医生撤回失败!");
}
}
});
}
},
'click .nursInfo': function (e, value, row, index) { 'click .nursInfo': function (e, value, row, index) {
getStaffRemarkFun(row.id,1); getStaffRemarkFun(row.id,1);
if (row.cmtNurse== '提交') { if (row.cmtNurse== '提交') {
@ -3019,6 +3055,25 @@
} }
} }
}, },
'click .nursInfoBack': function (e, value, row, index) {
if (confirm("您确定要撤回提交吗?")) {
var nurseFlag = 0;
var doctorFlag = -1;
$.ajax({
url: "${path}/beHosp/withdrawDoctorOrNurs",
type: "POST",
data: {cmtNurse: nurseFlag, id: row.id,cmtDoctor:doctorFlag},
success: function (result) {
if (result == "成功") {
$("#table").bootstrapTable("refresh");
toastr.success("归档护士撤回成功!");
} else {
toastr.error("归档护士撤回失败!");
}
}
});
}
},
'click .selInfo': function (e, value, row, index) { 'click .selInfo': function (e, value, row, index) {
$('#selModal').modal({ $('#selModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。 backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
@ -3083,6 +3138,17 @@
var idArr = []; var idArr = [];
var flag=0; var flag=0;
//实现复选框单选
function checkedThis(obj, obj) {
var boxArray = document.getElementsByName(obj.name);
for (var i = 0; i <= boxArray.length - 1; i++) {
if (boxArray[i] == obj && obj.checked) {
boxArray[i].checked = true;
} else {
boxArray[i].checked = false;
}
}
}
function initTable2() { function initTable2() {
idArr = []; idArr = [];

@ -14,17 +14,17 @@
<%@include file="../../jspf/comm.jspf" %> <%@include file="../../jspf/comm.jspf" %>
</head> </head>
<style> <style>
.modal-header2 { .modal-header2 {
text-align: center !important; text-align: center !important;
vertical-align: middle !important; vertical-align: middle !important;
background-color: #3c8dbc !important; background-color: #3c8dbc !important;
color: #fff; color: #fff;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
padding: 5px 5px 5px 5px !important; padding: 5px 5px 5px 5px !important;
} }
/*.modal-header {*/ /*.modal-header {*/
/*padding: 5px 5px 5px 5px !important;*/ /*padding: 5px 5px 5px 5px !important;*/
/*}*/ /*}*/
.modal-footer{ .modal-footer{
padding: 5px; padding: 5px;
@ -54,184 +54,184 @@
} }
</style> </style>
<body> <body>
<div style="margin-left:30px;margin-right:10px;height:auto"> <div style="margin-left:30px;margin-right:10px;height:auto">
<!--搜索--> <!--搜索-->
<form style="margin-top:20px;"> <form style="margin-top:20px;">
<div class="form-inline"> <div class="form-inline">
<div class="form-group divCss8"> <div class="form-group divCss8">
<label for="inpNo">住院号:</label> <label for="inpNo">住院号:</label>
<input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号"> <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号">
</div> </div>
<div class="form-group divCss8"> <div class="form-group divCss8">
<label for="visitId">住院次数:</label> <label for="visitId">住院次数:</label>
<input type="number" class="input-sm form-control" id="visitId" placeholder="请输入次数"> <input type="number" class="input-sm form-control" id="visitId" placeholder="请输入次数">
</div> </div>
<div class="form-group divCss8"> <div class="form-group divCss8">
<label for="name">姓名:</label> <label for="name">姓名:</label>
<input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名"> <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名">
</div> </div>
<div class="form-group divCss8"> <div class="form-group divCss8">
<label for="name">身份证号:</label> <label for="name">身份证号:</label>
<input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号"> <input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号">
</div> </div>
<div class="form-group divCss8"> <div class="form-group divCss8">
<label for="archivestate">归档状态 :</label> <label for="archivestate">归档状态 :</label>
<select class="input-sm form-control" id="archivestate"> <select class="input-sm form-control" id="archivestate">
<option value="">全部</option> <option value="">全部</option>
<option value="初审">初审</option> <option value="初审">初审</option>
<option value="已认证">已认证</option> <option value="已认证">已认证</option>
<option value="已归档">已归档</option> <option value="已归档">已归档</option>
</select> </select>
</div>
<div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
<label>入院科室 :</label>
<%--<select class="input-sm form-control" id="deptName">--%>
<%--<option value="">全部</option>--%>
<%--&lt;%&ndash;<option value="在院">在院</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="未归档">未归档</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="归档中">归档中</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="初审">初审</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="已认证">已认证</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="已归档">已归档</option>&ndash;%&gt;--%>
<%--</select>--%>
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
id="deptName" title="请输入科室">
<option value="">全部</option>
</select>
</div>
<div class="form-group divCss">
<label for="state">召回状态 :</label>
<select class="input-sm form-control" id="state">
<option value="">全部</option>
<option value="已召回">已召回</option>
<option value="未召回">未召回</option>
</select>
</div>
<button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn">查询</button>
<button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
</div> </div>
</form> <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
<!--数据表格--> <label>入院科室 :</label>
<table id="table" class="table text-nowrap table-striped" ></table> <%--<select class="input-sm form-control" id="deptName">--%>
<%--<option value="">全部</option>--%>
<%--&lt;%&ndash;<option value="在院">在院</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="未归档">未归档</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="归档中">归档中</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="初审">初审</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="已认证">已认证</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="已归档">已归档</option>&ndash;%&gt;--%>
<%--</select>--%>
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
id="deptName" title="请输入科室">
<option value="">全部</option>
</select>
</div>
<div class="form-group divCss">
<label for="state">召回状态 :</label>
<select class="input-sm form-control" id="state">
<option value="">全部</option>
<option value="已召回">已召回</option>
<option value="未召回">未召回</option>
</select>
</div>
<button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn">查询</button>
<button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
</div>
</form>
<!--数据表格-->
<table id="table" class="table text-nowrap table-striped" ></table>
<div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;"> <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
<div class="columns columns-right btn-group pull-right" style="margin-top:0px;"> <div class="columns columns-right btn-group pull-right" style="margin-top:0px;">
<div class="btn-group btn-info"> <div class="btn-group btn-info">
<select id="sel_exportoption" class="form-control">                 <select id="sel_exportoption" class="form-control">                
<option value="">导出当前页面数据</option>                 <option value="">导出当前页面数据</option>                
<option value="all">导出全部数据</option>               <option value="all">导出全部数据</option>              
<option value="selected">导出选中数据</option> <option value="selected">导出选中数据</option>
</select> </select>
</div> </div>
<button class=" btn btn-success btn-sm" style="height: 34px" type="button" id="refreshBtn" name="refresh" aria-label="Refresh" <button class=" btn btn-success btn-sm" style="height: 34px" type="button" id="refreshBtn" name="refresh" aria-label="Refresh"
title="Refresh"> title="Refresh">
<i class="glyphicon glyphicon-refresh icon-refresh"></i> <i class="glyphicon glyphicon-refresh icon-refresh"></i>
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<!-- 模态框3Modal召回日志 --> <!-- 模态框3Modal召回日志 -->
<div class="modal fade" id="logModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="logModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header2"> <div class="modal-header2">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times; &times;
</button> </button>
<h4 class="modal-title"> <h4 class="modal-title">
最后一次召回日志信息 最后一次召回日志信息
</h4> </h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<!--通过审批且未过期的patientId集合--> <!--通过审批且未过期的patientId集合-->
<form class="form-horizontal" id="logForm"> <form class="form-horizontal" id="logForm">
<input type="hidden" id="approveId" name="id"> <input type="hidden" id="approveId" name="id">
<div class="row"> <div class="row">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">病案号:</label> <label class="col-sm-4 control-label">病案号:</label>
<div class="col-sm-5"> <div class="col-sm-5">
<input type="text" class="input-sm form-control" readonly id="archiveDetailId" name="archiveDetailId"> <input type="text" class="input-sm form-control" readonly id="archiveDetailId" name="archiveDetailId">
</div>
<div class="col-sm-1"></div>
</div> </div>
<div class="col-sm-1"></div>
</div> </div>
<div class="row"> </div>
<div class="form-group"> <div class="row">
<label class="col-sm-4 control-label">操作人:</label> <div class="form-group">
<div class="col-sm-5"> <label class="col-sm-4 control-label">操作人:</label>
<input type="text" class="input-sm form-control" readonly id="creater" name="creater"> <div class="col-sm-5">
</div> <input type="text" class="input-sm form-control" readonly id="creater" name="creater">
<div class="col-sm-1"></div>
</div> </div>
<div class="col-sm-1"></div>
</div> </div>
<div class="row"> </div>
<div class="form-group"> <div class="row">
<label class="col-sm-4 control-label">ip</label> <div class="form-group">
<div class="col-sm-5"> <label class="col-sm-4 control-label">ip</label>
<input type="text" class="input-sm form-control" readonly id="ip" name="ip"> <div class="col-sm-5">
</div> <input type="text" class="input-sm form-control" readonly id="ip" name="ip">
<div class="col-sm-1"></div>
</div> </div>
<div class="col-sm-1"></div>
</div> </div>
<div class="row"> </div>
<div class="form-group"> <div class="row">
<label class="col-sm-4 control-label">说明:</label> <div class="form-group">
<div class="col-sm-6"> <label class="col-sm-4 control-label">说明:</label>
<textarea class="input-sm form-control" rows="3" readonly id="recallReason" name="recallReason"></textarea> <div class="col-sm-6">
</div> <textarea class="input-sm form-control" rows="3" readonly id="recallReason" name="recallReason"></textarea>
<div class="col-sm-1"></div>
</div> </div>
<div class="col-sm-1"></div>
</div> </div>
</form> </div>
</div> </form>
<div class="modal-footer"> </div>
<button type="button" class="btn btn-default btn-sm" data-dismiss="modal">关闭 <div class="modal-footer">
</button> <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">关闭
</button>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<%--确认框--%> <%--确认框--%>
<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"> <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content "> <div class="modal-content ">
<div class="modal-header2"> <div class="modal-header2">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button> aria-hidden="true">×</span></button>
<h4 class="modal-title" id="exampleModalLabel">确认召回</h4> <h4 class="modal-title" id="exampleModalLabel">确认召回</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form> <form>
<div class="form-group "> <div class="form-group ">
<input type="hidden" id="id" name="id" value=""/><label hidden id="danganhao"></label> <input type="hidden" id="id" name="id" value=""/><label hidden id="danganhao"></label>
<span style="vertical-align:top;">原因:</span><textarea rows="6" style="width:87%;" maxlength="255" id="recallReason2"></textarea> <span style="vertical-align:top;">原因:</span><textarea rows="6" style="width:87%;" maxlength="255" id="recallReason2"></textarea>
</div> </div>
<%--<div class="form-group">--%> <%--<div class="form-group">--%>
<%----%> <%----%>
<%--<label class="control-label">召回病案号:<label id="danganhao"></label>吗?</label>--%> <%--<label class="control-label">召回病案号:<label id="danganhao"></label>吗?</label>--%>
<%--</div>--%> <%--</div>--%>
<%--<div class="row">--%> <%--<div class="row">--%>
<%--<div class="form-group">--%> <%--<div class="form-group">--%>
<%--<label class="col-sm-4 control-label">原因:</label>--%> <%--<label class="col-sm-4 control-label">原因:</label>--%>
<%--<textarea class="input-sm " rows="3" maxlength="255" id="recallReason2"--%> <%--<textarea class="input-sm " rows="3" maxlength="255" id="recallReason2"--%>
<%--name="recallReason2"></textarea>--%> <%--name="recallReason2"></textarea>--%>
<%--<div class="col-sm-1"></div>--%> <%--<div class="col-sm-1"></div>--%>
<%--</div>--%> <%--</div>--%>
<%--</div>--%> <%--</div>--%>
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default btn-sm" data-dismiss="modal">返回</button> <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">返回</button>
<button type="button" class="btn btn-primary btn-sm" id="stateBtn">确认</button> <button type="button" class="btn btn-primary btn-sm" id="stateBtn">确认</button>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</body> </body>
<script> <script>
var tipLoad = 1; var tipLoad = 1;
@ -288,6 +288,8 @@
// } // }
} }
}); });
// $("#deptName").selectpicker('refresh'); //
} }
getDept(); getDept();
@ -365,14 +367,14 @@
var limit= null; var limit= null;
var offset= params.offset; var offset= params.offset;
//判断是否导出全部all //判断是否导出全部all
if ($("#sel_exportoption").val() == "all") { if ($("#sel_exportoption").val() == "all") {
offset=0; offset=0;
limit=this.totalRows; limit=this.totalRows;
this.pageSize= limit; this.pageSize= limit;
}else{ }else{
limit = currPageSize; limit = currPageSize;
this.pageSize = currPageSize; this.pageSize = currPageSize;
} }
var url = window.location.href; var url = window.location.href;
var deptName = ''; var deptName = '';
@ -395,7 +397,7 @@
} }
} }
var temp = { var temp = {
limit: limit, //页面大小 limit: limit, //页面大小
offset: offset, //页码 offset: offset, //页码
order: params.order, //排位命令descasc order: params.order, //排位命令descasc
@ -556,9 +558,9 @@
if (row.archivestate == "已认证" || row.archivestate == "已归档") { if (row.archivestate == "已认证" || row.archivestate == "已归档") {
if(row.state=="已召回"){ if(row.state=="已召回"){
return '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">召回 </button>' + '<button class="btn btn-danger btn-sm" onclick="logFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.recallReason + '\')">日志</button>'; return '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">召回 </button>' + '<button class="btn btn-danger btn-sm" onclick="logFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.recallReason + '\')">日志</button>';
}else{ }else{
return '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">召回 </button>'; return '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">召回 </button>';
} }
} else { } else {
return ''; return '';
} }
@ -643,9 +645,9 @@
//2.初始化select的change事件 //2.初始化select的change事件
$("#sel_exportoption").change(function () { $("#sel_exportoption").change(function () {
$('#table').bootstrapTable('refreshOptions', { $('#table').bootstrapTable('refreshOptions', {
exportDataType: $(this).val() exportDataType: $(this).val()
}); });
}); });
$("#refreshBtn").click(function () { $("#refreshBtn").click(function () {
//刷新 //刷新
@ -678,7 +680,7 @@
$("#stateBtn").click(function () { $("#stateBtn").click(function () {
$('#exampleModal').modal('hide'); //手动关闭 $('#exampleModal').modal('hide'); //手动关闭
//console.log("===召回事件======="+ $("#id").val()+":"+ $("#danganhao").html()); //console.log("===召回事件======="+ $("#id").val()+":"+ $("#danganhao").html());
var archiveDetailId=$("#danganhao").html(); var archiveDetailId=$("#danganhao").html();
var id = archiveDetailId; var id = archiveDetailId;
var recallReason= $("#recallReason2").val(); var recallReason= $("#recallReason2").val();
@ -696,8 +698,8 @@
} }
}, error: function () { }, error: function () {
//刷新 //刷新
// $('#table').bootstrapTable('refresh'); // $('#table').bootstrapTable('refresh');
//toastr.success("召回成功!"); //toastr.success("召回成功!");
toastr.error("召回失败!") toastr.error("召回失败!")
} }
}); });

@ -530,7 +530,7 @@
} else if (row.backFlag == 2) { } else if (row.backFlag == 2) {
val = "科主任退回护士"; val = "科主任退回护士";
} else if (row.backFlag == 5) { } else if (row.backFlag == 5) {
val = "病案室退回护士"; val = "病案室退回医生";
} else if (row.backFlag == 6) { } else if (row.backFlag == 6) {
val = "病案室退回护士"; val = "病案室退回护士";
} else { } else {
@ -643,7 +643,7 @@
} else if (row.backFlag == 2) { } else if (row.backFlag == 2) {
val = "科主任退回护士"; val = "科主任退回护士";
} else if (row.backFlag == 5) { } else if (row.backFlag == 5) {
val = "病案室退回护士"; val = "病案室退回医生";
} else if (row.backFlag == 6) { } else if (row.backFlag == 6) {
val = "病案室退回护士"; val = "病案室退回护士";
} else { } else {
@ -699,7 +699,7 @@
} else if (row.backFlag == 2) { } else if (row.backFlag == 2) {
val = "科主任退回护士"; val = "科主任退回护士";
} else if (row.backFlag == 5) { } else if (row.backFlag == 5) {
val = "病案室退回护士"; val = "病案室退回医生";
} else if (row.backFlag == 6) { } else if (row.backFlag == 6) {
val = "病案室退回护士"; val = "病案室退回护士";
} else { } else {
@ -814,7 +814,7 @@
} else if (row.backFlag == 2) { } else if (row.backFlag == 2) {
val = "科主任退回护士"; val = "科主任退回护士";
} else if (row.backFlag == 5) { } else if (row.backFlag == 5) {
val = "病案室退回护士"; val = "病案室退回医生";
} else if (row.backFlag == 6) { } else if (row.backFlag == 6) {
val = "病案室退回护士"; val = "病案室退回护士";
} else { } else {
@ -871,7 +871,7 @@
} else if (row.backFlag == 2) { } else if (row.backFlag == 2) {
val = "科主任退回护士"; val = "科主任退回护士";
} else if (row.backFlag == 5) { } else if (row.backFlag == 5) {
val = "病案室退回护士"; val = "病案室退回医生";
} else if (row.backFlag == 6) { } else if (row.backFlag == 6) {
val = "病案室退回护士"; val = "病案室退回护士";
} else { } else {

@ -282,6 +282,18 @@
//病案号 //病案号
//var archiveDetailId="1333ad3c4d6448c89372835dbad3c364"; //var archiveDetailId="1333ad3c4d6448c89372835dbad3c364";
var archiveDetailId = GetQueryString("archiveDetailId"); var archiveDetailId = GetQueryString("archiveDetailId");
var type = GetQueryString("type");
if(type==1){
$("#saveBtn").hide();
$("#clearBtn").hide();
$("#addBtn").hide();
$("#delBtn").hide();
$("#back2Btn").hide();
$("#lastBtn").hide();
$("#flag").attr("disabled", "disabled");
//$("#typeFlag").attr("disabled", "disabled");
$("#content").attr('readonly','true');
}
//1主任还是2病案室 //1主任还是2病案室
var roleVal = 2; var roleVal = 2;
//自动生成PDF的路径 //自动生成PDF的路径
@ -420,7 +432,7 @@
} else if (row.backFlag == 2) { } else if (row.backFlag == 2) {
val = "科主任退回护士"; val = "科主任退回护士";
} else if (row.backFlag == 5) { } else if (row.backFlag == 5) {
val = "病案室退回护士"; val = "病案室退回医生";
} else if (row.backFlag == 6) { } else if (row.backFlag == 6) {
val = "病案室退回护士"; val = "病案室退回护士";
} else { } else {
@ -523,7 +535,7 @@
} else if (row.backFlag == 2) { } else if (row.backFlag == 2) {
val = "科主任退回护士"; val = "科主任退回护士";
} else if (row.backFlag == 5) { } else if (row.backFlag == 5) {
val = "病案室退回护士"; val = "病案室退回医生";
} else if (row.backFlag == 6) { } else if (row.backFlag == 6) {
val = "病案室退回护士"; val = "病案室退回护士";
} else { } else {
@ -824,6 +836,10 @@
} }
// console.log($("#typeFlag").html()); // console.log($("#typeFlag").html());
$("#mulDiv").append(htmls); $("#mulDiv").append(htmls);
var type = GetQueryString("type");
if (type == 1) {
$("#typeFlag").attr("disabled", "disabled");
}
$('#typeFlag').multiselect({ $('#typeFlag').multiselect({
nonSelectedText : '--请选择--', nonSelectedText : '--请选择--',
enableCollapsibleOptGroups: true, enableCollapsibleOptGroups: true,

@ -1843,7 +1843,6 @@
endDate: $("#endDate").val(), endDate: $("#endDate").val(),
bedNumber:$("#bedNumber").val(), bedNumber:$("#bedNumber").val(),
deathFlag:$("#deathFlag").val() deathFlag:$("#deathFlag").val()
}; };
return temp; return temp;

Loading…
Cancel
Save