diff --git a/src/main/java/com/emr/controller/Power_MenuController.java b/src/main/java/com/emr/controller/Power_MenuController.java deleted file mode 100644 index 7f55a7e2..00000000 --- a/src/main/java/com/emr/controller/Power_MenuController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.emr.controller; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * @Author:hjl - * @Date:Creatid in 1:28 2019/4/17 - * @Description:菜單管理 - */ -@Controller -@RequestMapping("/menuPower") -public class Power_MenuController { -// @Autowired -// private Power_MenuService powerMenuService; -// -// @Autowired -// private Power_UserService powerUserService; -// -// -// @RequestMapping("/powerMenuList") -// @ResponseBody -// public Msg list() { -// List list = powerMenuService.queryAllPowerMenu(); -// return Msg.success().add("list",list); -// } -// -// @RequestMapping("/indexMenu") -// @ResponseBody -// public Msg indexMenu() { -// Power_User user = (Power_User) ActionScopeUtils.getSessionAttribute( Constant.CURRENT_USER); -// List list = null; -// List menuList = null; -// List listPower = null; -// if (user.getRoleId().equals(0)) { -// list = powerMenuService.queryAllPowerMenu(); -// return Msg.success().add("listRole", list); -// } else if(user.getRoleId().equals(-100)){ -// listPower = powerMenuService.queryPoswerMenuByUserId(user.getUserId()); -// return Msg.success().add("listPower", listPower); -// } else{ -// menuList = powerMenuService.queryMenuViewByUserId(user.getUserId()); -// return Msg.success().add("listUser", menuList); -// } -// } - -} diff --git a/src/main/java/com/emr/controller/TempHandleWzController.java b/src/main/java/com/emr/controller/TempHandleWzController.java index 13a638fc..761a5b0b 100644 --- a/src/main/java/com/emr/controller/TempHandleWzController.java +++ b/src/main/java/com/emr/controller/TempHandleWzController.java @@ -28,7 +28,7 @@ public class TempHandleWzController { @RequestMapping("selectByInpNoAndVisitId") @ResponseBody - public List selectByInpNoAndVisitId(Archive_Master_Vo archive_master_vo){ + public List selectByInpNoAndVisitId(Archive_Master_Vo archive_master_vo){ return this.archiveMasterService.selectByUnfile(archive_master_vo); } diff --git a/src/main/java/com/emr/controller/VCountController.java b/src/main/java/com/emr/controller/VCountController.java index c72bf6cf..ae939cb2 100644 --- a/src/main/java/com/emr/controller/VCountController.java +++ b/src/main/java/com/emr/controller/VCountController.java @@ -123,7 +123,7 @@ public class VCountController { String tableThNames = "名字,入院科室,入院日期,出院科室,出院日期,主管医生"; String fieldCns = "name,deptAdmissionTo,admissionDateTime,deptName,dischargeDateTime,doctorInCharge"; //构造excel的数据 - List list = archiveMasterService.selectByUnfile(archiveMasterVo); + List list = archiveMasterService.selectByUnfile(archiveMasterVo); Emr_Dictionary dic = new Emr_Dictionary(); dic.setEffective(1); dic.setTypecode("dept_code"); @@ -158,7 +158,7 @@ public class VCountController { exportExcelUtil.expordExcel(tableThNames, fieldCns, list, fileName, response); } - @ResponseBody + /*@ResponseBody @RequestMapping(value = "/exportExcel3") public void exportExcel3(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception { String tableThNames = "名字,入院科室,入院日期,出院科室,出院日期,主管医生,推迟天数"; @@ -197,16 +197,15 @@ public class VCountController { response.setContentType("application/ms-excel;charset=gbk"); //导出excel的操作 exportExcelUtil.expordExcel(tableThNames, fieldCns, list, fileName, response); - } + }*/ //获取完整信息 - @ResponseBody + /*@ResponseBody @RequestMapping(value = "/HomepageDic") public String HomepageDic(HttpServletRequest request, HttpServletResponse response) { String result=""; try { String endpoint = "http://120.27.212.36:9999/filing/services/HomepageDictionary?wsdl"; - //String endpoint = "http://localhost:8080/ca3/services/caSynrochnized?wsdl"; //直接引用远程的wsdl文件 @@ -238,7 +237,7 @@ public class VCountController { } return result; - } + }*/ } diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index e2f34505..52f7f7dd 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -277,90 +277,122 @@ public class beHospitaledController { if(!archiveMaster.getId().equals("")&&!archiveMaster.equals(null)) { Archive_Master obj=archiveMasterService.selectById(archiveMaster.getId()); if(obj!=null) { + //如果是医生提交判断医生是否有缺陷未处理，如果是护士提交判断护士是否有缺陷未处理 + //查询该病案号缺陷，如果有医生就退回医生如果有护士则退回护士否则不退回提示 + Emr_Fault_Detail entityFault=new Emr_Fault_Detail(); + entityFault.setArchiveDetailId(archiveMaster.getId()); + List faultList=emrFaultDetailService.selectByArchiveId(entityFault); + int doctorFlagNum=0; + int nurseFlagNum=0; + if(faultList!=null && faultList.size()>0){ + //1医生 ，2护士 + for (int k = 0; k < faultList.size(); k++) { + if ("1".equals(faultList.get(k).getBackFlag()) || "5".equals(faultList.get(k).getBackFlag())) { + doctorFlagNum+=1; + } + if ("2".equals(faultList.get(k).getBackFlag()) || "6".equals(faultList.get(k).getBackFlag())) { + nurseFlagNum+=1; + } + } + } + //修改病案归档状态 if (archiveMaster.getCmtDoctor()==1) { - //医生提交（医生和护士同时提交后，归档状态变更为：提交） - if(obj.getCmtNurse()==1){ - archiveMaster.setArchivestate("提交"); - archiveMaster.setCmtNurse(1); - } - archiveMaster.setCmtDoctor(1); - archiveMaster.setDoctorName(username); - archiveMaster.setCmtDoctorDate(nowTime); - - //添加医生备注记录 - emrStaffRemark.setTypeFlag(0); - List list = emrStaffRemarkService.selectByCol(emrStaffRemark); - if(list!=null && list.size()>0){ - //修改 - list.get(0).setUpdateTime(nowTime); - list.get(0).setUpdater(username); - list.get(0).setContent(archiveMasterVo.getContent()); - list.get(0).setUpdateTime(nowTime); - bol=emrStaffRemarkService.updateByClo(list.get(0)); + if(doctorFlagNum==0) { + //医生提交（医生和护士同时提交后，归档状态变更为：提交） + if (obj.getCmtNurse() == 1) { + archiveMaster.setArchivestate("提交"); + archiveMaster.setCmtNurse(1); + } + archiveMaster.setCmtDoctor(1); + archiveMaster.setDoctorName(username); + archiveMaster.setCmtDoctorDate(nowTime); + + //添加医生备注记录 + emrStaffRemark.setTypeFlag(0); + List list = emrStaffRemarkService.selectByCol(emrStaffRemark); + if (list != null && list.size() > 0) { + //修改 + list.get(0).setUpdateTime(nowTime); + list.get(0).setUpdater(username); + list.get(0).setContent(archiveMasterVo.getContent()); + list.get(0).setUpdateTime(nowTime); + bol = emrStaffRemarkService.updateByClo(list.get(0)); + } else { + //插入 + emrStaffRemark.setCreater(username); + 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{ - //插入 - emrStaffRemark.setCreater(username); - emrStaffRemark.setCreateTime(nowTime); - bol=emrStaffRemarkService.insertClo(emrStaffRemark); + result = "医生提交失败,存在缺陷未处理!"; } - - //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) { - archiveMaster.setArchivestate("提交"); - archiveMaster.setCmtDoctor(1); - } - archiveMaster.setCmtNurse(1); - archiveMaster.setNurseName(username); - archiveMaster.setCmtNurseDate(nowTime); - - //添加护士备注记录 - emrStaffRemark.setTypeFlag(1); - List list = emrStaffRemarkService.selectByCol(emrStaffRemark); - if(list!=null && list.size()>0){ - //修改 - list.get(0).setUpdater(username); - list.get(0).setUpdateTime(nowTime); - list.get(0).setContent(archiveMasterVo.getContent()); - bol=emrStaffRemarkService.updateByClo(list.get(0)); + if(nurseFlagNum==0) { + //护士提交（医生和护士同时提交后，归档状态变更为：提交） + if (obj.getCmtDoctor() == 1) { + archiveMaster.setArchivestate("提交"); + archiveMaster.setCmtDoctor(1); + } + archiveMaster.setCmtNurse(1); + archiveMaster.setNurseName(username); + archiveMaster.setCmtNurseDate(nowTime); + + //添加护士备注记录 + emrStaffRemark.setTypeFlag(1); + List list = emrStaffRemarkService.selectByCol(emrStaffRemark); + if (list != null && list.size() > 0) { + //修改 + list.get(0).setUpdater(username); + list.get(0).setUpdateTime(nowTime); + list.get(0).setContent(archiveMasterVo.getContent()); + bol = emrStaffRemarkService.updateByClo(list.get(0)); + } else { + //插入 + emrStaffRemark.setCreater(username); + 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); }else{ - //插入 - emrStaffRemark.setCreater(username); - emrStaffRemark.setCreateTime(nowTime); - bol=emrStaffRemarkService.insertClo(emrStaffRemark); + result = "护士提交失败,存在缺陷未处理!"; } - - //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 = "成功"; archiveMaster.setIsscaned(archiveMasterVo.getIsscaned()); bol = archiveMasterService.updateByClo(archiveMaster); - }else{ - result = "备注失败"; + if(archiveMaster.getCmtDoctor()==1) { + result = "归档医生提交"; + }else if(archiveMaster.getCmtNurse()==1){ + result = "归档护士提交"; + } + if(bol==1){ + result+="成功!"; + }else{ + result+= "失败!"; + } } - - }else{ - result = "病案不存在！"; + result = "病案不存在!"; } }else{ - result="病案不存在！"; + result="病案不存在!"; } return result; } diff --git a/src/main/java/com/emr/controller/commitController.java b/src/main/java/com/emr/controller/commitController.java index 008f8262..21f2a862 100644 --- a/src/main/java/com/emr/controller/commitController.java +++ b/src/main/java/com/emr/controller/commitController.java @@ -67,7 +67,7 @@ public class commitController { String tableThNames = "病历清单id,住院号,住院次数,名字,性别,身份证,出院科室,出院日期,主管医生,状态,医生是否提交,医生,医生提交日期,护士是否提交,护士,护士提交日期,是否死亡"; String fieldCns = "id,inpNo,visitId,name,sex,idNo,deptName,dischargeDateTime,doctorInCharge,archivestate,cmtDoctor,doctorName,cmtDoctorDate,cmtNurse,nurseName,cmtDurseDate,deathFlag"; //构造excel的数据 - List list = archiveMasterService.selectByCmtCol(archiveMasterVo); + List list = archiveMasterService.selectByCmtCol(archiveMasterVo); //文件名 String fileName = "科主任审核" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; diff --git a/src/main/java/com/emr/controller/faultController.java b/src/main/java/com/emr/controller/faultController.java index 13f133b6..5c8efae4 100644 --- a/src/main/java/com/emr/controller/faultController.java +++ b/src/main/java/com/emr/controller/faultController.java @@ -342,7 +342,6 @@ public class faultController { entity.setDealFlag("0"); entity.setDealPerson(""); entity.setDealTime(""); - } //修改 bol = emrFaultDetailService.updateCloByPrimaryKey(entity); diff --git a/src/main/java/com/emr/controller/inHospitalController.java b/src/main/java/com/emr/controller/inHospitalController.java index a08eb5f5..99771f8c 100644 --- a/src/main/java/com/emr/controller/inHospitalController.java +++ b/src/main/java/com/emr/controller/inHospitalController.java @@ -124,6 +124,7 @@ public class inHospitalController { return archiveDetailService.selectByClo(archiveDetailVo); } + //@OptionalLog(methods = "调用单个作废") @ResponseBody @RequestMapping(value = "/getAssortdetail") public OffsetLimitPage getAssortdetail(HttpServletResponse response, Archive_Detail_Vo archiveDetailVo, Integer offset, Integer limit) throws Exception { @@ -132,6 +133,14 @@ public class inHospitalController { return result; } + //@OptionalLog(methods = "调用单个作废") + @ResponseBody + @RequestMapping(value = "/getSourceByClo") + public List getSourceByClo(HttpServletResponse response, Archive_Detail_Vo archiveDetailVo) throws Exception { + //分段详情来源列表 + return archiveDetailService.sourceByClo(archiveDetailVo); + } + @OptionalLog(methods = "调用单个作废") @ResponseBody @RequestMapping(value = "/updateState") diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index ccf6c6fd..8fb47697 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -124,7 +124,7 @@ public class lastVerifyController { List list=emrFaultDetailService.selectByArchiveId(entityFault); int doctorFlagNum=0; int nurseFlagNum=0; - if(list.size()>0){ + if(list!=null && list.size()>0){ // 从session获取用户名 Subject currentUser = SecurityUtils.getSubject(); Session session = currentUser.getSession(); @@ -160,7 +160,6 @@ public class lastVerifyController { archive_master_following.setHandleId(username); archive_master_following.setHandleName(handleName); archive_master_followingService.insertSelective(archive_master_following); - } if(nurseFlagNum>0){ archiveMaster.setCmtNurse(0); @@ -176,7 +175,6 @@ public class lastVerifyController { archive_master_followingService.insertSelective(archive_master_following); } - //修改复审内容 if (bol == 1) { //判断缺陷记录是否有医生或护士（有则退回状态改1） @@ -187,6 +185,10 @@ public class lastVerifyController { bol = emrFaultDetailService.insertSel(emrFaultDetail); } } + if(doctorFlagNum==0 && nurseFlagNum==0){ + archiveMaster.setCmtDoctor(1); + archiveMaster.setCmtNurse(1); + } bol = archiveMasterService.updateByClo(archiveMaster); if (emrFaultDetail.getState().equals("复审退回")){ //2021-01-30 following表中添加病案室退回操作记录 diff --git a/src/main/java/com/emr/controller/unfileMedicalController.java b/src/main/java/com/emr/controller/unfileMedicalController.java index f3684d0d..d0c42a4a 100644 --- a/src/main/java/com/emr/controller/unfileMedicalController.java +++ b/src/main/java/com/emr/controller/unfileMedicalController.java @@ -56,7 +56,7 @@ public class unfileMedicalController { String tableThNames = "病历清单id,住院号,住院次数,名字,性别,身份证,入院科室,入院日期,出院科室,出院日期,主管医生,状态,医生是否提交,医生,医生提交日期,护士是否提交,护士,护士提交日期,电子病历医生提交,电子病历护士提交,是否死亡"; String fieldCns = "id,inpNo,visitId,name,sex,idNo,deptAdmissionTo,admissionDateTime,deptName,dischargeDateTime,doctorInCharge,archivestate,cmtDoctor,doctorName,cmtDoctorDate,cmtNurse,nurseName,cmtDurseDate,emrDoctorCmt,emrNureCmt,deathFlag"; //构造excel的数据 - List list = archiveMasterService.selectByUnfile(archiveMasterVo); + List list = archiveMasterService.selectByUnfile(archiveMasterVo); //文件名 String fileName = "未归档病历列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; diff --git a/src/main/java/com/emr/dao/Archive_DetailMapper.java b/src/main/java/com/emr/dao/Archive_DetailMapper.java index d58026c9..ffbeffe1 100644 --- a/src/main/java/com/emr/dao/Archive_DetailMapper.java +++ b/src/main/java/com/emr/dao/Archive_DetailMapper.java @@ -31,6 +31,8 @@ public interface Archive_DetailMapper { List detailByClo(Archive_Detail_Vo record); + List sourceByClo(Archive_Detail_Vo record); + List selectByIdStr(Archive_Detail record); List selectByCol2(Archive_Detail record); diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index 8a75e3b6..bfc7dbbb 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -21,7 +21,7 @@ public interface Archive_MasterMapper { List selectByLast(Archive_Master_Vo record); - List selectByUnfile(Archive_Master_Vo record); + List selectByUnfile(Archive_Master_Vo record); //List selectByUnfile2(Archive_Master_Vo record); /** @@ -29,9 +29,9 @@ public interface Archive_MasterMapper { * @param record * @return */ - List sel7DayByCol(Archive_Master_Vo record); + //List sel7DayByCol(Archive_Master_Vo record); - List selectByCmtCol(Archive_Master_Vo record); + List selectByCmtCol(Archive_Master_Vo record); List bbSel(Archive_Master_Vo record); @@ -43,7 +43,9 @@ public interface Archive_MasterMapper { List getDoctorInCharge(Archive_Master record); - //查询病案室操作记录 + /** + * 查询病案室操作记录 + */ List selectHandleDetail(Archive_Master_Vo record); //查询超期天数列表 diff --git a/src/main/java/com/emr/service/Archive_DetailService.java b/src/main/java/com/emr/service/Archive_DetailService.java index 1998204c..98c7522c 100644 --- a/src/main/java/com/emr/service/Archive_DetailService.java +++ b/src/main/java/com/emr/service/Archive_DetailService.java @@ -31,6 +31,13 @@ public interface Archive_DetailService { * @return */ OffsetLimitPage detailByClo(Archive_Detail_Vo record, Integer offset, Integer limit); + /** + * 根据条件查询分段详情来源列表 + * + * @param record + * @return + */ + List sourceByClo(Archive_Detail_Vo record); /** * 根据条件修改分段信息 diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index 294c685b..fa7ca076 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -56,7 +56,7 @@ public interface Archive_MasterService { * @param archiveMasterVo * @return */ - List selectByUnfile(Archive_Master_Vo archiveMasterVo); + List selectByUnfile(Archive_Master_Vo archiveMasterVo); /** * 根据条件查找病案未归档列表分页，除了已归档状态的记录 * @@ -69,7 +69,7 @@ public interface Archive_MasterService { * @param record * @return */ - List sel7DayByCol(Archive_Master_Vo record); + // List sel7DayByCol(Archive_Master_Vo record); /** * 根据条件查找'归档中','主任复审退回'病案列表 @@ -77,7 +77,7 @@ public interface Archive_MasterService { * @param archiveMasterVo * @return */ - List selectByCmtCol(Archive_Master_Vo archiveMasterVo); + List selectByCmtCol(Archive_Master_Vo archiveMasterVo); /** * 根据条件查找病案'归档中','审核退回'列表分页 diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java index 31f1a98e..7414b807 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java @@ -44,6 +44,11 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { return new OffsetLimitPage((Page) list); } + @Override + public List sourceByClo(Archive_Detail_Vo record) { + return archiveDetailMapper.sourceByClo(record); + } + @Override public int updateCloById(Archive_Detail record) { return archiveDetailMapper.updateCloById(record); 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 65dca8c7..0f4a9596 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -89,7 +89,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } @Override - public List selectByUnfile(Archive_Master_Vo archiveMasterVo) { + public List selectByUnfile(Archive_Master_Vo archiveMasterVo) { return archiveMasterMapper.selectByUnfile(archiveMasterVo); } @@ -98,13 +98,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return archiveMasterMapper.selectByUnfile2(archiveMasterVo); }*/ - @Override + /* @Override public List sel7DayByCol(Archive_Master_Vo archiveMasterVo) { return archiveMasterMapper.sel7DayByCol(archiveMasterVo); - } + }*/ @Override - public List selectByCmtCol(Archive_Master_Vo archiveMasterVo) { + public List selectByCmtCol(Archive_Master_Vo archiveMasterVo) { return archiveMasterMapper.selectByCmtCol(archiveMasterVo); } @@ -150,7 +150,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Override public OffsetLimitPage selectByUnfile(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); - List list = archiveMasterMapper.selectByUnfile(archiveMasterVo); + List list = archiveMasterMapper.selectByUnfile(archiveMasterVo); JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); @@ -161,7 +161,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return temp.getString("userName"); }}); - for (Archive_Master archive_master : list) { + for (Archive_Master_Vo archive_master : list) { JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); if (userInfo==null){ @@ -224,7 +224,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Override public OffsetLimitPage selectByCmtCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); - List list = archiveMasterMapper.selectByCmtCol(archiveMasterVo); + List list = archiveMasterMapper.selectByCmtCol(archiveMasterVo); JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); @@ -235,7 +235,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return temp.getString("userName"); }}); - for (Archive_Master archive_master : list) { + for (Archive_Master_Vo archive_master : list) { JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); if (userInfo==null){ diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 142516b0..392b9872 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -1,6 +1,6 @@ jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver jdbc.url=jdbc:sqlserver://120.27.212.36:1433;databaseName=emr_recode_test -#jdbc.url=jdbc:sqlserver://127.0.0.1:1433;databaseName=emr_recode_test +#jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=emr_recode_test jdbc.username=sa jdbc.password=docus@702 #hibernate config diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index 3744bcb9..b95dd035 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -90,9 +90,12 @@ and t.AssortID=#{assortId,jdbcType=VARCHAR} - + and t.Source=#{source,jdbcType=VARCHAR} + + and t.Source is null + and t.flag = #{flag,jdbcType=NVARCHAR} @@ -101,6 +104,43 @@ ORDER BY z.assort_sort,t.Title,t.page_number,t.UpLoadDateTime + + - select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.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.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned, - 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.is_scanning,bed_number + 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.is_scanning, + m.bed_number,ISNULL(s.numb, 0) numb from archive_master m LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) d @@ -448,6 +452,8 @@ LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) f on m.dept_name=f.code + LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and content!='' and content is not null and back_flag is not null GROUP BY archive_detail_id) s + on m.id=s.archive_detail_id where 1=1 --and m.ArchiveState in('归档中','初审','复审退回','提交','主任退回' ) @@ -556,14 +562,11 @@ ORDER BY m.discharge_date_time desc - select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.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.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning, - 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,bed_number + 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.bed_number,ISNULL(s.numb, 0) numb from archive_master m LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) d @@ -571,6 +574,8 @@ LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) f on m.dept_name=f.code + LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and content!='' and content is not null and back_flag is not null GROUP BY archive_detail_id) s + on m.id=s.archive_detail_id where 1=1 and ArchiveState in('提交','主任退回','归档中','复审退回') and m.id = #{id,jdbcType=NVARCHAR} diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml index e8fd234a..456c3fc4 100644 --- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml +++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml @@ -99,12 +99,24 @@ left JOIN archive_master m on m.id=d.archive_detail_id where 1=1 + and d.back_flag in (1,2,5,6) and d.back_flag in(5,6) + + and d.back_flag in (1,5) + + + and d.back_flag in (2,6) + and d.deal_flag = #{dealFlag,jdbcType=NVARCHAR} diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 870ba75f..7baaa4e5 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -134,6 +134,8 @@ text-align: center !important; } + + #assortModal > div > div { margin-top: 30%; margin-left: 60%; @@ -142,22 +144,22 @@ } #exampleModal > div > div { - margin-top: 50%; - margin-left: 70%; + margin-top: 30%; + margin-left: 60%; width: 400px; !important; } #delPdfModal > div > div { - margin-top: 50%; + margin-top: 30%; margin-left: 60%; width: 400px; !important; } #tsPdfModal > div > div { - margin-top: 50%; - margin-left: 60%; + margin-top: 40%; + margin-left: 70%; width: 400px; !important; } @@ -207,9 +209,9 @@ } #returnModal .modal-content { - margin-left: 10%; - margin-top: 10%; - width: 160%; + margin-left: 0%; + margin-top: 0%; + width: calc(210%); } #returnModal2 .modal-content { @@ -225,25 +227,27 @@ } #doctorModal .modal-content { - margin-left: 50%; - margin-top: 10%; - width: 120%; + margin-left: 0%; + margin-top: 5%; + width: calc(210%); } #nursModal .modal-content { - margin-left: 50%; - margin-top: 10%; - width: 120%; - } - - #QXInfoModal .modal-header2 { + margin-left: 0%; + margin-top: 5%; width: calc(210%); } #WZModal .modal-content { - margin-left: 50%; - margin-top: 10%; - width: 80%; + margin-left: 30%; + margin-top: 0%; + width: calc(150%); + } + + #WZModal2 .modal-content { + margin-left: 30%; + margin-top: 0%; + width: calc(150%); } #returnCmtModal .modal-content { @@ -252,11 +256,7 @@ width: 80%; } - #WZModal2 .modal-content { - margin-left: 50%; - margin-top: 10%; - width: 120%; - } + .panel-primary > .panel-heading { background-color: #3c8dbc; @@ -306,14 +306,14 @@ #delPdfPageModal2 > div > div { margin-top: 20%; - margin-left: 70%; - width: 90%; + margin-left: 60%; + width: 400px; !important; } #timeLineModal .modal-content { - margin-left: 50%; - margin-top: 10%; + margin-left: 55%; + margin-top: 5%; width: 100%; } @@ -407,7 +407,7 @@ } #delImgPageModal > div > div { - width: 70%; + width: 400px; margin-left: 55%; margin-top: 20%; } @@ -433,14 +433,14 @@ align:left; margin-left: 5px; height: 34px; - width:600px; + width:300px; !important; } #tableQX{ text-overflow: ellipsis; white-space: nowrap; - width:100%; + /* width:100%;*/ overflow:auto; !important; @@ -450,6 +450,15 @@ width:600px; !important; } + + #QXInfoModal .modal-header2 { + width: calc(210%); + } + + /*选中行颜色*/ + .fixed-table-container tbody .selected td { + background-color: #9acfea; + } @@ -704,6 +713,8 @@ + @@ -987,7 +998,7 @@
退回内容： - +
@@ -1032,17 +1043,22 @@
+
+
+ + +
+
- - + - <%--
--%> - <%--缺陷类型：--%> - <%----%> - <%--
--%> - <%--
--%> - <%--选项：--%> - <%--
--%> - <%--<%–
–%>--%> - <%--<%––%>--%> - <%--<%––%>--%> - <%--<%–
–%>--%> - <%--<%–
–%>--%> - <%--<%––%>--%> - <%--<%––%>--%> - <%--<%–
–%>--%> - <%--
--%> - <%--
--%>
内容： @@ -1230,16 +1228,16 @@ <%----%>
完整性信息： - +
护士备注： - +
医生备注： - +
<%--归档病历是否已全部无纸化无扫描件--%> @@ -1255,6 +1253,7 @@
+
@@ -1279,15 +1278,15 @@ <%----%>
完整性信息： - +
医生备注： - +
护士备注： - +
<%--归档病历是否已全部无纸化无扫描件--%> @@ -1303,6 +1302,7 @@
+
@@ -1511,7 +1511,7 @@ //创建数组保存图片 var files = new Array(); var id = 0; - var backFlagVal; + var backFlagVal=null; function getFaultType() { //获取科室列表 @@ -1567,7 +1567,13 @@ }); } + $(function () { + // $("#selModal").draggable({ + // handle: ".modal-header2" // 只能点击头部拖动 + // }); + // $("#selModal").css("overflow", "hidden"); // 防止出现滚动条，出现的话，你会把滚动条一起拖着走的 + getFaultType(); var objUrl; var img_html; @@ -2275,7 +2281,7 @@ undefinedText: '---', //当数据为 undefined 时显示的字符 singleSelect: true,//设置True 将禁止多选 clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox - height: 350, //定义表格的高度。 + height: 600, //定义表格的高度。 searchTimeOut: 500,// 默认500 设置搜索超时时间。 paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 showHeader: true,//是否显示列头。 @@ -2706,6 +2712,7 @@ if (result == "成功") { $("#table").bootstrapTable("refresh"); toastr.success("归档护士提交成功！"); + } else { toastr.error("归档护士提交失败！"); } @@ -2782,23 +2789,19 @@ type: "POST", data: entity, success: function (result) { - if (result == "成功") { - $("#WZModal2").modal('hide'); + $("#WZModal2").modal('hide'); + if (result.indexOf("成功")!=-1) { if (flag == 0) { $("#doctorModal").modal('hide'); $("#table").bootstrapTable("refresh"); - toastr.success("医生提交成功！"); + toastr.success("归档医生提交成功!"); } else if (flag == 1) { $("#nursModal").modal('hide'); $("#table").bootstrapTable("refresh"); - toastr.success("护士提交成功！"); + toastr.success("归档护士提交成功!"); } } else { - if (flag == 0) { - toastr.error("医生提交失败！"); - } else if (flag == 1) { - toastr.error("护士提交失败！"); - } + toastr.warning(result); } } @@ -2893,6 +2896,7 @@ } function getDept() { + //获取科室列表 $.ajax({ url: "${path}/inHosp/getDept", @@ -2900,6 +2904,7 @@ data: {effective: 1, typecode: "dept_code"}, success: function (result) { if (result != null) { + $("#deptName").empty(); for (var i = 0; i < result.length; i++) { if (deptArr.length != 1 && deptArr[0] != "") { var bol = deptArr.indexOf(result[i].code); @@ -3406,47 +3411,112 @@ }); } }); + } + + $("#selQXDoctorBtn").click(function () { + var id = $("#archiveId").val(); + backFlagVal=3; + $("#archIdQX").val(id); + $('#tableQX').bootstrapTable('refresh'); + $('#QXInfoModal').modal({ + backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 + keyboard: true,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 + show: true//弹出对话框 + }); + }); + + $("#selQXNuresBtn").click(function () { + var id = $("#archiveId").val(); + backFlagVal=4; + $("#archIdQX").val(id); + $('#tableQX').bootstrapTable('refresh'); + $('#QXInfoModal').modal({ + backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 + keyboard: true,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 + show: true//弹出对话框 + }); + }); + + $("#searchBtnQX").click(function () { + $('#tableQX').bootstrapTable('refresh'); + }); + + var editId=null; + function dealAndConcelFun() { + if (editId == null) { + toastr.warning("选中1条记录！"); + return; + } + if (editId != null && editId != "") { + //处理记录，登录处理人信息 + $.ajax({ + url: "${path}/fault/dealFault", + type: "POST", + data: {id: editId}, + success: function (result) { + if (result.indexOf("成功") != -1) { + //刷新 + $('#table').bootstrapTable('refresh'); + $('#tableQX').bootstrapTable('refresh'); + toastr.success(result); + } else if (result.indexOf("失败") != -1) { + toastr.error(result); + } else { + toastr.warning(result); + } + } + }); + } else { + toastr.warning("记录不存在!"); + } } + + var scollPostion = null; + var backFlagVal=1; function initTableQX() { + $("#QXDealCancelBtn").hide(); + $("#QXDealBtn").show(); $('#tableQX').bootstrapTable({ url: "${path}/fault/getFaultList", // 获取表格数据的url queryParams: function (params) { - //console.log($("#archIdQX").val()); - var backFlag=1; - //(1,2,5,6) - /* if($("#backFlagQX").val()!=null && $("#backFlagQX").val()!=null){ - backFlag=$("#backFlagQX").val(); - }*/ var temp = { - ///limit: limit, //页面大小 - // offset: offset, //页码 - //order: params.order, //排位命令（desc，asc） - //id: $("#id").val(), archiveDetailId: $("#archIdQX").val(), backContent:$("#assortNameQX").val(), dealFlag:$("#dealFlagQX").val(), - backFlag:backFlag, + backFlag:backFlagVal //backFlag: 1 }; + //console.log(temp); return temp; }, cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true - striped: true, //是否显示行间隔色 showColumns: true, + toolbar: '#toolbarQX',//指定工具栏 + undefinedText: '---', //当数据为 undefined 时显示的字符 + singleSelect: true,//设置True 将禁止多选 + clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox + striped: true, //是否显示行间隔色 + toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right' + paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 + showHeader: true,//是否显示列头。 + trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。 + //smartDisplay: false, //height:'300', //width:'100%', //height: $(window).height() / 2,//自定义高度 + sortName: 'id', // 要排序的字段 + sortOrder: 'desc', // 排序规则 columns: [ - /*{ + { title: '全选', field: 'select', //复选框 checkbox: true, width: 30, align: 'center', valign: 'middle' - }, */ + }, { field: 'id2', title: '序号', @@ -3538,6 +3608,23 @@ editId = null; //console.log("====取消选中"); }, + onClickRow : function(row, tr,flied){ + //console.log("====选中"); + }, + onCheck:function(row){ + editId = row.id; + scollPostion = $('#tableQX').bootstrapTable('getScrollPosition'); + if(row!=null){ + if(row.dealFlag=="0"){ + $("#QXDealCancelBtn").hide(); + $("#QXDealBtn").show(); + }else{ + $("#QXDealCancelBtn").show(); + $("#QXDealBtn").hide(); + } + } + + }, //如果想双击获取row，把onlClickRow改为onDbClickRow，如下 onDblClickRow: function (row) { // if (template.defaults.imports.hasPermission('/payment_manager/payment_detail')) { @@ -3545,8 +3632,13 @@ // } }, onRefresh: function (result) { - }, onLoadSuccess: function (result) { //加载成功时执行 - + } , onLoadSuccess: function (result) { //加载成功时执行 + $('#tableQX').bootstrapTable('scrollTo', scollPostion); //注意此代码要在setTimeout里面执行，原因是重新获取数据后还要生成dom节 + //console.log("====加载成功时执行"+editId); + if (editId != null) { + //对刷新表格的数据选中之前选的id行 + $('#tableQX').bootstrapTable("checkBy", {field: 'id', values: [editId]}); + } }, onLoadError: function () { //加载失败时执行 //$('#table').bootstrapTable("checkBy", {field: 'id', values: [selectNodeId]}); @@ -3856,7 +3948,7 @@ //缺陷 if (value == 1) { //有缺陷显示红色 - a = '已提交'; + a = '已提交'; } else { a = '未提交'; } @@ -3914,7 +4006,7 @@ var a = ""; if (redFlag == 0) { if (value == 1) { - a = '已提交'; + a = '已提交'; } else { a = '未提交'; } @@ -3922,7 +4014,7 @@ //有缺陷显示红色 if (value == 1) { //有缺陷显示红色 - a = '已提交'; + a = '已提交'; } else { a = '未提交'; } @@ -3981,14 +4073,14 @@ var a = ""; if (redFlag == 0) { if (value == '提交') { - a = '已提交'; + a = '已提交'; } else { a = '未提交'; } } else { if (value == '提交') { - //有缺陷显示红色 - a = '已提交'; + //有缺陷显示红色 #269abc; + a = '已提交'; } else { a = '未提交'; } @@ -4005,7 +4097,7 @@ var a = ""; if (redFlag == 0) { if (value == '提交') { - a = '已提交'; + a = '已提交'; } else { a = '未提交'; } @@ -4013,7 +4105,7 @@ //有缺陷显示红色 if (value == '提交') { //有缺陷显示红色 - a = '已提交'; + a = '已提交'; } else { a = '未提交'; } @@ -4142,11 +4234,12 @@ } } } - - var redFlag = row.numb; - if (redFlag != 0) { - //有缺陷 - html = html + ''; + if (index.indexOf("qxSel") != -1) { + var redFlag = row.numb; + if (redFlag != 0) { + //有缺陷 + html = html + ''; + } } } return html; @@ -4342,10 +4435,12 @@ $("#outDateLab").val(outDate[0] + "" + outDate[1] + "" + row.inpNo.trim() + "" + row.visitId + ""); initTree(row.id); + getSourceFun(); }, 'click .getQXInfo': function (e, value, row, index) { //查看缺陷列表 //initTableQX(row.id); + backFlagVal=1; $("#archIdQX").val(row.id); $('#tableQX').bootstrapTable('refresh'); $('#QXInfoModal').modal({ @@ -4407,18 +4502,12 @@ } - $("#searchBtnQX").click(function () { - $('#tableQX').bootstrapTable('refresh'); - }); + $("#returnCmtBtn").click(function () { returnDoctorFun(idCmt); }); - - var idArr = []; - var flag = 0; - //实现复选框单选 function checkedThis(obj, obj) { var boxArray = document.getElementsByName(obj.name); @@ -4431,8 +4520,64 @@ } } + function getSourceFun(){ + //console.log("获取来源下拉框：sourceSearch"); + var patientId = $("#idLab").html(); + var source=$("#sourceSearch").val(); + var assortId = $("#assortId").html(); + if (assortId == 0) assortId = null; + var temp = { + patientId: patientId, + assortId: assortId, + source: source, + flag: flag + }; + var title = $("#titleSearch").val(); + if (title != null && title != "") { + temp.title = title; + } + $.ajax({ + url: "${path}/inHosp/getSourceByClo", // 获取表格数据的url + type: "POST", + data: temp, + success: function (result) { + if (result != null) { + $("#sourceSearch").empty(); + if(source==""){ + $("#sourceSearch").append(""); + }else { + $("#sourceSearch").append(""); + } + for(var i=0;i" + result[i].source + ""); + }else { + $("#sourceSearch").append(""); + } + } else { + $("#sourceSearch").append(""); + } + }else{ + $("#sourceSearch").append(""); + } + } + $(".selectpicker").selectpicker('refresh'); + } else { + toastr.warning("暂无任何来源!"); + } + }, error: function () { + toastr.error("操作失败！"); + } + }); + } + + var idArr = []; + var flag = 0; + var scollPostion2 = null; function initTable2() { - idArr = []; + // idArr = []; $("#table2").bootstrapTable({ // 对应table标签的id //method: 'POST', url: "${path}/inHosp/getAssortdetail", // 获取表格数据的url @@ -4461,6 +4606,7 @@ showHeader: true,//是否显示列头。 trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。 queryParams: function (params) { + var currPageSize = this.pageSize; /* if (currPageSize == 2) { currPageSize = 10; @@ -4479,13 +4625,17 @@ limit = currPageSize; this.pageSize = currPageSize; } - + var source =null; + if($("#sourceSearch").val()!=null){ + source=$("#sourceSearch").val(); + } var temp = { limit: limit, //页面大小 offset: offset, //页码 order: params.order, //排位命令（desc，asc） patientId: patientId, assortId: assortId, + source: source, flag: flag }; @@ -4730,7 +4880,12 @@ ], onLoadSuccess: function (result) { //加载成功时执行 // console.info("加载成功"); - idArr = []; + //idArr = []; + $('#table2').bootstrapTable('scrollTo', scollPostion2); + if (idArr != []) { + //对刷新表格的数据选中之前选的id行 + $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr}); + } }, onLoadError: function () { //加载失败时执行 //console.info("加载数据失败"); @@ -4738,11 +4893,16 @@ }, onCheckAll: function (rows) { //点击全选框时触发的操作 if (rows != null && rows.length) { for (var i = 0; i < rows.length; i++) { - idArr.push(rows[i].id) + if(idArr.indexOf(row.id)==-1) { + idArr.push(rows[i].id); + } } } }, onCheck: function (row) {//点击每一个单选框时触发的操作 - idArr.push(row.id) + scollPostion2 = $('#table2').bootstrapTable('getScrollPosition'); + if(idArr.indexOf(row.id)==-1){ + idArr.push(row.id); + } }, onUncheck: function (row) {//取消每一个单选框时对应的操作； var index = idArr.indexOf(row.id); if (index > -1) { @@ -4768,7 +4928,7 @@ $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); } initTree($("#idLab").html()); - idArr = []; + //idArr = []; }); @@ -4952,7 +5112,7 @@ $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); //刷新 $('#table2').bootstrapTable('refresh'); - idArr = []; + // idArr = []; } } @@ -5016,32 +5176,6 @@ data: {"id": id, flag: "1"}, success: function (result) { if (result == 1) { - $.ajax({ - url: "${path}/inHosp/insertLog", - type: "POST", - data: {"logContent": id}, - success: function (result) { - if (result == 1) { - $.ajax({ - url: "${path}/inHosp/insertLog", - type: "POST", - data: {"logContent": id}, - success: function (result) { - - }, error: function () { - - } - }); - //刷新 - $('#table2').bootstrapTable('refresh'); - toastr.success("批量使用成功！"); - } else { - toastr.error("批量使用失败，无记录！"); - } - }, error: function () { - toastr.error("操作失败！"); - } - }); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量作废成功！"); @@ -5112,16 +5246,6 @@ data: {"id": id, flag: "1"}, success: function (result) { if (result == 1) { - $.ajax({ - url: "${path}/inHosp/insertLog", - type: "POST", - data: {"logContent": id}, - success: function (result) { - - }, error: function () { - - } - }); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("作废成功！"); @@ -5324,7 +5448,7 @@ uploadFileFun(); } } - idArr = []; + //idArr = []; }); $("#thPdfBtn").click(function () { diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index f7aa859a..fb68729b 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -201,22 +201,22 @@ } #exampleModal > div > div { - margin-top: 50%; - margin-left: 70%; + margin-top: 30%; + margin-left: 60%; width: 400px; !important; } #delPdfModal > div > div { - margin-top: 50%; + margin-top: 30%; margin-left: 60%; width: 400px; !important; } #tsPdfModal > div > div { - margin-top: 50%; - margin-left: 60%; + margin-top: 40%; + margin-left: 70%; width: 400px; !important; } @@ -236,27 +236,27 @@ } #returnModal .modal-content { - margin-left: 50%; - margin-top: 10%; - width: 120%; + margin-left: 0%; + margin-top: 5%; + width: calc(210%); } #firstModal .modal-content { - margin-left: 50%; - margin-top: 10%; - width: 100%; + margin-left: 0%; + margin-top: 5%; + width: calc(210%); } #verifyModal .modal-content { - margin-left: 50%; - margin-top: 10%; - width: 100%; + margin-left: 0%; + margin-top: 5%; + width: calc(210%); } #WZModal .modal-content { - margin-left: 50%; - margin-top: 10%; - width: 80%; + margin-left: 30%; + margin-top: 0%; + width: calc(150%); } #delPdfPageModal2 > div > div { @@ -268,7 +268,7 @@ #timeLineModal .modal-content { margin-left: 50%; - margin-top: 10%; + margin-top: 5%; width: 100%; } @@ -342,7 +342,7 @@ } #delImgPageModal > div > div { - width: 70%; + width: 400px; margin-left: 55%; margin-top: 20%; } @@ -360,9 +360,24 @@ align: left; margin-left: 5px; height: 34px; - width: 600px; + width: 300px; + !important; + } + + #QXInfoModal .modal-header2 { + width: calc(210%); + } + + #assortNameQX{ + width:600px; !important; } + + /*选中行颜色*/ + .fixed-table-container tbody .selected td { + background-color: #9acfea; + + } @@ -686,6 +701,8 @@ + @@ -990,15 +1007,15 @@
退回内容： - +
护士备注： - +
医生备注： - +
<%--归档病历已全部无纸化无扫描件--%> @@ -1033,15 +1050,15 @@
审核内容： - +
护士备注： - +
医生备注： - +
<%--归档病历已全部无纸化无扫描件--%> @@ -1087,6 +1104,101 @@
+<%--缺陷窗口--%> + + + + + + <%--审核弹窗--%> @@ -951,6 +968,103 @@
+ + +<%--缺陷窗口--%> + + + + + + <%--初审核弹窗--%> + <%--删除pdf某页弹窗--%> --%> -
+
-
+
-
+
@@ -346,7 +399,7 @@ @@ -489,7 +494,7 @@ var max = 0; var selectId = 0; - + var scollPostionVal = null; function initTable() { $('#table').bootstrapTable({ url: "${path}/fault/getFaultList", // 获取表格数据的url @@ -787,8 +792,14 @@ //selectNode=row.id; }, onUncheck: function (rowsAfter, rowsBefore) { - editId = null; //console.log("====取消选中"); + editId = null; + scollPostionVal = null; + }, onCheck:function(row){ + editId = row.id; + if(editId!=null) { + scollPostionVal = $('#table').bootstrapTable('getScrollPosition'); + } }, //如果想双击获取row，把onlClickRow改为onDbClickRow，如下 onDblClickRow: function (row) { @@ -806,6 +817,13 @@ // //选中第一行 // $('#table').bootstrapTable("checkBy", {field: 'id', values: [selectNodeId]}); // } + + if(scollPostionVal!=null) { + $("#table").bootstrapTable('scrollTo', scollPostionVal); + }else{ + scollPostionVal=$(window).height() / 2;//自定义高度 + $("#table").bootstrapTable('scrollTo', scollPostionVal); + } if (selectNodeId != 0) { // $("#typeFlag").selectpicker('val', selectNodeId).trigger("change"); @@ -817,12 +835,9 @@ if (row != null) { if (row.id != null && row.id != "") { - selectId = row.assortId; $("#typeFlag").multiselect('clearSelection', true); $('#typeFlag').multiselect('select', [row.assortId]); - - editId = row.id; btnFlag = 2; $("#content").val(row.content); $('#flag').selectpicker('val', row.backFlag); @@ -1288,7 +1303,6 @@ } else { toastr.warning("病案号不存在!"); } - }); //主任退回确认 @@ -1300,35 +1314,38 @@ // toastr.warning("评分范围0-100！"); // return; // } - var data = {}; - data.archiveDetailId = archiveDetailId; - //退回信息 - data.score = $("#score").val(); - data.backContent = $("#backContent").val(); - data.state = "主任退回"; - data.backFlag = 3; - //根据病案号保存缺陷信息 - $.ajax({ - url: "${path}/lastVerify/updateDetailByArchivId", - type: "POST", - data: data, - success: function (result) { - if (result == 1) { - //关闭modal - $('#returnModal').modal('hide'); //手动关闭 - //$('#firstModal').modal('hide'); //手动关闭 - toastr.success("退回成功！"); - //刷新 - $('#table').bootstrapTable('refresh'); - } else if (result == 2) { - toastr.warning("请先登记未处理缺陷！"); - $('#returnModal').modal('hide'); //手动关闭 - } else { - toastr.error("退回失败！"); + if (archiveDetailId != null && archiveDetailId != "") { + var data = {}; + data.archiveDetailId = archiveDetailId; + //退回信息 + data.score = $("#score").val(); + data.backContent = $("#backContent").val(); + data.state = "主任退回"; + data.backFlag = 3; + //根据病案号保存缺陷信息 + $.ajax({ + url: "${path}/lastVerify/updateDetailByArchivId", + type: "POST", + data: data, + success: function (result) { + if (result == 1) { + //关闭modal + $('#returnModal').modal('hide'); //手动关闭 + //$('#firstModal').modal('hide'); //手动关闭 + toastr.success("退回成功！"); + //刷新 + $('#table').bootstrapTable('refresh'); + } else if (result == 2) { + toastr.warning("请先登记未处理缺陷！"); + $('#returnModal').modal('hide'); //手动关闭 + } else { + toastr.error("退回失败！"); + } } - } - }); - + }); + } else { + toastr.warning("病案号不存在!"); + } }); @@ -1383,8 +1400,6 @@ } else { toastr.warning("病案不存在!"); } - - }, error: function () { toastr.error("操作失败！"); } diff --git a/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp b/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp index a8419aa9..a45345cf 100644 --- a/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp +++ b/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp @@ -74,16 +74,20 @@ width: 98%; } + #table{ + /*table-layout:fixed;*/ + scroll:auto; + } + /*选中行颜色*/ .fixed-table-container tbody .selected td { - background-color: #3c8dbc; + background-color: #9acfea; } table tr { color: #000 } - #firstModal .modal-content { margin-left: 50%; margin-top: 35%; @@ -91,15 +95,15 @@ } #lastModal .modal-content { - margin-left: 50%; - margin-top: 35%; - width: 100%; + margin-left: -30%; + margin-top: 20%; + width: calc(150%); } #lastBackModal .modal-content { - margin-left: 50%; - margin-top: 35%; - width: 120%; + margin-left:-30%; + margin-top: 20%; + width: calc(150%); } #assortNameQX { @@ -214,7 +218,7 @@
-
+
<%--
--%> @@ -240,7 +244,7 @@
内容： - +
@@ -274,8 +278,8 @@ 分
- 退回内容： - + 内容： +
@@ -360,6 +364,7 @@ var max = 0; var selectId=0; + var scollPostionVal = null; function initTable() { $("#roleVal").hide(); $('#table').bootstrapTable({ @@ -382,12 +387,13 @@ toolbar: '#toolbar',//指定工具栏 toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right' //height:'300', + width: '100%', height: $(window).height() / 2,//自定义高度 columns: [{ title: '全选', field: 'select', //复选框 checkbox: true, - width: 15, + width: 30, align: 'center', valign: 'middle' }, { @@ -398,7 +404,10 @@ field: 'assortId', title: '缺陷类型ID', width: 150, - visible: false + visible: false, + formatter: function (value, row, index) { + return value + } }, { field: 'assortName', title: '缺陷类型', @@ -412,7 +421,7 @@ var result = '' + value + '分'; return result } - },{ + }, { field: 'minusPoint', title: '扣分值', width: 80, @@ -421,13 +430,13 @@ var result = '' + value + '分'; return result } - },{ + }, + { title: '退回', field: 'backFlag', align: 'center', width: 100, formatter: function (value, row, index) { - if (btnFlag == 3) { selectNodeId = row.id; btnFlag=0; @@ -547,7 +556,6 @@ width: 250 }], onClickRow: function (row) { - if (row.archivestate == "复审退回" || row.archivestate == "已归档" || row.archivestate == "已认证") { $("#firstBtn").hide(); $("#backBtn").hide(); @@ -605,8 +613,6 @@ $("#dealBtn").hide(); $("#dealCancelBtn").show(); } - - editId = row.id; btnFlag = 2; $("#content").val(row.content); if (row.assortId == definedId) { @@ -688,8 +694,14 @@ } }, onUncheck: function (rowsAfter, rowsBefore) { - editId = null; //console.log("====取消选中"); + editId = null; + scollPostionVal = null; + }, onCheck:function(row){ + editId = row.id; + if(editId!=null) { + scollPostionVal = $('#table').bootstrapTable('getScrollPosition'); + } }, //如果想双击获取row，把onlClickRow改为onDbClickRow，如下 onDblClickRow: function (row) { @@ -699,6 +711,8 @@ },onRefresh: function (result) { },onLoadSuccess: function (result) { //加载成功时执行 + //定位修改后的行的位置 + // if (editId != null) { // //对刷新表格的数据选中之前选的id行 // $('#table').bootstrapTable("checkBy", {field: 'id', values: [editId]}); @@ -707,9 +721,13 @@ // //选中第一行 // $('#table').bootstrapTable("checkBy", {field: 'id', values: [selectNodeId]}); // } - + if(scollPostionVal!=null) { + $("#table").bootstrapTable('scrollTo', scollPostionVal); + }else{ + scollPostionVal=$(window).height() / 2;//自定义高度 + $("#table").bootstrapTable('scrollTo', scollPostionVal); + } if(selectNodeId!=0) { - // $("#typeFlag").selectpicker('val', selectNodeId).trigger("change"); $('#table').bootstrapTable("checkBy", {field: 'id', values: [selectNodeId]}); } @@ -1085,44 +1103,47 @@ // toastr.warning("评分范围0-100！"); // return; // } - var data = {}; - data.archiveDetailId = archiveDetailId; - //退回信息 - data.score = $("#scoreLast").val(); - data.backContent = $("#backContentLast").val(); - data.state = "复审退回"; - data.backFlag = 4; - //根据病案号保存缺陷信息 - $.ajax({ - url: "${path}/lastVerify/updateDetailByArchivId", - type: "POST", - data: data, - success: function (result) { - if (result == 1) { - //关闭modal - $('#lastBackModal').modal('hide'); //手动关闭 - //$('#firstModal').modal('hide'); //手动关闭 - toastr.success("退回成功！"); - //刷新 - $('#table').bootstrapTable('refresh'); - }else if (result == 2) { - toastr.warning("请先登记未处理缺陷！"); - $('#lastBackModal').modal('hide'); //手动关闭 - } else { - toastr.error("退回失败！"); + if (archiveDetailId != null && archiveDetailId != "") { + var data = {}; + data.archiveDetailId = archiveDetailId; + //退回信息 + data.score = $("#scoreLast").val(); + data.backContent = $("#backContentLast").val(); + data.state = "复审退回"; + data.backFlag = 4; + //根据病案号保存缺陷信息 + $.ajax({ + url: "${path}/lastVerify/updateDetailByArchivId", + type: "POST", + data: data, + success: function (result) { + if (result == 1) { + //关闭modal + $('#lastBackModal').modal('hide'); //手动关闭 + //$('#firstModal').modal('hide'); //手动关闭 + toastr.success("退回成功！"); + //刷新 + $('#table').bootstrapTable('refresh'); + }else if (result == 2) { + toastr.warning("请先登记未处理缺陷！"); + $('#lastBackModal').modal('hide'); //手动关闭 + } else { + toastr.error("退回失败！"); + } } - } - }); - - //修改master表score字段 保存总分数 - $.ajax({ - url: "${path}/lastVerify/updateScore", - type: "POST", - data: {id:archiveDetailId,score:$("#scoreLast").val()}, - success: function (result) { - } - }); + }); + //修改master表score字段 保存总分数 + $.ajax({ + url: "${path}/lastVerify/updateScore", + type: "POST", + data: {id:archiveDetailId,score:$("#scoreLast").val()}, + success: function (result) { + } + }); + } else { + toastr.warning("病案号不存在!"); + } }); diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index 654a5f7e..effa2f75 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -31,14 +31,14 @@ padding: 5px 5px 5px 5px !important; } - .modal-dialog { + /*.modal-dialog { position: fixed; !important; top: 0px; !important; left: 0px; !important; - } + }*/ .modal-footer { padding: 5px; @@ -72,10 +72,12 @@ .modal { margin-left: -45%; - overflow-x: auto; + overflow: auto; /*z-index: 1049;*/ } + + .divCss4 { border-top: 1px solid #e5e5e5; width: 97.5%; @@ -156,12 +158,12 @@ } #delPdfPageModal .modal-header2 { - margin-left: 20%; + margin-left: 5%; width: calc(200%); /*margin-left:-15%;*/ } #delPdfPageModal .modal-content { - margin-left: 20%; + margin-left: 5%; width: calc(200%); /*margin-left:-15%;*/ height: calc(100vh - 100px); overflow: hidden; @@ -218,28 +220,28 @@ #assortModal > div > div { margin-top: 30%; - margin-left: 90%; + margin-left: 60%; width: 500px; !important; } #exampleModal > div > div { - margin-top: 50%; - margin-left: 90%; + margin-top: 30%; + margin-left: 60%; width: 400px; !important; } #delPdfModal > div > div { - margin-top: 50%; - margin-left: 100%; + margin-top: 30%; + margin-left: 60%; width: 400px; !important; } #tsPdfModal > div > div { - margin-top: 50%; - margin-left: 90%; + margin-top: 40%; + margin-left: 70%; width: 400px; !important; } @@ -258,19 +260,19 @@ } #firstModal .modal-content { - margin-left: 90%; - margin-top: 10%; - width: 100%; + width: calc(200%); + margin-left: 5%; } #returnModal .modal-content { - margin-left: 50%; - margin-top: 10%; - width: 160%; + margin-left: 5%; + margin-top: 5%; + width: calc(200%); } - #qxModal > div > div { - margin-left: 20%; + #qxModal .modal-content { + width: calc(200%); + margin-left: 5%; } #returnModal2 .modal-content { @@ -297,16 +299,34 @@ color: blue; } - #selModal { + #selModal .modal-header2 { + margin-left: -35%; width: calc(200%); !important; } - #selModal > div > div { + #selModal .modal-content { + margin-left: -35%; width: calc(200%); !important; } + /* #selModal { + width: calc(200%); + height:500px; + overflow-x: hidden; + overflow-y: auto; + !important; + } + + + #selModal .modal-content { + width: calc(200%); + height: calc(100vh - 120px); + overflow:hidden + !important; + }*/ + #delPdfPageModal2 > div > div { margin-top: 20%; margin-left: 60%; @@ -315,8 +335,8 @@ } #timeLineModal .modal-content { - margin-left: 90%; - margin-top: 10%; + margin-left: 50%; + margin-top: 5%; width: 100%; } @@ -404,8 +424,8 @@ } #delImgPageModal > div > div { - width: 70%; - margin-left: 60%; + width: 400px; + margin-left: 55%; margin-top: 20%; } @@ -413,9 +433,43 @@ align: left; margin-left: 5px; height: 34px; - width: 600px; + width: 300px; !important; } + + + #assortNameQX{ + width:600px; + !important; + } + + #tableQX{ + text-overflow: ellipsis; + white-space: nowrap; + /* width:100%;*/ + overflow:auto; + + + !important; + } + + #QXInfoModal .modal-content { + margin-left: 20%; + width: calc(210%); + height: calc(100vh - 80px); + } + + #QXInfoModal .modal-header2 { + margin-left: 20%; + width: calc(210%); + + } + + /*选中行颜色*/ + .fixed-table-container tbody .selected td { + background-color: #9acfea; + + } @@ -554,7 +608,7 @@ <%----%> - @@ -766,10 +822,57 @@ -<%--缺陷详情弹窗--%> +<%--缺陷窗口--%> + + + +