diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index e2485696..e2f34505 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -402,6 +402,7 @@ public class beHospitaledController { @ResponseBody @RequestMapping(value = "/withdrawDoctorOrNurs") public String withdrawDoctorOrNurs(HttpServletRequest request, HttpServletResponse response,Archive_Master_Vo archiveMasterVo) { + response.setCharacterEncoding("utf-8"); Archive_Master archiveMaster=new Archive_Master(); archiveMaster.setId(archiveMasterVo.getId()); archiveMaster.setCmtDoctor(archiveMasterVo.getCmtDoctor()); @@ -410,24 +411,23 @@ public class beHospitaledController { 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)) { + 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){ + Archive_Master_Following archive_master_following = new Archive_Master_Following(); + archive_master_following.setMasterId(archiveMasterVo.getId()); + if (archiveMasterVo.getCmtDoctor()==0){ //医生撤回操作 archiveMaster.setCmtDoctorDate(""); archiveMaster.setDoctorName(""); + //following表中添加归档医生撤回操作记录 archive_master_following.setFollowingType("2"); archive_master_following.setFollowingContent("主管医生撤回提交"); @@ -435,8 +435,9 @@ public class beHospitaledController { archive_master_following.setHandleId(username); archive_master_following.setHandleName(handleName); bol = archive_master_followingService.insertSelective(archive_master_following); + result="归档医生撤回成功!"; } - if (archiveMasterVo.getCmtNurse()==0&&archiveMasterVo.getCmtDoctor()==-1){ + if (archiveMasterVo.getCmtNurse()==0){ //护士撤回操作 archiveMaster.setCmtNurseDate(""); archiveMaster.setNurseName(""); @@ -448,13 +449,17 @@ public class beHospitaledController { archive_master_following.setHandleId(username); archive_master_following.setHandleName(handleName); bol = archive_master_followingService.insertSelective(archive_master_following); + result="归档护士撤回成功!"; } archiveMaster.setIsscaned(archiveMasterVo.getIsscaned()); bol=archiveMasterService.updateByClo(archiveMaster); - if (bol==1){ - result = "成功"; - }else{ - result = "撤回失败"; + if (bol!=1){ + if (archiveMasterVo.getCmtDoctor()==0){ + result="归档医生撤回失败!"; + } + if (archiveMasterVo.getCmtNurse()==0){ + result="归档护士撤回失败!"; + } } }else{ result = "病案不存在！"; diff --git a/src/main/java/com/emr/controller/inHospitalController.java b/src/main/java/com/emr/controller/inHospitalController.java index 80e373c1..a08eb5f5 100644 --- a/src/main/java/com/emr/controller/inHospitalController.java +++ b/src/main/java/com/emr/controller/inHospitalController.java @@ -760,7 +760,6 @@ public class inHospitalController { if (picList.getAssortId() != entity.getAssortId() || picList.getRelationId() != entity.getRelationId()) { - //if(img[img.length-1]!= obj.get("fileSrc")){ //将之前文件删除 // File file1 = new File(realPath + "/static" + picList.getMaxPicture().split("static")[1]); @@ -821,7 +820,6 @@ public class inHospitalController { //file.delete(); boolean b = file.delete(); - if (!b) { FileWriter fw = new FileWriter(file); fw.close(); @@ -841,9 +839,7 @@ public class inHospitalController { result = "批量上传失败！"; } } - } else { - //得到图片名 String oldName = imgs[t].getOriginalFilename();// 如apple1.jpg String lasName = oldName.substring(oldName.lastIndexOf(".") + 1); @@ -867,37 +863,29 @@ public class inHospitalController { t++; } } else { - //得到图片名 String oldName = imgs[t].getOriginalFilename();// 如apple1.jpg String lasName = oldName.substring(oldName.lastIndexOf(".") + 1); if ("GIF".equals(lasName.toUpperCase()) || "JPEG".equals(lasName.toUpperCase()) || "PNG".equals(lasName.toUpperCase()) || "JPG".equals(lasName.toUpperCase())) { - - // 自定义的文件名称String.valueOf(System.currentTimeMillis()) trueFileName = firstFile + idTime + oldName; - //上传图片 imgs[t].transferTo(new File(realPath + path2 + pathType + trueFileName)); - //新的图片地址 entity.setMaxPicture(realPath + path2 + pathType + trueFileName); entity.setId(idTime); entity.setCreater(username); entity.setCreateTime(nowTime); entity.setEffective(1); - //插入记录 bol = emrPictureService.insertSel(entity); } t = t + 1; - } if (bol == 1) { //根据类别生成pdf:pathType(String.valueOf(System.currentTimeMillis()) ) String pdfFile = pathType.replace("\\", "") + ".pdf"; - //根据病案号和类别查询是否存在 Archive_Detail detail = new Archive_Detail(); detail.setMasterid(masterID); @@ -911,15 +899,13 @@ public class inHospitalController { detail.setFlag("0");//显示 detail.setSource("后台"); detail.setSys("emr_medical_record"); - detail.setTitle("自动生成分段类PDF"); + detail.setTitle("自动生成"+obj.get("selectName")+"PDF"); detail.setUploaddatetime(nowTime); detail.setPdfPath(realPath + masterID + "\\" + pathType + pdfFile); //类名 int b = archiveDetailService.insertSel(detail); - } - //判断pdf是否存在，将之前文件删除 File file1 = new File(realPath + masterID + "\\" + pathType + pdfFile); if (file1.exists() && file1.isFile()) { @@ -928,25 +914,30 @@ public class inHospitalController { } //读取指定路径下的文件名和目录名 - /* List arr = new ArrayList(); - arr.add(pathType.replace("\\", "")); - //图片转PDF(病案号文件夹+类别文件夹) - // String str = PrintToPdfUtil.toPdf(realPath + path2 + pathType, realPath + masterID + "\\" + pathType + pdfFile, arr); - File file=new File(realPath + path2 + pathType);*/ - - //读取指定路径下的文件名和目录名 + String pdfPathFile=realPath + path2+pathType.replace("\\", "")+"\\"+pathType.replace("\\", "")+".pdf"; + //获取图片的绝对路径，根据路径合成一份pdf文件 + entity = new Emr_Picture(); + entity.setRelationId(masterID); + entity.setAssortId(obj.get("selectVal").toString()); + List imgsList=emrPictureService.selectByClo(entity); + result=PrintToPdfUtil.imgsListTopdf(pdfPathFile,imgsList); + if(result.equals("合成pdf成功")){ + result = "批量上传成功！"; + }else{ + result=result; + } + /* 根据文件夹合成图片 List dirList = new ArrayList(); dirList.add(pathType.replace("\\", "")); try { PrintToPdfUtil.image2pdf(realPath + path2, dirList); } catch (DocumentException e) { e.printStackTrace(); - } - result = "批量上传成功！"; + }*/ + } else { result = "批量上传失败！"; } - } else { result = "没有找到相对应的文件！"; } diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index 8ffb7869..ccf6c6fd 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -122,111 +122,85 @@ public class lastVerifyController { Emr_Fault_Detail entityFault=new Emr_Fault_Detail(); entityFault.setArchiveDetailId(emrFaultDetail.getArchiveDetailId()); List list=emrFaultDetailService.selectByArchiveId(entityFault); + int doctorFlagNum=0; + int nurseFlagNum=0; if(list.size()>0){ + // 从session获取用户名 + Subject currentUser = SecurityUtils.getSubject(); + Session session = currentUser.getSession(); + String username = (String) session.getAttribute("userSession");//获取前面登录的用户名 + SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String nowTime = format1.format(new Date()); + + //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("主任退回")) { //1医生 ，2护士 for (int k = 0; k < list.size(); k++) { if ("1".equals(list.get(k).getBackFlag()) || "5".equals(list.get(k).getBackFlag())) { - archiveMaster.setCmtDoctor(0); - archiveMaster.setDoctorName(""); - archiveMaster.setCmtDoctorDate(""); + doctorFlagNum+=1; } if ("2".equals(list.get(k).getBackFlag()) || "6".equals(list.get(k).getBackFlag())) { - archiveMaster.setCmtNurse(0); - archiveMaster.setNurseName(""); - archiveMaster.setCmtNurseDate(""); + nurseFlagNum+=1; } } - } - bol = archiveMasterService.updateByClo(archiveMaster); - //修改复审内容 - if (bol == 1) { - // 从session获取用户名 - Subject currentUser = SecurityUtils.getSubject(); - Session session = currentUser.getSession(); - String username = (String) session.getAttribute("userSession");//获取前面登录的用户名 - SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String nowTime = format1.format(new Date()); - //判断缺陷记录是否有医生或护士（有则退回状态改1） - - //参数输入 - emrFaultDetail.setCreater(username); - emrFaultDetail.setCreateTime(nowTime); - //插入缺陷记录 - bol = emrFaultDetailService.insertSel(emrFaultDetail); + if(doctorFlagNum>0){ + archiveMaster.setCmtDoctor(0); + archiveMaster.setDoctorName(""); + archiveMaster.setCmtDoctorDate(""); + + //2021-01-30 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); - //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("病案室退回科主任"); + if(nurseFlagNum>0){ + archiveMaster.setCmtNurse(0); + archiveMaster.setNurseName(""); + archiveMaster.setCmtNurseDate(""); + + //2021-01-30 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); } - //通过病案号和标识判断是否存在记录 -// Emr_Fault_Detail entity = emrFaultDetailService.selectByArchiveDetailId(emrFaultDetail); -// if (entity != null) { -// //参数输入 -// entity.setUpdater(username); -// emrFaultDetail.setUpdater(username); -// entity.setUpdateTime(nowTime); -// entity.setScore(emrFaultDetail.getScore()); -// entity.setBackContent(emrFaultDetail.getBackContent()); -// entity.setBackFlag(emrFaultDetail.getBackFlag()); -// //2、修改缺陷记录 -// bol = emrFaultDetailService.updateCloByPrimaryKey(entity); -// } else { -// //参数输入 -// emrFaultDetail.setCreater(username); -// emrFaultDetail.setCreateTime(nowTime); -// //插入缺陷记录 -// bol = emrFaultDetailService.insertSel(emrFaultDetail); -// } - } + + //修改复审内容 + if (bol == 1) { + //判断缺陷记录是否有医生或护士（有则退回状态改1） + //参数输入 + emrFaultDetail.setCreater(username); + emrFaultDetail.setCreateTime(nowTime); + //插入缺陷记录 + bol = emrFaultDetailService.insertSel(emrFaultDetail); + } + } + bol = archiveMasterService.updateByClo(archiveMaster); + if (emrFaultDetail.getState().equals("复审退回")){ + //2021-01-30 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); + } }else{ bol=2; } -// archiveMaster.setCmtDoctor(0); -// archiveMaster.setCmtNurse(0); -// archiveMaster.setDoctorName(""); -// archiveMaster.setNurseName(""); -// archiveMaster.setCmtNurseDate(""); -// archiveMaster.setCmtDoctorDate(""); - - } - return bol; } diff --git a/src/main/java/com/emr/controller/storageController.java b/src/main/java/com/emr/controller/storageController.java index 280832a6..425de28e 100644 --- a/src/main/java/com/emr/controller/storageController.java +++ b/src/main/java/com/emr/controller/storageController.java @@ -84,7 +84,6 @@ public class storageController { } } } - //文件名 String fileName = "召回信息数据" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; //ExportExcelUtil @@ -143,8 +142,6 @@ public class storageController { archiveMasterFollowing.setRemark(emrFaultDetail.getRecallReason()); bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing); } - - } return bol; } diff --git a/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java b/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java index c90d66e6..0e6cdad0 100644 --- a/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java +++ b/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java @@ -17,8 +17,6 @@ public interface Emr_Fault_DetailMapper { int insertSel(Emr_Fault_Detail record); - Emr_Fault_Detail selectByPrimaryKey(Integer id); - int updateCloByPrimaryKey(Emr_Fault_Detail record); int updateByPrimaryKey(Emr_Fault_Detail record); 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 52db1a6c..33c18a9a 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -121,6 +121,8 @@ public class Archive_Master_Vo { private String overdueDays; + private String score; + private int numb; public String getOverdueDays() { @@ -552,6 +554,14 @@ public class Archive_Master_Vo { this.bedNumber = bedNumber; } + public String getScore() { + return score; + } + + public void setScore(String score) { + this.score = score; + } + public int getNumb() { return numb; } diff --git a/src/main/java/com/emr/util/PrintToPdfUtil.java b/src/main/java/com/emr/util/PrintToPdfUtil.java index 56b9d5dd..07dca68d 100644 --- a/src/main/java/com/emr/util/PrintToPdfUtil.java +++ b/src/main/java/com/emr/util/PrintToPdfUtil.java @@ -7,6 +7,7 @@ package com.emr.util; import com.emr.entity.Archive_Detail; +import com.emr.entity.Emr_Picture; import com.emr.entity.MergePDFItem; import com.itextpdf.text.Element; import com.itextpdf.text.Phrase; @@ -128,9 +129,75 @@ public class PrintToPdfUtil { } + } + } + } + + public static String imgsListTopdf(String pdfPath,List imgsList) throws DocumentException, IOException { + String result="合成pdf成功"; + File file=new File(pdfPath); + if(file.exists()){ + file.delete(); + } + //循环类别 + if(pdfPath.length()>0){ + file=new File(pdfPath); + Document document = new Document(); + OutputStream os = new FileOutputStream(file); + PdfWriter.getInstance(document, os); + document.open(); + if(imgsList.size()>0){ + Image img =null; + File file1=null; + String info=""; + for(int j=0;j A4_weight) && (h < A4_height)) { + percent = (A4_weight * 100) / w; + } else if ((w < A4_weight) && (h > A4_height)) { + percent = (A4_height * 100) / h; + } else if ((w > A4_weight) && (h > A4_height)) { + percent = (A4_weight * 100) / w; + h = (h * percent) / 100; + if (h > A4_height) { + percent = (A4_height * 100) / h; + } + } + // 读取图片流 + img.setAlignment(com.lowagie.text.Image.ALIGN_CENTER); + if (percent != 100) { + img.scaleAbsolute(A4_weight, A4_height); + } else { + img.scalePercent(percent); + } + document.add(img); + }else{ + //图片格式后缀不对! + info+=file1.getName().toString()+","; + result="文件："+info+"，图片格式后缀不对!"; + } + }else{ + //图片不存在! + result="图片不存在!"; + } + } + + document.close(); } + }else{ + result="图片记录不存在!"; } + return result; } static Document doc =null; @@ -868,7 +935,7 @@ public class PrintToPdfUtil { - public static void main(String[] args) throws IOException { + public static void main(String[] args) throws IOException, DocumentException { String pdfFile = String.valueOf(System.currentTimeMillis()); //读取指定路径下的文件名和目录名 List list = new ArrayList(); @@ -920,11 +987,21 @@ public class PrintToPdfUtil { //复制pdf文件 /*File file=new File("C:\\Users\\Administrator\\Desktop\\images\\报表工具v2.4操作手册文档.pdf"); save(file, "cc.pdf", "C:\\Users\\Administrator\\Desktop\\images");*/ - String fileName="C:\\Users\\HIPAA\\Desktop\\测试\\sss7.pdf"; - fileName = fileName.substring(fileName.lastIndexOf("\\")+1).replace(".pdf",""); - - System.out.println("方法二：fileName = " + fileName); + //String fileName="C:\\Users\\HIPAA\\Desktop\\测试\\sss7.pdf"; + // fileName = fileName.substring(fileName.lastIndexOf("\\")+1).replace(".pdf",""); + // System.out.println("方法二：fileName = " + fileName); + + List list2 = new ArrayList(); + Emr_Picture pic=new Emr_Picture(); + pic.setMaxPicture("D:\\test\\uploadImage\\a490ca0b-879f-4ae4-9238-33c44e5fda99\\3\\202012931178716189095653488.jpg"); + list2.add(pic); + pic=new Emr_Picture(); + pic.setMaxPicture("D:\\test\\uploadImage\\a490ca0b-879f-4ae4-9238-33c44e5fda99\\3\\2020129311787161890956595411.jpg"); + list2.add(pic); + String pdfPath="D:\\test\\uploadImage\\a490ca0b-879f-4ae4-9238-33c44e5fda99\\3\\3.pdf"; + String fileName=imgsListTopdf(pdfPath,list2); + System.out.println("合成pdf: " + fileName); } diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index 2a93f343..3744bcb9 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -96,6 +96,9 @@ and t.flag = #{flag,jdbcType=NVARCHAR} + + and t.title like '%'+#{title,jdbcType=VARCHAR}+'%' + ORDER BY z.assort_sort,t.Title,t.page_number,t.UpLoadDateTime diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 6e40bfd9..de1f9b6d 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -384,8 +384,8 @@ color: red; } - #upLoadImgBtn{ - width:35%; + #upLoadImgBtn { + width: 35%; text-align: left; } @@ -417,11 +417,10 @@ width: calc(200%); /*margin-left:-15%;*/ height: calc(100vh - 100px); overflow-x: hidden; - overflow-y:auto; + overflow-y: auto; !important; } - #wzContent { margin-left: 30px; margin-right: 30px; @@ -430,7 +429,27 @@ overflow-y: hidden; } + #titleSearch{ + align:left; + margin-left: 5px; + height: 34px; + width:600px; + !important; + } + #tableQX{ + text-overflow: ellipsis; + white-space: nowrap; + width:100%; + overflow:auto; + + !important; + } + + #assortNameQX{ + width:600px; + !important; + } @@ -660,27 +679,35 @@
-
- - - - - <%----%> - - +
+
+ 只显示作废 +
+
+ + + + + <%----%> + + +
-
-
-
- 只显示作废 - <%----%> +
+
+
+
标题: + + +
@@ -986,12 +1013,30 @@
-
- -
+
+
+
+ + +
+
+ + +
+ +
+
+ +
+
+
+ @@ -1316,16 +1361,20 @@
页码： - - + -
---不可恢复--
- -
@@ -1399,7 +1448,7 @@
-<%--确认框提示清空所有图片--%> +<%--护士撤回--%>