diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
index ada5ff0..c6679aa 100644
--- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
+++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
@@ -181,23 +181,6 @@ public class CommomSearchController {
         }
     }
 
-    //阿拉伯数字转中文
-    private static String toChinese(String str) {
-        String[] s1 = {"零", "一", "二", "三", "四", "五", "六", "七", "八", "九"};
-        String[] s2 = {"十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千"};
-        String result = "";
-        int n = str.length();
-        for (int i = 0; i < n; i++) {
-            int num = str.charAt(i) - '0';
-            if (i != n - 1 && num != 0) {
-                result += s1[num] + s2[n - 2 - i];
-            } else {
-                result += s1[num];
-            }
-        }
-        return result;
-    }
-
     //加载科室
     @RequestMapping("getDept")
     @ResponseBody
@@ -224,10 +207,8 @@ public class CommomSearchController {
         return JSON.toJSONString(commomVo);
     }
 
-
     /**
      * 加载公共表信息
-     *
      * @return
      */
     @RequestMapping("getCommonInfo")
@@ -267,7 +248,6 @@ public class CommomSearchController {
             return null;
         }
     }
-    /*******************************************病案预览操作*********************************************************/
 
     //加载转归情况
     @RequestMapping("getDiagStatus174")
@@ -281,8 +261,20 @@ public class CommomSearchController {
             return null;
         }
     }
