diff --git a/src/main/java/com/emr/DataSourceHolder.java b/src/main/java/com/emr/DataSourceHolder.java deleted file mode 100644 index dcdd92c..0000000 --- a/src/main/java/com/emr/DataSourceHolder.java +++ /dev/null @@ -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 contextHolder = new ThreadLocal(); - - //设置当前线程要使用的数据源 - 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(); - } -} diff --git a/src/main/java/com/emr/DynamicDataSource.java b/src/main/java/com/emr/DynamicDataSource.java deleted file mode 100644 index 4dfc897..0000000 --- a/src/main/java/com/emr/DynamicDataSource.java +++ /dev/null @@ -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(); - } -} diff --git a/src/main/java/com/emr/controller/LoginController.java b/src/main/java/com/emr/controller/LoginController.java index a71d4fc..53a1c16 100644 --- a/src/main/java/com/emr/controller/LoginController.java +++ b/src/main/java/com/emr/controller/LoginController.java @@ -57,7 +57,7 @@ public class LoginController { String token = request.getParameter("token"); String userName = request.getParameter("userName"); String name = request.getParameter("name"); - UsernamePasswordToken userToken = new UsernamePasswordToken(userName, "123456"); + UsernamePasswordToken userToken = new UsernamePasswordToken(userName, "456789"); Subject subject = SecurityUtils.getSubject(); subject.login(userToken); model.addAttribute("POWER_URLHEAD", POWER_JSP); diff --git a/src/main/java/com/emr/controller/MedicalRecallController.java b/src/main/java/com/emr/controller/MedicalRecallController.java index 28249c0..3d1d027 100644 --- a/src/main/java/com/emr/controller/MedicalRecallController.java +++ b/src/main/java/com/emr/controller/MedicalRecallController.java @@ -8,10 +8,7 @@ package com.emr.controller; import com.emr.annotation.OptionalLog; import com.emr.entity.*; -import com.emr.service.Archive_MasterService; -import com.emr.service.Emr_DictionaryService; -import com.emr.service.Emr_Fault_DetailService; -import com.emr.service.LogService; +import com.emr.service.*; import com.emr.util.ExportExcelUtil; import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.Session; @@ -45,6 +42,9 @@ public class MedicalRecallController { @Autowired private Archive_MasterService archiveMasterService; + @Autowired(required = false) + private Archive_Master_FollowingService archive_master_followingService; + @Value("${recallReason}") private String recallReason; @@ -109,6 +109,11 @@ public class MedicalRecallController { Subject currentUser = SecurityUtils.getSubject(); Session session = currentUser.getSession(); 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); SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String nowTime = format1.format(new Date()); @@ -135,6 +140,16 @@ public class MedicalRecallController { emrFaultDetail.setFirstTrial(null); 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; } diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 766c7f2..7c30beb 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -55,6 +55,9 @@ public class beHospitaledController { @Autowired private Emr_PictureService emrPictureService; + @Autowired(required = false) + private Archive_Master_FollowingService archive_master_followingService; + @Value("${HomepageDictionary}") private String HomepageDictionary; @Value("${HomepageMethod}") @@ -181,6 +184,19 @@ public class beHospitaledController { 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; } @@ -194,27 +210,27 @@ public class beHospitaledController { SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String nowTime = format1.format(new Date()); - //修改病案归档状态 - Archive_Master archiveMaster = new Archive_Master(); - archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); - archiveMaster.setArchivestate("初审"); - archiveMaster.setCmtDoctor(1); - archiveMaster.setCmtNurse(1); - archiveMaster.setFirstInstance(username); - archiveMaster.setLockinfo(emrFaultDetail.getContent()); - int bol = archiveMasterService.updateByClo(archiveMaster); - - emrFaultDetail.setCreater(username); - emrFaultDetail.setCreateTime(nowTime); - emrFaultDetail.setArchiveState("初审"); + //修改病案归档状态 + Archive_Master archiveMaster = new Archive_Master(); + archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); + archiveMaster.setArchivestate("初审"); + archiveMaster.setCmtDoctor(1); + archiveMaster.setCmtNurse(1); + archiveMaster.setFirstInstance(username); + archiveMaster.setLockinfo(emrFaultDetail.getContent()); + int bol = archiveMasterService.updateByClo(archiveMaster); + + emrFaultDetail.setCreater(username); + emrFaultDetail.setCreateTime(nowTime); + emrFaultDetail.setArchiveState("初审"); + bol = emrFaultDetailService.insertSel(emrFaultDetail); + //添加初审内容 + if (bol == 1) { + //参数输入 + emrFaultDetail.setState("未召回"); + emrFaultDetail.setArchiveState(null); bol = emrFaultDetailService.insertSel(emrFaultDetail); - //添加初审内容 - if (bol == 1) { - //参数输入 - emrFaultDetail.setState("未召回"); - emrFaultDetail.setArchiveState(null); - bol = emrFaultDetailService.insertSel(emrFaultDetail); - } + } return bol+""; } @@ -238,6 +254,8 @@ public class beHospitaledController { Subject currentUser = SecurityUtils.getSubject(); Session session = currentUser.getSession(); 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(); archiveMaster.setId(archiveMasterVo.getId()); archiveMaster.setCmtDoctor(archiveMasterVo.getCmtDoctor()); @@ -248,6 +266,8 @@ public class beHospitaledController { emrStaffRemark.setMasterId(archiveMasterVo.getId()); 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"); String nowTime = format1.format(new Date()); @@ -284,6 +304,14 @@ public class beHospitaledController { emrStaffRemark.setCreateTime(nowTime); 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) { //护士提交（医生和护士同时提交后，归档状态变更为：提交） if (obj.getCmtDoctor()==1) { @@ -309,6 +337,14 @@ public class beHospitaledController { emrStaffRemark.setCreateTime(nowTime); 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) { result = "成功"; @@ -361,6 +397,73 @@ public class beHospitaledController { //根据目前账号所在科室获取主管医生列表 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; + } } diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index ea12acd..b3b9dbb 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -7,10 +7,7 @@ package com.emr.controller; import com.emr.entity.*; -import com.emr.service.Archive_MasterService; -import com.emr.service.Emr_DictionaryService; -import com.emr.service.Emr_Fault_DetailService; -import com.emr.service.Emr_Fault_TypeService; +import com.emr.service.*; import com.emr.util.ExportExcelUtil; import org.apache.axis.client.Call; import org.apache.axis.client.Service; @@ -51,6 +48,9 @@ public class lastVerifyController { @Autowired private Emr_Fault_DetailService emrFaultDetailService; + @Autowired(required = false) + private Archive_Master_FollowingService archive_master_followingService; + @RequestMapping(value = "/lastVerifys") public String faults(Model model) { return "lastVerifyDir/lastVerifyList"; @@ -151,6 +151,44 @@ public class lastVerifyController { emrFaultDetail.setCreateTime(nowTime); //插入缺陷记录 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); // if (entity != null) { @@ -228,6 +266,19 @@ public class lastVerifyController { }else{ 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; } diff --git a/src/main/java/com/emr/controller/pdfController.java b/src/main/java/com/emr/controller/pdfController.java index 581ccd8..8b6ffd9 100644 --- a/src/main/java/com/emr/controller/pdfController.java +++ b/src/main/java/com/emr/controller/pdfController.java @@ -33,6 +33,7 @@ public class pdfController { String archiveDetailId = emrFaultDetail.getArchiveDetailId(); //req.setAttribute("aa", "cccc"); req.setAttribute("archiveDetailId", archiveDetailId); + req.setAttribute("type", req.getAttribute("type")); //req.setAttribute("roleVal","1"+ emrFaultDetail.getBackFlag()); //req.setAttribute("pdfPath","1"+ emrFaultDetail.getContent()); return "pdfDir/pdfLastDir"; diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index e6f0e34..0e9a86e 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -43,4 +43,7 @@ public interface Archive_MasterMapper { //power查询用户姓名 String getFName(String userName); + + //查询病案室操作记录 + List selectHandleDetail(Archive_Master_Vo record); } \ No newline at end of file diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index 537819b..c4ddad0 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -80,6 +80,156 @@ public class Archive_Master_Vo { 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() { return deathFlag; } diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index a6b1a6d..2d9570a 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -166,6 +166,22 @@ public interface Archive_MasterService { //power查询用户姓名 String getFullName(String userName); + + /** + * 根据条件查找案室操作记录 + * + * @param archiveMasterVo + * @return + */ + List selectHandleDetail(Archive_Master_Vo archiveMasterVo); + + /** + * 根据条件查找病案室操作记录 + * + * @param archiveMasterVo + * @return + */ + OffsetLimitPage selectHandleDetail(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit); } diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index 5cb26dd..2a77997 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -154,6 +154,19 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public String getFullName(String userName) { return archiveMasterMapper.getFName(userName); } + + @Override + public List selectHandleDetail(Archive_Master_Vo archiveMasterVo) { + List list = archiveMasterMapper.selectHandleDetail(archiveMasterVo); + return list; + } + + @Override + public OffsetLimitPage selectHandleDetail(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List list = archiveMasterMapper.selectHandleDetail(archiveMasterVo); + return new OffsetLimitPage((Page) list); + } } diff --git a/src/main/resources/config/applicationContext.xml b/src/main/resources/config/applicationContext.xml index a9c64c2..640dcc3 100644 --- a/src/main/resources/config/applicationContext.xml +++ b/src/main/resources/config/applicationContext.xml @@ -34,39 +34,16 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index fc156b9..c9da5d7 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -1,17 +1,14 @@ -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.driver=com.mysql.jdbc.Driver +#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.mysql.username=root -jdbc.mysql.password=docus702 - -#jdbc.driver=com.mysql.jdbc.Driver -#jdbc.url=jdbc\:mysql\://localhost\: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.sqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver -#jdbc.url=jdbc\:sqlserver\://120.27.212.36:1433;databaseName=emr_record_zc -jdbc.sqlserver.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY -jdbc.sqlserver.username=sa -jdbc.sqlserver.password=docus@702 +#jdbc.mysql.username=root +#jdbc.mysql.password=root + +jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver +jdbc.url=jdbc\:sqlserver\://127.0.0.1:1433;databaseName=emr_recode_test +#jdbc.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY +jdbc.username=sa +jdbc.password=123456 #hibernate config hibernate.dialect=org.hibernate.dialect.SQLServerDialect hibernate.show_sql=true @@ -21,33 +18,37 @@ hibernate.hbm2ddl.auto=update hibernate.current_session_context_class=thread hibernate.jdbc.batch_size=50 hibernate.enable_lazy_load_no_trans=true -#\u56FE\u7247\u5730\u5740 +#ͼƬַ pictureUrl=C:\\Users\\HIPAA\\Desktop\\test\\uploadImage #pictureUrl=src\\main\\webapp -#\u672C\u5730\u81EA\u52A8\u751F\u6210PDF\u5730\u5740 +#ԶPDFַ autoPdfUrl=C:/Users/HIPAA/Desktop/test/autoPdf -#\u672C\u5730\u4E0A\u4F20PDF\u5730\u5740 +#ϴPDFַ 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\\ -#\u8D85\u671F\u5929\u6570 +# expired=7 -#\u6B7B\u4EA1\u8D85\u671F\u5929\u6570 +# deathExpired=7 powerUrl=http://127.0.0.1:8080/power/font/getMenusByUserIdAndSysFlag POWER_URLHEAD=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 -HomepageDictionary=http://10.6.1.127:9999/WholeCheckInterface/services/HomepageDictionary?wsdl +recallReason=ҽԺҪĵ +#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 +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 #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 diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index c52765e..330253f 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -94,7 +94,7 @@ and t.flag = #{flag,jdbcType=NVARCHAR} - ORDER BY z.assort_sort,t.page_number + ORDER BY z.assort_sort,t.page_number,t.Title,t.UpLoadDateTime SELECT `name` FROM `power_user` WHERE user_name = #{userName} + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 1b09b6f..75be68e 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -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" %> <% @@ -915,7 +915,13 @@
- 归档病历已全部无纸化无扫描件 + <%--归档病历已全部无纸化无扫描件--%> + 归档病历是否已全部无纸化无扫描件 + + 是 + 否 + + <%--归档病历已全部无纸化无扫描件--%>
@@ -957,7 +963,12 @@
- 归档病历已全部无纸化无扫描件 + <%--归档病历已全部无纸化无扫描件--%> + 归档病历是否已全部无纸化无扫描件 + + 是 + 否 +
@@ -2897,6 +2908,12 @@ html = html + '' } } + if (row.archivestate != '初审' && row.archivestate != '提交' && row.cmtDoctor == 1) { + html = html + '' + } + if (row.archivestate != '初审' && row.archivestate != '提交' && row.cmtNurse == 1) { + html = 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) { getStaffRemarkFun(row.id,1); 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) { $('#selModal').modal({ backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 @@ -3083,6 +3138,17 @@ var idArr = []; 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() { idArr = []; diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp index b4b44bd..43595e7 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp @@ -14,17 +14,17 @@ <%@include file="../../jspf/comm.jspf" %> -
- - -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - <%----%> - -
-
- - -
- - +
+ + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
- - -
+
+ + <%----%> + +
+
+ + +
+ + +
+ + +
-
- -
- +
+ +
+
- -