-
-    /**
+    /***
+     * 根据用户权限查询分段
+     * @param request
+     * @return
+     */
+    @RequestMapping("selectIsPowerByUser")
+    @ResponseBody
+    public String selectIsPowerByUser(HttpServletRequest request) {
+        Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
+        List<Zd_Assort> zdAssorts = assortService.selectAllByPower(user);
+        return JSON.toJSONString(zdAssorts);
+    }
+    /******************************病案预览操作****************************/
+    /**英德、湛江
      * @MethodName: showRecord
      * @Description: 跳转到病案预览
      * @Param String patientId:patientId
@@ -310,6 +302,7 @@ public class CommomSearchController {
     }
 
     /**
+     * 脐血库
      * @MethodName: showRecordBlood
      * @Description: 跳转到档案预览
      * @Param String patientId:patientId
@@ -340,7 +333,7 @@ public class CommomSearchController {
         return "recordManage/commomSearch/showRecordBlood";
     }
 
-    /**
+    /**174医院、祈福
      * @MethodName: showRecord174
      * @Description: 跳转到档案预览
      * @Param String patientId:patientId
@@ -429,6 +422,7 @@ public class CommomSearchController {
     }
 
     /**
+     * 湛江、英德查看pdfIframe页
      * @MethodName: showRecordIframe
      * @Description: 病案预览Iframe, 按住院次数显示页面
      * @Param String patientId:patientId
@@ -460,7 +454,14 @@ public class CommomSearchController {
         return "recordManage/commomSearch/showRecordIframe";
     }
 
-    //脐血库
+    /**
+     * 脐血库、祈福
+     * 跳转查看pdfiframe页
+     * @param patientId
+     * @param model
+     * @param request
+     * @return
+     */
     @RequestMapping("showRecordIframeBlood")
     public String showRecordIframeBlood(String patientId,Model model, HttpServletRequest request) {
         model.addAttribute("patientId", patientId);
@@ -489,38 +490,7 @@ public class CommomSearchController {
         return "recordManage/commomSearch/showRecordIframeBlood";
     }
 
-    //查询分段集合
-    @RequestMapping("selectIsPowerByUser")
-    @ResponseBody
-    public String selectIsPowerByUser(HttpServletRequest request) {
-        Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
-        List<Zd_Assort> zdAssorts = assortService.selectAllByPower(user);
-        return JSON.toJSONString(zdAssorts);
-    }
-
-    @RequiresPermissions("/commom/updateCommomInfo")
-    @OptionalLog(module = "保存",methods = "病案信息修改")
-    @RequestMapping("updateCommomInfo")
-    @ResponseBody
-    public ResultUtil updateCommomInfo(CommomVo commomVo) throws Exception{
-        if (null != commomVo.getInpatientNo()){
-            int vo = commomMapper.selectCountByPatients(commomVo.getPatientId());
-            if (vo > 0){
-                int i = commomMapper.updateByPrimaryKeySelective(commomVo);
-                if (i > 0){
-                    return ResultUtil.ok();
-                } else {
-                    return ResultUtil.error("修改失败!");
-                }
-            } else {
-                return ResultUtil.error("修改失败,该病案主键不存在!");
-            }
-        } else {
-            return ResultUtil.error("修改失败,主键不能为空!");
-        }
-    }
-
-    /**
+    /**查看其它诊断
      * @MethodName: getOtherDiagNameByAdmissTimesAndInpatientNo
      * @Description: 根据admissTimes和inpatientNo查询包含其他诊断名称的基本信息
      * @Param Integer admissTimes:住院次数,String inpatientNo：病案号
@@ -573,9 +543,9 @@ public class CommomSearchController {
         }
         return null;
     }
-    //脐血库
 
     /**
+     * 英德湛江分类树
      * @MethodName: getRecordTypeTree
      * @Description: 根据patientId组织病案分类集合树
      * @Param String patientId:patientId
@@ -663,135 +633,12 @@ public class CommomSearchController {
     }
 
     /**
-     * @MethodName: getRecordTree
-     * @Description: 根据patientId组织病案集合树
-     * @Param String patientId:patientId
-     * @Return
-     * @Author: 曾文和
-     * @CreateDate: 2019-06-04
-     * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-04
-     * @UpdateRemark: 更新说明
-     * @Version: 1.0
+     * 脐血、祈福分类树
+     * @param patientId
+     * @param typeId
+     * @param request
+     * @return
      */
-    @RequestMapping(value = "getRecordTree", produces = {"text/json;charset=UTF-8"})
-    @ResponseBody
-    public String getRecordTree(String patientId, Integer typeId, HttpServletRequest request) {
-        long start = System.currentTimeMillis();
-        List<CommomTree> treeList = new ArrayList<>();
-        //查询该有的权限分类
-        try {
-            Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
-            List<CommomTree> commomVos = new ArrayList<>();
-            //先查归档表
-            if (user.getRoleId() == 0 || user.getRoleId() == -100) {
-                commomVos = commomMapper.selectScanCountByMedicalPatientId(patientId, null, null);
-            } else {
-                commomVos = commomMapper.selectScanCountByMedicalPatientId(patientId, user.getRoleId(), user.getUserId());
-            }
-            //归档不表不存在，查病案数据表
-            //从归档查type为1
-            int type = 1;
-            if (null == commomVos || commomVos.isEmpty()) {
-                if (user.getRoleId() == 0 || user.getRoleId() == -100) {
-                    commomVos = commomMapper.selectScanPathByPatientId(patientId, null, null);
-                } else {
-                    commomVos = commomMapper.selectScanPathByPatientId(patientId, user.getRoleId(), user.getUserId());
-                }
-                type = 2;
-            }
-            long end = System.currentTimeMillis();
-            System.out.println((end - start) / 1000 + "s");
-            //按打印分类id查询归属分类集合
-            List<Emr_Type_Related> typeRelateds = new ArrayList<>();
-            if (typeId != null) {
-                typeRelateds = typeRelatedService.selectAssortIdsByTypeId(typeId);
-            }
-
-            //第一级：全部影像资料
-            CommomTree tree1 = new CommomTree();
-            Integer id = 1;
-            tree1.setId(id);
-            tree1.setAssortName("全部影像资料");
-            if (null != commomVos && !commomVos.isEmpty()) {
-                //去重，取出不重复的分类集合
-                Map<String, CommomTree> assortMap = new LinkedHashMap<>();
-                for (int i = 0; i < commomVos.size(); i++) {
-                    assortMap.put(commomVos.get(i).getAssortId(), commomVos.get(i));
-                }
-                //判断分类是否全选，全选，父类跟着全选
-                if (null != typeRelateds && !typeRelateds.isEmpty()) {
-                    Boolean checkedFlag = true;
-                    for (Map.Entry<String, CommomTree> map : assortMap.entrySet()) {
-                        //定义是否存在
-                        Boolean flag = false;
-                        for (int i = 0; i < typeRelateds.size(); i++) {
-                            if (typeRelateds.get(i).getAssortId().equals(map.getKey())) {
-                                flag = true;
-                                break;
-                            }
-                        }
-                        if (!flag) {
-                            checkedFlag = false;
-                            break;
-                        }
-                    }
-                    if (checkedFlag) {
-                        tree1.setChecked("true");
-                    }
-                }
-                treeList.add(tree1);
-                int oneId = 0;
-                for (Map.Entry<String, CommomTree> map : assortMap.entrySet()) {
-                    id++;
-                    oneId = id;
-                    String assortId = map.getValue().getAssortId();
-                    CommomTree tree2 = new CommomTree();
-                    tree2.setId(id);
-                    tree2.setParentId(1);
-                    tree2.setAssortId(map.getValue().getAssortId());
-                    //判断选中
-                    Boolean checkFlag = false;
-                    if (null != typeRelateds && !typeRelateds.isEmpty()) {
-                        for (int j = 0; j < typeRelateds.size(); j++) {
-                            if (StringUtils.isNotBlank(assortId) && assortId.equals(typeRelateds.get(j).getAssortId())) {
-                                tree2.setChecked("true");
-                                checkFlag = true;
-                                break;
-                            }
-                        }
-                    }
-                    //定义该类影像图片数量
-                    int scanPathCount = 0;
-                    //第二层 图片
-                    for (int i = 0; i < commomVos.size(); i++) {
-                        if (StringUtils.isNotBlank(assortId) && StringUtils.isNotBlank(commomVos.get(i).getAssortId()) &&
-                                assortId.equals(commomVos.get(i).getAssortId())) {
-                            id++;
-                            CommomTree tree3 = new CommomTree();
-                            tree3.setId(id);
-                            tree3.setParentId(oneId);
-                            tree3.setAssortId(assortId);
-                            if (checkFlag) {
-                                tree3.setChecked("true");
-                            }
-                            tree3.setAssortName(commomVos.get(i).getScanPage());
-                            treeList.add(tree3);
-                            scanPathCount++;
-                        }
-                    }
-                    tree2.setAssortName(map.getValue().getAssortName() + "(" + scanPathCount + ")");
-                    treeList.add(tree2);
-                }
-            }
-            return JSON.toJSONString(treeList);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    //脐血库
     @RequestMapping(value = "getBloodRecordTree", produces = {"text/json;charset=UTF-8"})
     @ResponseBody
     public String getBloodRecordTree(String patientId, Integer typeId, HttpServletRequest request) {
@@ -807,7 +654,6 @@ public class CommomSearchController {
                     commomVos = commomMapper.selectScanPathByPatientId(patientId, user.getRoleId(), user.getUserId());
                 }
             }
-
             //按打印分类id查询归属分类集合
             List<Emr_Type_Related> typeRelateds = new ArrayList<>();
             if (typeId != null) {
@@ -892,6 +738,7 @@ public class CommomSearchController {
                             //设置树图片节点的名称
                             tree3.setNewName("(第"+scanPathCount+"页)"+name);
                             tree3.setSource(commomVos.get(i).getSource());
+                            //存储水印图片
                             treeList.add(tree3);
 
                         }
@@ -907,6 +754,29 @@ public class CommomSearchController {
         }
     }
 
+    /**
+     * 祈福打印预览前加载图片
+     * @param patientId
+     * @param rootPaths
+     * @param names
+     * @param sources
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="selectPrintPic",method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil selectPrintPic(String patientId,String rootPaths,String names,String sources) throws Exception{
+        List<String> outs = commomService.selectPrintPic(patientId,rootPaths,names,sources);
+        return ResultUtil.ok(outs);
+    }
+
+    /**
+     * 英德分段计算页数
+     * @param patientId
+     * @param type
+     * @return
+     * @throws Exception
+     */
     private Map<String, Integer> setPdfPageWithAssorts(String patientId, int type) throws Exception {
         //定义分段map
         Map<String, Integer> map = new HashMap<>();
@@ -1032,7 +902,7 @@ public class CommomSearchController {
         }
     }
 
-    /**
+    /**英德、湛江查看pdf
      * @MethodName: showRecordContent
      * @Description: 显示病案pdf内容，加载pdf
      * @Param String patientId:patientId String assortIds:病案分段id集合
@@ -1091,7 +961,14 @@ public class CommomSearchController {
         }
     }
 
-    //脐血库
+    /**
+     * 脐血库、祈福查看pdf
+     * @param patientId
+     * @param scanPages
+     * @param sources
+     * @param flag
+     * @param response
+     */
     @RequestMapping(value = "showRecordContentBlood")
     @ResponseBody
     public void showRecordContentBlood(String patientId,String scanPages, String sources,String flag,HttpServletResponse response) {
@@ -1102,8 +979,7 @@ public class CommomSearchController {
         }
     }
 
-    //脐血库
-    /**
+    /**第一版本
      * @MethodName: updateScanAssort
      * @Description: 重新分页
      * @Param String patientId,String assortIds:病案分段id集合,Integer index：pdf当前页数
@@ -1137,9 +1013,8 @@ public class CommomSearchController {
         }
         return null;
     }
-    //脐血库
 
-    /**
+    /**脐血库、祈福
      * @MethodName: updateScanAssortByBlood
      * @Description: 重新分页
      * @Param String patientId,String assortIds:病案图片集合,newAssortId新的分类id
@@ -1174,657 +1049,821 @@ public class CommomSearchController {
         return null;
     }
 
-    /*****************************************编码操作**************************************************/
+    /*****************************病案图片操作****************************/
+    @OptionalLog(module = "保存", methods = "图片资料", fieldName = "name", tableName = "commomtable")
+    @RequiresPermissions("/commom/updatePic")
+    @RequestMapping(value = "updatePic", method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil updatePic(CommomVo commomVo,@RequestParam(required = false, value = "files") MultipartFile[] files,String assortId) throws Exception{
+        ResultUtil resultUtil = commomService.updatePic(files, commomVo.getPatientId(), assortId);
+        if(!resultUtil.getCode().equals(0)){
+            return resultUtil;
+        }
+        return ResultUtil.ok();
+    }
+
     /**
-     * @MethodName: codeTable
-     * @Description: 跳转到编码录入页面
-     * @Param
+     * @MethodName: delScanAssortByBlood
+     * @Description: 删除图片
+     * @Param String patientId,String assortIds:病案图片集合
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-12-04
+     * @CreateDate: 2020-03-09
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-12-04
+     * @UpdateDate: 2020-03-09
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequestMapping("codeTable")
-    public String codeTable(String patientId, Model model) {
-        model.addAttribute("patientId", patientId);
-        try {
-            //加载诊断编码和名称
-            List<T_Diag> diags = diagService.selectAllByPatientId(patientId, null);
-            model.addAttribute("diags", diags);
-            //加载手术编码和手术名称
-            List<T_Operate> operates = operateService.selectAllByPatientId(patientId, null);
-            model.addAttribute("operates", operates);
-            //麻醉方式
-            List<Emr_Dictionary> anaesthesias = dictionaryMapper.selectDictionaryByTypeCode("anaesthesia");
-            model.addAttribute("anaesthesias", anaesthesias);
-            //切口愈合等级
-            List<Emr_Dictionary> cutHealGrades = dictionaryMapper.selectDictionaryByTypeCode("cut_heal_grade");
-            model.addAttribute("cutHealGrades", cutHealGrades);
-            //是否择期手术
-            List<Emr_Dictionary> whether = dictionaryMapper.selectDictionaryByTypeCode("whether");
-            model.addAttribute("whether", whether);
-            //手术类型
-            List<Emr_Dictionary> operateClasses = dictionaryMapper.selectDictionaryByTypeCode("operate_class");
-            model.addAttribute("operateClasses", operateClasses);
-        } catch (Exception e) {
-            e.printStackTrace();
+    @RequiresPermissions("/commom/delScanAssort")
+    @OptionalLog(module = "删除", methods = "档案预览页面删除病案图片",fieldName = "name",tableName = "commomtable")
+    @RequestMapping(value = "delScanAssortByBlood", method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil delScanAssortByBlood(String patientId) throws Exception{
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String assortIds = request.getParameter("assortIds");
+        if (StringUtils.isNoneBlank(patientId) && StringUtils.isNoneBlank(assortIds)) {
+            scanAssortService.SimpleDelByPatientIdAndScanPages(patientId, assortIds);
+            return ResultUtil.ok();
         }
-        return "recordManage/commomSearch/codeTable";
+        return null;
     }
 
+    /*****************************病案备注操作****************************/
     /**
-     * @MethodName: getDiagCodeContents
-     * @Description: 根据icd编码查询诊断对象集合
+     * @MethodName: updateRecordReMark
+     * @Description: 修改病案备注
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-07-03
+     * @CreateDate: 2020-06-05
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-07-03
+     * @UpdateDate: 2020-06-05
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequestMapping(value = "getDiagCodeContents", produces = {"text/json;charset=UTF-8"})
+    @OptionalLog(module = "修改", methods = "修改病案备注", fieldName = "name", tableName = "commomtable")
+    @RequiresPermissions("/commom/addReMark")
+    @RequestMapping(value="updateRecordReMark",method = RequestMethod.POST)
     @ResponseBody
-    public String getDiagCodeContents(String code, String name) {
-        try {
-            List<Zd_Icd_Code> icdCodes = new ArrayList<>();
-            if (StringUtils.isNotBlank(code)) {
-                icdCodes = icdCodeMapper.selectAll(code, null);
-            } else {
-                icdCodes = icdCodeMapper.selectAll(null, name);
-            }
-            Map<String, String> map = new HashMap<>();
-            if (null != icdCodes && !icdCodes.isEmpty()) {
-                for (int i = 0; i < icdCodes.size(); i++) {
-                    if (StringUtils.isNoneBlank(icdCodes.get(i).getCode())) {
-                        map.put(icdCodes.get(i).getCode(), icdCodes.get(i).getName());
-                    }
-                }
-            }
-            return JSON.toJSONString(map);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
+    public ResultUtil updateRecordReMark(CommomVo commomVo) throws Exception{
+        commomService.updateRecordReMark(commomVo);
+        return ResultUtil.ok();
     }
-
-
-
-    /**getOperateCodeContents
-     * @MethodName:
-     * @Description: 根据手术编码查询手术对象集合
+    /**************************病案备注结束*******************************/
+    /**************************恢复已删除图片开始*************************/
+    /**
+     * @MethodName: getDeledPicRecordTree
+     * @Description: 组织已删除图片的病案分类树
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-07-03
+     * @CreateDate: 2020-06-08
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-07-03
+     * @UpdateDate: 2020-06-08
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequestMapping(value = "getOperateCodeContents", produces = {"text/json;charset=UTF-8"})
+    @RequestMapping("selectDeledPicRecordTree")
     @ResponseBody
-    public String getOperateCodeContents(String code, String name) {
-        try {
-            List<Zd_Cm3> zdCm3s = new ArrayList<>();
-            if (StringUtils.isNotBlank(code)) {
-                zdCm3s = cm3Mapper.selectAll(code, null);
-            } else {
-                zdCm3s = cm3Mapper.selectAll(null, name);
+    public List<ScanDeledAssortTree> selectDeledPicRecordTree(String patientId,String flag) {
+        List<ScanDeledAssortTree> treeList = new ArrayList<>();
+        //根据patientId查询已删除图片集合
+        List<ScanAssortVo> scanAssortVos = scanAssortMapper.selectDeledPicList(patientId,flag);
+        //第一级：全部影像资料
+        ScanDeledAssortTree tree1 = new ScanDeledAssortTree();
+        Integer id = 1;
+        tree1.setId(id);
+        tree1.setName("全部影像资料(" + scanAssortVos.size() + ")");
+        tree1.setCount(scanAssortVos.size());
+        //定义图片集合
+        String scanPathList = "";
+        //定义绝对路径集合
+        String srcs = "";
+        //定义分类名称集合
+        String assortNames = "";
+        if (null != scanAssortVos && !scanAssortVos.isEmpty()) {
+            //定义图片分类不重复结合
+            Set<String> assortNameSet = new LinkedHashSet<>();
+            for (ScanAssortVo scanAssort : scanAssortVos) {
+                if (StringUtils.isNotBlank(scanAssort.getAssortName())) {
+                    assortNameSet.add(scanAssort.getAssortName());
+                    scanPathList += scanAssort.getScanPage() + ",";
+                    srcs += scanAssort.getRootPath() + "\\" + scanAssort.getScanPage() + ",";
+                    assortNames += scanAssort.getAssortName() + ",";
+                }
             }
-            Map<String, String> map = new HashMap<>();
-            if (null != zdCm3s && !zdCm3s.isEmpty()) {
-                for (int i = 0; i < zdCm3s.size(); i++) {
-                    if (StringUtils.isNoneBlank(zdCm3s.get(i).getCode())) {
-                        map.put(zdCm3s.get(i).getCode(), zdCm3s.get(i).getName());
+            //设置图片名称集合
+            tree1.setScanPageList(scanPathList);
+            tree1.setSrcs(srcs);
+            tree1.setAssortNames(assortNames);
+            treeList.add(tree1);
+            for (String assortName : assortNameSet) {
+                id++;
+                ScanDeledAssortTree tree2 = new ScanDeledAssortTree();
+                tree2.setId(id);
+                tree2.setParentId(1);
+                //定义图片集合
+                String scanPathList1 = "";
+                String srcs1 = "";
+                //定义分类图片的个数
+                Integer count = 0;
+                for (ScanAssortVo scanAssort : scanAssortVos) {
+                    if (StringUtils.isNotBlank(scanAssort.getAssortName())) {
+                        if (scanAssort.getAssortName().equals(assortName)) {
+                            scanPathList1 += scanAssort.getScanPage() + ",";
+                            srcs1 += scanAssort.getRootPath() + "\\" + scanAssort.getScanPage() + ",";
+                            count++;
+                        }
                     }
                 }
+                tree2.setName(assortName + "(" + count + ")");
+                tree2.setCount(count);
+                tree2.setScanPageList(scanPathList1);
+                tree2.setSrcs(srcs1);
+                tree2.setAssortNames(assortName);
+                treeList.add(tree2);
             }
-            return JSON.toJSONString(map);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
         }
+        return treeList;
     }
-
     /**
-     * @MethodName: loadSelect
-     * @Description: 加载编码字典
+     * @MethodName: getDeledPicRecordTree
+     * @Description: 组织已删除图片的病案分类树
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-12-05
+     * @CreateDate: 2020-06-08
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-12-05
+     * @UpdateDate: 2020-06-08
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequestMapping("loadCM3")
+    @OptionalLog(module = "修改", methods = "恢复已删除图片", fieldName = "name", tableName = "commomtable")
+    @RequiresPermissions("/commom/recoverPic")
+    @RequestMapping(value="recoverPic",method = RequestMethod.POST)
     @ResponseBody
-    public String loadCM3() {
-        try {
-            //加载手术cmd3
-            List<Zd_Cm3> cm3s = cm3Mapper.selectAll(null, null);
-            return JSON.toJSONString(cm3s);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+    public ResultUtil recoverPic(CommomVo commomVo,String scanPages) throws Exception{
+        scanAssortService.recoverPic(commomVo.getPatientId(),scanPages);
+        return ResultUtil.ok();
+    }
+    /**************************恢复已删除图片结束***********************/
+    /**************************病案维护开始*****************************/
+    /**
+     * 祈福医院病案修改
+     * @param commomVo
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions("/commom/updateCommomInfo")
+    @OptionalLog(module = "保存",methods = "病案信息修改")
+    @RequestMapping("updateCommomInfo")
+    @ResponseBody
+    public ResultUtil updateCommomInfo(CommomVo commomVo) throws Exception{
+        if (null != commomVo.getInpatientNo()){
+            int vo = commomMapper.selectCountByPatients(commomVo.getPatientId());
+            if (vo > 0){
+                int i = commomMapper.updateByPrimaryKeySelective(commomVo);
+                if (i > 0){
+                    return ResultUtil.ok();
+                } else {
+                    return ResultUtil.error("修改失败!");
+                }
+            } else {
+                return ResultUtil.error("修改失败,该病案主键不存在!");
+            }
+        } else {
+            return ResultUtil.error("修改失败,主键不能为空!");
         }
     }
-
-
-
-
     /**
-     * @MethodName: getCodeTypeTree
-     * @Description: 根据patientId加载类别树
-     * @Param
-     * @Return
-     * @Author: 曾文和
-     * @CreateDate: 2019-06-11
-     * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-11
-     * @UpdateRemark: 更新说明
-     * @Version: 1.0
+     * 验证编号和协议号是否存在
+     * @param commomBlood
+     * @return
+     * @throws Exception
      */
-    @RequestMapping(value = "getCodeTypeTree", produces = {"text/json;charset=UTF-8"})
+    //脐血库
+    @RequestMapping("validExistForm")
     @ResponseBody
-    public String getCodeTypeTree(String patientId) {
-        if (StringUtils.isNoneBlank(patientId)) {
-            try {
-                List<Emr_Code_Type> types = codeTypeService.selectAllByPatientId(patientId);
-                List<CodeTree> treeList = new ArrayList<>();
-                if (null != types && !types.isEmpty()) {
-                    Integer id = 0;
-                    Integer parentId = 0;
-                    //第一级，类别层级
-                    for (int i = 0; i < types.size(); i++) {
-                        id++;
-                        CodeTree tree = new CodeTree();
-                        BeanUtils.copyProperties(types.get(i), tree);
-                        tree.setId(id);
-                        tree.setParentId(0);
-                        tree.setSelfId(types.get(i).getId());
-                        tree.setName(types.get(i).getTypeName());
-                        //子集赋值父Id
-                        parentId = id;
-                        treeList.add(tree);
-                        //第二级，手术类或西医编码类或中医编码类
-                        String typeFlag = types.get(i).getTypeFlag();
-                        //1.手术
-                        if (StringUtils.isNoneBlank(typeFlag) && "operate".equals(typeFlag)) {
-                            List<T_Operate> operates = operateService.selectAllByPatientId(patientId, null);
-                            if (null != operates && !operates.isEmpty()) {
-                                for (int j = 0; j < operates.size(); j++) {
-                                    id++;
-                                    CodeTree tree1 = new CodeTree();
-                                    BeanUtils.copyProperties(operates.get(j), tree1);
-                                    tree1.setId(id);
-                                    tree1.setParentId(parentId);
-                                    tree1.setName(operates.get(j).getOperateNo() + "." + operates.get(j).getOperateName());
-                                    //转换时间格式
-                                    SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
-                                    if (null != tree1.getOperateDate()) {
-                                        tree1.setOperateDateStr(fmt.format(tree1.getOperateDate()));
-                                    }
-                                    if (null != tree1.getOperDate()) {
-                                        tree1.setOperDateStr(fmt.format(tree1.getOperDate()));
-                                    }
-                                    treeList.add(tree1);
-                                }
-                            }
-                            //西医诊断
-                        } else if (StringUtils.isNoneBlank(typeFlag) && "diag".equals(typeFlag)) {
-                            List<T_Diag> diags = diagService.selectAllByPatientId(patientId, null);
-                            if (null != diags && !diags.isEmpty()) {
-                                for (int j = 0; j < diags.size(); j++) {
-                                    id++;
-                                    CodeTree tree2 = new CodeTree();
-                                    BeanUtils.copyProperties(diags.get(j), tree2);
-                                    tree2.setId(id);
-                                    tree2.setParentId(parentId);
-                                    tree2.setName(diags.get(j).getDiagNo() + "." + diags.get(j).getDiagName());
-                                    //转换时间格式
-                                    if (null != tree2.getOperDate()) {
-                                        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                                        tree2.setOperDateStr(fmt.format(tree2.getOperDate()));
-                                        treeList.add(tree2);
-                                    }
-                                }
-                            }
-                            //中医诊断
-                        } else if (StringUtils.isNoneBlank(typeFlag) && "herbDiag".equals(typeFlag)) {
-                            List<T_Herb_Diag> herbDiags = herbDiagService.selectAllByPatientId(patientId, null);
-                            if (null != herbDiags && !herbDiags.isEmpty()) {
-                                for (int j = 0; j < herbDiags.size(); j++) {
-                                    id++;
-                                    CodeTree tree3 = new CodeTree();
-                                    BeanUtils.copyProperties(herbDiags.get(j), tree3);
-                                    tree3.setId(id);
-                                    tree3.setParentId(parentId);
-                                    tree3.setName(herbDiags.get(j).getHerbNo() + "." + herbDiags.get(j).getHerbName());
-                                    //转换时间格式
-                                    SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
-                                    tree3.setOperDateStr(fmt.format(tree3.getOperDate()));
-                                    treeList.add(tree3);
-                                }
-                            }
-                        }
-                    }
-                }
-                return JSON.toJSONString(treeList);
-            } catch (Exception e) {
-                e.printStackTrace();
-                return null;
+    public ResultUtil validExistForm(CommomBlood commomBlood) throws Exception{
+        String patientId = commomBlood.getPatientId();
+        commomBlood.setPatientId(null);
+        FontCommom commom = new FontCommom();
+        BeanUtils.copyProperties(commomBlood,commom);
+        List<FontCommom> list = commomMapper.isExistInpatient(commom);
+        if(!CollectionUtils.isEmpty(list)){
+            //修改的情况，同一份病案返回成功
+            if(StringUtils.isNotBlank(patientId) && list.get(0).getPatientId().equals(patientId)){
+                return ResultUtil.ok();
             }
-        } else {
-            return null;
+            return ResultUtil.ok("已存在");
+        }
+        return ResultUtil.ok();
+    }
+    /**
+     * 脐血库新增档案
+     * @param commomBlood
+     * @return
+     * @throws Exception
+     */
+    @OptionalLog(module = "新增", methods = "新增档案")
+    @RequiresPermissions("/commom/addRecord")
+    @RequestMapping(value="addRecord",method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil addRecordBlood(@Valid CommomBlood commomBlood,HttpServletRequest request) throws Exception{
+        //判断formToken
+        boolean flag = FormTokenFlagUtil.isFlag(request);
+        if(!flag){
+            return ResultUtil.error("请不要重复提交!");
+        }
+        //判断表单不为空和不可重复的字段
+        ResultUtil result = validFieldOper(commomBlood);
+        if(!result.getCode().equals(0)){
+            return result;
+        }
+        //进入添加病案方法
+        ResultUtil resultUtil = commomService.addRecordBlood(commomBlood, request);
+        //有错误返回错误信息
+        if(!resultUtil.getCode().equals(0)){
+            return resultUtil;
         }
+        return ResultUtil.ok();
     }
 
     /**
-     * @MethodName: addCodeType
-     * @Description: 保存编码类别信息
-     * @Param Emr_Code_Type codeType编码类别对象,Integer index：pdf当前页码,String patientId,String assortIds：分段id
-     * @Return
-     * @Author: 曾文和
-     * @CreateDate: 2019-06-10
-     * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-10
-     * @UpdateRemark: 更新说明
-     * @Version: 1.0
+     * 加载分类树
+     * @param request
+     * @return
      */
-    @RequiresPermissions(value = {"/commom/addCodeType", "/commom/updateCodeType"})
-    @OptionalLog(module = "新增", methods = "编码类别", fieldName = "typeName")
-    @RequestMapping("addCodeType")
+    @RequestMapping("selectRecordTree")
     @ResponseBody
-    public ResultUtil addCodeType(Emr_Code_Type codeType, Integer index, String patientId, String assortIds,
-                                  HttpServletRequest request) throws Exception{
-        if (StringUtils.isBlank(assortIds)) {
-            return ResultUtil.error("没有分段数据,请先在用户分配调阅里添加并分配分段数据!");
+    public List<Zd_Assort> selectRecordTree(HttpServletRequest request){
+        List<Zd_Assort> treeList = new ArrayList<>();
+        Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER");
+        try {
+            List<Zd_Assort> assorts = assortService.selectAllByPower(user);
+            //第一级：全部影像资料
+            Zd_Assort tree1 = new Zd_Assort();
+            tree1.setAssortId("0");
+            tree1.setAssortName("全部分类");
+            treeList.add(tree1);
+            if(!CollectionUtils.isEmpty(assorts)){
+                for(Zd_Assort assort : assorts){
+                    assort.setPrintFlag("0");
+                }
+                treeList.addAll(assorts);
+            }
+            return treeList;
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error(ExceptionUtils.getExceptionStr(e));
+            return null;
         }
-        if (StringUtils.isNoneBlank(patientId) && null != index) {
-            //验证标志和名称都不能重复
-            Emr_Code_Type isExistFlag = codeTypeMapper.checkFlagAndNameIsExist(codeType.getTypeFlag(), null);
-            Emr_Code_Type isExistName = codeTypeMapper.checkFlagAndNameIsExist(null, codeType.getTypeName());
-            if (codeType.getId() == null) {
-                if (isExistFlag == null) {
-                    if (isExistName == null) {
-                        //新增
-                        codeType.setPatientId(patientId);
-                        //根据index:当前pdf页数，patientId，admissIds获取pdf信息
-                        List<ScanPathVo> scanPathVo = getPdfPathVo(index, patientId, assortIds);
-                        if (null != scanPathVo && !scanPathVo.isEmpty()) {
-                            codeType.setAssortId(scanPathVo.get(0).getAssortId());
-                            codeType.setScanPage(scanPathVo.get(0).getScanPage());
-                        } else {
-                            return ResultUtil.error("图片不存在!");
-                        }
-                        codeTypeService.addCodeType(codeType, request);
+    }
+
+    //判断表单不为空和不可重复的字段
+    private ResultUtil validFieldOper(CommomBlood commomBlood) throws Exception{
+        String patientId = commomBlood.getPatientId();
+        //判断脐血编号不为空
+        String inpatientNo = commomBlood.getInpatientNo();
+        if(StringUtils.isBlank(inpatientNo)){
+            return ResultUtil.error("脐血编号不能为空!");
+        }else{
+            FontCommom commom = new FontCommom();
+            commom.setInpatientNo(inpatientNo);
+            List<FontCommom> list = commomMapper.isExistInpatient(commom);
+            if(!CollectionUtils.isEmpty(list)){
+                if(StringUtils.isNotBlank(patientId)){
+                    if(list.get(0).getPatientId().equals(patientId)){
                         return ResultUtil.ok();
-                    } else {
-                        return ResultUtil.error("类别名称不能重复!");
                     }
-                } else {
-                    return ResultUtil.error("类别标志不能重复!");
                 }
-            } else {
-                if (null != isExistName && !isExistName.getId().equals(codeType.getId())) {
-                    return ResultUtil.error("类别名称不能重复!");
-                } else {
-                    if (null != isExistFlag && !isExistFlag.getId().equals(codeType.getId())) {
-                        return ResultUtil.error("类别标志不能重复!");
-                    } else {
-                        //修改
-                        codeTypeService.updateCodeType(codeType, request);
+                return ResultUtil.error("脐血编号已存在!");
+            }
+        }
+        //验证协议号是否存在
+        String admissId = commomBlood.getAdmissId();
+        if(StringUtils.isNotBlank(admissId)){
+            FontCommom commom = new FontCommom();
+            commom.setAdmissId(admissId);
+            List<FontCommom> list = commomMapper.isExistInpatient(commom);
+            if(!CollectionUtils.isEmpty(list)){
+                if(StringUtils.isNotBlank(patientId)){
+                    if(list.get(0).getPatientId().equals(patientId)){
                         return ResultUtil.ok();
                     }
                 }
+                return ResultUtil.error("协议号已存在!");
             }
         }
-        return null;
+        //判断孕妇姓名不为空
+        if(StringUtils.isBlank(commomBlood.getName())){
+            return ResultUtil.error("孕妇姓名不能为空!");
+        }
+        return ResultUtil.ok();
     }
 
     /**
-     * @MethodName: delCodeTypeById
-     * @Description: 根据id删除编码类别
-     * @Param
-     * @Return
-     * @Author: 曾文和
-     * @CreateDate: 2019-06-11
-     * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-11
-     * @UpdateRemark: 更新说明
-     * @Version: 1.0
+     * 脐血库修改档案
+     * @param commomBlood
+     * @return
+     * @throws Exception
      */
-    @RequiresPermissions("/commom/delCodeTypeById")
-    @OptionalLog(module = "删除", methods = "编码类别", fieldName = "typeName", tableName = "emr_code_type")
-    @RequestMapping(value = "delCodeTypeById/{id}")
+    @OptionalLog(module = "修改", methods = "修改档案",fieldName = "name",tableName = "commomtable")
+    @RequiresPermissions("/commom/updateRecord")
+    @RequestMapping(value="updateRecordBlood",method = RequestMethod.POST)
     @ResponseBody
-    public ResultUtil delCodeTypeById(@PathVariable("id") Integer id) throws Exception{
-        codeTypeService.deleteByPrimaryKey(id);
+    public ResultUtil updateRecordBlood(CommomBlood commomBlood) throws Exception{
+        //判断表单不为空和不可重复的字段
+        ResultUtil resultUtil = validFieldOper(commomBlood);
+        if(!resultUtil.getCode().equals(0)){
+            return resultUtil;
+        }
+        CommomVo commomVo = new CommomVo();
+        BeanUtils.copyProperties(commomBlood,commomVo);
+        commomService.updateRecord(commomVo);
         return ResultUtil.ok();
     }
-    /********************************************手术编码*******************************************************/
 
     /**
-     * @MethodName: addDiagCode
-     * @Description: 保存诊断编码
-     * @Param
-     * @Return
-     * @Author: 曾文和
-     * @CreateDate: 2020-01-03
-     * @UpdateUser: 曾文和
-     * @UpdateDate: 2020-01-03
-     * @UpdateRemark: 更新说明
-     * @Version: 1.0
+     * 脐血库删除档案
+     * @param patientId
+     * @return
+     * @throws Exception
      */
-    @RequiresPermissions("/commom/addOperCode")
-    @RequestMapping(value = "addDiagCode")
+    @OptionalLog(module = "删除", methods = "删除档案",fieldName = "name",tableName = "commomtable")
+    @RequiresPermissions("/commom/deleteRecord")
+    @RequestMapping(value="deleteRecordBlood",method = RequestMethod.POST)
     @ResponseBody
-    public ResultUtil addDiagCode(String patientId, String diagNos, String diagNames, String diagCodes, String inhospstats) throws Exception{
-        diagService.addDiagCode(patientId, diagNos, diagNames, diagCodes, inhospstats);
+    public ResultUtil deleteRecordBlood(String patientId) throws Exception{
+        commomService.deleteRecord(patientId);
         return ResultUtil.ok();
     }
-
+    /**************************病案维护结束*****************************/
+    /*******************第一版本手术、诊断操作开始**********************/
+    /*****************************************编码操作**************************************************/
     /**
-     * @MethodName: checkOperateNo
-     * @Description: 验证手术序号是否存在
+     * @MethodName: codeTable
+     * @Description: 跳转到编码录入页面
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-06-12
+     * @CreateDate: 2019-12-04
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-12
+     * @UpdateDate: 2019-12-04
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequestMapping(value = "checkOperateNo")
-    @ResponseBody
-    public ResultUtil checkOperateNo(String patientId, Short operateNo) throws Exception{
-        if (StringUtils.isNoneBlank(patientId) && operateNo != null) {
-            //根据patientId和手术编码查询手术编码集合
-            List<T_Operate> operates = operateService.selectAllByPatientId(patientId, operateNo);
-            if (operates != null && !operates.isEmpty()) {
-                //存在
-                return ResultUtil.error();
-            } else {
-                return ResultUtil.ok();
-            }
+    @RequestMapping("codeTable")
+    public String codeTable(String patientId, Model model) {
+        model.addAttribute("patientId", patientId);
+        try {
+            //加载诊断编码和名称
+            List<T_Diag> diags = diagService.selectAllByPatientId(patientId, null);
+            model.addAttribute("diags", diags);
+            //加载手术编码和手术名称
+            List<T_Operate> operates = operateService.selectAllByPatientId(patientId, null);
+            model.addAttribute("operates", operates);
+            //麻醉方式
+            List<Emr_Dictionary> anaesthesias = dictionaryMapper.selectDictionaryByTypeCode("anaesthesia");
+            model.addAttribute("anaesthesias", anaesthesias);
+            //切口愈合等级
+            List<Emr_Dictionary> cutHealGrades = dictionaryMapper.selectDictionaryByTypeCode("cut_heal_grade");
+            model.addAttribute("cutHealGrades", cutHealGrades);
+            //是否择期手术
+            List<Emr_Dictionary> whether = dictionaryMapper.selectDictionaryByTypeCode("whether");
+            model.addAttribute("whether", whether);
+            //手术类型
+            List<Emr_Dictionary> operateClasses = dictionaryMapper.selectDictionaryByTypeCode("operate_class");
+            model.addAttribute("operateClasses", operateClasses);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        return ResultUtil.error();
-    }
-
-    /**
-     * @MethodName: getOperByCodeOrName
-     * @Description: 通过手术编码或手术名称查询手术字典集合
-     * @Param
-     * @Return
-     * @Author: 曾文和
-     * @CreateDate: 2019-06-12
-     * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-12
-     * @UpdateRemark: 更新说明
-     * @Version: 1.0
-     */
-    @RequestMapping(value = "getOperByCodeOrName", produces = {"text/json;charset=UTF-8"})
-    @ResponseBody
-    public String getOperByCodeOrName(String code, String name) throws Exception{
-        //根据手术编码和名称查询手术编码对象
-        List<Zd_Cm3> cm3s = cm3Mapper.selectAll(code, name);
-        return JSON.toJSONString(cm3s);
+        return "recordManage/commomSearch/codeTable";
     }
 
     /**
-     * @MethodName: saveOperCode
-     * @Description: 保存手术编码
+     * @MethodName: getDiagCodeContents
+     * @Description: 根据icd编码查询诊断对象集合
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-06-12
+     * @CreateDate: 2019-07-03
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-12
+     * @UpdateDate: 2019-07-03
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequiresPermissions(value = {"/commom/addOperCode", "/commom/updateOperCode"})
-    @OptionalLog(module = "新增", methods = "手术编码", fieldName = "operateName")
-    @RequestMapping(value = "saveOperCode")
+    @RequestMapping(value = "getDiagCodeContents", produces = {"text/json;charset=UTF-8"})
     @ResponseBody
-    public ResultUtil saveOperCode(T_Operate operate, Integer isUpdateOperNo, HttpServletRequest request) throws Exception{
-        if (operate.getCurrentOperateNo() == null) {
-            //新增
-            boolean flag = FormTokenFlagUtil.isFlag(request);
-            if (!flag) {
-                return ResultUtil.error("请不要重复提交!");
+    public String getDiagCodeContents(String code, String name) {
+        try {
+            List<Zd_Icd_Code> icdCodes = new ArrayList<>();
+            if (StringUtils.isNotBlank(code)) {
+                icdCodes = icdCodeMapper.selectAll(code, null);
+            } else {
+                icdCodes = icdCodeMapper.selectAll(null, name);
             }
-            operateService.insert(operate);
-        } else {
-            //修改
-            if (isUpdateOperNo == 1) {
-                //有修改手术序号
-                //查询手术序号是否存在
-                List<T_Operate> operates = operateService.selectAllByPatientId(operate.getPatientId(), operate.getOperateNo());
-                if (null != operates && !operates.isEmpty()) {
-                    //存在
-                    return ResultUtil.error("该手术序号已存在!");
-                } else {
-                    operateService.updateByPrimaryKeySelective(operate);
+            Map<String, String> map = new HashMap<>();
+            if (null != icdCodes && !icdCodes.isEmpty()) {
+                for (int i = 0; i < icdCodes.size(); i++) {
+                    if (StringUtils.isNoneBlank(icdCodes.get(i).getCode())) {
+                        map.put(icdCodes.get(i).getCode(), icdCodes.get(i).getName());
+                    }
                 }
-            } else {
-                //手术序号一样
-                operateService.updateByPrimaryKeySelective(operate);
             }
+            return JSON.toJSONString(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
         }
-        return ResultUtil.ok();
     }
 
-        /**
-     * @MethodName: deleteOperCodeByPatientIdAndOperNo
-     * @Description: 根据petientId和手术序号删除手术编码对象
-     * @Param
-     * @Return
-     * @Author: 曾文和
-     * @CreateDate: 2019-06-12
-     * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-12
-     * @UpdateRemark: 更新说明
-     * @Version: 1.0
-     */
-    @RequiresPermissions("/commom/deleteOperCode")
-    @OptionalLog(module = "删除", methods = "手术编码", fieldName = "operateName", tableName = "t_operate")
-    @RequestMapping(value = "deleteOperCodeByPatientIdAndOperNo")
-    @ResponseBody
-    public ResultUtil deleteOperCodeByPatientIdAndOperNo(String patientId, Short operateNo) throws Exception{
-        if (StringUtils.isNoneBlank(patientId) && null != operateNo) {
-            operateService.deleteOperCodeByPatientIdAndOperNo(patientId, operateNo);
-            return ResultUtil.ok();
-        } else {
-            return ResultUtil.error();
-        }
-    }/**************************************************西医诊断操作*************************************************/
 
-/**
-     * @MethodName: addOperCode
-     * @Description: 保存手术编码
-     * @Param
-     * @Return
-     * @Author: 曾文和
-     * @CreateDate: 2020-01-03
-     * @UpdateUser: 曾文和
-     * @UpdateDate: 2020-01-03
-     * @UpdateRemark: 更新说明
-     * @Version: 1.0
-     */
-    @RequiresPermissions("/commom/addOperCode")
-    @RequestMapping(value = "addOperCode")
-    @ResponseBody
-    public ResultUtil addOperCode(String patientId, String operNos, String operDates, String operCodes, String operNames, String operateClasses, String operators, String assistant1s, String assistant2s, String cuts, String chossurgs, String anaesthesiaTypes, String anaesthesiaNames) throws Exception{
-        operateService.addOperCode(patientId, operNos, operDates, operCodes, operNames, operateClasses, operators, assistant1s, assistant2s, cuts, chossurgs, anaesthesiaTypes, anaesthesiaNames);
-        return ResultUtil.ok();
-    }
 
-    /**
-     * @MethodName: getDictionaryByTypeCode
-     * @Description: 根据字典标识查询字典集合
+    /**getOperateCodeContents
+     * @MethodName:
+     * @Description: 根据手术编码查询手术对象集合
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-06-12
+     * @CreateDate: 2019-07-03
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-12
+     * @UpdateDate: 2019-07-03
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequestMapping(value = "getDictionaryByTypeCode", produces = {"text/json;charset=UTF-8"})
+    @RequestMapping(value = "getOperateCodeContents", produces = {"text/json;charset=UTF-8"})
     @ResponseBody
-    public String getDictionaryByTypeCode(String typeCode) throws Exception{
-        List<Emr_Dictionary> dictionaries = dictionaryMapper.selectDictionaryByTypeCode(typeCode);
-        return JSON.toJSONString(dictionaries);
+    public String getOperateCodeContents(String code, String name) {
+        try {
+            List<Zd_Cm3> zdCm3s = new ArrayList<>();
+            if (StringUtils.isNotBlank(code)) {
+                zdCm3s = cm3Mapper.selectAll(code, null);
+            } else {
+                zdCm3s = cm3Mapper.selectAll(null, name);
+            }
+            Map<String, String> map = new HashMap<>();
+            if (null != zdCm3s && !zdCm3s.isEmpty()) {
+                for (int i = 0; i < zdCm3s.size(); i++) {
+                    if (StringUtils.isNoneBlank(zdCm3s.get(i).getCode())) {
+                        map.put(zdCm3s.get(i).getCode(), zdCm3s.get(i).getName());
+                    }
+                }
+            }
+            return JSON.toJSONString(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
     }
 
     /**
-     * @MethodName: getIcdCodeList
-     * @Description: 加载icd编码字典表
+     * @MethodName: loadSelect
+     * @Description: 加载编码字典
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-06-12
+     * @CreateDate: 2019-12-05
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-12
+     * @UpdateDate: 2019-12-05
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequestMapping(value = "getIcdCodeList", produces = {"text/json;charset=UTF-8"})
+    @RequestMapping("loadCM3")
     @ResponseBody
-    public String getIcdCodeList() throws Exception{
-        List<Zd_Icd_Code> icdCodes = icdCodeMapper.selectAll(null, null);
-        return JSON.toJSONString(icdCodes);
+    public String loadCM3() {
+        try {
+            //加载手术cmd3
+            List<Zd_Cm3> cm3s = cm3Mapper.selectAll(null, null);
+            return JSON.toJSONString(cm3s);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
     }
 
+    //封装根据index:当前pdf页数，patientId，admissIds获取pdf信息
+    private List<ScanPathVo> getPdfPathVo(Integer index, String patientId, String assortIds) throws Exception {
+        List<ScanPathVo> list = new ArrayList<>();
+        patientId = "'" + patientId + "'";
+        List<ScanPathVo> scanPathVos = scanPathMapper.selectScanFileByPatientIds(patientId, assortIds);
+        //重新组织存在的文件，即转换成功的文件
+        if (null != scanPathVos && !scanPathVos.isEmpty()) {
+            // 实例化图片
+            Image image = null;
+            //不成张合成的高度
+            float tempHeight = 0;
+            Integer pageCount = 0;
+            for (ScanPathVo scanPathVo : scanPathVos) {
+                String fileRealPath = scanPathVo.getFileRealPath();
+                if (StringUtils.isNoneBlank(fileRealPath)) {
+                    //判断文件是否存在
+                    File file1 = new File(fileRealPath);
+                    if (file1.exists()) {
+                        if (file1.getName().endsWith(".tif") || file1.getName().endsWith(".tiff")) {
+                            Object localObject1 = null;
+                            Object localObject2 = null;
+                            URL paramURL = Utilities.toURL(fileRealPath);
+                            try {
+                                if ("file".equals(paramURL.getProtocol())) {
+                                    localObject2 = paramURL.getFile();
+                                    localObject2 = Utilities
+                                            .unEscapeURL((String) localObject2);
+                                    localObject1 = new RandomAccessFileOrArray(
+                                            (String) localObject2);
+                                } else {
+                                    localObject1 = new RandomAccessFileOrArray(paramURL);
+                                }
+
+                                int pageNums = TiffImage
+                                        .getNumberOfPages((RandomAccessFileOrArray) localObject1);
+                                if (pageNums > 0) {
+                                    for (int i = 1; i <= pageNums; i++) {
+                                        localObject2 = TiffImage.getTiffImage(
+                                                (RandomAccessFileOrArray) localObject1, i);
+                                        image = (Image) localObject2;
+                                    }
+                                }
+                                if (localObject1 != null) {
+                                    ((RandomAccessFileOrArray) localObject1).close();
+                                }
+
+                            } finally {
+                                if (localObject1 != null) {
+                                    ((RandomAccessFileOrArray) localObject1).close();
+                                }
+                            }
+                        } else if (file1.getName().endsWith(".png")
+                                || file1.getName().endsWith(".jpg")
+                                || file1.getName().endsWith(".gif")
+                                || file1.getName().endsWith(".jpeg")
+                        ) {
+                            // 实例化图牿
+                            image = Image.getInstance(fileRealPath);
+                        }
+                        // 获得图片的高庿
+                        float heigth = image.getHeight();
+                        float width = image.getWidth();
+                        // 合理压缩，h>w，按w压缩，否则按w压缩
+                        int percent = Jpg2PdfUtil.getPercent(heigth, width);
+
+                        // 设置图片居中显示
+                        image.setAlignment(Image.ALIGN_CENTER);
+                        // 按百分比显示图片的比便
+                        if (width > 1024 || heigth > 786) {
+                            image.scalePercent(percent + 5);
+                            pageCount++;
+                            if (pageCount.equals(index)) {
+                                //当前页返回
+                                list.clear();
+                                list.add(scanPathVo);
+                                return list;
+                            }
+                            //整张，把合成的高度置为0；
+                            tempHeight = 0;
+                        } else if (heigth < 786) {
+                            if (tempHeight == 0) {
+                                pageCount++;
+                            }
+                            tempHeight += heigth;
+                            if (tempHeight > 786) {
+                                pageCount++;
+                                if (pageCount.equals(index)) {
+                                    //当前页返回
+                                    list.clear();
+                                    list.add(scanPathVo);
+                                    return list;
+                                } else if (pageCount == (index + 1)) {
+                                    //已另起一页，返回前一页
+                                    return list;
+                                }
+                                tempHeight = heigth;
+                            } else {
+                                //连续的几张图片高度总和小于786添加进集合
+                                list.add(scanPathVo);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return list;
+    }
     /**
-     * @MethodName: getIcdCodeByCodeOrName
-     * @Description: 根据icd编码或名称查询icd字典集合
+     * @MethodName: getCodeTypeTree
+     * @Description: 根据patientId加载类别树
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-06-12
+     * @CreateDate: 2019-06-11
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-12
+     * @UpdateDate: 2019-06-11
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequestMapping(value = "getIcdCodeByCodeOrName", produces = {"text/json;charset=UTF-8"})
+    @RequestMapping(value = "getCodeTypeTree", produces = {"text/json;charset=UTF-8"})
     @ResponseBody
-    public String getIcdCodeByCodeOrName(String code, String name) throws Exception{
-        List<Zd_Icd_Code> icdCodes = icdCodeMapper.selectAll(code, name);
-        return JSON.toJSONString(icdCodes);
+    public String getCodeTypeTree(String patientId) {
+        if (StringUtils.isNoneBlank(patientId)) {
+            try {
+                List<Emr_Code_Type> types = codeTypeService.selectAllByPatientId(patientId);
+                List<CodeTree> treeList = new ArrayList<>();
+                if (null != types && !types.isEmpty()) {
+                    Integer id = 0;
+                    Integer parentId = 0;
+                    //第一级，类别层级
+                    for (int i = 0; i < types.size(); i++) {
+                        id++;
+                        CodeTree tree = new CodeTree();
+                        BeanUtils.copyProperties(types.get(i), tree);
+                        tree.setId(id);
+                        tree.setParentId(0);
+                        tree.setSelfId(types.get(i).getId());
+                        tree.setName(types.get(i).getTypeName());
+                        //子集赋值父Id
+                        parentId = id;
+                        treeList.add(tree);
+                        //第二级，手术类或西医编码类或中医编码类
+                        String typeFlag = types.get(i).getTypeFlag();
+                        //1.手术
+                        if (StringUtils.isNoneBlank(typeFlag) && "operate".equals(typeFlag)) {
+                            List<T_Operate> operates = operateService.selectAllByPatientId(patientId, null);
+                            if (null != operates && !operates.isEmpty()) {
+                                for (int j = 0; j < operates.size(); j++) {
+                                    id++;
+                                    CodeTree tree1 = new CodeTree();
+                                    BeanUtils.copyProperties(operates.get(j), tree1);
+                                    tree1.setId(id);
+                                    tree1.setParentId(parentId);
+                                    tree1.setName(operates.get(j).getOperateNo() + "." + operates.get(j).getOperateName());
+                                    //转换时间格式
+                                    SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
+                                    if (null != tree1.getOperateDate()) {
+                                        tree1.setOperateDateStr(fmt.format(tree1.getOperateDate()));
+                                    }
+                                    if (null != tree1.getOperDate()) {
+                                        tree1.setOperDateStr(fmt.format(tree1.getOperDate()));
+                                    }
+                                    treeList.add(tree1);
+                                }
+                            }
+                            //西医诊断
+                        } else if (StringUtils.isNoneBlank(typeFlag) && "diag".equals(typeFlag)) {
+                            List<T_Diag> diags = diagService.selectAllByPatientId(patientId, null);
+                            if (null != diags && !diags.isEmpty()) {
+                                for (int j = 0; j < diags.size(); j++) {
+                                    id++;
+                                    CodeTree tree2 = new CodeTree();
+                                    BeanUtils.copyProperties(diags.get(j), tree2);
+                                    tree2.setId(id);
+                                    tree2.setParentId(parentId);
+                                    tree2.setName(diags.get(j).getDiagNo() + "." + diags.get(j).getDiagName());
+                                    //转换时间格式
+                                    if (null != tree2.getOperDate()) {
+                                        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                                        tree2.setOperDateStr(fmt.format(tree2.getOperDate()));
+                                        treeList.add(tree2);
+                                    }
+                                }
+                            }
+                            //中医诊断
+                        } else if (StringUtils.isNoneBlank(typeFlag) && "herbDiag".equals(typeFlag)) {
+                            List<T_Herb_Diag> herbDiags = herbDiagService.selectAllByPatientId(patientId, null);
+                            if (null != herbDiags && !herbDiags.isEmpty()) {
+                                for (int j = 0; j < herbDiags.size(); j++) {
+                                    id++;
+                                    CodeTree tree3 = new CodeTree();
+                                    BeanUtils.copyProperties(herbDiags.get(j), tree3);
+                                    tree3.setId(id);
+                                    tree3.setParentId(parentId);
+                                    tree3.setName(herbDiags.get(j).getHerbNo() + "." + herbDiags.get(j).getHerbName());
+                                    //转换时间格式
+                                    SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
+                                    tree3.setOperDateStr(fmt.format(tree3.getOperDate()));
+                                    treeList.add(tree3);
+                                }
+                            }
+                        }
+                    }
+                }
+                return JSON.toJSONString(treeList);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return null;
+            }
+        } else {
+            return null;
+        }
     }
 
     /**
-     * @MethodName: checkDiagNo
-     * @Description: 验证西医诊断序号是否存在
-     * @Param
+     * @MethodName: addCodeType
+     * @Description: 保存编码类别信息
+     * @Param Emr_Code_Type codeType编码类别对象,Integer index：pdf当前页码,String patientId,String assortIds：分段id
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-06-12
+     * @CreateDate: 2019-06-10
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-12
+     * @UpdateDate: 2019-06-10
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequestMapping(value = "checkDiagNo")
+    @RequiresPermissions(value = {"/commom/addCodeType", "/commom/updateCodeType"})
+    @OptionalLog(module = "新增", methods = "编码类别", fieldName = "typeName")
+    @RequestMapping("addCodeType")
     @ResponseBody
-    public ResultUtil checkDiagNo(String patientId, Short diagNo) throws Exception{
-        if (StringUtils.isNoneBlank(patientId) && diagNo != null) {
-            List<T_Diag> diags = diagService.selectAllByPatientId(patientId, diagNo);
-            if (diags != null && !diags.isEmpty()) {
-                //存在
-                return ResultUtil.error();
+    public ResultUtil addCodeType(Emr_Code_Type codeType, Integer index, String patientId, String assortIds,
+                                  HttpServletRequest request) throws Exception{
+        if (StringUtils.isBlank(assortIds)) {
+            return ResultUtil.error("没有分段数据,请先在用户分配调阅里添加并分配分段数据!");
+        }
+        if (StringUtils.isNoneBlank(patientId) && null != index) {
+            //验证标志和名称都不能重复
+            Emr_Code_Type isExistFlag = codeTypeMapper.checkFlagAndNameIsExist(codeType.getTypeFlag(), null);
+            Emr_Code_Type isExistName = codeTypeMapper.checkFlagAndNameIsExist(null, codeType.getTypeName());
+            if (codeType.getId() == null) {
+                if (isExistFlag == null) {
+                    if (isExistName == null) {
+                        //新增
+                        codeType.setPatientId(patientId);
+                        //根据index:当前pdf页数，patientId，admissIds获取pdf信息
+                        List<ScanPathVo> scanPathVo = getPdfPathVo(index, patientId, assortIds);
+                        if (null != scanPathVo && !scanPathVo.isEmpty()) {
+                            codeType.setAssortId(scanPathVo.get(0).getAssortId());
+                            codeType.setScanPage(scanPathVo.get(0).getScanPage());
+                        } else {
+                            return ResultUtil.error("图片不存在!");
+                        }
+                        codeTypeService.addCodeType(codeType, request);
+                        return ResultUtil.ok();
+                    } else {
+                        return ResultUtil.error("类别名称不能重复!");
+                    }
+                } else {
+                    return ResultUtil.error("类别标志不能重复!");
+                }
             } else {
-                return ResultUtil.ok();
+                if (null != isExistName && !isExistName.getId().equals(codeType.getId())) {
+                    return ResultUtil.error("类别名称不能重复!");
+                } else {
+                    if (null != isExistFlag && !isExistFlag.getId().equals(codeType.getId())) {
+                        return ResultUtil.error("类别标志不能重复!");
+                    } else {
+                        //修改
+                        codeTypeService.updateCodeType(codeType, request);
+                        return ResultUtil.ok();
+                    }
+                }
             }
         }
-        return ResultUtil.error();
+        return null;
     }
 
     /**
-     * @MethodName: saveDiag
-     * @Description: 保存西医诊断
+     * @MethodName: delCodeTypeById
+     * @Description: 根据id删除编码类别
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-06-12
+     * @CreateDate: 2019-06-11
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-12
+     * @UpdateDate: 2019-06-11
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequiresPermissions(value = {"/commom/addOperCode", "/commom/updateOperCode"})
-    @OptionalLog(module = "保存", methods = "西医诊断编码", fieldName = "diagName")
-    @RequestMapping(value = "saveDiag")
+    @RequiresPermissions("/commom/delCodeTypeById")
+    @OptionalLog(module = "删除", methods = "编码类别", fieldName = "typeName", tableName = "emr_code_type")
+    @RequestMapping(value = "delCodeTypeById/{id}")
     @ResponseBody
-    public ResultUtil saveDiag(T_Diag diag, Integer isUpdateOperNo, HttpServletRequest request) throws Exception{
-        if (diag.getCurrentDiagNo() == null) {
-            //新增
-            boolean flag = FormTokenFlagUtil.isFlag(request);
-            if (!flag) {
-                return ResultUtil.error("请不要重复提交!");
-            }
-            diagService.insert(diag);
-        } else {
-            //修改
-            if (isUpdateOperNo == 1) {
-                //有修改序号
-                //查询序号是否存在
-                List<T_Diag> diags = diagService.selectAllByPatientId(diag.getPatientId(), diag.getDiagNo());
-                if (null != diags && !diags.isEmpty()) {
-                    //存在
-                    return ResultUtil.error("该诊断序号已存在！");
-                } else {
-                    diagService.updateByPrimaryKeySelective(diag);
-                }
-            } else {
-                //诊断序号一样
-                diagService.updateByPrimaryKeySelective(diag);
-            }
-        }
+    public ResultUtil delCodeTypeById(@PathVariable("id") Integer id) throws Exception{
+        codeTypeService.deleteByPrimaryKey(id);
         return ResultUtil.ok();
     }
-    /*****************************************中医诊断********************************************************/
+    /********************************************手术编码*******************************************************/
 
     /**
-     * @MethodName: deleteCodeByPatientIdAndDiagNo
-     * @Description: 根据petientId和诊断序号删除西医诊断编码对象
+     * @MethodName: addDiagCode
+     * @Description: 保存诊断编码
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-06-13
+     * @CreateDate: 2020-01-03
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-13
+     * @UpdateDate: 2020-01-03
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequiresPermissions("/commom/deleteOperCode")
-    @OptionalLog(module = "删除", methods = "西医诊断编码", fieldName = "diagName", tableName = "t_diag")
-    @RequestMapping(value = "deleteCodeByPatientIdAndDiagNo")
+    @RequiresPermissions("/commom/addOperCode")
+    @RequestMapping(value = "addDiagCode")
     @ResponseBody
-    public ResultUtil deleteCodeByPatientIdAndDiagNo(String patientId, Short diagNo) throws Exception{
-        if (StringUtils.isNoneBlank(patientId) && null != diagNo) {
-            diagService.deleteDiagByPatientIdAndDiagNo(patientId, diagNo);
-            return ResultUtil.ok();
-        } else {
-            return ResultUtil.error();
-        }
+    public ResultUtil addDiagCode(String patientId, String diagNos, String diagNames, String diagCodes, String inhospstats) throws Exception{
+        diagService.addDiagCode(patientId, diagNos, diagNames, diagCodes, inhospstats);
+        return ResultUtil.ok();
     }
 
     /**
-     * @MethodName: checkHerbNo
-     * @Description: 验证中医诊断序号是否存在
+     * @MethodName: checkOperateNo
+     * @Description: 验证手术序号是否存在
      * @Param
      * @Return
      * @Author: 曾文和
@@ -1834,12 +1873,13 @@ public class CommomSearchController {
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequestMapping(value = "checkHerbNo")
+    @RequestMapping(value = "checkOperateNo")
     @ResponseBody
-    public ResultUtil checkHerbNo(String patientId, Short herbNo) throws Exception{
-        if (StringUtils.isNoneBlank(patientId) && herbNo != null) {
-            List<T_Herb_Diag> herbDiags = herbDiagService.selectAllByPatientId(patientId, herbNo);
-            if (herbDiags != null && !herbDiags.isEmpty()) {
+    public ResultUtil checkOperateNo(String patientId, Short operateNo) throws Exception{
+        if (StringUtils.isNoneBlank(patientId) && operateNo != null) {
+            //根据patientId和手术编码查询手术编码集合
+            List<T_Operate> operates = operateService.selectAllByPatientId(patientId, operateNo);
+            if (operates != null && !operates.isEmpty()) {
                 //存在
                 return ResultUtil.error();
             } else {
@@ -1850,8 +1890,8 @@ public class CommomSearchController {
     }
 
     /**
-     * @MethodName: saveHerbDiag
-     * @Description: 保存中医诊断
+     * @MethodName: getOperByCodeOrName
+     * @Description: 通过手术编码或手术名称查询手术字典集合
      * @Param
      * @Return
      * @Author: 曾文和
@@ -1861,479 +1901,367 @@ public class CommomSearchController {
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequiresPermissions(value = {"/commom/addOperCode", "/commom/updateOperCode"})
-    @OptionalLog(module = "保存", methods = "中医诊断编码", fieldName = "herbName")
-    @RequestMapping(value = "saveHerbDiag")
+    @RequestMapping(value = "getOperByCodeOrName", produces = {"text/json;charset=UTF-8"})
     @ResponseBody
-    public ResultUtil saveHerbDiag(T_Herb_Diag herbDiag, Integer isUpdateOperNo, HttpServletRequest request) throws Exception{
-        if (herbDiag.getCurrentHerbDiagNo() == null) {
-            //新增
-            boolean flag = FormTokenFlagUtil.isFlag(request);
-            if (!flag) {
-                return ResultUtil.error("请不要重复提交!");
-            }
-            herbDiagService.insert(herbDiag);
-        } else {
-            //修改
-            if (isUpdateOperNo == 1) {
-                //有修改序号
-                //查询序号是否存在
-                List<T_Herb_Diag> herbDiags = herbDiagService.selectAllByPatientId(herbDiag.getPatientId(), herbDiag.getHerbNo());
-                if (null != herbDiags && !herbDiags.isEmpty()) {
-                    //存在
-                    return ResultUtil.error("该诊断序号已存在！");
-                } else {
-                    herbDiagService.updateByPrimaryKeySelective(herbDiag);
-                }
-            } else {
-                //诊断序号一样
-                herbDiagService.updateByPrimaryKeySelective(herbDiag);
-            }
-        }
-        return ResultUtil.ok();
+    public String getOperByCodeOrName(String code, String name) throws Exception{
+        //根据手术编码和名称查询手术编码对象
+        List<Zd_Cm3> cm3s = cm3Mapper.selectAll(code, name);
+        return JSON.toJSONString(cm3s);
     }
 
     /**
-     * @MethodName: deleteCodeByPatientIdAndHerbNo
-     * @Description: 根据petientId和诊断序号删除中医诊断编码对象
+     * @MethodName: saveOperCode
+     * @Description: 保存手术编码
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2019-06-13
+     * @CreateDate: 2019-06-12
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2019-06-13
+     * @UpdateDate: 2019-06-12
      * @UpdateRemark: 更新说明
-     * @Version: 1.0
-     */
-    @RequiresPermissions("/commom/deleteOperCode")
-    @OptionalLog(module = "删除", methods = "中医诊断编码", fieldName = "herbName", tableName = "t_herb_diag")
-    @RequestMapping(value = "deleteCodeByPatientIdAndHerbNo")
-    @ResponseBody
-    public ResultUtil deleteCodeByPatientIdAndHerbNo(String patientId, Short herbNo) throws Exception{
-        if (StringUtils.isNoneBlank(patientId) && null != herbNo) {
-            herbDiagService.deleteHerbDiagByPatientIdAndHerbNo(patientId, herbNo);
-            return ResultUtil.ok();
-        } else {
-            return ResultUtil.error();
-        }
-    }
-
-    //封装根据index:当前pdf页数，patientId，admissIds获取pdf信息
-    private List<ScanPathVo> getPdfPathVo(Integer index, String patientId, String assortIds) throws Exception {
-        List<ScanPathVo> list = new ArrayList<>();
-        patientId = "'" + patientId + "'";
-        List<ScanPathVo> scanPathVos = scanPathMapper.selectScanFileByPatientIds(patientId, assortIds);
-        //重新组织存在的文件，即转换成功的文件
-        if (null != scanPathVos && !scanPathVos.isEmpty()) {
-            // 实例化图片
-            Image image = null;
-            //不成张合成的高度
-            float tempHeight = 0;
-            Integer pageCount = 0;
-            for (ScanPathVo scanPathVo : scanPathVos) {
-                String fileRealPath = scanPathVo.getFileRealPath();
-                if (StringUtils.isNoneBlank(fileRealPath)) {
-                    //判断文件是否存在
-                    File file1 = new File(fileRealPath);
-                    if (file1.exists()) {
-                        if (file1.getName().endsWith(".tif") || file1.getName().endsWith(".tiff")) {
-                            Object localObject1 = null;
-                            Object localObject2 = null;
-                            URL paramURL = Utilities.toURL(fileRealPath);
-                            try {
-                                if ("file".equals(paramURL.getProtocol())) {
-                                    localObject2 = paramURL.getFile();
-                                    localObject2 = Utilities
-                                            .unEscapeURL((String) localObject2);
-                                    localObject1 = new RandomAccessFileOrArray(
-                                            (String) localObject2);
-                                } else {
-                                    localObject1 = new RandomAccessFileOrArray(paramURL);
-                                }
-
-                                int pageNums = TiffImage
-                                        .getNumberOfPages((RandomAccessFileOrArray) localObject1);
-                                if (pageNums > 0) {
-                                    for (int i = 1; i <= pageNums; i++) {
-                                        localObject2 = TiffImage.getTiffImage(
-                                                (RandomAccessFileOrArray) localObject1, i);
-                                        image = (Image) localObject2;
-                                    }
-                                }
-                                if (localObject1 != null) {
-                                    ((RandomAccessFileOrArray) localObject1).close();
-                                }
-
-                            } finally {
-                                if (localObject1 != null) {
-                                    ((RandomAccessFileOrArray) localObject1).close();
-                                }
-                            }
-                        } else if (file1.getName().endsWith(".png")
-                                || file1.getName().endsWith(".jpg")
-                                || file1.getName().endsWith(".gif")
-                                || file1.getName().endsWith(".jpeg")
-                        ) {
-                            // 实例化图牿
-                            image = Image.getInstance(fileRealPath);
-                        }
-                        // 获得图片的高庿
-                        float heigth = image.getHeight();
-                        float width = image.getWidth();
-                        // 合理压缩，h>w，按w压缩，否则按w压缩
-                        int percent = Jpg2PdfUtil.getPercent(heigth, width);
-
-                        // 设置图片居中显示
-                        image.setAlignment(Image.ALIGN_CENTER);
-                        // 按百分比显示图片的比便
-                        if (width > 1024 || heigth > 786) {
-                            image.scalePercent(percent + 5);
-                            pageCount++;
-                            if (pageCount.equals(index)) {
-                                //当前页返回
-                                list.clear();
-                                list.add(scanPathVo);
-                                return list;
-                            }
-                            //整张，把合成的高度置为0；
-                            tempHeight = 0;
-                        } else if (heigth < 786) {
-                            if (tempHeight == 0) {
-                                pageCount++;
-                            }
-                            tempHeight += heigth;
-                            if (tempHeight > 786) {
-                                pageCount++;
-                                if (pageCount.equals(index)) {
-                                    //当前页返回
-                                    list.clear();
-                                    list.add(scanPathVo);
-                                    return list;
-                                } else if (pageCount == (index + 1)) {
-                                    //已另起一页，返回前一页
-                                    return list;
-                                }
-                                tempHeight = heigth;
-                            } else {
-                                //连续的几张图片高度总和小于786添加进集合
-                                list.add(scanPathVo);
-                            }
-                        }
-                    }
+     * @Version: 1.0
+     */
+    @RequiresPermissions(value = {"/commom/addOperCode", "/commom/updateOperCode"})
+    @OptionalLog(module = "新增", methods = "手术编码", fieldName = "operateName")
+    @RequestMapping(value = "saveOperCode")
+    @ResponseBody
+    public ResultUtil saveOperCode(T_Operate operate, Integer isUpdateOperNo, HttpServletRequest request) throws Exception{
+        if (operate.getCurrentOperateNo() == null) {
+            //新增
+            boolean flag = FormTokenFlagUtil.isFlag(request);
+            if (!flag) {
+                return ResultUtil.error("请不要重复提交!");
+            }
+            operateService.insert(operate);
+        } else {
+            //修改
+            if (isUpdateOperNo == 1) {
+                //有修改手术序号
+                //查询手术序号是否存在
+                List<T_Operate> operates = operateService.selectAllByPatientId(operate.getPatientId(), operate.getOperateNo());
+                if (null != operates && !operates.isEmpty()) {
+                    //存在
+                    return ResultUtil.error("该手术序号已存在!");
+                } else {
+                    operateService.updateByPrimaryKeySelective(operate);
                 }
+            } else {
+                //手术序号一样
+                operateService.updateByPrimaryKeySelective(operate);
             }
         }
-        return list;
+        return ResultUtil.ok();
     }
-    /*****************************病案图片操作****************************/
-    @OptionalLog(module = "保存", methods = "图片资料", fieldName = "name", tableName = "commomtable")
-    @RequiresPermissions("/commom/updatePic")
-    @RequestMapping(value = "updatePic", method = RequestMethod.POST)
+
+    /**
+     * @MethodName: deleteOperCodeByPatientIdAndOperNo
+     * @Description: 根据petientId和手术序号删除手术编码对象
+     * @Param
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2019-06-12
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2019-06-12
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
+     */
+    @RequiresPermissions("/commom/deleteOperCode")
+    @OptionalLog(module = "删除", methods = "手术编码", fieldName = "operateName", tableName = "t_operate")
+    @RequestMapping(value = "deleteOperCodeByPatientIdAndOperNo")
     @ResponseBody
-    public ResultUtil updatePic(CommomVo commomVo,@RequestParam(required = false, value = "files") MultipartFile[] files,String assortId) throws Exception{
-        ResultUtil resultUtil = commomService.updatePic(files, commomVo.getPatientId(), assortId);
-        if(!resultUtil.getCode().equals(0)){
-            return resultUtil;
+    public ResultUtil deleteOperCodeByPatientIdAndOperNo(String patientId, Short operateNo) throws Exception{
+        if (StringUtils.isNoneBlank(patientId) && null != operateNo) {
+            operateService.deleteOperCodeByPatientIdAndOperNo(patientId, operateNo);
+            return ResultUtil.ok();
+        } else {
+            return ResultUtil.error();
         }
+    }/**************************************************西医诊断操作*************************************************/
+
+    /**
+     * @MethodName: addOperCode
+     * @Description: 保存手术编码
+     * @Param
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2020-01-03
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2020-01-03
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
+     */
+    @RequiresPermissions("/commom/addOperCode")
+    @RequestMapping(value = "addOperCode")
+    @ResponseBody
+    public ResultUtil addOperCode(String patientId, String operNos, String operDates, String operCodes, String operNames, String operateClasses, String operators, String assistant1s, String assistant2s, String cuts, String chossurgs, String anaesthesiaTypes, String anaesthesiaNames) throws Exception{
+        operateService.addOperCode(patientId, operNos, operDates, operCodes, operNames, operateClasses, operators, assistant1s, assistant2s, cuts, chossurgs, anaesthesiaTypes, anaesthesiaNames);
         return ResultUtil.ok();
     }
 
     /**
-     * @MethodName: delScanAssortByBlood
-     * @Description: 删除图片
-     * @Param String patientId,String assortIds:病案图片集合
+     * @MethodName: getDictionaryByTypeCode
+     * @Description: 根据字典标识查询字典集合
+     * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2020-03-09
+     * @CreateDate: 2019-06-12
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2020-03-09
+     * @UpdateDate: 2019-06-12
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequiresPermissions("/commom/delScanAssort")
-    @OptionalLog(module = "删除", methods = "档案预览页面删除病案图片",fieldName = "name",tableName = "commomtable")
-    @RequestMapping(value = "delScanAssortByBlood", method = RequestMethod.POST)
+    @RequestMapping(value = "getDictionaryByTypeCode", produces = {"text/json;charset=UTF-8"})
     @ResponseBody
-    public ResultUtil delScanAssortByBlood(String patientId) throws Exception{
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        String assortIds = request.getParameter("assortIds");
-        if (StringUtils.isNoneBlank(patientId) && StringUtils.isNoneBlank(assortIds)) {
-            scanAssortService.SimpleDelByPatientIdAndScanPages(patientId, assortIds);
-            return ResultUtil.ok();
-        }
-        return null;
+    public String getDictionaryByTypeCode(String typeCode) throws Exception{
+        List<Emr_Dictionary> dictionaries = dictionaryMapper.selectDictionaryByTypeCode(typeCode);
+        return JSON.toJSONString(dictionaries);
     }
 
-    /*****************************病案备注操作****************************/
     /**
-     * @MethodName: updateRecordReMark
-     * @Description: 修改病案备注
+     * @MethodName: getIcdCodeList
+     * @Description: 加载icd编码字典表
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2020-06-05
+     * @CreateDate: 2019-06-12
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2020-06-05
+     * @UpdateDate: 2019-06-12
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @OptionalLog(module = "修改", methods = "修改病案备注", fieldName = "name", tableName = "commomtable")
-    @RequiresPermissions("/commom/addReMark")
-    @RequestMapping(value="updateRecordReMark",method = RequestMethod.POST)
+    @RequestMapping(value = "getIcdCodeList", produces = {"text/json;charset=UTF-8"})
     @ResponseBody
-    public ResultUtil updateRecordReMark(CommomVo commomVo) throws Exception{
-        commomService.updateRecordReMark(commomVo);
-        return ResultUtil.ok();
+    public String getIcdCodeList() throws Exception{
+        List<Zd_Icd_Code> icdCodes = icdCodeMapper.selectAll(null, null);
+        return JSON.toJSONString(icdCodes);
     }
-    /**************************病案备注结束*******************************/
-    /**************************恢复已删除图片开始*************************/
+
     /**
-     * @MethodName: getDeledPicRecordTree
-     * @Description: 组织已删除图片的病案分类树
+     * @MethodName: getIcdCodeByCodeOrName
+     * @Description: 根据icd编码或名称查询icd字典集合
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2020-06-08
+     * @CreateDate: 2019-06-12
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2020-06-08
+     * @UpdateDate: 2019-06-12
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @RequestMapping("selectDeledPicRecordTree")
+    @RequestMapping(value = "getIcdCodeByCodeOrName", produces = {"text/json;charset=UTF-8"})
     @ResponseBody
-    public List<ScanDeledAssortTree> selectDeledPicRecordTree(String patientId,String flag) {
-        List<ScanDeledAssortTree> treeList = new ArrayList<>();
-        //根据patientId查询已删除图片集合
-        List<ScanAssortVo> scanAssortVos = scanAssortMapper.selectDeledPicList(patientId,flag);
-        //第一级：全部影像资料
-        ScanDeledAssortTree tree1 = new ScanDeledAssortTree();
-        Integer id = 1;
-        tree1.setId(id);
-        tree1.setName("全部影像资料(" + scanAssortVos.size() + ")");
-        tree1.setCount(scanAssortVos.size());
-        //定义图片集合
-        String scanPathList = "";
-        //定义绝对路径集合
-        String srcs = "";
-        //定义分类名称集合
-        String assortNames = "";
-        if (null != scanAssortVos && !scanAssortVos.isEmpty()) {
-            //定义图片分类不重复结合
-            Set<String> assortNameSet = new LinkedHashSet<>();
-            for (ScanAssortVo scanAssort : scanAssortVos) {
-                if (StringUtils.isNotBlank(scanAssort.getAssortName())) {
-                    assortNameSet.add(scanAssort.getAssortName());
-                    scanPathList += scanAssort.getScanPage() + ",";
-                    srcs += scanAssort.getRootPath() + "\\" + scanAssort.getScanPage() + ",";
-                    assortNames += scanAssort.getAssortName() + ",";
-                }
+    public String getIcdCodeByCodeOrName(String code, String name) throws Exception{
+        List<Zd_Icd_Code> icdCodes = icdCodeMapper.selectAll(code, name);
+        return JSON.toJSONString(icdCodes);
+    }
+
+    /**
+     * @MethodName: checkDiagNo
+     * @Description: 验证西医诊断序号是否存在
+     * @Param
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2019-06-12
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2019-06-12
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
+     */
+    @RequestMapping(value = "checkDiagNo")
+    @ResponseBody
+    public ResultUtil checkDiagNo(String patientId, Short diagNo) throws Exception{
+        if (StringUtils.isNoneBlank(patientId) && diagNo != null) {
+            List<T_Diag> diags = diagService.selectAllByPatientId(patientId, diagNo);
+            if (diags != null && !diags.isEmpty()) {
+                //存在
+                return ResultUtil.error();
+            } else {
+                return ResultUtil.ok();
             }
-            //设置图片名称集合
-            tree1.setScanPageList(scanPathList);
-            tree1.setSrcs(srcs);
-            tree1.setAssortNames(assortNames);
-            treeList.add(tree1);
-            for (String assortName : assortNameSet) {
-                id++;
-                ScanDeledAssortTree tree2 = new ScanDeledAssortTree();
-                tree2.setId(id);
-                tree2.setParentId(1);
-                //定义图片集合
-                String scanPathList1 = "";
-                String srcs1 = "";
-                //定义分类图片的个数
-                Integer count = 0;
-                for (ScanAssortVo scanAssort : scanAssortVos) {
-                    if (StringUtils.isNotBlank(scanAssort.getAssortName())) {
-                        if (scanAssort.getAssortName().equals(assortName)) {
-                            scanPathList1 += scanAssort.getScanPage() + ",";
-                            srcs1 += scanAssort.getRootPath() + "\\" + scanAssort.getScanPage() + ",";
-                            count++;
-                        }
-                    }
-                }
-                tree2.setName(assortName + "(" + count + ")");
-                tree2.setCount(count);
-                tree2.setScanPageList(scanPathList1);
-                tree2.setSrcs(srcs1);
-                tree2.setAssortNames(assortName);
-                treeList.add(tree2);
+        }
+        return ResultUtil.error();
+    }
+
+    /**
+     * @MethodName: saveDiag
+     * @Description: 保存西医诊断
+     * @Param
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2019-06-12
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2019-06-12
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
+     */
+    @RequiresPermissions(value = {"/commom/addOperCode", "/commom/updateOperCode"})
+    @OptionalLog(module = "保存", methods = "西医诊断编码", fieldName = "diagName")
+    @RequestMapping(value = "saveDiag")
+    @ResponseBody
+    public ResultUtil saveDiag(T_Diag diag, Integer isUpdateOperNo, HttpServletRequest request) throws Exception{
+        if (diag.getCurrentDiagNo() == null) {
+            //新增
+            boolean flag = FormTokenFlagUtil.isFlag(request);
+            if (!flag) {
+                return ResultUtil.error("请不要重复提交!");
+            }
+            diagService.insert(diag);
+        } else {
+            //修改
+            if (isUpdateOperNo == 1) {
+                //有修改序号
+                //查询序号是否存在
+                List<T_Diag> diags = diagService.selectAllByPatientId(diag.getPatientId(), diag.getDiagNo());
+                if (null != diags && !diags.isEmpty()) {
+                    //存在
+                    return ResultUtil.error("该诊断序号已存在！");
+                } else {
+                    diagService.updateByPrimaryKeySelective(diag);
+                }
+            } else {
+                //诊断序号一样
+                diagService.updateByPrimaryKeySelective(diag);
             }
         }
-        return treeList;
+        return ResultUtil.ok();
     }
+    /*****************************************中医诊断********************************************************/
+
     /**
-     * @MethodName: getDeledPicRecordTree
-     * @Description: 组织已删除图片的病案分类树
+     * @MethodName: deleteCodeByPatientIdAndDiagNo
+     * @Description: 根据petientId和诊断序号删除西医诊断编码对象
      * @Param
      * @Return
      * @Author: 曾文和
-     * @CreateDate: 2020-06-08
+     * @CreateDate: 2019-06-13
      * @UpdateUser: 曾文和
-     * @UpdateDate: 2020-06-08
+     * @UpdateDate: 2019-06-13
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @OptionalLog(module = "修改", methods = "恢复已删除图片", fieldName = "name", tableName = "commomtable")
-    @RequiresPermissions("/commom/recoverPic")
-    @RequestMapping(value="recoverPic",method = RequestMethod.POST)
+    @RequiresPermissions("/commom/deleteOperCode")
+    @OptionalLog(module = "删除", methods = "西医诊断编码", fieldName = "diagName", tableName = "t_diag")
+    @RequestMapping(value = "deleteCodeByPatientIdAndDiagNo")
     @ResponseBody
-    public ResultUtil recoverPic(CommomVo commomVo,String scanPages) throws Exception{
-        scanAssortService.recoverPic(commomVo.getPatientId(),scanPages);
-        return ResultUtil.ok();
+    public ResultUtil deleteCodeByPatientIdAndDiagNo(String patientId, Short diagNo) throws Exception{
+        if (StringUtils.isNoneBlank(patientId) && null != diagNo) {
+            diagService.deleteDiagByPatientIdAndDiagNo(patientId, diagNo);
+            return ResultUtil.ok();
+        } else {
+            return ResultUtil.error();
+        }
     }
-    /**************************恢复已删除图片结束***********************/
-    /**************************病案维护开始*****************************/
+
     /**
-     * 验证编号和协议号是否存在
-     * @param commomBlood
-     * @return
-     * @throws Exception
+     * @MethodName: checkHerbNo
+     * @Description: 验证中医诊断序号是否存在
+     * @Param
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2019-06-12
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2019-06-12
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
      */
-    //脐血库
-    @RequestMapping("validExistForm")
+    @RequestMapping(value = "checkHerbNo")
     @ResponseBody
-    public ResultUtil validExistForm(CommomBlood commomBlood) throws Exception{
-        String patientId = commomBlood.getPatientId();
-        commomBlood.setPatientId(null);
-        FontCommom commom = new FontCommom();
-        BeanUtils.copyProperties(commomBlood,commom);
-        List<FontCommom> list = commomMapper.isExistInpatient(commom);
-        if(!CollectionUtils.isEmpty(list)){
-            //修改的情况，同一份病案返回成功
-            if(StringUtils.isNotBlank(patientId) && list.get(0).getPatientId().equals(patientId)){
+    public ResultUtil checkHerbNo(String patientId, Short herbNo) throws Exception{
+        if (StringUtils.isNoneBlank(patientId) && herbNo != null) {
+            List<T_Herb_Diag> herbDiags = herbDiagService.selectAllByPatientId(patientId, herbNo);
+            if (herbDiags != null && !herbDiags.isEmpty()) {
+                //存在
+                return ResultUtil.error();
+            } else {
                 return ResultUtil.ok();
             }
-            return ResultUtil.ok("已存在");
-        }
-        return ResultUtil.ok();
-    }
-    /**
-     * 脐血库新增档案
-     * @param commomBlood
-     * @return
-     * @throws Exception
-     */
-    @OptionalLog(module = "新增", methods = "新增档案")
-    @RequiresPermissions("/commom/addRecord")
-    @RequestMapping(value="addRecord",method = RequestMethod.POST)
-    @ResponseBody
-    public ResultUtil addRecordBlood(@Valid CommomBlood commomBlood,HttpServletRequest request) throws Exception{
-        //判断formToken
-        boolean flag = FormTokenFlagUtil.isFlag(request);
-        if(!flag){
-            return ResultUtil.error("请不要重复提交!");
-        }
-        //判断表单不为空和不可重复的字段
-        ResultUtil result = validFieldOper(commomBlood);
-        if(!result.getCode().equals(0)){
-            return result;
-        }
-        //进入添加病案方法
-        ResultUtil resultUtil = commomService.addRecordBlood(commomBlood, request);
-        //有错误返回错误信息
-        if(!resultUtil.getCode().equals(0)){
-            return resultUtil;
         }
-        return ResultUtil.ok();
+        return ResultUtil.error();
     }
 
     /**
-     * 加载分类树
-     * @param request
-     * @return
+     * @MethodName: saveHerbDiag
+     * @Description: 保存中医诊断
+     * @Param
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2019-06-12
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2019-06-12
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
      */
-    @RequestMapping("selectRecordTree")
+    @RequiresPermissions(value = {"/commom/addOperCode", "/commom/updateOperCode"})
+    @OptionalLog(module = "保存", methods = "中医诊断编码", fieldName = "herbName")
+    @RequestMapping(value = "saveHerbDiag")
     @ResponseBody
-    public List<Zd_Assort> selectRecordTree(HttpServletRequest request){
-        List<Zd_Assort> treeList = new ArrayList<>();
-        Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER");
-        try {
-            List<Zd_Assort> assorts = assortService.selectAllByPower(user);
-            //第一级：全部影像资料
-            Zd_Assort tree1 = new Zd_Assort();
-            tree1.setAssortId("0");
-            tree1.setAssortName("全部分类");
-            treeList.add(tree1);
-            if(!CollectionUtils.isEmpty(assorts)){
-                for(Zd_Assort assort : assorts){
-                    assort.setPrintFlag("0");
-                }
-                treeList.addAll(assorts);
-            }
-            return treeList;
-        }catch (Exception e){
-            e.printStackTrace();
-            log.error(ExceptionUtils.getExceptionStr(e));
-            return null;
-        }
-    }
-
-    //判断表单不为空和不可重复的字段
-    private ResultUtil validFieldOper(CommomBlood commomBlood) throws Exception{
-        String patientId = commomBlood.getPatientId();
-        //判断脐血编号不为空
-        String inpatientNo = commomBlood.getInpatientNo();
-        if(StringUtils.isBlank(inpatientNo)){
-            return ResultUtil.error("脐血编号不能为空!");
-        }else{
-            FontCommom commom = new FontCommom();
-            commom.setInpatientNo(inpatientNo);
-            List<FontCommom> list = commomMapper.isExistInpatient(commom);
-            if(!CollectionUtils.isEmpty(list)){
-                if(StringUtils.isNotBlank(patientId)){
-                    if(list.get(0).getPatientId().equals(patientId)){
-                        return ResultUtil.ok();
-                    }
-                }
-                return ResultUtil.error("脐血编号已存在!");
+    public ResultUtil saveHerbDiag(T_Herb_Diag herbDiag, Integer isUpdateOperNo, HttpServletRequest request) throws Exception{
+        if (herbDiag.getCurrentHerbDiagNo() == null) {
+            //新增
+            boolean flag = FormTokenFlagUtil.isFlag(request);
+            if (!flag) {
+                return ResultUtil.error("请不要重复提交!");
             }
-        }
-        //验证协议号是否存在
-        String admissId = commomBlood.getAdmissId();
-        if(StringUtils.isNotBlank(admissId)){
-            FontCommom commom = new FontCommom();
-            commom.setAdmissId(admissId);
-            List<FontCommom> list = commomMapper.isExistInpatient(commom);
-            if(!CollectionUtils.isEmpty(list)){
-                if(StringUtils.isNotBlank(patientId)){
-                    if(list.get(0).getPatientId().equals(patientId)){
-                        return ResultUtil.ok();
-                    }
+            herbDiagService.insert(herbDiag);
+        } else {
+            //修改
+            if (isUpdateOperNo == 1) {
+                //有修改序号
+                //查询序号是否存在
+                List<T_Herb_Diag> herbDiags = herbDiagService.selectAllByPatientId(herbDiag.getPatientId(), herbDiag.getHerbNo());
+                if (null != herbDiags && !herbDiags.isEmpty()) {
+                    //存在
+                    return ResultUtil.error("该诊断序号已存在！");
+                } else {
+                    herbDiagService.updateByPrimaryKeySelective(herbDiag);
                 }
-                return ResultUtil.error("协议号已存在!");
+            } else {
+                //诊断序号一样
+                herbDiagService.updateByPrimaryKeySelective(herbDiag);
             }
         }
-        //判断孕妇姓名不为空
-        if(StringUtils.isBlank(commomBlood.getName())){
-            return ResultUtil.error("孕妇姓名不能为空!");
-        }
         return ResultUtil.ok();
     }
 
-    @OptionalLog(module = "修改", methods = "修改档案",fieldName = "name",tableName = "commomtable")
-    @RequiresPermissions("/commom/updateRecord")
-    @RequestMapping(value="updateRecordBlood",method = RequestMethod.POST)
+    /**
+     * @MethodName: deleteCodeByPatientIdAndHerbNo
+     * @Description: 根据petientId和诊断序号删除中医诊断编码对象
+     * @Param
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2019-06-13
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2019-06-13
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
+     */
+    @RequiresPermissions("/commom/deleteOperCode")
+    @OptionalLog(module = "删除", methods = "中医诊断编码", fieldName = "herbName", tableName = "t_herb_diag")
+    @RequestMapping(value = "deleteCodeByPatientIdAndHerbNo")
     @ResponseBody
-    public ResultUtil updateRecordBlood(CommomBlood commomBlood) throws Exception{
-        //判断表单不为空和不可重复的字段
-        ResultUtil resultUtil = validFieldOper(commomBlood);
-        if(!resultUtil.getCode().equals(0)){
-            return resultUtil;
+    public ResultUtil deleteCodeByPatientIdAndHerbNo(String patientId, Short herbNo) throws Exception{
+        if (StringUtils.isNoneBlank(patientId) && null != herbNo) {
+            herbDiagService.deleteHerbDiagByPatientIdAndHerbNo(patientId, herbNo);
+            return ResultUtil.ok();
+        } else {
+            return ResultUtil.error();
         }
-        CommomVo commomVo = new CommomVo();
-        BeanUtils.copyProperties(commomBlood,commomVo);
-        commomService.updateRecord(commomVo);
-        return ResultUtil.ok();
     }
-
-    @OptionalLog(module = "删除", methods = "删除档案",fieldName = "name",tableName = "commomtable")
-    @RequiresPermissions("/commom/deleteRecord")
-    @RequestMapping(value="deleteRecordBlood",method = RequestMethod.POST)
-    @ResponseBody
-    public ResultUtil deleteRecordBlood(String patientId) throws Exception{
-        commomService.deleteRecord(patientId);
-        return ResultUtil.ok();
+    /*******************第一版本手术、诊断操作结束**********************/
+    //阿拉伯数字转中文
+    private static String toChinese(String str) {
+        String[] s1 = {"零", "一", "二", "三", "四", "五", "六", "七", "八", "九"};
+        String[] s2 = {"十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千"};
+        String result = "";
+        int n = str.length();
+        for (int i = 0; i < n; i++) {
+            int num = str.charAt(i) - '0';
+            if (i != n - 1 && num != 0) {
+                result += s1[num] + s2[n - 2 - i];
+            } else {
+                result += s1[num];
+            }
+        }
+        return result;
     }
-    /**************************病案维护结束*****************************/
 }
diff --git a/src/main/java/com/emr/dao/emrPdfWaterSet/EmrPdfWaterSetMapper.xml b/src/main/java/com/emr/dao/emrPdfWaterSet/EmrPdfWaterSetMapper.xml
index cda8b3a..2715ea3 100644
--- a/src/main/java/com/emr/dao/emrPdfWaterSet/EmrPdfWaterSetMapper.xml
+++ b/src/main/java/com/emr/dao/emrPdfWaterSet/EmrPdfWaterSetMapper.xml
@@ -12,19 +12,25 @@
     <result column="text_color" property="textColor" jdbcType="NVARCHAR" />
     <result column="text_size" property="textSize" jdbcType="INTEGER" />
     <result column="text_rotation" property="textRotation" jdbcType="INTEGER" />
+    <result column="is_img" property="isImg" jdbcType="SMALLINT" />
     <result column="img_file" property="imgFile" jdbcType="NVARCHAR" />
     <result column="img_width" property="imgWidth" jdbcType="INTEGER" />
     <result column="img_height" property="imgHeight" jdbcType="INTEGER" />
     <result column="img_x" property="imgX" jdbcType="INTEGER" />
     <result column="img_y" property="imgY" jdbcType="INTEGER" />
     <result column="unique_id" property="uniqueId" jdbcType="NVARCHAR" />
+    <result column="download_effective" property="downloadEffective" jdbcType="SMALLINT" />
+    <result column="download_is_img" property="downloadIsImg" jdbcType="SMALLINT" />
+    <result column="print_effective" property="printEffective" jdbcType="SMALLINT" />
+    <result column="print_is_img" property="printIsImg" jdbcType="SMALLINT" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, effective, up_or_under, transparent, text, text_x, text_y, text_color, text_size, 
-    text_rotation, img_file, img_width, img_height, img_x, img_y, unique_id
+    id, effective, up_or_under, transparent, text, text_x, text_y, text_color, text_size,
+    text_rotation, is_img, img_file, img_width, img_height, img_x, img_y, unique_id,
+    download_effective, download_is_img, print_effective, print_is_img
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from emr_pdf_water_set
     where id = #{id,jdbcType=INTEGER}
@@ -34,18 +40,22 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet" >
-    insert into emr_pdf_water_set (id, effective, up_or_under, 
-      transparent, text, text_x, 
-      text_y, text_color, text_size, 
-      text_rotation, img_file, img_width, 
-      img_height, img_x, img_y, 
-      unique_id)
-    values (#{id,jdbcType=INTEGER}, #{effective,jdbcType=SMALLINT}, #{upOrUnder,jdbcType=SMALLINT}, 
-      #{transparent,jdbcType=REAL}, #{text,jdbcType=NVARCHAR}, #{textX,jdbcType=INTEGER}, 
-      #{textY,jdbcType=INTEGER}, #{textColor,jdbcType=NVARCHAR}, #{textSize,jdbcType=INTEGER}, 
-      #{textRotation,jdbcType=INTEGER}, #{imgFile,jdbcType=NVARCHAR}, #{imgWidth,jdbcType=INTEGER}, 
-      #{imgHeight,jdbcType=INTEGER}, #{imgX,jdbcType=INTEGER}, #{imgY,jdbcType=INTEGER}, 
-      #{uniqueId,jdbcType=NVARCHAR})
+    insert into emr_pdf_water_set (id, effective, up_or_under,
+      transparent, text, text_x,
+      text_y, text_color, text_size,
+      text_rotation, is_img, img_file,
+      img_width, img_height, img_x,
+      img_y, unique_id, download_effective,
+      download_is_img, print_effective, print_is_img
+      )
+    values (#{id,jdbcType=INTEGER}, #{effective,jdbcType=SMALLINT}, #{upOrUnder,jdbcType=SMALLINT},
+      #{transparent,jdbcType=REAL}, #{text,jdbcType=NVARCHAR}, #{textX,jdbcType=INTEGER},
+      #{textY,jdbcType=INTEGER}, #{textColor,jdbcType=NVARCHAR}, #{textSize,jdbcType=INTEGER},
+      #{textRotation,jdbcType=INTEGER}, #{isImg,jdbcType=SMALLINT}, #{imgFile,jdbcType=NVARCHAR},
+      #{imgWidth,jdbcType=INTEGER}, #{imgHeight,jdbcType=INTEGER}, #{imgX,jdbcType=INTEGER},
+      #{imgY,jdbcType=INTEGER}, #{uniqueId,jdbcType=NVARCHAR}, #{downloadEffective,jdbcType=SMALLINT},
+      #{downloadIsImg,jdbcType=SMALLINT}, #{printEffective,jdbcType=SMALLINT}, #{printIsImg,jdbcType=SMALLINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet" >
     insert into emr_pdf_water_set
@@ -80,6 +90,9 @@
       <if test="textRotation != null" >
         text_rotation,
       </if>
+      <if test="isImg != null" >
+        is_img,
+      </if>
       <if test="imgFile != null" >
         img_file,
       </if>
@@ -98,6 +111,18 @@
       <if test="uniqueId != null" >
         unique_id,
       </if>
+      <if test="downloadEffective != null" >
+        download_effective,
+      </if>
+      <if test="downloadIsImg != null" >
+        download_is_img,
+      </if>
+      <if test="printEffective != null" >
+        print_effective,
+      </if>
+      <if test="printIsImg != null" >
+        print_is_img,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -130,6 +155,9 @@
       <if test="textRotation != null" >
         #{textRotation,jdbcType=INTEGER},
       </if>
+      <if test="isImg != null" >
+        #{isImg,jdbcType=SMALLINT},
+      </if>
       <if test="imgFile != null" >
         #{imgFile,jdbcType=NVARCHAR},
       </if>
@@ -148,6 +176,18 @@
       <if test="uniqueId != null" >
         #{uniqueId,jdbcType=NVARCHAR},
       </if>
+      <if test="downloadEffective != null" >
+        #{downloadEffective,jdbcType=SMALLINT},
+      </if>
+      <if test="downloadIsImg != null" >
+        #{downloadIsImg,jdbcType=SMALLINT},
+      </if>
+      <if test="printEffective != null" >
+        #{printEffective,jdbcType=SMALLINT},
+      </if>
+      <if test="printIsImg != null" >
+        #{printIsImg,jdbcType=SMALLINT},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet" >
@@ -180,6 +220,9 @@
       <if test="textRotation != null" >
         text_rotation = #{textRotation,jdbcType=INTEGER},
       </if>
+      <if test="isImg != null" >
+        is_img = #{isImg,jdbcType=SMALLINT},
+      </if>
       <if test="imgFile != null" >
         img_file = #{imgFile,jdbcType=NVARCHAR},
       </if>
@@ -198,6 +241,18 @@
       <if test="uniqueId != null" >
         unique_id = #{uniqueId,jdbcType=NVARCHAR},
       </if>
+      <if test="downloadEffective != null" >
+        download_effective = #{downloadEffective,jdbcType=SMALLINT},
+      </if>
+      <if test="downloadIsImg != null" >
+        download_is_img = #{downloadIsImg,jdbcType=SMALLINT},
+      </if>
+      <if test="printEffective != null" >
+        print_effective = #{printEffective,jdbcType=SMALLINT},
+      </if>
+      <if test="printIsImg != null" >
+        print_is_img = #{printIsImg,jdbcType=SMALLINT},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -212,12 +267,17 @@
       text_color = #{textColor,jdbcType=NVARCHAR},
       text_size = #{textSize,jdbcType=INTEGER},
       text_rotation = #{textRotation,jdbcType=INTEGER},
+      is_img = #{isImg,jdbcType=SMALLINT},
       img_file = #{imgFile,jdbcType=NVARCHAR},
       img_width = #{imgWidth,jdbcType=INTEGER},
       img_height = #{imgHeight,jdbcType=INTEGER},
       img_x = #{imgX,jdbcType=INTEGER},
       img_y = #{imgY,jdbcType=INTEGER},
-      unique_id = #{uniqueId,jdbcType=NVARCHAR}
+      unique_id = #{uniqueId,jdbcType=NVARCHAR},
+      download_effective = #{downloadEffective,jdbcType=SMALLINT},
+      download_is_img = #{downloadIsImg,jdbcType=SMALLINT},
+      print_effective = #{printEffective,jdbcType=SMALLINT},
+      print_is_img = #{printIsImg,jdbcType=SMALLINT}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/emr/entity/Paper.java b/src/main/java/com/emr/entity/Paper.java
deleted file mode 100644
index d1bc8b2..0000000
--- a/src/main/java/com/emr/entity/Paper.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.emr.entity;
-
-/**
- * @Author:hjl
- * @Date:Creatid in 15:44 2019/4/6
- * @Description:
- */
-public class Paper {
-    private long paperId;
-    private String paperName;
-    private int paperNum;
-    private String paperDetail;
-
-    public long getPaperId() {
-        return paperId;
-    }
-
-    public void setPaperId(long paperId) {
-        this.paperId = paperId;
-    }
-
-    public String getPaperName() {
-        return paperName;
-    }
-
-    public void setPaperName(String paperName) {
-        this.paperName = paperName;
-    }
-
-    public int getPaperNum() {
-        return paperNum;
-    }
-
-    public void setPaperNum(int paperNum) {
-        this.paperNum = paperNum;
-    }
-
-    public String getPaperDetail() {
-        return paperDetail;
-    }
-
-    public void setPaperDetail(String paperDetail) {
-        this.paperDetail = paperDetail;
-    }
-}
diff --git a/src/main/java/com/emr/entity/emrPdfWaterSet/EmrPdfWaterSet.java b/src/main/java/com/emr/entity/emrPdfWaterSet/EmrPdfWaterSet.java
index 8ed42b4..1b8c3cf 100644
--- a/src/main/java/com/emr/entity/emrPdfWaterSet/EmrPdfWaterSet.java
+++ b/src/main/java/com/emr/entity/emrPdfWaterSet/EmrPdfWaterSet.java
@@ -7,8 +7,6 @@ public class EmrPdfWaterSet implements Serializable {
 
     private Short effective;
 
-    private Short downloadEffective;
-
     private Short upOrUnder;
 
     private Float transparent;
@@ -27,8 +25,6 @@ public class EmrPdfWaterSet implements Serializable {
 
     private Short isImg;
 
-    private Short downloadIsImg;
-
     private String imgFile;
 
     private Integer imgWidth;
@@ -41,6 +37,14 @@ public class EmrPdfWaterSet implements Serializable {
 
     private String uniqueId;
 
+    private Short downloadEffective;
+
+    private Short downloadIsImg;
+
+    private Short printEffective;
+
+    private Short printIsImg;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -59,14 +63,6 @@ public class EmrPdfWaterSet implements Serializable {
         this.effective = effective;
     }
 
-    public Short getDownloadEffective() {
-        return downloadEffective;
-    }
-
-    public void setDownloadEffective(Short downloadEffective) {
-        this.downloadEffective = downloadEffective;
-    }
-
     public Short getUpOrUnder() {
         return upOrUnder;
     }
@@ -139,14 +135,6 @@ public class EmrPdfWaterSet implements Serializable {
         this.isImg = isImg;
     }
 
-    public Short getDownloadIsImg() {
-        return downloadIsImg;
-    }
-
-    public void setDownloadIsImg(Short downloadIsImg) {
-        this.downloadIsImg = downloadIsImg;
-    }
-
     public String getImgFile() {
         return imgFile;
     }
@@ -195,6 +183,38 @@ public class EmrPdfWaterSet implements Serializable {
         this.uniqueId = uniqueId == null ? null : uniqueId.trim();
     }
 
+    public Short getDownloadEffective() {
+        return downloadEffective;
+    }
+
+    public void setDownloadEffective(Short downloadEffective) {
+        this.downloadEffective = downloadEffective;
+    }
+
+    public Short getDownloadIsImg() {
+        return downloadIsImg;
+    }
+
+    public void setDownloadIsImg(Short downloadIsImg) {
+        this.downloadIsImg = downloadIsImg;
+    }
+
+    public Short getPrintEffective() {
+        return printEffective;
+    }
+
+    public void setPrintEffective(Short printEffective) {
+        this.printEffective = printEffective;
+    }
+
+    public Short getPrintIsImg() {
+        return printIsImg;
+    }
+
+    public void setPrintIsImg(Short printIsImg) {
+        this.printIsImg = printIsImg;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -203,7 +223,6 @@ public class EmrPdfWaterSet implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", effective=").append(effective);
-        sb.append(", downloadEffective=").append(downloadEffective);
         sb.append(", upOrUnder=").append(upOrUnder);
         sb.append(", transparent=").append(transparent);
         sb.append(", text=").append(text);
@@ -213,13 +232,16 @@ public class EmrPdfWaterSet implements Serializable {
         sb.append(", textSize=").append(textSize);
         sb.append(", textRotation=").append(textRotation);
         sb.append(", isImg=").append(isImg);
-        sb.append(", downloadIsImg=").append(downloadIsImg);
         sb.append(", imgFile=").append(imgFile);
         sb.append(", imgWidth=").append(imgWidth);
         sb.append(", imgHeight=").append(imgHeight);
         sb.append(", imgX=").append(imgX);
         sb.append(", imgY=").append(imgY);
         sb.append(", uniqueId=").append(uniqueId);
+        sb.append(", downloadEffective=").append(downloadEffective);
+        sb.append(", downloadIsImg=").append(downloadIsImg);
+        sb.append(", printEffective=").append(printEffective);
+        sb.append(", printIsImg=").append(printIsImg);
         sb.append("]");
         return sb.toString();
     }
diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java
index 967aa86..c6daa4a 100644
--- a/src/main/java/com/emr/service/CommomService.java
+++ b/src/main/java/com/emr/service/CommomService.java
@@ -28,6 +28,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
@@ -54,6 +56,10 @@ import java.util.*;
 public class CommomService {
     @Value("${POWER_URLHEAD}")
     private  String POWER_URLHEAD;
+    @Value("${waterPicPath}")
+    private String WATERPICPATH;
+    @Value("${EMR_RECORD_JSP}")
+    private String EMRRECORDJSP;
     @Autowired
     private CommomMapper commomMapper;
     @Autowired
@@ -362,4 +368,102 @@ public class CommomService {
         commomVo.setIsOper("-1");
         commomMapper.updateRecordReMark(commomVo);
     }
+
+    /**
+     * 脐血库、祈福医院打印预览前加载图片
+     * @param patientId
+     * @param rootPaths
+     * @param names
+     * @param sources
+     * @return
+     */
+    public List<String> selectPrintPic(String patientId, String rootPaths, String names, String sources) {
+        List<String> outs = new LinkedList<>();
+        if(StringUtils.isNotBlank(names)){
+            String[] rootPathList = rootPaths.split(",");
+            String[] nameList = names.split(",");
+            String[] sourceList = sources.split(",");
+            //获取水印设置
+            EmrPdfWaterSet emrPdfWaterSet = pdfWaterSetMapper.selectByPrimaryKey(1);
+            //获取是否打印文本水印
+            Short printEffective = emrPdfWaterSet.getPrintEffective();
+            //获取是否打印图片水印
+            Short printIsImg = emrPdfWaterSet.getPrintIsImg();
+            for (int i = 0;i < nameList.length;i++) {
+                //定义图片根目录地址
+                String rootPath = "";
+                //组织原图片地址
+                if("1".equals(sourceList[i])){
+                    //扫描图片地址位于rootPathList第一个
+                    rootPath = rootPathList[0];
+                }else{
+                    rootPath = rootPathList[1];
+                }
+                //原图片地址
+                String srcPath = rootPath + "\\" + nameList[i];
+                //定义输出地址
+                String outSrc = "";
+                //获取项目上下文地址
+                if((printEffective != null && printEffective == 1) ||
+                        (printIsImg != null && printIsImg == 1)){
+                    //需要水印
+                    //组织加水印后图片存放目录
+                    String waterPicRoot = WATERPICPATH + patientId +"\\" + sourceList[i] + "\\";
+                    //目录不存在则创建
+                    if(!new File(waterPicRoot).isDirectory()){
+                        new File(waterPicRoot).mkdirs();
+                    }
+                    //组织加水印后图片存放地址
+                    String waterPicPath = waterPicRoot + nameList[i];
+                    if(!new File(waterPicPath).exists()) {
+                        img2PdfUtil.addWatermarkPic1(new File(srcPath), emrPdfWaterSet, waterPicPath);
+                    }
+                    //组织输出地址
+                    outSrc = EMRRECORDJSP + "\\reload\\" + patientId +"\\" + sourceList[i] + "\\" + nameList[i];
+                }else{
+                    //不需要水印
+                    //将原图片地址转换成映射地址
+                    //获取盘符并转换映射地址的头部地址
+                    String root = selectRootByNotWater(srcPath);
+                    //获取盘符后面的地址
+                    String str1 = srcPath.substring(0, srcPath.indexOf("\\"));
+                    String picPath = srcPath.substring(str1.length()+1, srcPath.length());
+                    outSrc = EMRRECORDJSP + "\\" + root + picPath;
+                }
+                outs.add(outSrc);
+            }
+        }
+        return outs;
+    }
+
+    /**
+     * 根据地址转换映射头
+     * @param srcPath
+     * @return
+     */
+    private String selectRootByNotWater(String srcPath) {
+        //获取盘符
+        String str = srcPath.substring(0, 1).toUpperCase();
+        switch (str){
+            case "C":
+                return "reloadC\\";
+            case "D":
+                return "reloadD\\";
+            case "E":
+                return "reloadE\\";
+            case "F":
+                return "reloadF\\";
+            case "G":
+                return "reloadG\\";
+            case "H":
+                return "reloadH\\";
+            case "I":
+                return "reloadI\\";
+            case "J":
+                return "reloadJ\\";
+            case "K":
+                return "reloadK\\";
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/com/emr/util/img2PdfUtil.java b/src/main/java/com/emr/util/img2PdfUtil.java
index 0672673..0be3e2e 100644
--- a/src/main/java/com/emr/util/img2PdfUtil.java
+++ b/src/main/java/com/emr/util/img2PdfUtil.java
@@ -14,9 +14,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
+import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -86,7 +88,63 @@ public class img2PdfUtil {
                     pdfWaterSet.getImgHeight(), pdfWaterSet.getImgX(), pdfWaterSet.getImgY());
         }
     }
-
+    public static String addWatermarkPic1(File srcImgFile, EmrPdfWaterSet pdfWaterSet,String outPath) {
+        try {
+            long start = System.currentTimeMillis();
+            java.awt.Image srcImg = ImageIO.read(srcImgFile);//文件转化为图片
+            long end = System.currentTimeMillis();
+            //System.out.println("读取图片"+(end-start)/1000.0+"s");
+            int srcImgWidth = srcImg.getWidth(null);//获取图片的宽
+            int srcImgHeight = srcImg.getHeight(null);//获取图片的高
+            // 加水印
+            BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB);
+            Font font = new Font("STSong-Light", Font.ITALIC, pdfWaterSet.getTextSize() * 4);//水印字体，大小
+            Graphics2D g = bufImg.createGraphics();//得到画笔
+            long start1 = System.currentTimeMillis();
+            g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
+            long end1 = System.currentTimeMillis();
+            //System.out.println("画图片"+(end1-start1)/1000.0+"s");
+            //判断是否加水印
+            Short effective = pdfWaterSet.getEffective();
+            Short isImg = pdfWaterSet.getIsImg();
+            if (effective == 1 || isImg == 1) {
+                Color color = toColorFromString(pdfWaterSet.getTextColor());
+                Integer degree = 0 - pdfWaterSet.getTextRotation();//设置水印文字的旋转角度
+                float alpha = pdfWaterSet.getTransparent();//设置水印透明度 默认为1.0  值越小颜色越浅
+                g.setColor(color); //设置水印颜色
+                g.setFont(font);              //设置字体
+                g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));//设置水印文字透明度
+                if (null != degree) {
+                    g.rotate(Math.toRadians(degree), (double) bufImg.getWidth(), (double) bufImg.getHeight());//设置水印旋转
+                }
+                long start2 = System.currentTimeMillis();
+                g.drawString(pdfWaterSet.getText(), srcImg.getWidth(null) / 2 + pdfWaterSet.getTextX(), srcImg.getHeight(null) / 2 + (pdfWaterSet.getTextY() - 200));//画出水印,并设置水印位置
+                long end2 = System.currentTimeMillis();
+                //System.out.println("画文字图片"+(end2-start2)/1000.0+"s");
+            }
+            g.dispose();// 释放资源*/
+            long start3 = System.currentTimeMillis();
+            //ByteArrayInputStream fis = new ByteArrayInputStream(imageToByteArr);//创建输入流对象
+            if(!new File(outPath).exists()) {
+                ImageIO.write(bufImg, "jpg", new File(outPath));
+            }
+                       /* FileOutputStream fos = new FileOutputStream("d:\\jiashi\\reload\\00004312bfd54291b31d77cc4b8e4c3b\\" + srcImgFile.getName()); //创建输出流对象
+                        byte datas[] = new byte[1024 * 8];//创建搬运工具
+                        int len = 0;//创建长度
+                        while ((len = srcImgFile.read(datas)) != -1)//循环读取数据
+                        {
+                            fos.write(datas, 0, len);
+                        }*/
+            long end3 = System.currentTimeMillis();
+            //System.out.println("输出时间"+(end3-start3)/1000.0+"s");
+            return outPath;
+            // 输出图片
+        } catch (Exception e) {
+            e.printStackTrace();
+            e.getMessage();
+            return null;
+        }
+    }
     //图片合成pdf
     private static void imgToPdf(Document document,List<String> filePaths) throws Exception{
         document.open(); //打开容器
diff --git a/src/main/resources/config/applicationContext-shiro.xml b/src/main/resources/config/applicationContext-shiro.xml
index 347afa8..1c4ce33 100644
--- a/src/main/resources/config/applicationContext-shiro.xml
+++ b/src/main/resources/config/applicationContext-shiro.xml
@@ -39,6 +39,7 @@ http://www.springframework.org/schema/tx/spring-tx.xsd">
                 /images/**=anon
                 /css/**=anon
                 /js/**=anon
+                /reload/**=anon
                 /layui/**=anon
                 /json/**=anon
                 /pdfWaterSet/**=anon
diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties
index 4627720..cf4efa9 100644
--- a/src/main/resources/config/config.properties
+++ b/src/main/resources/config/config.properties
@@ -1,27 +1,33 @@
-#power权限系统的服务器地址头
-POWER_IP = localhost
-POWER_URLHEAD = http://localhost:8081/power
+#power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934
+POWER_IP = 192.168.1.3
+POWER_URLHEAD = http://192.168.1.3:8080/power
 
-POWER_JSPHEAD = localhost
-POWER_JSP = http://localhost:8081/power
+POWER_JSPHEAD = 192.168.1.3
+POWER_JSP = http://192.168.1.3:8080/power
 
+#\u672C\u8EAB\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934
+EMR_RECORD_JSP = http://192.168.1.3:8083/emr_record
 
-#webSocket服务器地址
+
+#webSocket\u670D\u52A1\u5668\u5730\u5740
 WEBSOCKET_URLHEAD = ${POWER_JSPHEAD}:8088
-#通知字符串间隔符
+#\u901A\u77E5\u5B57\u7B26\u4E32\u95F4\u9694\u7B26
 STR_SPLIT = *^:|,.
 
-#日志保留天数
+#\u65E5\u5FD7\u4FDD\u7559\u5929\u6570
 log.days = 180
 
-#session过期时间
-TOKEN_EXPIRE_TIME = 1200000
+#session\u8FC7\u671F\u65F6\u95F4ms
+TOKEN_EXPIRE_TIME = 3600000
 
-#pdf水印
-pdfWater = 广东省英德市人民医院
+#pdf\u6C34\u5370
+pdfWater = \u5E7F\u4E1C\u7701\u82F1\u5FB7\u5E02\u4EBA\u6C11\u533B\u9662
 
-#icd版本
+#icd\u7248\u672C
 icdVersion = 10
 
-#水印图片目录
+#\u6C34\u5370\u56FE\u7247\u76EE\u5F55
 picPath = static/pdfWaterSet/upload/
+
+#\u751F\u6210\u52A0\u4E0A\u6C34\u5370\u540E\u7684\u56FE\u7247\u7684\u66F4\u76EE\u5F55
+waterPicPath = D:/jiashi/reload/
diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties
index e8441c7..f17d567 100644
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@@ -5,22 +5,9 @@ jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 
 jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=qf_record
 jdbc.username=sa
-jdbc.password=12345612345654
+jdbc.password=docus702
 
 #dataSource2
 jdbc.url2=jdbc\:sqlserver\://localhost:1433;databaseName=blgd_java
 jdbc.username2=sa
 jdbc.password2=docus702
-
-#hibernate config
-hibernate.dialect=org.hibernate.dialect.SQLServerDialect
-hibernate.show_sql=true
-hibernate.format_sql=true
-hibernate.hbm2ddl.auto=update
-#hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext
-hibernate.current_session_context_class=thread  
-hibernate.jdbc.batch_size=50  
-hibernate.enable_lazy_load_no_trans=true  
-
-
-
diff --git a/src/main/resources/config/jdbcRecord.properties b/src/main/resources/config/jdbcRecord.properties
deleted file mode 100644
index f5178ef..0000000
--- a/src/main/resources/config/jdbcRecord.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-record.jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-#jdbc.url=jdbc\:sqlserver\://120.27.212.36:1433;databaseName=emr_record
-#jdbc.username=sa
-#jdbc.password=docus@702
-
-record.jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=blgd_java
-record.jdbc.username=sa
-record.jdbc.password=docus702
-
-#hibernate config
-hibernate.dialect=org.hibernate.dialect.SQLServerDialect
-hibernate.show_sql=true
-hibernate.format_sql=true
-hibernate.hbm2ddl.auto=update
-#hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext
-hibernate.current_session_context_class=thread  
-hibernate.jdbc.batch_size=50  
-hibernate.enable_lazy_load_no_trans=true  
-
-
-
diff --git a/src/main/resources/mapper/CommomMapper.xml b/src/main/resources/mapper/CommomMapper.xml
index f190b21..326b78b 100644
--- a/src/main/resources/mapper/CommomMapper.xml
+++ b/src/main/resources/mapper/CommomMapper.xml
@@ -329,10 +329,12 @@
             dbo.commomtable.main_dis_thing,
             dbo.commomtable.dis_dept,
             <if test="flag != null and flag != ''">
-                dbo.commomtable.memo,
                 commomtable.home_addr,
                 commomtable.file_path,
                 commomtable.new_path,
+                <if test="flag == 'home_addr'">
+                    dbo.commomtable.memo,
+                </if>
             </if>
             dbo.commomtable.dis_date,
             t_scan_assort.count delCount
diff --git a/src/main/resources/mapper/emrPdfWaterSet/EmrPdfWaterSetMapper.xml b/src/main/resources/mapper/emrPdfWaterSet/EmrPdfWaterSetMapper.xml
index 750916e..2715ea3 100644
--- a/src/main/resources/mapper/emrPdfWaterSet/EmrPdfWaterSetMapper.xml
+++ b/src/main/resources/mapper/emrPdfWaterSet/EmrPdfWaterSetMapper.xml
@@ -4,7 +4,6 @@
   <resultMap id="BaseResultMap" type="com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="effective" property="effective" jdbcType="SMALLINT" />
-    <result column="download_effective" property="downloadEffective" jdbcType="SMALLINT" />
     <result column="up_or_under" property="upOrUnder" jdbcType="SMALLINT" />
     <result column="transparent" property="transparent" jdbcType="REAL" />
     <result column="text" property="text" jdbcType="NVARCHAR" />
@@ -14,18 +13,21 @@
     <result column="text_size" property="textSize" jdbcType="INTEGER" />
     <result column="text_rotation" property="textRotation" jdbcType="INTEGER" />
     <result column="is_img" property="isImg" jdbcType="SMALLINT" />
-    <result column="download_is_img" property="downloadIsImg" jdbcType="SMALLINT" />
     <result column="img_file" property="imgFile" jdbcType="NVARCHAR" />
     <result column="img_width" property="imgWidth" jdbcType="INTEGER" />
     <result column="img_height" property="imgHeight" jdbcType="INTEGER" />
     <result column="img_x" property="imgX" jdbcType="INTEGER" />
     <result column="img_y" property="imgY" jdbcType="INTEGER" />
     <result column="unique_id" property="uniqueId" jdbcType="NVARCHAR" />
+    <result column="download_effective" property="downloadEffective" jdbcType="SMALLINT" />
+    <result column="download_is_img" property="downloadIsImg" jdbcType="SMALLINT" />
+    <result column="print_effective" property="printEffective" jdbcType="SMALLINT" />
+    <result column="print_is_img" property="printIsImg" jdbcType="SMALLINT" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, effective, download_effective, up_or_under, transparent, text, text_x, text_y, 
-    text_color, text_size, text_rotation, is_img, download_is_img, img_file, img_width, 
-    img_height, img_x, img_y, unique_id
+    id, effective, up_or_under, transparent, text, text_x, text_y, text_color, text_size,
+    text_rotation, is_img, img_file, img_width, img_height, img_x, img_y, unique_id,
+    download_effective, download_is_img, print_effective, print_is_img
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -38,20 +40,22 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet" >
-    insert into emr_pdf_water_set (id, effective, download_effective, 
-      up_or_under, transparent, text, 
-      text_x, text_y, text_color, 
-      text_size, text_rotation, is_img, 
-      download_is_img, img_file, img_width, 
-      img_height, img_x, img_y, 
-      unique_id)
-    values (#{id,jdbcType=INTEGER}, #{effective,jdbcType=SMALLINT}, #{downloadEffective,jdbcType=SMALLINT}, 
-      #{upOrUnder,jdbcType=SMALLINT}, #{transparent,jdbcType=REAL}, #{text,jdbcType=NVARCHAR}, 
-      #{textX,jdbcType=INTEGER}, #{textY,jdbcType=INTEGER}, #{textColor,jdbcType=NVARCHAR}, 
-      #{textSize,jdbcType=INTEGER}, #{textRotation,jdbcType=INTEGER}, #{isImg,jdbcType=SMALLINT}, 
-      #{downloadIsImg,jdbcType=SMALLINT}, #{imgFile,jdbcType=NVARCHAR}, #{imgWidth,jdbcType=INTEGER}, 
-      #{imgHeight,jdbcType=INTEGER}, #{imgX,jdbcType=INTEGER}, #{imgY,jdbcType=INTEGER}, 
-      #{uniqueId,jdbcType=NVARCHAR})
+    insert into emr_pdf_water_set (id, effective, up_or_under,
+      transparent, text, text_x,
+      text_y, text_color, text_size,
+      text_rotation, is_img, img_file,
+      img_width, img_height, img_x,
+      img_y, unique_id, download_effective,
+      download_is_img, print_effective, print_is_img
+      )
+    values (#{id,jdbcType=INTEGER}, #{effective,jdbcType=SMALLINT}, #{upOrUnder,jdbcType=SMALLINT},
+      #{transparent,jdbcType=REAL}, #{text,jdbcType=NVARCHAR}, #{textX,jdbcType=INTEGER},
+      #{textY,jdbcType=INTEGER}, #{textColor,jdbcType=NVARCHAR}, #{textSize,jdbcType=INTEGER},
+      #{textRotation,jdbcType=INTEGER}, #{isImg,jdbcType=SMALLINT}, #{imgFile,jdbcType=NVARCHAR},
+      #{imgWidth,jdbcType=INTEGER}, #{imgHeight,jdbcType=INTEGER}, #{imgX,jdbcType=INTEGER},
+      #{imgY,jdbcType=INTEGER}, #{uniqueId,jdbcType=NVARCHAR}, #{downloadEffective,jdbcType=SMALLINT},
+      #{downloadIsImg,jdbcType=SMALLINT}, #{printEffective,jdbcType=SMALLINT}, #{printIsImg,jdbcType=SMALLINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet" >
     insert into emr_pdf_water_set
@@ -62,9 +66,6 @@
       <if test="effective != null" >
         effective,
       </if>
-      <if test="downloadEffective != null" >
-        download_effective,
-      </if>
       <if test="upOrUnder != null" >
         up_or_under,
       </if>
@@ -92,9 +93,6 @@
       <if test="isImg != null" >
         is_img,
       </if>
-      <if test="downloadIsImg != null" >
-        download_is_img,
-      </if>
       <if test="imgFile != null" >
         img_file,
       </if>
@@ -113,6 +111,18 @@
       <if test="uniqueId != null" >
         unique_id,
       </if>
+      <if test="downloadEffective != null" >
+        download_effective,
+      </if>
+      <if test="downloadIsImg != null" >
+        download_is_img,
+      </if>
+      <if test="printEffective != null" >
+        print_effective,
+      </if>
+      <if test="printIsImg != null" >
+        print_is_img,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -121,9 +131,6 @@
       <if test="effective != null" >
         #{effective,jdbcType=SMALLINT},
       </if>
-      <if test="downloadEffective != null" >
-        #{downloadEffective,jdbcType=SMALLINT},
-      </if>
       <if test="upOrUnder != null" >
         #{upOrUnder,jdbcType=SMALLINT},
       </if>
@@ -151,9 +158,6 @@
       <if test="isImg != null" >
         #{isImg,jdbcType=SMALLINT},
       </if>
-      <if test="downloadIsImg != null" >
-        #{downloadIsImg,jdbcType=SMALLINT},
-      </if>
       <if test="imgFile != null" >
         #{imgFile,jdbcType=NVARCHAR},
       </if>
@@ -172,6 +176,18 @@
       <if test="uniqueId != null" >
         #{uniqueId,jdbcType=NVARCHAR},
       </if>
+      <if test="downloadEffective != null" >
+        #{downloadEffective,jdbcType=SMALLINT},
+      </if>
+      <if test="downloadIsImg != null" >
+        #{downloadIsImg,jdbcType=SMALLINT},
+      </if>
+      <if test="printEffective != null" >
+        #{printEffective,jdbcType=SMALLINT},
+      </if>
+      <if test="printIsImg != null" >
+        #{printIsImg,jdbcType=SMALLINT},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet" >
@@ -180,9 +196,6 @@
       <if test="effective != null" >
         effective = #{effective,jdbcType=SMALLINT},
       </if>
-      <if test="downloadEffective != null" >
-        download_effective = #{downloadEffective,jdbcType=SMALLINT},
-      </if>
       <if test="upOrUnder != null" >
         up_or_under = #{upOrUnder,jdbcType=SMALLINT},
       </if>
@@ -210,9 +223,6 @@
       <if test="isImg != null" >
         is_img = #{isImg,jdbcType=SMALLINT},
       </if>
-      <if test="downloadIsImg != null" >
-        download_is_img = #{downloadIsImg,jdbcType=SMALLINT},
-      </if>
       <if test="imgFile != null" >
         img_file = #{imgFile,jdbcType=NVARCHAR},
       </if>
@@ -231,13 +241,24 @@
       <if test="uniqueId != null" >
         unique_id = #{uniqueId,jdbcType=NVARCHAR},
       </if>
+      <if test="downloadEffective != null" >
+        download_effective = #{downloadEffective,jdbcType=SMALLINT},
+      </if>
+      <if test="downloadIsImg != null" >
+        download_is_img = #{downloadIsImg,jdbcType=SMALLINT},
+      </if>
+      <if test="printEffective != null" >
+        print_effective = #{printEffective,jdbcType=SMALLINT},
+      </if>
+      <if test="printIsImg != null" >
+        print_is_img = #{printIsImg,jdbcType=SMALLINT},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet" >
     update emr_pdf_water_set
     set effective = #{effective,jdbcType=SMALLINT},
-      download_effective = #{downloadEffective,jdbcType=SMALLINT},
       up_or_under = #{upOrUnder,jdbcType=SMALLINT},
       transparent = #{transparent,jdbcType=REAL},
       text = #{text,jdbcType=NVARCHAR},
@@ -247,13 +268,16 @@
       text_size = #{textSize,jdbcType=INTEGER},
       text_rotation = #{textRotation,jdbcType=INTEGER},
       is_img = #{isImg,jdbcType=SMALLINT},
-      download_is_img = #{downloadIsImg,jdbcType=SMALLINT},
       img_file = #{imgFile,jdbcType=NVARCHAR},
       img_width = #{imgWidth,jdbcType=INTEGER},
       img_height = #{imgHeight,jdbcType=INTEGER},
       img_x = #{imgX,jdbcType=INTEGER},
       img_y = #{imgY,jdbcType=INTEGER},
-      unique_id = #{uniqueId,jdbcType=NVARCHAR}
+      unique_id = #{uniqueId,jdbcType=NVARCHAR},
+      download_effective = #{downloadEffective,jdbcType=SMALLINT},
+      download_is_img = #{downloadIsImg,jdbcType=SMALLINT},
+      print_effective = #{printEffective,jdbcType=SMALLINT},
+      print_is_img = #{printIsImg,jdbcType=SMALLINT}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml b/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml
index 93cd155..6812e8d 100644
--- a/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml
+++ b/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml
@@ -46,6 +46,16 @@
     </mvc:annotation-driven>
     <!-- 静态资源映射 -->
     <mvc:resources mapping="/static/**" location="/static/" />
+    <mvc:resources mapping="/reload/**" location="file:D:/jiashi/reload/" />
+    <mvc:resources mapping="/reloadC/**" location="file:C:/" />
+    <mvc:resources mapping="/reloadD/**" location="file:D:/" />
+    <mvc:resources mapping="/reloadE/**" location="file:E:/" />
+    <mvc:resources mapping="/reloadF/**" location="file:F:/" />
+    <mvc:resources mapping="/reloadG/**" location="file:G:/" />
+    <mvc:resources mapping="/reloadH/**" location="file:D:/" />
+    <mvc:resources mapping="/reloadI/**" location="file:I:/" />
+    <mvc:resources mapping="/reloadJ/**" location="file:J:/" />
+    <mvc:resources mapping="/reloadK/**" location="file:K:/" />
     <!-- 当上面要访问的静态资源不包括在上面的配置中时，则根据此配置来访问 -->
     <!--配置视图解析器，方便页面返回  -->
     <bean id="jspViewResolver"
diff --git a/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp b/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp
index 4398a35..cad5b13 100644
--- a/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp
+++ b/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp
@@ -100,28 +100,29 @@
         <div class="row">
             <div class="col-md-5">
                 <div class="col-md-5 labelDiv">
-                    <label>文本内容：</label>
+                    <label>打印启用文本水印：</label>
                 </div>
                 <div class="col-md-7">
-                    <input type="text" id="text" class="form-control input-sm" value="${pdfWaterSet.text}"
-                           name="text" maxlength="50">
+                    <select class="form-control input-sm" name="printEffective">
+                        <option value="1" <c:if test="${pdfWaterSet.printEffective == 1}">selected</c:if>>是</option>
+                        <option value="0" <c:if test="${pdfWaterSet.printEffective == 0}">selected</c:if>>否</option>
+                    </select>
                 </div>
             </div>
             <div class="col-md-5">
                 <div class="col-md-5 labelDiv">
-                    <label>文本颜色：</label>
+                    <label>文本内容：</label>
                 </div>
                 <div class="col-md-7">
-                    <input type="text" id="color"  class="form-control input-sm" style="background-color: ${pdfWaterSet.textColor}">
-                    <input type="hidden" class="form-control input-sm" value="${pdfWaterSet.textColor}"
-                           id="textColor" name="textColor" maxlength="12">
+                    <input type="text" id="text" class="form-control input-sm" value="${pdfWaterSet.text}"
+                           name="text" maxlength="50">
                 </div>
             </div>
         </div>
         <div class="row">
             <div class="col-md-5">
                 <div class="col-md-5 labelDiv">
-                    <label>文本左偏(px)：</label>
+                    <label>文本偏右(px)：</label>
                 </div>
                 <div class="col-md-7">
                     <input type="number" min="0" id="textX" class="form-control input-sm" value="${pdfWaterSet.textX}"
@@ -130,7 +131,7 @@
             </div>
             <div class="col-md-5">
                 <div class="col-md-5 labelDiv">
-                    <label>文本右偏(px)：</label>
+                    <label>文本偏上(px)：</label>
                 </div>
                 <div class="col-md-7">
                     <input type="number" min="0" id="textY" class="form-control input-sm" value="${pdfWaterSet.textY}"
@@ -158,6 +159,18 @@
                 </div>
             </div>
         </div>
+        <div class="row">
+            <div class="col-md-5">
+                <div class="col-md-5 labelDiv">
+                    <label>文本颜色：</label>
+                </div>
+                <div class="col-md-7">
+                    <input type="text" id="color"  class="form-control input-sm" style="background-color: ${pdfWaterSet.textColor}">
+                    <input type="hidden" class="form-control input-sm" value="${pdfWaterSet.textColor}"
+                           id="textColor" name="textColor" maxlength="12">
+                </div>
+            </div>
+        </div>
         <hr>
         <div class="row">
             <div class="col-md-5">
@@ -183,6 +196,31 @@
                 </div>
             </div>
         </div>
+        <div class="row">
+            <div class="col-md-5">
+                <div class="col-md-5 labelDiv">
+                    <label>打印启用水印图片：</label>
+                </div>
+                <div class="col-md-7">
+                    <select class="form-control input-sm" name="printIsImg">
+                        <option <c:if test="${pdfWaterSet.printIsImg == 1}">selected</c:if> value="1">是</option>
+                        <option <c:if test="${pdfWaterSet.printIsImg == 0}">selected</c:if> value="0">否</option>
+                    </select>
+                </div>
+            </div>
+            <div class="col-md-5">
+                <div class="col-md-5 labelDiv">
+                    <label>选择图片：</label>
+                </div>
+                <div class="col-md-7">
+                    <input type="file" id="file" accept="image/jpg,image/jpeg,image/png,image/bmp">
+                    <input type="hidden" id="imgFile" name="imgFile" value="${pdfWaterSet.imgFile}">
+                    <a href="${path}/static/pdfWaterSet/upload/${pdfWaterSet.imgFile}" target="_blank" id="aDiv">
+                        <img width="100" height="100" src="${path}/static/pdfWaterSet/upload/${pdfWaterSet.imgFile}" id="imgDiv"/>
+                    </a>
+                </div>
+            </div>
+        </div>
         <div class="row">
             <div class="col-md-5">
                 <div class="col-md-5 labelDiv">
@@ -206,7 +244,7 @@
         <div class="row">
             <div class="col-md-5">
                 <div class="col-md-5 labelDiv">
-                    <label>图片左偏(px)：</label>
+                    <label>图片偏右(px)：</label>
                 </div>
                 <div class="col-md-7">
                     <input type="number" min="0" class="form-control input-sm" value="${pdfWaterSet.imgX}"
@@ -215,7 +253,7 @@
             </div>
             <div class="col-md-5">
                 <div class="col-md-5 labelDiv">
-                    <label>图片右偏(px)：</label>
+                    <label>图片偏上(px)：</label>
                 </div>
                 <div class="col-md-7">
                     <input type="number" min="0" class="form-control input-sm" value="${pdfWaterSet.imgY}"
@@ -223,20 +261,6 @@
                 </div>
             </div>
         </div>
-        <div class="row">
-            <div class="col-md-5">
-                <div class="col-md-5 labelDiv">
-                    <label>选择图片：</label>
-                </div>
-                <div class="col-md-7">
-                    <input type="file" id="file" accept="image/jpg,image/jpeg,image/png,image/bmp">
-                    <input type="hidden" id="imgFile" name="imgFile" value="${pdfWaterSet.imgFile}">
-                    <a href="${path}/static/pdfWaterSet/upload/${pdfWaterSet.imgFile}" target="_blank" id="aDiv">
-                        <img width="100" height="100" src="${path}/static/pdfWaterSet/upload/${pdfWaterSet.imgFile}" id="imgDiv"/>
-                    </a>
-                </div>
-            </div>
-        </div>
         <div class="btnsDiv">
             <shiro:hasPermission name="/pdfWaterSet/update">
                 <button type="button" class="btn btn-sm btn-primary btns" onclick="save()">保存</button>
diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp
index d82c74e..e563df3 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp
@@ -155,8 +155,11 @@
     </style>
 </head>
 <body style="scroll:auto" onkeydown="disabledPrint()">
-<input type="hidden" id="patientId" value="${patientId}">
-<input type="hidden" id="flag" value="file_path">
+<input hidden id="patientId" value="${patientId}">
+<!--174、祈福医院扫描图片存放根目录的字段-->
+<input hidden id="flag" value="file_path">
+<!--存放扫描图片和新上传图片根目录的集合-->
+<input type="hidden" id="rootPaths">
 <div class="main">
     <div class="headDiv">
         <div class="headSpanDiv">
@@ -243,6 +246,11 @@
                             <button type="button" class="btn btn-sm btn-primary"  data-toggle="modal" data-target="#myModal3" onclick="addPic()">新增扫描图片</button>
                         </div>
                     </shiro:hasPermission>
+                       <shiro:hasPermission name="/commom/recoverPic">
+                           <div class="btn" id="recoverPic" style="display: none">
+                               <button type="button" class="btn btn-sm btn-warning"  data-toggle="modal" data-target="#myModal5" onclick="recoverPic()">恢复扫描图片</button>
+                           </div>
+                       </shiro:hasPermission>
                     <shiro:hasPermission name="/collect/addCollect">
                         <div class="col-sm-4">
                             <button type="button" class="btn btn-sm btn-primary"  data-toggle="modal" data-target="#myModal2" onclick="collect()">&nbsp;&nbsp;&nbsp;&nbsp;收藏&nbsp;&nbsp;&nbsp;&nbsp;</button>
@@ -875,5 +883,6 @@
     </div>
 </div>
 <script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecord174.js?t=2019-12-20"></script>
+<script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordBlood.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordBlood.jsp
index 3e8a113..0a698f5 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordBlood.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordBlood.jsp
@@ -135,7 +135,10 @@
 </head>
 <body style="scroll:auto" onkeydown="disabledPrint()">
 <input type="hidden" id="patientId" value="${patientId}">
+<!--脐血库扫描图片存放根目录的字段-->
 <input type="hidden" id="flag" value="home_addr">
+<!--存放扫描图片和新上传图片根目录的集合-->
+<input type="hidden" id="rootPaths">
 <div class="main">
     <div class="headDiv">
         <div class="headSpanDiv">
@@ -447,4 +450,5 @@
 
 </script>--%>
 <script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecordBlood.js?t=2019-12-20"></script>
+<script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js"></script>
 </html>
diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframe.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframe.jsp
index 547e0fd..d09c31f 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframe.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframe.jsp
@@ -43,8 +43,10 @@
     </style>
 </head>
 <body style="scroll:auto" onkeydown="disabledPrint()">
-<input type="hidden" id="patientId"  value="${patientId}">
-<input type="hidden" id="assortIds">
+<input hidden id="patientId"  value="${patientId}">
+<input hidden id="assortIds">
+<!--定义打印预览的图片加载完成标识-->
+<input type="hidden" id="printPicLoaded">
 <div class="content-left">
     <div class="form-group">
         <div class="col-sm-7">
@@ -76,7 +78,7 @@
             &lt;%&ndash;<button type="button" class="btn btn-warning" style="float:right;margin-right: 1%" onclick="">笔记</button>&ndash;%&gt;
         </div>
     </shiro:hasPermission>--%>
-    <iframe width="100%" height="100%" src="" id="iframe1" frameborder="0" scrolling="yes"></iframe>
+    <iframe width="100%" height="100%" src="" id="iframe1" name="iframe1" frameborder="0" scrolling="yes"></iframe>
 </div>
 <script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecordIframe.js?t=2020-04-27"></script>
 </body>
diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp
index b0bc669..479bb18 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp
@@ -52,6 +52,10 @@
 <input type="hidden" id="print" value="${printFlag}">
 <!--文件路径-->
 <input type="hidden" id="filePath">
+<!--定义iframe1加载完成标识-->
+<input type="hidden" id="iframeLoad">
+<!--定义打印预览的图片加载完成标识-->
+<input type="hidden" id="printPicLoaded">
 <div class="content-left">
     <div class="form-group">
         <div class="col-sm-5" style="padding-right: 0">
@@ -95,5 +99,6 @@
     <iframe width="100%" height="100%" src="" id="iframe1" frameborder="0" scrolling="yes"></iframe>
 </div>
 <script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecordIframeBlood.js"></script>
+<script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js"></script>
 </body>
 </html>
diff --git a/src/main/webapp/static/img/000239.jpg b/src/main/webapp/static/img/000239.jpg
new file mode 100644
index 0000000..c3207c8
Binary files /dev/null and b/src/main/webapp/static/img/000239.jpg differ
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
index 3d04578..85fb5e3 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
@@ -1,21 +1,3 @@
-//屏蔽鼠标右键
-document.oncontextmenu = function(e) {
-	var e = e || window.event;
-	e.returnValue = false;
-	return false;
-}
-//禁止快捷键打印
-function disabledPrint(){
-	if(event.keyCode==80 && event.ctrlKey){
-		event.keyCode=0;
-		event.returnValue=false;
-	}
-	if (event.ctrlKey && event.keyCode == 83) {
-		event.preventDefault();
-		event.returnValue = false;
-		return false;
-	}
-}
 //初始化函数
 $(function(){
 	//加载其他诊断名称鼠标滑过显示全部文本
@@ -49,7 +31,7 @@ function loadRecord(){
 	$.ajax({
 		type:'get',
 		url:path+'/commom/getRecord',
-		data:{patientId:$("#patientId").val()},
+		data:{patientId:$("#patientId").val(),flag:$("#flag").val()},
 		async:false,
 		dataType:'json',
 		success:function (data) {
@@ -63,6 +45,26 @@ function loadRecord(){
 				$("#disDate").val(data.disDate);
 				$("#disDeptName").val(data.disDept);
 				$("#diagName").val(data.mainDiagName);
+				var delCount = data.delCount;
+				//不为空，有已删除的图片，显示恢复图片按钮
+				if(delCount != null){
+					$("#recoverPic").show();
+				}
+				//判断哪家医院赋值扫描图片和新上传图片的根目录集合
+				var flag = $("#flag").val();
+				var rootPaths = "";
+				if(flag != '' && flag == 'home_addr'){
+					//脐血库
+					rootPaths = data.homeAddr + ",";
+				}else if(flag != '' && flag == 'file_path'){
+					//祈福医院
+					rootPaths = data.filePath + ",";
+				}
+				//拼接新上传图片根目录
+				if(data.newFile != null && data.newFile != ''){
+					rootPaths += data.newFile;
+				}
+				$("#rootPaths").val(rootPaths);
 				//$("#otherDiagName").val(data.otherDiagName);
 			}
 		}
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecordBlood.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecordBlood.js
index fc9fd6d..a7bcea8 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/showRecordBlood.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecordBlood.js
@@ -1,21 +1,3 @@
-//屏蔽鼠标右键
-document.oncontextmenu = function(e) {
-	var e = e || window.event;
-	e.returnValue = false;
-	return false;
-}
-//禁止快捷键打印
-function disabledPrint(){
-	if(event.keyCode==80 && event.ctrlKey){
-		event.keyCode=0;
-		event.returnValue=false;
-	}
-	if (event.ctrlKey && event.keyCode == 83) {
-		event.preventDefault();
-		event.returnValue = false;
-		return false;
-	}
-}
 //初始化函数
 $(function(){
 	//加载病案信息
@@ -57,6 +39,21 @@ function loadRecord(){
 				if(delCount != null){
 					$("#recoverPic").show();
 				}
+				//判断哪家医院赋值扫描图片和新上传图片的根目录集合
+				var flag = $("#flag").val();
+				var rootPaths = "";
+				if(flag != '' && flag == 'home_addr'){
+					//脐血库
+					rootPaths = data.homeAddr + ",";
+				}else if(flag != '' && flag == 'file_path'){
+					//祈福医院
+					rootPaths = data.filePath + ",";
+				}
+				//拼接新上传图片根目录
+				if(data.newFile != null && data.newFile != ''){
+					rootPaths += data.newFile;
+				}
+				$("#rootPaths").val(rootPaths);
 			}
 		}
 	})
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js
index 2fe6f6e..b89c26b 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js
@@ -110,6 +110,11 @@ $("#typeId").change(function(){
 })
 //加载pdf按钮功能
 function onloadPdf(){
+	$("#iframeLoad").val("");
+	$("#printPicLoaded").val("");
+	if($("#iframeLoad").val() == 1) {
+		window.frames['iframe1'].contentDocument.getElementById("printContainer1").innerHTML = '';
+	}
 	var patientId = $("#patientId").val();
 	//图片集合
 	var scanPages = $("#assortIds").val();
@@ -119,6 +124,65 @@ function onloadPdf(){
 	var flag = parent.$("#flag").val();
 	var str= path+"/commom/showRecordContentBlood?patientId="+patientId+"&scanPages="+scanPages+"&sources="+sources+"&flag="+flag;
 	$("#iframe1").attr("src",path+"/static/pdfjs/web/viewer1.html?file="+encodeURIComponent(str));
+	var rootPaths = parent.$("#rootPaths").val();
+	//获取加水印后的图片
+	if(scanPages != ''){
+		selectPrintPic(patientId,rootPaths,scanPages,sources);
+	}
+}
+
+/**
+ * 加载打印预览所需图片
+ */
+function selectPrintPic(patientId,rootPaths,scanPages,sources){
+	$.ajax({
+		type:'post',
+		url:path+"/commom/selectPrintPic",
+		data:{
+			patientId:patientId,
+			rootPaths:rootPaths,
+			names:scanPages,
+			sources:sources
+		},
+		datType:'json',
+		success:function(data){
+			if(data.code == 0){
+				var resultList = data.data;
+				if(null != resultList){
+					var img = '';
+					for (var i = 0; i < resultList.length; i++) {
+						img += "<img src='"+resultList[i]+"' width='850' height='1190'>";
+					}
+					setInterval(function () {
+						if($("#iframeLoad").val() == 1 && $("#printPicLoaded").val() != 1) {
+							window.frames['iframe1'].contentDocument.getElementById("printContainer1").innerHTML = img;
+							$("#printPicLoaded").val(1);
+						}
+					},1*1000);
+
+				}
+			}
+		}
+	})
+}
+var iframe = window.frames['iframe1'];
+if(iframe.attachEvent){
+	iframe.attachEvent("onreadystatechange", function() {
+		//此事件在内容没有被载入时候也会被触发，所以我们要判断状态
+		//有时候会比较怪异 readyState状态会跳过 complete 所以我们loaded状态也要判断
+		if (iframe.readyState === "complete" || iframe.readyState == "loaded") {
+			//代码能执行到这里说明已经载入成功完毕了
+			//要清除掉事件
+			iframe.detachEvent("onreadystatechange", arguments.callee);
+			//这里是回调函数
+		}
+	});
+}else{
+	iframe.addEventListener("load", function() {
+		$("#iframeLoad").val(1);
+		//代码能执行到这里说明已经载入成功完毕了
+		this.removeEventListener("load", arguments.call, false);
+	}, false);
 }
 //下载pdf按钮功能
 function onloadJpgForPdf(){
@@ -231,22 +295,4 @@ function printInfoBlood(){
 			}
 		}
 	})
-}
-//屏蔽鼠标右键
-// document.oncontextmenu = function(e) {
-// 	var e = e || window.event;
-// 	e.returnValue = false;
-// 	return false;
-// }
-//禁止快捷键打印
-function disabledPrint(){
-	if(event.keyCode==80 && event.ctrlKey){
-		event.keyCode=0;
-		event.returnValue=false;
-	}
-	if (event.ctrlKey && event.keyCode == 83) {
-		event.preventDefault();
-		event.returnValue = false;
-		return false;
-	}
 }
\ No newline at end of file
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js
index f04490a..bb64c1b 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js
@@ -16,195 +16,3 @@ function disabledPrint(){
 		return false;
 	}
 }
-//树操作
-var menu = {
-	setting: {
-		view:{
-			fontCss : {"font-family": "微软雅黑","color":"blue"}
-		},
-		data:{
-			key:{
-				name:"assortName"
-			},
-			simpleData: {
-				chkStyle: "checkbox",
-				enable: true,
-				idKey: "id",
-				pIdKey: "parentId",
-			},
-		},
-		check:{
-			enable:true
-		},
-		callback: { //回调函数
-			onCheck: onCheck }
-	},
-	loadMenuTree:function(){
-		$.ajax({
-			type: "post",
-			url:path+"/commom/getRecordTree",
-			data:{patientId:$("#patientId").val(),typeId:$("#typeId").val()},
-			dataType:"json",
-			success:function(data){
-				$("#assortIds").val("");
-				if(data != null){
-					var assortIds = '';
-					for (var i = 0; i < data.length; i++) {
-						if(data[i].parentId != null && data[i].parentId != 1 && data[i].checked == 'true'){
-							assortIds += data[i].assortName+",";
-						}
-					}
-					if(assortIds != ''){
-						assortIds = assortIds.substring(0,assortIds.length-1);
-						$("#assortIds").val(assortIds);
-					}
-					$.fn.zTree.init($("#ztree"), menu.setting, data);
-					zTree = $.fn.zTree.getZTreeObj("ztree");
-					var nodes = zTree.getNodes();
-					for (var i = 0; i < nodes.length; i++) { //设置节点展开
-						zTree.expandNode(nodes[i], true, false, true);
-					}
-					//加载pdf
-					onloadPdf();
-				}
-			}
-		})
-	}
-};
-//加载树
-$().ready(function(data){
-	menu.loadMenuTree();
-	//loadFilePath();
-});
-
-
-//树选中事件
-function onCheck(e, treeId, treeNode) {
-	var treeObj=$.fn.zTree.getZTreeObj("ztree");
-	nodes=treeObj.getCheckedNodes(true);
-	var assortIds = '';
-	for (var i = 0; i < nodes.length; i++) {
-		if(nodes[i].level == 2){
-			if(i == 0){
-				assortIds = nodes[i].assortName+",";
-			}else{
-				if(i != (nodes.length-1)){
-					assortIds += nodes[i].assortName+",";
-				}else{
-					assortIds += nodes[i].assortName;
-				}
-			}
-		}
-	}
-	$("#assortIds").val(assortIds);
-};
-//打印分类变更事件
-$("#typeId").change(function(){
-	menu.loadMenuTree();
-})
-//记录打印记录
-function printInfoBlood(){
-	var patientId = "'"+$("#patientId").val()+"'";
-	var assortIds = $("#assortIds").val();
-	var typeId = $("#typeId").val();
-	post(path+'/template/printInfoBlood',{"patientIds":patientId,"assortIds":assortIds,"typeId":typeId});
-}
-//确定按钮功能
-function sure(){
-	Common.confirm({
-		title: "提示",
-		message: "确认将左侧树选中的图片是否重新归页?",
-		operate: function (reselt) {
-			if (reselt) {
-				//pdf页数
-				var newAssortId = $("#newAssortId").val();
-				if (newAssortId != '') {
-					var patientId = $("#patientId").val();
-					var assortIds = $("#assortIds").val();
-					if(assortIds != ''){
-						$.ajax({
-							type: 'post',
-							url: path + '/commom/updateScanAssortByBlood',
-							data: {patientId: patientId, assortIds: assortIds,newAssortId: newAssortId},
-							dataType: 'json',
-							success: function (data) {
-								if (data.code == 0) {
-									toastr.success("重新归页成功！");
-								}
-								//重新加载
-								menu.loadMenuTree();
-							}
-						})
-					}else{
-						toastr.warning("左侧树至少选中一张图片!")
-					}
-				} else {
-					toastr.warning("要重新分页，需选中其中下拉框其中一项！")
-				}
-			}
-		}
-	})
-}
-function delPic(){
-	Common.confirm({
-		title: "提示",
-		message: "确认将左侧树选中的图片删除,删除就不可恢复?",
-		operate: function (reselt) {
-			if (reselt) {
-				var patientId = $("#patientId").val();
-				var assortIds = $("#assortIds").val();
-				if(assortIds != '') {
-					$.ajax({
-						type: 'post',
-						url: path + '/commom/delScanAssortByBlood',
-						data: {patientId: patientId, assortIds: assortIds},
-						dataType: 'json',
-						success: function (data) {
-							if (data.code == 0) {
-								toastr.success("删除成功！");
-							}
-							//重新加载
-							menu.loadMenuTree();
-						}
-					})
-				}
-			}
-		}
-	})
-}
-/*
-//确定按钮功能
-function sure(){
-	Common.confirm({
-		title: "提示",
-		message: "确认是否重新归页?",
-		operate: function (reselt) {
-			if (reselt) {
-				//pdf页数
-				var index = $("#iframe1").contents().find("#pageNumber").val();
-				var newAssortId = $("#newAssortId").val();
-				if (newAssortId != '') {
-					if (index != '' && index != null) {
-						var patientId = $("#patientId").val();
-						var assortIds = $("#assortIds").val();
-						$.ajax({
-							type: 'post',
-							url: path + '/commom/updateScanAssort',
-							data: {patientId: patientId, assortIds: assortIds, index: index, newAssortId: newAssortId},
-							dataType: 'json',
-							success: function (data) {
-								if (data.code == 0) {
-									toastr.success("重新归页成功！");
-								}
-								//重新加载
-								menu.loadMenuTree();
-							}
-						})
-					}
-				} else {
-					toastr.warning("要重新分页，需选中其中下拉框其中一项！")
-				}
-			}
-		}
-	})
-}*/
diff --git a/src/main/webapp/static/pdfjs/Print.js b/src/main/webapp/static/pdfjs/Print.js
new file mode 100644
index 0000000..a0a9baf
--- /dev/null
+++ b/src/main/webapp/static/pdfjs/Print.js
@@ -0,0 +1,124 @@
+/* @Print.js
+ * DH (http://denghao.me)
+ * 2017-7-14
+ */
+(function (window, document) {
+  var Print = function (dom, options) {
+    if (!(this instanceof Print)) return new Print(dom, options);
+
+    this.options = this.extend({
+      noPrint: '.no-print',
+      onStart: function () { },
+      onEnd: function () { }
+    }, options);
+
+    if ((typeof dom) === "string") {
+      this.dom = document.querySelector(dom);
+    } else {
+      this.dom = dom;
+    }
+
+    this.init();
+  };
+  Print.prototype = {
+    init: function () {
+      var content = this.getStyle() + this.getHtml();
+      this.writeIframe(content);
+    },
+    extend: function (obj, obj2) {
+      for (var k in obj2) {
+        obj[k] = obj2[k];
+      }
+      return obj;
+    },
+
+    getStyle: function () {
+      var str = "",
+        styles = document.querySelectorAll('style,link');
+      for (var i = 0; i < styles.length; i++) {
+        str += styles[i].outerHTML;
+      }
+      str += "<style>" + (this.options.noPrint ? this.options.noPrint : '.no-print') + "{display:none;}</style>";
+
+      return str;
+    },
+
+    getHtml: function () {
+      var inputs = document.querySelectorAll('input');
+      var textareas = document.querySelectorAll('textarea');
+      var selects = document.querySelectorAll('select');
+
+      for (var k in inputs) {
+        if (inputs[k].type == "checkbox" || inputs[k].type == "radio") {
+          if (inputs[k].checked == true) {
+            inputs[k].setAttribute('checked', "checked")
+          } else {
+            inputs[k].removeAttribute('checked')
+          }
+        } else if (inputs[k].type == "text") {
+          inputs[k].setAttribute('value', inputs[k].value)
+        }
+      }
+
+      for (var k2 in textareas) {
+        if (textareas[k2].type == 'textarea') {
+          textareas[k2].innerHTML = textareas[k2].value
+        }
+      }
+
+      for (var k3 in selects) {
+        if (selects[k3].type == 'select-one') {
+          var child = selects[k3].children;
+          for (var i in child) {
+            if (child[i].tagName == 'OPTION') {
+              if (child[i].selected == true) {
+                child[i].setAttribute('selected', "selected")
+              } else {
+                child[i].removeAttribute('selected')
+              }
+            }
+          }
+        }
+      }
+
+      return this.dom.outerHTML;
+    },
+
+    writeIframe: function (content) {
+      var w, doc, iframe = document.createElement('iframe'),
+        f = document.body.appendChild(iframe);
+      iframe.id = "myIframe";
+      iframe.style = "position:absolute;width:0;height:0;top:-10px;left:-10px;";
+
+      w = f.contentWindow || f.contentDocument;
+      doc = f.contentDocument || f.contentWindow.document;
+      doc.open();
+      doc.write(content);
+      doc.close();
+      this.toPrint(w, function () {
+        document.body.removeChild(iframe)
+      });
+    },
+
+    toPrint: function (w, cb) {
+      var _this = this;
+      w.onload = function () {
+        try {
+          setTimeout(function () {
+            w.focus();
+            typeof _this.options.onStart === 'function' && _this.options.onStart();
+            if (!w.document.execCommand('print', false, null)) {
+              w.print();
+            }
+            typeof _this.options.onEnd === 'function' && _this.options.onEnd();
+            w.close();
+            cb && cb()
+          });
+        } catch (err) {
+          console.log('err', err);
+        }
+      }
+    }
+  };
+  window.Print = Print;
+}(window, document));
\ No newline at end of file
diff --git a/src/main/webapp/static/pdfjs/build/pdf.js b/src/main/webapp/static/pdfjs/build/pdf.js
index c6ffc51..ea2f30b 100644
--- a/src/main/webapp/static/pdfjs/build/pdf.js
+++ b/src/main/webapp/static/pdfjs/build/pdf.js
@@ -13,13 +13,13 @@ function loadPdf() {
   }
 }
 //屏蔽鼠标右键
-document.oncontextmenu = function(e) {
+/*document.oncontextmenu = function(e) {
   var e = e || window.event;
   e.returnValue = false;
   return false;
-}
+}*/
 //禁止快捷键打印
-function disabledPrint(){
+/*function disabledPrint(){
   if(event.keyCode==80 && event.ctrlKey){
     event.keyCode=0;
     event.returnValue=false;
@@ -29,7 +29,7 @@ function disabledPrint(){
     event.returnValue = false;
     return false;
   }
-}
+}*/
 document.onkeydown = function(e) {
   //快捷键ctrl+上图片放大
   if (38 == e.keyCode && e.ctrlKey) {
diff --git a/src/main/webapp/static/pdfjs/web/viewer1.html b/src/main/webapp/static/pdfjs/web/viewer1.html
index fe0cd26..6954b78 100644
--- a/src/main/webapp/static/pdfjs/web/viewer1.html
+++ b/src/main/webapp/static/pdfjs/web/viewer1.html
@@ -45,6 +45,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/
   <script src="debugger.js"></script>
   <script src="viewer1.js"></script>
   <script src="../build/pdf.js"></script>
+  <script src="../Print.js"></script>
 
   <style>
     .loading {
@@ -389,6 +390,8 @@ http://sourceforge.net/adobe/cmap/wiki/License/
 
 </div> <!-- outerContainer -->
 <div id="printContainer"></div>
+<div id="printContainer1">
+</div>
 <div id="mozPrintCallback-shim" hidden>
   <style>
     @media print {
@@ -457,8 +460,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/
     }
   </style>
   <div class="mozPrintCallback-dialog-box">
-    &lt;!&ndash; TODO: Localise the following strings &ndash;&gt;
-    Preparing document for printing...
+    打印加载中...
     <div class="progress-row">
       <progress value="0" max="100"></progress>
       <span class="relative-progress">0%</span>
@@ -470,12 +472,23 @@ http://sourceforge.net/adobe/cmap/wiki/License/
 </div>
 </body>
 <script>
+  function getContextPath() {
+    var pathName = document.location.pathname;
+    var index = pathName.substr(1).indexOf("/");
+    var result = pathName.substr(0, index + 1);
+    return result;
+  }
+  var path;
   $(function(){
     //获取父页面打印权限显示打印按钮
     var print = parent.$("#print").val();
     if(print == 1){
       $("#print").show();
     }
+    /*for (var i = 0; i < 147; i++) {
+       var html = "<img src=\"http://localhost:8083/emr_record/reload/000239.jpg\" width=\"890\" height=\"1180\">";
+       $("#printContainer1").append(html);
+    }*/
   })
 </script>
 </html>
diff --git a/src/main/webapp/static/pdfjs/web/viewer1.js b/src/main/webapp/static/pdfjs/web/viewer1.js
index b744998..44fbbe2 100644
--- a/src/main/webapp/static/pdfjs/web/viewer1.js
+++ b/src/main/webapp/static/pdfjs/web/viewer1.js
@@ -1883,7 +1883,22 @@ var SecondaryToolbar = {
     },
 
     printClick: function secondaryToolbarPrintClick(evt) {
-        window.print();
+        //window.print();
+        //是否打印预览图片加载完成标识
+        var printPicLoaded = parent.$("#printPicLoaded").val();
+        if(printPicLoaded == 1){
+            Print('#printContainer1', {
+                onStart: function () {
+                    console.log('onStart', new Date())
+                },
+                onEnd: function () {
+                    console.log('onEnd', new Date())
+                    $("#printContainer1").hide();
+                }
+            })
+        }else{
+            alert("预览图片未加载完,请稍后再试");
+        }
         this.close();
     },