添加病案保存图片前备份

pom.xml

@@ -32,7 +32,7 @@
         <httpclient.version>4.3.5</httpclient.version>
         <javax-servlet-api.version>4.0.1</javax-servlet-api.version>
         <commons-lang3.version>3.3.2</commons-lang3.version>
-        <pagehelper.version>5.0.0</pagehelper.version>
+        <pagehelper.version>5.1.10</pagehelper.version>
         <alibabaJson.version>1.2.4</alibabaJson.version>
         <jackson.version>2.9.4</jackson.version>
         <commons-fileupload.version>1.3.1</commons-fileupload.version>
@@ -44,6 +44,8 @@
         <poi.version>3.9</poi.version>
         <lombok.version>1.16.8</lombok.version>
         <itextpdf.version>5.5.7</itextpdf.version>
+        <jai.version>1.1.3</jai.version>
+        <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
     </properties>
     <!-- maven依赖 -->
     <dependencies>
@@ -223,6 +225,26 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
+        <!-- tif转jpg -->
+        <dependency>
+            <groupId>javax.media</groupId>
+            <artifactId>jai-core</artifactId>
+            <version>${jai.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.sun.media/jai-codec -->
+        <dependency>
+            <groupId>com.sun.media</groupId>
+            <artifactId>jai-codec</artifactId>
+            <version>${jai.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator -->
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>

src/main/java/com/emr/controller/ExceptionUtils.java

@@ -0,0 +1,24 @@
+package com.emr.controller;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+/**
+ * @ProjectName:
+ * @Description:
+ * @Param 传输参数
+ * @Return
+ * @Author: 曾文和
+ * @CreateDate: 2020/6/10 10:59
+ * @UpdateUser: 曾文和
+ * @UpdateDate: 2020/6/10 10:59
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+public class ExceptionUtils {
+    public static String getExceptionStr(Exception e){
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        e.printStackTrace(new PrintStream(baos));
+        return baos.toString();
+    }
+}

src/main/java/com/emr/controller/GlobalExceptionHandler.java

@@ -0,0 +1,81 @@
+package com.emr.controller;
+
+/**
+ * @ProjectName:
+ * @Description:
+ * @Param 传输参数
+ * @Return
+ * @Author: 曾文和
+ * @CreateDate: 2020/5/15 16:14
+ * @UpdateUser: 曾文和
+ * @UpdateDate: 2020/5/15 16:14
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+
+import com.alibaba.fastjson.support.spring.FastJsonJsonView;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.springframework.validation.BindException;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@ControllerAdvice
+public class GlobalExceptionHandler {
+    @ExceptionHandler(value = Exception.class)//指定拦截的异常
+    public ModelAndView errorHandler(Exception e) {
+        return returnMv(e, "服务器出错了,请联系系统管理员");
+    }
+
+    @ExceptionHandler(value = RuntimeException.class)//指定拦截的异常
+    public ModelAndView runtimeHandler(Exception e) {
+        return returnMv(e, "服务器出错了,请联系系统管理员");
+    }
+
+    @ExceptionHandler(value = UnauthorizedException.class)//指定拦截的异常
+    public ModelAndView unauthorizedHandler(Exception e) {
+        return returnMv(e, "您权限验证出错了,请联系系统管理员");
+    }
+
+    @ExceptionHandler(BindException.class)
+    @ResponseBody
+    public Map<String, Object> bindErrHandler(BindException e) {
+        Map<String,Object> map = new HashMap<String, Object>(3) {{
+            put("code", "500");
+            put("msg", "参数有误");
+            BindingResult bindingResult = e.getBindingResult();
+            put("fieldErrors", new HashMap<String, String>(bindingResult.getErrorCount()) {{
+                bindingResult.getFieldErrors().forEach(fieldError -> put(fieldError.getField(), fieldError.getDefaultMessage()));
+            }});
+        }};
+        log.error(map.toString());
+        return map;
+    }
+
+    private ModelAndView returnMv(Exception e, String msg) {
+        ModelAndView mv = new ModelAndView();
+        /*  使用FastJson提供的FastJsonJsonView视图返回，不需要捕获异常   */
+        FastJsonJsonView view = new FastJsonJsonView();
+        Map<String, Object> attributes = new HashMap<>(1);
+        attributes.put("code", "500");
+        attributes.put("msg", msg);
+        view.setAttributesMap(attributes);
+        mv.setView(view);
+        //方法名
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        e.printStackTrace(new PrintStream(baos));
+        String exception = baos.toString();
+        log.error(exception);
+        e.printStackTrace();
+        return mv;
+    }
+}

src/main/java/com/emr/controller/ImageController.java

@@ -0,0 +1,86 @@
+package com.emr.controller;
+
+import com.sun.media.jai.codec.ImageCodec;
+import com.sun.media.jai.codec.ImageEncoder;
+import com.sun.media.jai.codec.JPEGEncodeParam;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.imageio.ImageIO;
+import javax.media.jai.JAI;
+import javax.media.jai.RenderedOp;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.*;
+import java.io.*;
+
+/**
+ * @ProjectName:
+ * @Description:
+ * @Param 传输参数
+ * @Return
+ * @Author: 曾文和
+ * @CreateDate: 2020/6/5 15:14
+ * @UpdateUser: 曾文和
+ * @UpdateDate: 2020/6/5 15:14
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+@Controller
+public class ImageController{
+    /**
+     * @param imgUrl 图片在本地磁盘的位置 如：E:/teacherCompetition/1/images/1.jpg
+     * @param response
+     */
+    @RequestMapping("/toFindImg")
+    public void picToJSP(@RequestParam("imgUrl") String imgUrl,HttpServletResponse response){
+        InputStream in;
+        response.setContentType("image/png;charset=utf-8");
+        try {
+            File file = new File(imgUrl);
+            if(file.exists()) {
+                //判断是否是jgp
+                boolean flag = checkJpg(file);
+                if (!flag) {
+                    //tif转jpg输出到前台
+                    tiffTuanJPG(response.getOutputStream(), file);
+                } else {
+                    //图片读取路径
+                    in=new FileInputStream(file);
+                    int i=in.available();
+                    byte[]data=new byte[i];
+                    in.read(data);
+                    in.close();
+                    response.getOutputStream().write(data);
+                }
+            }
+            //写图片
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    public boolean checkJpg(File file){
+        try {
+            Image image = ImageIO.read(file);
+            return image != null;
+        } catch(IOException ex) {
+            return false;
+        }
+    }
+    public static void tiffTuanJPG(OutputStream out,File fileTiff){
+        String filePath = fileTiff.getAbsolutePath();
+        RenderedOp rd = JAI.create("fileload", filePath);//读取iff文件
+        try {
+            //文件存储输出流
+            com.sun.media.jai.codec.JPEGEncodeParam param = new JPEGEncodeParam();
+            ImageEncoder image = ImageCodec.createImageEncoder("JPEG", out, param); //指定输出格式
+            image.encode(rd);
+            //解析输出流进行输出
+            out.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/com/emr/controller/LogAopAction.java

@@ -153,11 +153,14 @@ public class LogAopAction {
                             //一个参数如id
                             sqlWhere = " " + propertyToField(parameterNames[0]) + " = '" + args[0] +"'";
                         } else {
+                            String regexp = "\'";
                             for (int i = 0; i < args.length; i++) {
+                                String fieldValue = (String)args[i];
+                                fieldValue = fieldValue.replaceAll(regexp, "");
                                 if (i != args.length - 1) {
-                                    sqlWhere += " " + propertyToField(parameterNames[i]) + " = '" + args[i] + "' AND ";
+                                    sqlWhere += " " + propertyToField(parameterNames[i]) + " = '" + fieldValue + "' AND ";
                                 } else {
-                                    sqlWhere += " " + propertyToField(parameterNames[i]) + " = '" + args[i] +"'";
+                                    sqlWhere += " " + propertyToField(parameterNames[i]) + " = '" + fieldValue +"'";
                                 }
                             }
                         }

src/main/java/com/emr/controller/commomSearch/CommomSearchController.java

@@ -2,6 +2,7 @@ package com.emr.controller.commomSearch;
 
 import com.alibaba.fastjson.JSON;
 import com.emr.annotation.OptionalLog;
+import com.emr.controller.ExceptionUtils;
 import com.emr.controller.FormTokenFlagUtil;
 import com.emr.dao.*;
 import com.emr.dao.approve.Emr_Apply_ApproveMapper;
@@ -19,7 +20,7 @@ import com.emr.entity.emrCodeType.Emr_Code_Type;
 import com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet;
 import com.emr.entity.recordType.Emr_Type;
 import com.emr.entity.recordType.Emr_Type_Related;
-import com.emr.entity.tScanAssort.T_Scan_Assort;
+import com.emr.service.CommomService;
 import com.emr.service.Zd_AssortServiceImpl;
 import com.emr.service.emrCode.DiagService;
 import com.emr.service.emrCode.HerbDiagService;
@@ -29,36 +30,35 @@ import com.emr.service.emrPrintOrDownLoadInfo.PrintOrDownLoadInfoService;
 import com.emr.service.recordType.EmrTypeRelatedService;
 import com.emr.service.recordType.EmrTypeService;
 import com.emr.service.tScanAssort.T_Scan_AssortService;
-import com.emr.util.FieldPropertyConvert;
 import com.emr.util.Jpg2PdfUtil;
 import com.emr.util.img2PdfUtil;
 import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo;
 import com.emr.vo.FontVo.FontCommom;
 import com.emr.vo.FontVo.ScanAssortVo;
 import com.emr.vo.codeType.CodeTree;
-import com.emr.vo.commomSearch.CommomTree;
-import com.emr.vo.commomSearch.CommomVo;
-import com.emr.vo.commomSearch.ScanPathVo;
+import com.emr.vo.commomSearch.*;
 import com.lowagie.text.Image;
 import com.lowagie.text.Utilities;
 import com.lowagie.text.pdf.*;
 import com.lowagie.text.pdf.codec.TiffImage;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.*;
-import java.lang.reflect.Field;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -125,6 +125,8 @@ public class CommomSearchController {
     private ZdDeptCodeMapper deptCodeMapper;
     @Autowired
     private ZdDisDiagStatusMapper disDiagStatusMapper;
+    @Autowired
+    private CommomService commomService;
     /**
      * @MethodName commomList
      * @Description: 跳转到常用查询页面
@@ -373,11 +375,11 @@ public class CommomSearchController {
     //加载病案信息
     @RequestMapping("getRecord")
     @ResponseBody
-    public String getRecord(String patientId) {
+    public String getRecord(String patientId,String flag) {
         if (StringUtils.isNoneBlank(patientId)) {
             try {
                 //根据patientId查询包含其他诊断的基本信息
-                List<CommomVo> commomVos = commomMapper.selectOtherDiagByPatientId(patientId);
+                List<CommomVo> commomVos = commomMapper.selectOtherDiagByPatientId(patientId,flag);
                 return JSON.toJSONString(commomVos.get(0));
             } catch (Exception e) {
                 e.printStackTrace();
@@ -465,9 +467,8 @@ public class CommomSearchController {
 
     //脐血库
     @RequestMapping("showRecordIframeBlood")
-    public String showRecordIframeBlood(String patientId, String flag, Model model, HttpServletRequest request) {
+    public String showRecordIframeBlood(String patientId,Model model, HttpServletRequest request) {
         model.addAttribute("patientId", patientId);
-        model.addAttribute("flag", flag);
         Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
         //打印分类集合
         List<Emr_Type> emrTypes = emrTypeService.selectAllByCreater(1, request);
@@ -524,21 +525,6 @@ public class CommomSearchController {
         }
     }
 
-
-    //脐血库
-    //获取病案图片根路径
-    @RequestMapping("getFilePath")
-    @ResponseBody
-    public ResultUtil getFilePath(String patientId) {
-        try {
-            CommomVo commomVo = commomMapper.selectByPrimaryKey(patientId);
-            return ResultUtil.ok(commomVo);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResultUtil.error("出错了,请联系系统管理员!");
-        }
-    }
-
     /**
      * @MethodName: getOtherDiagNameByAdmissTimesAndInpatientNo
      * @Description: 根据admissTimes和inpatientNo查询包含其他诊断名称的基本信息
@@ -553,7 +539,7 @@ public class CommomSearchController {
      */
     @RequestMapping(value = "getOtherDiagNameByAdmissTimesAndInpatientNo", produces = {"text/json;charset=UTF-8"})
     @ResponseBody
-    public String getOtherDiagNameByAdmissTimesAndInpatientNo(String name, Short admissTimes, String inpatientNo, String startTime2) {
+    public String getOtherDiagNameByAdmissTimesAndInpatientNo(String name, Short admissTimes, String inpatientNo, String startTime2,String flag) {
         if (StringUtils.isNoneBlank(name) && admissTimes != null && StringUtils.isNoneBlank(inpatientNo)) {
             try {
                 if (StringUtils.isNotBlank(startTime2)) {
@@ -572,7 +558,7 @@ public class CommomSearchController {
                     return "查询无该档案";
                 }
                 if (StringUtils.isNoneBlank(patientId)) {
-                    List<CommomVo> commomVos = commomMapper.selectOtherDiagByPatientId(patientId);
+                    List<CommomVo> commomVos = commomMapper.selectOtherDiagByPatientId(patientId,flag);
                     try {
                         if (null != commomVos && !commomVos.isEmpty()) {
                             return JSON.toJSONString(commomVos.get(0));
@@ -836,7 +822,7 @@ public class CommomSearchController {
             CommomTree tree1 = new CommomTree();
             Integer id = 1;
             tree1.setId(id);
-            tree1.setAssortName("全部影像资料");
+            tree1.setNewName("全部影像资料");
             if (null != commomVos && !commomVos.isEmpty()) {
                 //去重，取出不重复的分类集合
                 Map<String, CommomTree> assortMap = new LinkedHashMap<>();
@@ -904,12 +890,18 @@ public class CommomSearchController {
                             if (checkFlag) {
                                 tree3.setChecked("true");
                             }
-                            tree3.setAssortName(commomVos.get(i).getScanPage());
-                            treeList.add(tree3);
                             scanPathCount++;
+                            //图片名称
+                            String name = commomVos.get(i).getScanPage();
+                            tree3.setAssortName(name);
+                            //设置树图片节点的名称
+                            tree3.setNewName("(第"+scanPathCount+"页)"+name);
+                            tree3.setSource(commomVos.get(i).getSource());
+                            treeList.add(tree3);
+
                         }
                     }
-                    tree2.setAssortName(map.getValue().getAssortName() + "(" + scanPathCount + ")");
+                    tree2.setNewName(map.getValue().getAssortName() + "(" + scanPathCount + ")");
                     treeList.add(tree2);
                 }
             }
@@ -1105,52 +1097,17 @@ public class CommomSearchController {
     }
 
     //脐血库
-    @RequestMapping(value = "showRecordContentBlood/{flag}/{patientId}/{assortIds}")
+    @RequestMapping(value = "showRecordContentBlood")
     @ResponseBody
-    public void showRecordContentBlood(@PathVariable("patientId") String patientId,
-                                       @PathVariable("assortIds") String assortIds,
-                                       @PathVariable("flag") String flag, HttpServletResponse response) {
-        String pdfName = "档案管理PDF";
+    public void showRecordContentBlood(String patientId,String scanPages, String sources,String flag,HttpServletResponse response) {
         try {
-            if (StringUtils.isNotBlank(patientId)) {
-                patientId = patientId.replace("\'", "");
-                CommomVo commomVo = new CommomVo();
-                if (StringUtils.isNotBlank(flag) && "file_path".equals(flag)) {
-                    commomVo = commomMapper.selectByPrimaryKeyPath(patientId);
-                } else {
-                    commomVo = commomMapper.selectByPrimaryKey(patientId);
-                }
-                String[] scanPaths = assortIds.split(",");
-                //组织图片地址集合
-                List<String> filePaths = new ArrayList<>();
-                if (null != scanPaths) {
-                    flag = FieldPropertyConvert.fieldToProperty(flag);
-                    Field declaredField = commomVo.getClass().getDeclaredField(flag);
-                    declaredField.setAccessible(true);
-                    String src = (String) declaredField.get(commomVo);
-                    for (int i = 0; i < scanPaths.length; i++) {
-                        if (StringUtils.isNotBlank(scanPaths[i])) {
-                            String fileRealPath = src + "/" + scanPaths[i];
-                            File file = new File(fileRealPath);
-                            if (file.isFile()) {
-                                filePaths.add(fileRealPath);
-                            }
-                        }
-                    }
-                    if (null != filePaths && !filePaths.isEmpty()) {
-                        //根据图片路径转换pdf
-                        EmrPdfWaterSet emrPdfWaterSet = pdfWaterSetMapper.selectByPrimaryKey(1);
-                        img2PdfUtil.imageToPdf(response, filePaths, pdfName, emrPdfWaterSet);
-                    }
-                }
-            }
+            commomService.showRecordContentBlood(patientId,scanPages,sources,flag,response);
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     //脐血库
-
     /**
      * @MethodName: updateScanAssort
      * @Description: 重新分页
@@ -1164,7 +1121,7 @@ public class CommomSearchController {
      * @Version: 1.0
      */
     @RequiresPermissions("/commom/updateScanAssort")
-    @OptionalLog(module = "修改", methods = "病案预览页面病案图片重新分类")
+    @OptionalLog(module = "修改", methods = "档案预览页面病案图片重新分类")
     @RequestMapping(value = "updateScanAssort")
     @ResponseBody
     public ResultUtil updateScanAssort(String patientId, String assortIds, Integer index, String newAssortId) {
@@ -1205,21 +1162,15 @@ public class CommomSearchController {
      * @Version: 1.0
      */
     @RequiresPermissions("/commom/updateScanAssort")
-    @OptionalLog(module = "修改", methods = "病案预览页面病案图片重新分类")
+    @OptionalLog(module = "修改", methods = "档案预览页面病案图片重新分类",fieldName = "name",tableName = "commomtable")
     @RequestMapping(value = "updateScanAssortByBlood", method = RequestMethod.POST)
     @ResponseBody
-    public ResultUtil updateScanAssortByBlood(String patientId, String assortIds, String newAssortId) {
-        if (StringUtils.isNoneBlank(patientId) && StringUtils.isNoneBlank(assortIds) && StringUtils.isNoneBlank(newAssortId)) {
+    public ResultUtil updateScanAssortByBlood(CommomVo commomVo,String assortIds, String newAssortId) {
+        if (StringUtils.isNoneBlank(commomVo.getPatientId()) && StringUtils.isNoneBlank(assortIds) && StringUtils.isNoneBlank(newAssortId)) {
             try {
                 //根据patientId，admissIds(scanPage分类图片集合)批量更新分段id assrotdId
                 //批量更新
-                String[] split = assortIds.split(",");
-                assortIds = "";
-                for (String str : split) {
-                    assortIds += "'" + str + "',";
-                }
-                assortIds = assortIds.substring(0, assortIds.length() - 1);
-                scanAssortService.SimpleUpdateByPatientIdAndScanPages(patientId, newAssortId, assortIds);
+                scanAssortService.SimpleUpdateByPatientIdAndScanPages(commomVo.getPatientId(), newAssortId, assortIds);
                 return ResultUtil.ok();
             } catch (Exception e) {
                 e.printStackTrace();
@@ -1230,55 +1181,6 @@ public class CommomSearchController {
     }
 
     /*****************************************编码操作**************************************************/
-
-    /**
-     * @MethodName: delScanAssortByBlood
-     * @Description: 删除图片
-     * @Param String patientId,String assortIds:病案图片集合
-     * @Return
-     * @Author: 曾文和
-     * @CreateDate: 2020-03-09
-     * @UpdateUser: 曾文和
-     * @UpdateDate: 2020-03-09
-     * @UpdateRemark: 更新说明
-     * @Version: 1.0
-     */
-    @RequiresPermissions("/commom/delScanAssort")
-    @OptionalLog(module = "删除", methods = "病案预览页面删除病案图片")
-    @RequestMapping(value = "delScanAssortByBlood", method = RequestMethod.POST)
-    @ResponseBody
-    public ResultUtil delScanAssortByBlood(String patientId, String assortIds) {
-        if (StringUtils.isNoneBlank(patientId) && StringUtils.isNoneBlank(assortIds)) {
-            try {
-                //根据patientId，admissIds(scanPage分类图片集合)批量更新分段id assrotdId
-                //批量更新
-                String[] split = assortIds.split(",");
-                assortIds = "";
-                //逐个删除图片
-                CommomVo commomVo = commomMapper.selectByPrimaryKey(patientId);
-                String path = commomVo.getHomeAddr();
-                for (String str : split) {
-                    assortIds += "'" + str + "',";
-                    //删除影像图片文件，2020-04-01修改不删除图片
-                    /*if(StringUtils.isNotBlank(path)){
-                        String src = path + "/" + str;
-                        File file = new File(src);
-                        if(file.exists()){
-                            file.delete();
-                        }
-                    }*/
-                }
-                assortIds = assortIds.substring(0, assortIds.length() - 1);
-                scanAssortService.SimpleDelByPatientIdAndScanPages(patientId, assortIds);
-                return ResultUtil.ok();
-            } catch (Exception e) {
-                e.printStackTrace();
-                return null;
-            }
-        }
-        return null;
-    }
-
     /**
      * @MethodName: codeTable
      * @Description: 跳转到编码录入页面
@@ -2212,50 +2114,17 @@ public class CommomSearchController {
         }
         return list;
     }
-
-    /*@RequestMapping("toPdf")
-    public String toPdf(String patientId,String assortIds,String name,Model model){
-        model.addAttribute("patientId",patientId);
-        model.addAttribute("assortIds",assortIds);
-        model.addAttribute("name",name);
-        return "recordManage/commomSearch/pdf";
-    }*/
+    /*****************************病案图片操作****************************/
+    @OptionalLog(module = "保存", methods = "图片资料", fieldName = "name", tableName = "commomtable")
     @RequiresPermissions("/commom/updatePic")
     @RequestMapping(value = "updatePic", method = RequestMethod.POST)
     @ResponseBody
-    public ResultUtil updatePic(@RequestParam(required = false, value = "files")
-                                        MultipartFile[] files, String patientId, String assortId, String flag) {
+    public ResultUtil updatePic(CommomVo commomVo,@RequestParam(required = false, value = "files") MultipartFile[] files,String assortId) {
         try {
-            CommomVo commomVo = commomMapper.selectByPrimaryKey(patientId);
-            flag = FieldPropertyConvert.fieldToProperty(flag);
-            Field field = commomVo.getClass().getDeclaredField(flag);
-            field.setAccessible(true);
-            String path = (String) field.get(commomVo) + "/";
-            SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-            //定义批量添加进图片明细表集合
-            List<T_Scan_Assort> insertList = new ArrayList<>();
-            for (int i = 0; i < files.length; i++) {
-                String fullName = files[i].getOriginalFilename();
-                String src = path + fullName;
-                File file = new File(src);
-                //判断是否存在，存在文件加日期
-                if (file.exists()) {
-                    //原始名
-                    String baseName = FilenameUtils.getBaseName(files[i].getOriginalFilename());
-                    //扩展名
-                    String ext = FilenameUtils.getExtension(files[i].getOriginalFilename());
-                    fullName = baseName + "_" + fmt.format(new Date()) + "." + ext;
-                }
-                src = path + fullName;
-                //上传图片
-                files[i].transferTo(new File(src));
-                T_Scan_Assort scanAssort = new T_Scan_Assort();
-                scanAssort.setPatientId(patientId);
-                scanAssort.setAssortId(assortId);
-                scanAssort.setScanPage(fullName);
-                insertList.add(scanAssort);
+            String str = commomService.updatePic(files, commomVo.getPatientId(), assortId);
+            if(StringUtils.isNotBlank(str)){
+                return ResultUtil.error(str);
             }
-            scanAssortService.SimpleInsert(insertList);
             return ResultUtil.ok();
         } catch (Exception e) {
             e.printStackTrace();
@@ -2263,4 +2132,219 @@ public class CommomSearchController {
         }
     }
 
+    /**
+     * @MethodName: delScanAssortByBlood
+     * @Description: 删除图片
+     * @Param String patientId,String assortIds:病案图片集合
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2020-03-09
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2020-03-09
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
+     */
+    @RequiresPermissions("/commom/delScanAssort")
+    @OptionalLog(module = "删除", methods = "档案预览页面删除病案图片",fieldName = "name",tableName = "commomtable")
+    @RequestMapping(value = "delScanAssortByBlood", method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil delScanAssortByBlood(String patientId) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String assortIds = request.getParameter("assortIds");
+        if (StringUtils.isNoneBlank(patientId) && StringUtils.isNoneBlank(assortIds)) {
+            try {
+                scanAssortService.SimpleDelByPatientIdAndScanPages(patientId, assortIds);
+                return ResultUtil.ok();
+            } catch (Exception e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+        return null;
+    }
+
+    /*****************************病案备注操作****************************/
+    /**
+     * @MethodName: updateRecordReMark
+     * @Description: 修改病案备注
+     * @Param
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2020-06-05
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2020-06-05
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
+     */
+    @OptionalLog(module = "修改", methods = "修改病案备注", fieldName = "name", tableName = "commomtable")
+    @RequiresPermissions("/commom/addReMark")
+    @RequestMapping(value="updateRecordReMark",method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil updateRecordReMark(CommomVo commomVo){
+        try {
+            commomMapper.updateRecordReMark(commomVo);
+            return ResultUtil.ok();
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultUtil.error("修改失败,请联系系统管理员!");
+        }
+    }
+    /**************************病案备注结束*******************************/
+    /**************************恢复已删除图片开始*************************/
+    /**
+     * @MethodName: getDeledPicRecordTree
+     * @Description: 组织已删除图片的病案分类树
+     * @Param
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2020-06-08
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2020-06-08
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
+     */
+    @RequestMapping("selectDeledPicRecordTree")
+    @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() + ",";
+                }
+            }
+            //设置图片名称集合
+            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 treeList;
+    }
+    /**
+     * @MethodName: getDeledPicRecordTree
+     * @Description: 组织已删除图片的病案分类树
+     * @Param
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2020-06-08
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2020-06-08
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
+     */
+    @OptionalLog(module = "修改", methods = "恢复已删除图片", fieldName = "name", tableName = "commomtable")
+    @RequiresPermissions("/commom/recoverPic")
+    @RequestMapping(value="recoverPic",method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil recoverPic(CommomVo commomVo,String scanPages) {
+        try {
+            scanAssortService.recoverPic(commomVo.getPatientId(),scanPages);
+            return ResultUtil.ok();
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultUtil.error(e.getMessage());
+        }
+    }
+    /**************************恢复已删除图片结束***********************/
+    /**************************病案维护开始*****************************/
+    //脐血库
+    /**
+     * 脐血库新增档案
+     * @param commomBlood
+     * @return
+     * @throws Exception
+     */
+    @OptionalLog(module = "新增", methods = "新增档案")
+    @RequiresPermissions("/commom/addRecord")
+    @RequestMapping("addRecord")
+    @ResponseBody
+    public ResultUtil addRecordBlood(@Valid CommomBlood commomBlood,HttpServletRequest request) throws Exception{
+        //判断formToken
+        boolean flag = FormTokenFlagUtil.isFlag(request);
+        if(!flag){
+            return ResultUtil.error("请不要重复提交!");
+        }
+        //判断脐血编号不为空
+        if(StringUtils.isBlank(commomBlood.getInpatientNo())){
+            return ResultUtil.error("脐血编号不能为空!");
+        }
+        //判断孕妇姓名不为空
+        if(StringUtils.isBlank(commomBlood.getName())){
+            return ResultUtil.error("孕妇姓名不能为空!");
+        }
+        commomService.addRecordBlood(commomBlood);
+        return ResultUtil.ok();
+    }
+    @RequestMapping("selectRecordTree")
+    @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;
+        }
+    }
+    /**************************病案维护结束*****************************/
 }

src/main/java/com/emr/controller/otherManage/BloodAndAgreeStatusSetController.java

@@ -0,0 +1,202 @@
+package com.emr.controller.otherManage;
+
+import com.emr.annotation.OptionalLog;
+import com.emr.entity.ResultUtil;
+import com.emr.entity.zdBloodAgree.ZdBloodAgreeStatus;
+import com.emr.service.BloodAndAgreeStatusSetService;
+import com.emr.vo.BloodAndAgreeStatusTree;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.util.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ProjectName:
+ * @Description:
+ * @Param 传输参数
+ * @Return
+ * @Author: 曾文和
+ * @CreateDate: 2020/6/9 10:28
+ * @UpdateUser: 曾文和
+ * @UpdateDate: 2020/6/9 10:28
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+@Controller
+public class BloodAndAgreeStatusSetController {
+    @Autowired
+    private BloodAndAgreeStatusSetService bloodAndAgreeStatusSetService;
+    /************************维护脐血状态开始******************************/
+    /**
+     * bloodSet
+     * 跳转到维护脐血状态页面
+     * @return
+     */
+    @OptionalLog(module = "查看", methods = "查看脐血状态页面")
+    @RequiresPermissions("/blood/select")
+    @RequestMapping("blood/bloodSet")
+    public String bloodSet(){
+        return "otherManage/bloodSet";
+    }
+
+    /**
+     * addBlood
+     * 新增脐血状态
+     * @return
+     */
+    @OptionalLog(module = "新增", methods = "新增脐血状态")
+    @RequiresPermissions("/blood/addBlood")
+    @RequestMapping(value="blood/addBlood",method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil addBlood(@Valid ZdBloodAgreeStatus bloodAgreeStatus) throws Exception{
+        bloodAndAgreeStatusSetService.insertBloodAndAgreeStatus(bloodAgreeStatus);
+        return ResultUtil.ok(bloodAgreeStatus.getId().toString());
+    }
+
+    /**
+     * updateBlood
+     * 修改脐血状态
+     * @return
+     */
+    @OptionalLog(module = "修改", methods = "修改脐血状态",fieldName = "name",tableName = "zd_blood_agree_status")
+    @RequiresPermissions("/blood/updateBlood")
+    @RequestMapping(value="blood/updateBlood",method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil updateBlood(@Valid ZdBloodAgreeStatus bloodAgreeStatus) throws Exception{
+        bloodAndAgreeStatusSetService.updateBloodAndAgreeStatus(bloodAgreeStatus);
+        return ResultUtil.ok();
+    }
+    /**
+     * deleteBlood
+     * 删除脐血状态
+     * @return
+     */
+    @OptionalLog(module = "删除", methods = "删除脐血状态",fieldName = "name",tableName = "zd_blood_agree_status")
+    @RequiresPermissions("/blood/deleteBlood")
+    @RequestMapping(value="blood/deleteBlood/{id}",method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil deleteBlood(@PathVariable("id")Integer id) throws Exception{
+        bloodAndAgreeStatusSetService.deleteBloodAndAgreeStatus(id);
+        return ResultUtil.ok();
+    }
+    /************************维护脐血状态结束******************************/
+    /************************公共部分开始**********************************/
+    /**
+     * 查询所有
+     * @return
+     */
+    @RequestMapping("blood/selectAll")
+    @ResponseBody
+    public ResultUtil selectBloodSetTree() throws Exception{
+        List<BloodAndAgreeStatusTree> list = bloodAndAgreeStatusSetService.selectByCode(null,null);
+        return ResultUtil.ok(list);
+    }
+    /**
+     *组织字典树
+     * @param rootName 根目录名称
+     * @param code 标识，blood是脐血状态，agree是协议状态
+     * @return
+     */
+    @RequestMapping("blood/selectBloodSetTree")
+    @ResponseBody
+    public List<BloodAndAgreeStatusTree> selectBloodSetTree(String rootName,String code) throws Exception{
+        List<BloodAndAgreeStatusTree> treeList = new ArrayList<>();
+        //第一级：根目录
+        BloodAndAgreeStatusTree tree1 = new BloodAndAgreeStatusTree();
+        tree1.setId(0);
+        tree1.setName(rootName);
+        treeList.add(tree1);
+        List<BloodAndAgreeStatusTree> list = bloodAndAgreeStatusSetService.selectByCode(code,null);
+        if (!CollectionUtils.isEmpty(list)) {
+            treeList.addAll(list);
+        }
+      return treeList;
+    }
+
+    @RequestMapping("/blood/selectNameExist")
+    @ResponseBody
+    public ResultUtil selectNameExist(String name,String code,Integer id){
+        try {
+            List<BloodAndAgreeStatusTree> list = bloodAndAgreeStatusSetService.selectByCode(code,name);
+            if(null == id){
+                //新增
+                if(!CollectionUtils.isEmpty(list)){
+                    return ResultUtil.error("名称已存在");
+                }
+            }else{
+                //修改
+                if(!CollectionUtils.isEmpty(list)){
+                    for(BloodAndAgreeStatusTree vo : list){
+                        if(!vo.getId().equals(id) && vo.getName().equals(name)){
+                            return ResultUtil.error("名称已存在");
+                        }
+                    }
+                }
+            }
+            return ResultUtil.ok();
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultUtil.error("查询出错了,请联系系统管理员");
+        }
+    }
+    /************************公共部分结束**********************************/
+
+    /************************维护协议状态开始******************************/
+    /**
+     * agreeSet
+     * 跳转到维护脐血状态页面
+     * @return
+     */
+    @OptionalLog(module = "查看", methods = "查看协议状态页面")
+    @RequiresPermissions("/agree/select")
+    @RequestMapping("agree/agreeSet")
+    public String agreeSet(){
+        return "otherManage/agreeSet";
+    }
+
+    /**
+     * addAgree
+     * 新增协议状态
+     * @return
+     */
+    @OptionalLog(module = "新增", methods = "新增协议状态")
+    @RequiresPermissions("/agree/addAgree")
+    @RequestMapping(value="agree/addAgree",method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil addAgree(@Valid ZdBloodAgreeStatus bloodAgreeStatus) throws Exception{
+        bloodAndAgreeStatusSetService.insertBloodAndAgreeStatus(bloodAgreeStatus);
+        return ResultUtil.ok(bloodAgreeStatus.getId().toString());
+    }
+    /**
+     * updateAgree
+     * 修改协议状态
+     * @return
+     */
+    @OptionalLog(module = "修改", methods = "修改协议状态",fieldName = "name",tableName = "zd_blood_agree_status")
+    @RequiresPermissions("/agree/updateAgree")
+    @RequestMapping(value="agree/updateAgree",method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil updateAgree(@Valid ZdBloodAgreeStatus bloodAgreeStatus) throws Exception{
+        bloodAndAgreeStatusSetService.updateBloodAndAgreeStatus(bloodAgreeStatus);
+        return ResultUtil.ok();
+    }
+    /**
+     * deleteAgree
+     * 删除脐血状态
+     * @return
+     */
+    @OptionalLog(module = "删除", methods = "删除协议状态",fieldName = "name",tableName = "zd_blood_agree_status")
+    @RequiresPermissions("/agree/deleteAgree")
+    @RequestMapping(value="agree/deleteAgree/{id}",method = RequestMethod.POST)
+    @ResponseBody
+    public ResultUtil deleteAgree(@PathVariable("id")Integer id) throws Exception{
+        bloodAndAgreeStatusSetService.deleteBloodAndAgreeStatus(id);
+        return ResultUtil.ok();
+    }
+    /************************维护协议状态结束******************************/
+}

src/main/java/com/emr/controller/otherManage/CommomSetController.java

@@ -10,6 +10,8 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.io.File;
+
 @Controller
 @RequestMapping("commomSet/")
 public class CommomSetController {
@@ -31,6 +33,31 @@ public class CommomSetController {
     @ResponseBody
     public ResultUtil updateCommomSet(EmrComomSet comomSet){
         try{
+            //判断图片根目录的合法性
+            String newPicRoot = comomSet.getNewPicRoot();
+            newPicRoot = newPicRoot.trim();
+            //验证目录是否正确
+            String fileRegex = "^[A-z]:\\\\([^|><?*\":\\/]*\\\\)*([^|><?*\":\\/]*)?$";
+            boolean matches = newPicRoot.matches(fileRegex);
+            if(!matches){
+                return ResultUtil.error("目录路径格式不正确!");
+            }
+            //验证是否有特殊字符
+            String[] split = newPicRoot.split("\\\\");
+            for(int i = 0;i < split.length;i++){
+                if(i != 0){
+                    boolean flag = split[i].matches("[^\\s\\\\/:\\*\\?\\\"<>\\|](\\x20|[^\\s\\\\/:\\*\\?\\\"<>\\|])*[^\\s\\\\/:\\*\\?\\\"<>\\|\\.]$");
+                    if(!flag){
+                        return ResultUtil.error("不能存在特殊符号/ \\ \": | * ? < >");
+                    }
+                }
+            }
+            //验证盘符是否存在d:/
+            String str = newPicRoot.substring(0,1) + ":/";
+            if(!new File(str).exists()){
+                return ResultUtil.error(newPicRoot.substring(0,1) + "盘符不存在!");
+            }
+            comomSet.setNewPicRoot(newPicRoot);
             commomSetService.update(comomSet);
             return ResultUtil.ok();
         }catch (Exception e){

src/main/java/com/emr/dao/CommomMapper.java

@@ -41,7 +41,7 @@ public interface CommomMapper {
     /**
      * 根据patientId查询其他诊断
      * */
-    List<CommomVo> selectOtherDiagByPatientId(@Param("patientId") String patientId);
+    List<CommomVo> selectOtherDiagByPatientId(@Param("patientId") String patientId,@Param("flag")String flag);
     /**
      * selectAdmissTimesByNameAndNo
      * */
@@ -102,4 +102,9 @@ public interface CommomMapper {
     int selectCommomCount();
 
     int selectCountByPatients(String inpatientNo);
+
+    /**
+     * 修改病案备注
+     */
+    int updateRecordReMark(CommomVo commomVo);
 }

src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java

@@ -3,6 +3,7 @@ package com.emr.dao.tScanAssort;
 import com.emr.entity.tScanAssort.T_Scan_Assort;
 import com.emr.vo.FontVo.FontCommom;
 import com.emr.vo.FontVo.ScanAssortVo;
+import com.emr.vo.commomSearch.CommomVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -26,4 +27,17 @@ public interface T_Scan_AssortMapper {
                                             @Param("scanPages")String scanPages);
 
     int SimpleInsert(@Param("list")List<T_Scan_Assort> list);
+
+    /**
+     * 查询图片路径集合
+     */
+    List<ScanAssortVo> selectPicPaths(@Param("patientId")String patientId,@Param("scanPages")String scanPages,@Param("flag")String flag);
+    /**
+     * 查询已删除图片集合
+     */
+    List<ScanAssortVo> selectDeledPicList(@Param("patientId")String patientId,@Param("flag")String flag);
+
+    void selectPicPaths(CommomVo commomVo, String scanPages);
+
+    void recoverPic(@Param("patientId") String patientId, @Param("scanPages") String scanPages);
 }

src/main/java/com/emr/dao/zdBloodAgree/ZdBloodAgreeStatusMapper.java

@@ -0,0 +1,23 @@
+package com.emr.dao.zdBloodAgree;
+
+import com.emr.entity.zdBloodAgree.ZdBloodAgreeStatus;
+import com.emr.vo.BloodAndAgreeStatusTree;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ZdBloodAgreeStatusMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(ZdBloodAgreeStatus record);
+
+    int insertSelective(ZdBloodAgreeStatus record);
+
+    ZdBloodAgreeStatus selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(ZdBloodAgreeStatus record);
+
+    int updateByPrimaryKey(ZdBloodAgreeStatus record);
+
+    List<BloodAndAgreeStatusTree> selectByCode(@Param("code")String code,@Param("name")String name);
+}

src/main/java/com/emr/entity/EmrComomSet.java

@@ -11,6 +11,8 @@ public class EmrComomSet implements Serializable {
 
     private int maxDay;
 
+    private String newPicRoot;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -45,17 +47,26 @@ public class EmrComomSet implements Serializable {
         this.maxDay = maxDay;
     }
 
+    public String getNewPicRoot() {
+        return newPicRoot;
+    }
+
+    public void setNewPicRoot(String newPicRoot) {
+        this.newPicRoot = newPicRoot;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", times=").append(times);
-        sb.append(", defaultDay=").append(defaultDay);
-        sb.append(", maxDay=").append(maxDay);
-        sb.append("]");
-        return sb.toString();
+        return "EmrComomSet{" +
+                "id=" + id +
+                ", times=" + times +
+                ", defaultDay=" + defaultDay +
+                ", maxDay=" + maxDay +
+                ", newPicRoot='" + newPicRoot + '\'' +
+                '}';
     }
 }

src/main/java/com/emr/entity/tScanAssort/T_Scan_Assort.java

@@ -7,6 +7,26 @@ public class T_Scan_Assort {
 
     private String scanPage;
 
+    private Short source;
+
+    private Short isDel;
+
+    public Short getSource() {
+        return source;
+    }
+
+    public void setSource(Short source) {
+        this.source = source;
+    }
+
+    public Short getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Short isDel) {
+        this.isDel = isDel;
+    }
+
     public String getPatientId() {
         return patientId;
     }

src/main/java/com/emr/entity/zdBloodAgree/ZdBloodAgreeStatus.java

@@ -0,0 +1,107 @@
+package com.emr.entity.zdBloodAgree;
+
+
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+public class ZdBloodAgreeStatus implements Serializable {
+    private Integer id;
+
+    @NotBlank(message = "编码不能为空")
+    @Length(max = 32,message = "长度不能超过32个字符")
+    private String code;
+
+    @NotBlank(message = "名称不能为空")
+    @Length(max = 16,message = "长度不能超过16个中文")
+    private String name;
+
+    @Length(max = 32,message = "长度不能超过32个字符")
+    private String initialsSimplified;
+
+    @Length(max = 32,message = "长度不能超过32个字符")
+    private String chineseSimplified;
+
+    @NotNull(message = "有效不能为空")
+    private Short effective;
+
+    @Length(max = 250,message = "长度不能超过250个中文")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getInitialsSimplified() {
+        return initialsSimplified;
+    }
+
+    public void setInitialsSimplified(String initialsSimplified) {
+        this.initialsSimplified = initialsSimplified == null ? null : initialsSimplified.trim();
+    }
+
+    public String getChineseSimplified() {
+        return chineseSimplified;
+    }
+
+    public void setChineseSimplified(String chineseSimplified) {
+        this.chineseSimplified = chineseSimplified == null ? null : chineseSimplified.trim();
+    }
+
+    public Short getEffective() {
+        return effective;
+    }
+
+    public void setEffective(Short effective) {
+        this.effective = effective;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", code=").append(code);
+        sb.append(", name=").append(name);
+        sb.append(", initialsSimplified=").append(initialsSimplified);
+        sb.append(", chineseSimplified=").append(chineseSimplified);
+        sb.append(", effective=").append(effective);
+        sb.append(", remark=").append(remark);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/emr/service/BloodAndAgreeStatusSetService.java

@@ -0,0 +1,44 @@
+package com.emr.service;
+
+import com.emr.dao.zdBloodAgree.ZdBloodAgreeStatusMapper;
+import com.emr.entity.zdBloodAgree.ZdBloodAgreeStatus;
+import com.emr.vo.BloodAndAgreeStatusTree;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @ProjectName:
+ * @Description:
+ * @Param 传输参数
+ * @Return
+ * @Author: 曾文和
+ * @CreateDate: 2020/6/9 14:30
+ * @UpdateUser: 曾文和
+ * @UpdateDate: 2020/6/9 14:30
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+@Service
+@Transactional
+public class BloodAndAgreeStatusSetService {
+    @Autowired
+    private ZdBloodAgreeStatusMapper bloodAgreeStatusMapper;
+
+    public  List<BloodAndAgreeStatusTree> selectByCode(String code,String name){
+        return  bloodAgreeStatusMapper.selectByCode(code,name);
+    }
+
+    public void insertBloodAndAgreeStatus(ZdBloodAgreeStatus bloodAgreeStatus){
+        bloodAgreeStatusMapper.insertSelective(bloodAgreeStatus);
+    }
+    public void updateBloodAndAgreeStatus(ZdBloodAgreeStatus bloodAgreeStatus){
+        bloodAgreeStatusMapper.updateByPrimaryKeySelective(bloodAgreeStatus);
+    }
+
+    public void deleteBloodAndAgreeStatus(Integer id){
+        bloodAgreeStatusMapper.deleteByPrimaryKey(id);
+    }
+}

src/main/java/com/emr/service/CommomService.java

@@ -2,17 +2,38 @@ package com.emr.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.emr.dao.CommomMapper;
+import com.emr.dao.emrPdfWaterSet.EmrPdfWaterSetMapper;
+import com.emr.entity.EmrComomSet;
+import com.emr.entity.ResultUtil;
+import com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet;
+import com.emr.entity.tScanAssort.T_Scan_Assort;
+import com.emr.service.tScanAssort.T_Scan_AssortService;
+import com.emr.util.UUIDUtils;
+import com.emr.util.img2PdfUtil;
+import com.emr.vo.FontVo.ScanAssortVo;
 import com.emr.vo.User;
+import com.emr.vo.commomSearch.CommomBlood;
+import com.emr.vo.commomSearch.CommomVo;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -31,6 +52,14 @@ import java.util.List;
 public class CommomService {
     @Value("${POWER_URLHEAD}")
     private  String POWER_URLHEAD;
+    @Autowired
+    private CommomMapper commomMapper;
+    @Autowired
+    private CommomSetService commomSetService;
+    @Autowired
+    private T_Scan_AssortService scanAssortService;
+    @Autowired
+    private EmrPdfWaterSetMapper pdfWaterSetMapper;
     //获取所属医院用户名集合
     public static String creaters(HttpServletRequest request){
         List<User> userList = (List<User>)request.getSession().getAttribute("USER_LIST");
@@ -100,4 +129,144 @@ public class CommomService {
         }
         return userList;
     }
+
+    public String updatePic(MultipartFile[] files, String patientId, String assortId) throws Exception{
+        //查询目录
+        CommomVo commomVo = commomMapper.selectByPrimaryKey(patientId);
+        String path = commomVo.getNewPath();
+        //不存在的话,组织存放目录
+        if(StringUtils.isBlank(path)){
+            //查询设置的根目录
+            EmrComomSet emrComomSet = commomSetService.selectByPrimaryKey(1);
+            String newPicRoot = emrComomSet.getNewPicRoot();
+            if(StringUtils.isBlank(newPicRoot)){
+                return "目录未设置,请先前往参数设置页面设置图片存在根目录!";
+            }
+            //组织存放目录
+            //D:\新图像\202005\GDZT20120916076-2a41fe252a024978af7098afcf52ca1a
+            //格式化年月
+            SimpleDateFormat fmt = new SimpleDateFormat("yyyyMM");
+            path = newPicRoot + "/" + fmt.format(new Date()) + "/" + commomVo.getInpatientNo() + "-" + patientId;
+            //保存至commomtable表
+            commomVo.setNewPath(path);
+            commomMapper.updateByPrimaryKeySelective(commomVo);
+        }
+        //该目录不存在，创建目录
+        if(!new File(path).isDirectory()){
+            new File(path).mkdirs();
+        }
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        //定义批量添加进图片明细表集合
+        List<T_Scan_Assort> insertList = new ArrayList<>();
+        for (int i = 0; i < files.length; i++) {
+            String fullName = files[i].getOriginalFilename();
+            String src = path + "/" + fullName;
+            File file = new File(src);
+            //判断是否存在，存在文件加日期
+            if (file.exists()) {
+                //原始名
+                String baseName = FilenameUtils.getBaseName(files[i].getOriginalFilename());
+                //扩展名
+                String ext = FilenameUtils.getExtension(files[i].getOriginalFilename());
+                fullName = baseName + "_" + fmt.format(new Date()) + "." + ext;
+            }
+            src = path + "/" +  fullName;
+            //上传图片
+            files[i].transferTo(new File(src));
+            T_Scan_Assort scanAssort = new T_Scan_Assort();
+            scanAssort.setPatientId(patientId);
+            scanAssort.setAssortId(assortId);
+            scanAssort.setScanPage(fullName);
+            scanAssort.setSource(Short.valueOf("2"));
+            insertList.add(scanAssort);
+        }
+        scanAssortService.SimpleInsert(insertList);
+        return null;
+    }
+
+    public void showRecordContentBlood(String patientId, String scanPages, String sources, String flag, HttpServletResponse response) throws Exception{
+        String pdfName = "档案管理PDF";
+        if (StringUtils.isNotBlank(patientId)) {
+            patientId = patientId.replace("\'", "");
+            //查询
+            if(StringUtils.isNotBlank(flag)){
+                CommomVo commomVo = commomMapper.selectByPrimaryKey(patientId);
+                //flag = home_addr取home_addr字段，path_file取home_addr字段
+                String root1 = "";
+                if("home_addr".equals(flag)){
+                    root1 = commomVo.getHomeAddr();
+                }else if("file_path".equals(flag)){
+                    root1 = commomVo.getFilePath();
+                }
+                String root2 = commomVo.getNewPath();
+                //组织src
+                List<String> src = new LinkedList<>();
+                String[] scanPageArr = scanPages.split(",");
+                String[] sourceArr = sources.split(",");
+                for(int i = 0;i < scanPageArr.length;i++){
+                    String srcStr = "";
+                    if(StringUtils.isNotBlank(scanPageArr[i])){
+                        if("1".equals(sourceArr[i])){
+                            srcStr = root1 + "\\" + scanPageArr[i];
+                        }else{
+                            srcStr = root2 + "\\" +  scanPageArr[i];
+                        }
+                    }
+                    src.add(srcStr);
+                }
+                List<String> filePaths = new LinkedList<>();
+                for (String srcs : src) {
+                    File file = new File(srcs);
+                    if (file.isFile()) {
+                        filePaths.add(srcs);
+                    }
+                }
+                if (null != filePaths && !filePaths.isEmpty()) {
+                    //根据图片路径转换pdf
+                    EmrPdfWaterSet emrPdfWaterSet = pdfWaterSetMapper.selectByPrimaryKey(1);
+                    img2PdfUtil.imageToPdf(response, filePaths, pdfName, emrPdfWaterSet);
+                }
+            }
+        }
+    }
+
+    /**
+     * 脐血库新增档案
+     * @param commomBlood
+     */
+    public String addRecordBlood(CommomBlood commomBlood) {
+        //复制到commomVo
+        CommomVo commomVo = new CommomVo();
+        BeanUtils.copyProperties(commomBlood,commomVo);
+        //生成patientId
+        String patientId = UUIDUtils.getUUID();
+        commomVo.setPatientId(patientId);
+        //设置创建时间到dis_date
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        commomVo.setDisDate(fmt.format(new Date()));
+        //设置初始化is_oper=1
+        commomVo.setIsOper("1");
+        //设置图片根目录
+        //selectRootPath(patientId,)
+        //保存至commomtable表
+        //commomVo.setNewPath(path);
+        //新增
+        commomMapper.insertSelective(commomVo);
+        return null;
+    }
+
+    //封装组织新增图片根目录
+    public ResultUtil selectRootPath(String patientId,String inpatientId){
+        //查询设置的根目录
+        EmrComomSet emrComomSet = commomSetService.selectByPrimaryKey(1);
+        String newPicRoot = emrComomSet.getNewPicRoot();
+        if(StringUtils.isBlank(newPicRoot)){
+            return ResultUtil.error("目录未设置,请先前往参数设置页面设置图片存在根目录!");
+        }
+        //组织存放目录
+        //D:\新图像\202005\GDZT20120916076-2a41fe252a024978af7098afcf52ca1a
+        //格式化年月
+        SimpleDateFormat fmt1 = new SimpleDateFormat("yyyyMM");
+        return ResultUtil.ok(newPicRoot + "/" + fmt1.format(new Date()) + "/" + inpatientId + "-" + patientId);
+    }
 }

src/main/java/com/emr/service/CommomSetService.java

@@ -3,18 +3,24 @@ package com.emr.service;
 import com.emr.dao.EmrComomSetMapper;
 import com.emr.entity.EmrComomSet;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.servlet.ServletContext;
 
 @Service
 @Transactional
-public class CommomSetService {
+public class CommomSetService{
     @Autowired
     private EmrComomSetMapper comomSetMapper;
     public EmrComomSet selectByPrimaryKey(Integer id){
         return comomSetMapper.selectByPrimaryKey(id);
     }
 
+
     public void update(EmrComomSet comomSet){
         comomSetMapper.updateByPrimaryKey(comomSet);
     }

src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java

@@ -1,14 +1,19 @@
 package com.emr.service.tScanAssort;
 
 import com.emr.entity.tScanAssort.T_Scan_Assort;
-import org.apache.ibatis.annotations.Param;
+import com.emr.vo.FontVo.ScanAssortVo;
+import com.emr.vo.commomSearch.CommomVo;
 
 import java.util.List;
 
 public interface T_Scan_AssortService {
-    void updateByPrimaryKeySelective(@Param("newAssort") T_Scan_Assort newAssort, @Param("oldAssort")T_Scan_Assort oldAssort);
+    void updateByPrimaryKeySelective(T_Scan_Assort newAssort,T_Scan_Assort oldAssort);
     int SimpleUpdate(String patientId,String assortId,List<String> list);
     int SimpleUpdateByPatientIdAndScanPages(String patientId,String newAssortId,String scanPages);
     int SimpleDelByPatientIdAndScanPages(String patientId,String scanPages);
     int SimpleInsert(List<T_Scan_Assort> list);
+
+    List<ScanAssortVo> selectPicPaths(String patientId,String scanPages,String flag);
+
+    void recoverPic(String patientId, String scanPages);
 }

src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java

@@ -2,6 +2,8 @@ package com.emr.service.tScanAssort;
 
 import com.emr.dao.tScanAssort.T_Scan_AssortMapper;
 import com.emr.entity.tScanAssort.T_Scan_Assort;
+import com.emr.vo.FontVo.ScanAssortVo;
+import com.emr.vo.commomSearch.CommomVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,4 +51,14 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService{
     public int SimpleInsert(List<T_Scan_Assort> list) {
         return scanAssortMapper.SimpleInsert(list);
     }
+
+    @Override
+    public List<ScanAssortVo> selectPicPaths(String patientId, String scanPages, String flag) {
+        return scanAssortMapper.selectPicPaths(patientId, scanPages, flag);
+    }
+
+    @Override
+    public void recoverPic(String patientId, String scanPages) {
+        scanAssortMapper.recoverPic(patientId, scanPages);
+    }
 }

src/main/java/com/emr/vo/BloodAndAgreeStatusTree.java

@@ -0,0 +1,21 @@
+package com.emr.vo;
+
+import com.emr.entity.zdBloodAgree.ZdBloodAgreeStatus;
+import lombok.Data;
+
+/**
+ * @ProjectName:
+ * @Description:
+ * @Param 传输参数
+ * @Return
+ * @Author: 曾文和
+ * @CreateDate: 2020/6/9 10:53
+ * @UpdateUser: 曾文和
+ * @UpdateDate: 2020/6/9 10:53
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+@Data
+public class BloodAndAgreeStatusTree extends ZdBloodAgreeStatus {
+    private Integer parentId;
+}

src/main/java/com/emr/vo/FontVo/ScanAssortVo.java

@@ -41,6 +41,16 @@ public class ScanAssortVo {
 
     private String scanPage;
 
+    private String rootPath;
+
+    public String getRootPath() {
+        return rootPath;
+    }
+
+    public void setRootPath(String rootPath) {
+        this.rootPath = rootPath;
+    }
+
     public String getScanPage() {
         return scanPage;
     }

src/main/java/com/emr/vo/commomSearch/CommomBlood.java

@@ -0,0 +1,41 @@
+package com.emr.vo.commomSearch;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @ProjectName:
+ * @Description:
+ * @Param 传输参数
+ * @Return
+ * @Author: 曾文和
+ * @CreateDate: 2020/6/10 9:36
+ * @UpdateUser: 曾文和
+ * @UpdateDate: 2020/6/10 9:36
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+@Data
+public class CommomBlood {
+    @NotBlank(message = "脐血编号不能为空")
+    @Length(max = 15,message = "字符不能超过15个字符")
+    private String inpatientNo;//脐血编号
+
+    @NotBlank(message = "产妇姓名不能为空")
+    @Length(max = 30,message = "字符不能超过30个字符")
+    private String name;//产妇姓名
+
+    @Length(max = 15,message = "字符不能超过15个字符")
+    private String admissId;//协议号
+
+    @Length(max = 25,message = "字符不能超过25个字符")
+    private String mainDiagCode;//主要诊断编码
+
+    @Length(max = 100,message = "字符不能超过100个字符")
+    private String mainDiagName;//主要诊断名称
+
+    @Length(max = 25,message = "字符不能超过25个字符")
+    private String mainDisThing;//主要诊断转归情况
+}

src/main/java/com/emr/vo/commomSearch/CommomTree.java

@@ -17,6 +17,26 @@ public class CommomTree {
 
     private String checked;
 
+    private String newName;
+
+    private String source;
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getNewName() {
+        return newName;
+    }
+
+    public void setNewName(String newName) {
+        this.newName = newName;
+    }
+
     public String getScanPage() {
         return scanPage;
     }

src/main/java/com/emr/vo/commomSearch/CommomVo.java

@@ -43,6 +43,8 @@ public class CommomVo {
 
     private String mainDisThing;//主要诊断转归情况
 
+    private String memo;//病案备注
+
     private String country;//国籍
 
     private String birthAddr;//出生地
@@ -353,7 +355,9 @@ public class CommomVo {
 
     private String babySex;
 
-    private String filePath;
+    private String filePath;//脐血库、祈福医院影像图片目录
+
+    private String newPath;//新增图片目录
 
     private String ph;//病历扫描盘号
 
@@ -373,6 +377,16 @@ public class CommomVo {
 
     private String affirmDate;//确诊日期
 
+    private Integer delCount;//病案图片已删除的个数
+
+    public Integer getDelCount() {
+        return delCount;
+    }
+
+    public void setDelCount(Integer delCount) {
+        this.delCount = delCount;
+    }
+
     public String getAffirmDate() {
         return affirmDate;
     }
@@ -453,6 +467,14 @@ public class CommomVo {
         this.mainDiagCode = mainDiagCode;
     }
 
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
     public String getFilePath() {
         return filePath;
     }
@@ -461,6 +483,14 @@ public class CommomVo {
         this.filePath = filePath;
     }
 
+    public String getNewPath() {
+        return newPath;
+    }
+
+    public void setNewPath(String newPath) {
+        this.newPath = newPath;
+    }
+
     public String getTransferHospitalName() {
         return transferHospitalName;
     }

src/main/java/com/emr/vo/commomSearch/ScanDeledAssortTree.java

@@ -0,0 +1,89 @@
+package com.emr.vo.commomSearch;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.List;
+
+/**
+ * @ProjectName:
+ * @Description:
+ * @Param 传输参数
+ * @Return
+ * @Author: 曾文和
+ * @CreateDate: 2020/6/8 10:05
+ * @UpdateUser: 曾文和
+ * @UpdateDate: 2020/6/8 10:05
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+public class ScanDeledAssortTree {
+    private Integer id;
+
+    private Integer parentId;
+
+    private String name;
+
+    private String assortNames;
+
+    private Integer count;
+
+    private String srcs;//图片根目录集合
+
+    private String scanPageList;//图片名称集合
+
+    public String getAssortNames() {
+        return assortNames;
+    }
+
+    public void setAssortNames(String assortNames) {
+        this.assortNames = assortNames;
+    }
+
+    public String getSrcs() {
+        return srcs;
+    }
+
+    public void setSrcs(String srcs) {
+        this.srcs = srcs;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    public String getScanPageList() {
+        return scanPageList;
+    }
+
+    public void setScanPageList(String scanPageList) {
+        this.scanPageList = scanPageList;
+    }
+}

src/main/resources/config/logback.xml

@@ -41,7 +41,7 @@
     <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!--如果只是想要 Error 级别的日志，那么需要过滤一下，默认是 info 级别的，ThresholdFilter-->
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>Error</level>
+            <level>WARN</level>
         </filter>
         <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
             如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天

src/main/resources/mapper/CommomMapper.xml

@@ -210,7 +210,8 @@
         dbo.commomtable.patient_id,
         dbo.t_scan_assort.assort_id,
         dbo.zd_assort.assort_name,
-        t_scan_assort.scan_page
+        t_scan_assort.scan_page,
+        t_scan_assort.source
         FROM
         dbo.commomtable
         LEFT JOIN
@@ -259,6 +260,7 @@
         </if>
         WHERE
         dbo.commomtable.patient_id = #{patientId}
+        and t_scan_assort.is_del = 0
         ORDER BY
         dbo.zd_assort.assort_sort
     </select>
@@ -326,35 +328,29 @@
             dbo.commomtable.main_diag_name,
             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>
             dbo.commomtable.dis_date,
-            (select stuff((select '，' + diag_name
-                           from dbo.t_diag
-                           where diag.patient_id = patient_id
-                             and diag_no > '1' for xml path('')),
-                    1,
-                    1,
-                    '')
-            ) as
-            otherDiagName
+            t_scan_assort.count delCount
         FROM
-            dbo
-            .
-            commomtable
-            LEFT
-            JOIN
-            dbo
-            .
-            t_diag
-            diag
-        ON
-            dbo
-            .
             commomtable
-            .
-            patient_id =
-            diag
-            .
-            patient_id
+        LEFT JOIN (
+            SELECT
+                count( 1 ) count,
+                commomtable.patient_id
+            FROM
+                commomtable
+            INNER JOIN t_scan_assort ON commomtable.patient_id = t_scan_assort.patient_id
+            AND t_scan_assort.is_del = 1
+            WHERE
+                dbo.commomtable.patient_id = #{patientId}
+            GROUP BY
+            commomtable.patient_id
+        ) t_scan_assort ON commomtable.patient_id = t_scan_assort.patient_id
         WHERE
             dbo.commomtable.patient_id = #{patientId}
     </select>
@@ -533,6 +529,9 @@
             <if test="mainDisThing != null">
                 main_dis_thing,
             </if>
+            <if test="mainDiagCode != null">
+                main_diag_code,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="patientId != null">
@@ -592,6 +591,9 @@
             <if test="mainDisThing != null">
                 #{mainDisThing,jdbcType=NVARCHAR},
             </if>
+            <if test="mainDiagCode != null">
+                #{mainDiagCode,jdbcType=NVARCHAR},
+            </if>
         </trim>
     </insert>
 
@@ -653,6 +655,9 @@
             <if test="mainDisThing != null">
                 main_dis_thing = #{mainDisThing,jdbcType=NVARCHAR},
             </if>
+            <if test="newPath != null">
+                new_path = #{newPath,jdbcType=NVARCHAR},
+            </if>
         </set>
         where patient_id = #{patientId,jdbcType=VARCHAR}
     </update>
@@ -1253,4 +1258,9 @@
         (SELECT DISTINCT inpatient_no FROM dbo.commomtable)
         AS commom
     </select>
+    <!--修改病案备注-->
+    <update id="updateRecordReMark">
+        update commomtable set memo = #{memo}
+        where patient_id = #{patientId}
+    </update>
 </mapper>

src/main/resources/mapper/EmrComomSetMapper.xml

@@ -6,9 +6,10 @@
     <result column="times" property="times" jdbcType="SMALLINT" />
     <result column="defaultDay" property="defaultDay" jdbcType="INTEGER" />
     <result column="maxDay" property="maxDay" jdbcType="INTEGER" />
+    <result column="new_pic_root" property="newPicRoot" jdbcType="NVARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, times, defaultDay, maxDay
+    id, times, defaultDay, maxDay,new_pic_root
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -21,8 +22,8 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.emr.entity.EmrComomSet" >
-    insert into emr_comom_set (id, times, defaultDay, maxDay)
-    values (#{id,jdbcType=INTEGER}, #{times,jdbcType=SMALLINT}, #{defaultDay,jdbcType=INTEGER}, #{maxDay,jdbcType=INTEGER})
+    insert into emr_comom_set (id, times, defaultDay, maxDay,new_pic_root)
+    values (#{id,jdbcType=INTEGER}, #{times,jdbcType=SMALLINT}, #{defaultDay,jdbcType=INTEGER}, #{maxDay,jdbcType=INTEGER}, #{newPicRoot,jdbcType=NVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.emr.entity.EmrComomSet" >
     insert into emr_comom_set
@@ -39,6 +40,9 @@
       <if test="maxDay != null" >
         maxDay,
       </if>
+      <if test="newPicRoot != null" >
+        new_pic_root,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -53,6 +57,9 @@
       <if test="maxDay != null" >
         #{maxDay,jdbcType=INTEGER},
       </if>
+      <if test="newPicRoot != null" >
+        #{newPicRoot,jdbcType=NVARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.emr.entity.EmrComomSet" >
@@ -67,12 +74,15 @@
       <if test="maxDay != null" >
         #{maxDay,jdbcType=INTEGER},
       </if>
+      <if test="newPicRoot != null" >
+        #{newPicRoot,jdbcType=NVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.emr.entity.EmrComomSet" >
     update emr_comom_set
-    set times = #{times,jdbcType=SMALLINT}, defaultDay = #{defaultDay,jdbcType=INTEGER}, maxDay = #{maxDay,jdbcType=INTEGER}
+    set times = #{times,jdbcType=SMALLINT}, defaultDay = #{defaultDay,jdbcType=INTEGER}, maxDay = #{maxDay,jdbcType=INTEGER}, new_pic_root = #{newPicRoot,jdbcType=NVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

src/main/resources/mapper/commomSearch/ScanPathMapper.xml

@@ -41,7 +41,12 @@
         commomtable.dis_date,
         dbo.t_scan_assort.assort_id,
         dbo.t_scan_assort.scan_page,
-        (dbo.commomtable.${flag}+'\'+dbo.t_scan_assort.scan_page) fileRealPath
+      case
+      when t_scan_assort.source = 1
+      then dbo.commomtable.${flag}+'\'+dbo.t_scan_assort.scan_page
+      when t_scan_assort.source = 2
+      then dbo.commomtable.new_path+'\'+dbo.t_scan_assort.scan_page
+      end fileRealPath
     FROM
         dbo.commomtable
     LEFT OUTER JOIN

src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml

@@ -20,6 +20,7 @@
     <result column="parent_id" property="parentId" jdbcType="SMALLINT" />
     <result column="page_count" property="pageCount" jdbcType="SMALLINT" />
     <result column="file_path" property="filePath" jdbcType="VARCHAR" />
+    <result column="scan_page" property="scanPage" jdbcType="VARCHAR" />
   </resultMap>
   <insert id="insert" parameterType="com.emr.entity.tScanAssort.T_Scan_Assort" >
     insert into t_scan_assort (patient_id, assort_id, scan_page
@@ -136,11 +137,11 @@
     </update>
     <insert id="SimpleInsert" parameterType="java.util.List">
         insert into t_scan_assort(
-          patient_id, assort_id, scan_page
+          patient_id, assort_id, scan_page,source
         )
         <foreach collection="list" item="items" separator="union">
             select
-            #{items.patientId,jdbcType=VARCHAR}, #{items.assortId,jdbcType=VARCHAR}, #{items.scanPage,jdbcType=VARCHAR}
+            #{items.patientId,jdbcType=VARCHAR}, #{items.assortId,jdbcType=VARCHAR}, #{items.scanPage,jdbcType=VARCHAR}, #{items.source,jdbcType=SMALLINT}
         </foreach>
     </insert>
     <!--根据patiengId和图片集合批量更新-->
@@ -149,7 +150,58 @@
         where patient_id = #{patientId} and scan_page in (${scanPages})
     </update>
     <!--根据patiengId和图片集合批量删除-->
-    <delete id="SimpleDelByPatientIdAndScanPages">
-        delete from t_scan_assort where patient_id = #{patientId} and scan_page in (${scanPages})
-    </delete>
+    <update id="SimpleDelByPatientIdAndScanPages">
+        update t_scan_assort set is_del = 1 where patient_id = #{patientId} and scan_page in
+        (
+        <foreach collection="scanPages.split(',')" item="item" separator=",">
+            #{item}
+        </foreach>
+        )
+    </update>
+    <!--查询图片地址集合-->
+    <select id="selectPicPaths" resultMap="BaseResultMap1">
+        SELECT
+            CASE
+                WHEN
+                    source = 1 THEN
+                        #{flag} + '/' + scan_page ELSE new_path + '/' + scan_page
+                    END filePath
+            FROM
+                t_scan_assort
+                INNER JOIN commomtable ON t_scan_assort.patient_id = commomtable.patient_id
+                INNER JOIN zd_assort ON t_scan_assort.assort_id = zd_assort.assort_id
+            WHERE
+                t_scan_assort.patient_id = #{patientId}
+                AND scan_page IN (${scanPages})
+                AND t_scan_assort.is_del = 0
+            ORDER BY
+                zd_assort.assort_sort
+    </select>
+    <!--根据patientId查询已删除图片集合-->
+    <select id="selectDeledPicList" resultMap="BaseResultMap1">
+        SELECT
+            t_scan_assort.scan_page,
+            zd_assort.assort_name,
+            case
+                when  t_scan_assort.source = 1
+                then commomtable.${flag}
+                when  t_scan_assort.source = 2
+                then commomtable.new_path
+            end rootPath
+        FROM
+            commomtable
+            INNER JOIN t_scan_assort ON commomtable.patient_id = t_scan_assort.patient_id
+            AND t_scan_assort.is_del = 1
+            INNER JOIN zd_assort ON t_scan_assort.assort_id = zd_assort.assort_id
+            AND zd_assort.print_flag = 0
+        WHERE
+            commomtable.patient_id = #{patientId}
+        ORDER BY
+            zd_assort.assort_sort
+    </select>
+    <!--修改图片集合为未删除-->
+    <update id="recoverPic">
+        update t_scan_assort set is_del = 0 where patient_id = #{patientId}
+        and scan_page in (${scanPages})
+    </update>
 </mapper>

src/main/resources/mapper/zdBloodAgree/ZdBloodAgreeStatusMapper.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.emr.dao.zdBloodAgree.ZdBloodAgreeStatusMapper" >
+  <resultMap id="BaseResultMap" type="com.emr.vo.BloodAndAgreeStatusTree" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="code" property="code" jdbcType="NVARCHAR" />
+    <result column="name" property="name" jdbcType="NVARCHAR" />
+    <result column="initials_simplified" property="initialsSimplified" jdbcType="NVARCHAR" />
+    <result column="chinese_simplified" property="chineseSimplified" jdbcType="NVARCHAR" />
+    <result column="effective" property="effective" jdbcType="SMALLINT" />
+    <result column="remark" property="remark" jdbcType="NVARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, code, name, initials_simplified, chinese_simplified, effective, remark
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from zd_blood_agree_status
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from zd_blood_agree_status
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.emr.entity.zdBloodAgree.ZdBloodAgreeStatus" >
+    insert into zd_blood_agree_status (id, code, name,
+      initials_simplified, chinese_simplified,
+      effective, remark)
+    values (#{id,jdbcType=INTEGER}, #{code,jdbcType=NVARCHAR}, #{name,jdbcType=NVARCHAR},
+      #{initialsSimplified,jdbcType=NVARCHAR}, #{chineseSimplified,jdbcType=NVARCHAR},
+      #{effective,jdbcType=SMALLINT}, #{remark,jdbcType=NVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.emr.entity.zdBloodAgree.ZdBloodAgreeStatus" useGeneratedKeys="true" keyProperty="id">
+    insert into zd_blood_agree_status
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="code != null" >
+        code,
+      </if>
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="initialsSimplified != null" >
+        initials_simplified,
+      </if>
+      <if test="chineseSimplified != null" >
+        chinese_simplified,
+      </if>
+      <if test="effective != null" >
+        effective,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="code != null" >
+        #{code,jdbcType=NVARCHAR},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=NVARCHAR},
+      </if>
+      <if test="initialsSimplified != null" >
+        #{initialsSimplified,jdbcType=NVARCHAR},
+      </if>
+      <if test="chineseSimplified != null" >
+        #{chineseSimplified,jdbcType=NVARCHAR},
+      </if>
+      <if test="effective != null" >
+        #{effective,jdbcType=SMALLINT},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=NVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.emr.entity.zdBloodAgree.ZdBloodAgreeStatus" >
+    update zd_blood_agree_status
+    <set >
+      <if test="code != null" >
+        code = #{code,jdbcType=NVARCHAR},
+      </if>
+      <if test="name != null" >
+        name = #{name,jdbcType=NVARCHAR},
+      </if>
+      <if test="initialsSimplified != null" >
+        initials_simplified = #{initialsSimplified,jdbcType=NVARCHAR},
+      </if>
+      <if test="chineseSimplified != null" >
+        chinese_simplified = #{chineseSimplified,jdbcType=NVARCHAR},
+      </if>
+      <if test="effective != null" >
+        effective = #{effective,jdbcType=SMALLINT},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=NVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.emr.entity.zdBloodAgree.ZdBloodAgreeStatus" >
+    update zd_blood_agree_status
+    set code = #{code,jdbcType=NVARCHAR},
+      name = #{name,jdbcType=NVARCHAR},
+      initials_simplified = #{initialsSimplified,jdbcType=NVARCHAR},
+      chinese_simplified = #{chineseSimplified,jdbcType=NVARCHAR},
+      effective = #{effective,jdbcType=SMALLINT},
+      remark = #{remark,jdbcType=NVARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <!--根据code查询全部有效的-->
+  <select id="selectByCode" resultMap="BaseResultMap">
+    select *,0 as parentId from zd_blood_agree_status where effective = 1
+    <if test="code != null and code != ''">
+       and code = #{code}
+    </if>
+    <if test="name != null and name != ''">
+       and name = #{name}
+    </if>
+  </select>
+</mapper>

src/main/resources/rebel.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
+
+	<classpath>
+		<dir name="E:/ideaProject/EMR_Record/target/classes">
+		</dir>
+	</classpath>
+
+	<web>
+		<link target="/">
+			<dir name="E:/ideaProject/EMR_Record/src/main/webapp">
+			</dir>
+		</link>
+	</web>
+
+</application>

src/main/webapp/WEB-INF/jspf/ztreeCommom.jsp

@@ -3,8 +3,6 @@
 <script type="text/javascript" src="${path}/static/js/html5shiv.min.js"></script>
 <script type="text/javascript" src="${path}/static/js/respond.js"></script>
 <script type="text/javascript" src="${path}/static/zTree_v3-master/js/jquery-1.4.4.min.js"></script>
-<script  src="${path}/static/zTree_v3-master/js/jquery.ztree.allv3-3.5.28.js"></script>
-<script type="text/javascript" src="${path}/static/zTree_v3-master/js/jquery.ztree.exhidev3-3.5.28.js"></script>
 <![endif]-->
 
 <!--[if !IE]><!-->

src/main/webapp/WEB-INF/views/otherManage/agreeSet.jsp

@@ -0,0 +1,210 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<c:set var="path" value="${pageContext.request.contextPath}"/>
+<%@ include file="/WEB-INF/jspf/common.jspf" %>
+<%@ include file="/WEB-INF/jspf/ztreeCommom.jsp" %>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <title>协议类型设置</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv=X-UA-Compatible IE=EmulateIE7>
+    <!--[if lt IE 9]>
+    <script type="text/javascript" src="${path}/static/js/html5shiv.min.js"></script>
+    <script type="text/javascript" src="${path}/static/js/jquery-1.11.3.min.js"></script>
+    <script type="text/javascript" src="${path}/static/js/respond.min.js"></script>
+    <![endif]-->
+    <script>
+        var path = "${path}";
+    </script>
+    <style type="text/css">
+        .leftDiv{
+            height: 100%;
+            border-right: 10px solid #c1d7e3;
+            background-color:#fff
+        }
+        .rightDiv{
+            height: 100%;
+            background-color:#fff
+        }
+        .form-group{
+            margin-top:-3%;
+        }
+        .form-control{
+             margin: 0 auto;
+             width:80%;
+         }
+        .input{
+            width:205px;
+        }
+        .treeBtns{
+            margin-top:10px;
+            margin-left:30px;
+        }
+        .treeBtn{
+            margin-left:13%;
+        }
+        .insertbtn{
+            right: 93px!important;
+            margin-top: 20px;
+            width: 107px;
+            position: absolute;
+            color: #fff;
+        }
+        .btns{
+            width:100%;
+            margin-left:116px;
+            margin-top:46px;
+        }
+        .savebtn{
+            width: 107px;
+        }
+        .delbtn{
+            width: 107px;
+            margin-left: 70px;
+        }
+        .content{
+            position: absolute;
+            margin-top: 4%;
+            margin-left: 3%;
+        }
+        /**页头**/
+        .headDiv{
+            height:30px;
+            width: 100%;
+            font-weight: bold;
+            font-size: 18px;
+        }
+        .headDiv span{
+           color: #fff;
+        }
+        .headSpanDiv{
+            padding: 5px 15px;}
+        /**form表单div*/
+        .formDiv{
+            padding-left:87px;
+        }
+        .textarea{
+            width: 305px;
+        }
+        .loading {
+            width: 160px;
+            height: 56px;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            line-height: 56px;
+            color: #fff;
+            padding-left: 60px;
+            font-size: 15px;
+            background: #000;
+            opacity: 0.7;
+            z-index: 9999;
+            -moz-border-radius: 20px;
+            -webkit-border-radius: 20px;
+            border-radius: 20px;
+            filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70);
+        }
+        .col-md-3,.col-md-9 {
+            padding: 0;
+        }
+        .zTreeDemo {
+            height: calc(100vh - 200px) !important;
+            min-height: 394px !important;
+        }
+    </style>
+</head>
+<body style="background-color: #c1d7e3">
+<input type="hidden" id="rootName" value="协议类型列表">
+<div class="row main">
+    <!--树-->
+    <div class="col-md-3 leftDiv">
+        <div class="headDiv">
+            <div class="headSpanDiv">
+            </div>
+        </div>
+        <div class="treeBtns">
+            <button type="button" class="btn  btn-primary btn-sm treeBtn" onclick="expandAll();">全部展开</button>
+            <button type="button" class="btn  btn-primary btn-sm treeBtn" onclick="collapseAll();">全部收缩</button>
+        </div>
+        <div id="myModal" class="modal fade" data-keyboard="false"
+             data-backdrop="static" data-role="dialog"
+             aria-labelledby="myModalLabel" aria-hidden="true">
+            <div id="loading" class="loading">加载中。。。</div>
+        </div>
+        <div class="zTreeDemo">
+            <ul id="ztree" class="ztree"></ul>
+        </div>
+    </div>
+    <!--内容-->
+    <div class="rightDiv col-md-9">
+        <div class="headDiv">
+            <div class="headSpanDiv">
+                <span>协议类型设置</span>
+            </div>
+        </div>
+        <div class="formDiv">
+            <form class="form-horizontal" role="form" id="form">
+                <input type="hidden" id="id" name="id">
+                <input type="hidden" id="code" name="code" value="agree">
+                <shiro:hasPermission name="/agree/addAgree">
+                    <div class="row" id="addBtn">
+                        <button type="button" class="btn btn-sm insertbtn" style="background-color: #FF6600" onclick="add()">添加</button>
+                    </div>
+                </shiro:hasPermission>
+                <div class="row">
+                    <div class="content" id="contentDiv">
+                        <div class="form-group typeDiv">
+                            <label class="col-sm-5 control-label">名称：</label>
+                            <div class="col-sm-7">
+                                <input type="text" class="form-control input input-sm" name="name" id="name" maxlength="16">
+                            </div>
+                        </div>
+                        <div class="form-group typeDiv">
+                            <label  class="col-sm-5 control-label">名称首字母简写：</label>
+                            <div class="col-sm-7">
+                                <input type="text" class="form-control input input-sm" name="initialsSimplified" id="initialsSimplified" maxlength="32">
+                            </div>
+                        </div>
+                        <div class="form-group codeDiv">
+                            <label  class="col-sm-5 control-label">名称全拼简写：</label>
+                            <div class="col-sm-7">
+                                <input type="text" class="form-control input input-sm" name="chineseSimplified" id="chineseSimplified" maxlength="32">
+                            </div>
+                        </div>
+                        <div class="form-group codeDiv">
+                            <label class="col-sm-5 control-label">有效否：</label>
+                            <div class="col-sm-7">
+                                <select type="text" class="form-control input input-sm" name="effective" id="effective">
+                                    <option value="1">是</option>
+                                    <option value="0">否</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label  class="col-sm-5 control-label">备注:</label>
+                            <div class="col-sm-7">
+                                <textarea class="form-control input input-sm textarea" name="remark"  id="remark" maxlength="250"></textarea>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="btns">
+                                <shiro:hasPermission name="/agree/updateAgree">
+                                    <button type="button" class="btn btn-info btn-sm savebtn" onclick="save()">保存</button>
+                                </shiro:hasPermission>
+                                <shiro:hasPermission name="/agree/deleteAgree">
+                                        <button type="button" id="delBtn" disabled class="btn btn-danger btn-sm delbtn" onclick="del()">删除</button>
+                                </shiro:hasPermission>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+<script src="${path}/static/js/otherManage/bloodAndAgreeSet.js?t=1"></script>
+<script src="${path}/static/js/pinying.js"></script>
+</body>
+</html>

src/main/webapp/WEB-INF/views/otherManage/bloodSet.jsp

@@ -0,0 +1,210 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<c:set var="path" value="${pageContext.request.contextPath}"/>
+<%@ include file="/WEB-INF/jspf/common.jspf" %>
+<%@ include file="/WEB-INF/jspf/ztreeCommom.jsp" %>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <title>脐血状态设置</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv=X-UA-Compatible IE=EmulateIE7>
+    <!--[if lt IE 9]>
+    <script type="text/javascript" src="${path}/static/js/html5shiv.min.js"></script>
+    <script type="text/javascript" src="${path}/static/js/jquery-1.11.3.min.js"></script>
+    <script type="text/javascript" src="${path}/static/js/respond.min.js"></script>
+    <![endif]-->
+    <script>
+        var path = "${path}";
+    </script>
+    <style type="text/css">
+        .leftDiv{
+            height: 100%;
+            border-right: 10px solid #c1d7e3;
+            background-color:#fff
+        }
+        .rightDiv{
+            height: 100%;
+            background-color:#fff
+        }
+        .form-group{
+            margin-top:-3%;
+        }
+        .form-control{
+             margin: 0 auto;
+             width:80%;
+         }
+        .input{
+            width:205px;
+        }
+        .treeBtns{
+            margin-top:10px;
+            margin-left:30px;
+        }
+        .treeBtn{
+            margin-left:13%;
+        }
+        .insertbtn{
+            right: 93px!important;
+            margin-top: 20px;
+            width: 107px;
+            position: absolute;
+            color: #fff;
+        }
+        .btns{
+            width:100%;
+            margin-left:116px;
+            margin-top:46px;
+        }
+        .savebtn{
+            width: 107px;
+        }
+        .delbtn{
+            width: 107px;
+            margin-left: 70px;
+        }
+        .content{
+            position: absolute;
+            margin-top: 4%;
+            margin-left: 3%;
+        }
+        /**页头**/
+        .headDiv{
+            height:30px;
+            width: 100%;
+            font-weight: bold;
+            font-size: 18px;
+        }
+        .headDiv span{
+           color: #fff;
+        }
+        .headSpanDiv{
+            padding: 5px 15px;}
+        /**form表单div*/
+        .formDiv{
+            padding-left:87px;
+        }
+        .textarea{
+            width: 305px;
+        }
+        .loading {
+            width: 160px;
+            height: 56px;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            line-height: 56px;
+            color: #fff;
+            padding-left: 60px;
+            font-size: 15px;
+            background: #000;
+            opacity: 0.7;
+            z-index: 9999;
+            -moz-border-radius: 20px;
+            -webkit-border-radius: 20px;
+            border-radius: 20px;
+            filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70);
+        }
+        .col-md-3,.col-md-9 {
+            padding: 0;
+        }
+        .zTreeDemo {
+            height: calc(100vh - 200px) !important;
+            min-height: 394px !important;
+        }
+    </style>
+</head>
+<body style="background-color: #c1d7e3">
+<input type="hidden" id="rootName" value="脐血状态列表">
+<div class="row main">
+    <!--树-->
+    <div class="col-md-3 leftDiv">
+        <div class="headDiv">
+            <div class="headSpanDiv">
+            </div>
+        </div>
+        <div class="treeBtns">
+            <button type="button" class="btn  btn-primary btn-sm treeBtn" onclick="expandAll();">全部展开</button>
+            <button type="button" class="btn  btn-primary btn-sm treeBtn" onclick="collapseAll();">全部收缩</button>
+        </div>
+        <div id="myModal" class="modal fade" data-keyboard="false"
+             data-backdrop="static" data-role="dialog"
+             aria-labelledby="myModalLabel" aria-hidden="true">
+            <div id="loading" class="loading">加载中。。。</div>
+        </div>
+        <div class="zTreeDemo">
+            <ul id="ztree" class="ztree"></ul>
+        </div>
+    </div>
+    <!--内容-->
+    <div class="rightDiv col-md-9">
+        <div class="headDiv">
+            <div class="headSpanDiv">
+                <span>脐血状态设置</span>
+            </div>
+        </div>
+        <div class="formDiv">
+            <form class="form-horizontal" role="form" id="form">
+                <input type="hidden" id="id" name="id">
+                <input type="hidden" id="code" name="code" value="blood">
+                <shiro:hasPermission name="/blood/addBlood">
+                    <div class="row" id="addBtn">
+                        <button type="button" class="btn btn-sm insertbtn" style="background-color: #FF6600" onclick="add()">添加</button>
+                    </div>
+                </shiro:hasPermission>
+                <div class="row">
+                    <div class="content" id="contentDiv">
+                        <div class="form-group typeDiv">
+                            <label class="col-sm-5 control-label">名称：</label>
+                            <div class="col-sm-7">
+                                <input type="text" class="form-control input input-sm" name="name" id="name" maxlength="16">
+                            </div>
+                        </div>
+                        <div class="form-group typeDiv">
+                            <label  class="col-sm-5 control-label">名称首字母简写：</label>
+                            <div class="col-sm-7">
+                                <input type="text" class="form-control input input-sm" name="initialsSimplified" id="initialsSimplified" maxlength="32">
+                            </div>
+                        </div>
+                        <div class="form-group codeDiv">
+                            <label  class="col-sm-5 control-label">名称全拼简写：</label>
+                            <div class="col-sm-7">
+                                <input type="text" class="form-control input input-sm" name="chineseSimplified" id="chineseSimplified" maxlength="32">
+                            </div>
+                        </div>
+                        <div class="form-group codeDiv">
+                            <label class="col-sm-5 control-label">有效否：</label>
+                            <div class="col-sm-7">
+                                <select type="text" class="form-control input input-sm" name="effective" id="effective">
+                                    <option value="1">是</option>
+                                    <option value="0">否</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label  class="col-sm-5 control-label">备注:</label>
+                            <div class="col-sm-7">
+                                <textarea class="form-control input input-sm textarea" name="remark"  id="remark" maxlength="250"></textarea>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="btns">
+                                <shiro:hasPermission name="/blood/updateBlood">
+                                    <button type="button" class="btn btn-info btn-sm savebtn" onclick="save()">保存</button>
+                                </shiro:hasPermission>
+                                <shiro:hasPermission name="/blood/deleteBlood">
+                                        <button type="button" id="delBtn" disabled class="btn btn-danger btn-sm delbtn" onclick="del()">删除</button>
+                                </shiro:hasPermission>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+<script src="${path}/static/js/otherManage/bloodAndAgreeSet.js?t=1"></script>
+<script src="${path}/static/js/pinying.js"></script>
+</body>
+</html>

src/main/webapp/WEB-INF/views/otherManage/commomSetList.jsp

@@ -20,10 +20,11 @@
     </script>
     <style type="text/css">
         .mainDiv{
-            background-color: #fff;
+            height: 40%;
+            background-color: #c1d7e3;
         }
         .searchInput{
-            width:19%;
+            width:59%;
             margin-left: 5px;
         }
         .searchElement{
@@ -39,7 +40,6 @@
         }
         /**查询按钮组*/
         .btnsDiv{
-            margin-top: 15px;
             height:35px;
             text-align: right;
             margin-right: 25px;
@@ -47,6 +47,9 @@
         .btns{
             margin-left: 2%;
         }
+        form{
+            padding:10px 0 0 0;
+        }
     </style>
 </head>
 <body>
@@ -88,14 +91,21 @@
                            name="maxDay" id="maxDay" onblur="checkNum('maxDay')">
                 </div>
             </div>
+            <div class="searchInputElement left" style="margin-left: 10px; margin-top: 20px;">
+                <div class="searchElement left">
+                    <label class="labelDiv">新增图片存放根路径：</label>
+                </div>
+                <div class="searchInput left">
+                    <input type="text" class="form-control input-sm" value="${comomSet.newPicRoot}" name="newPicRoot" id="newPicRoot">
+                    <p style="color: red;">格式D:\新图像</p>
+                </div>
+            </div>
         </form>
     </div>
     <div class="btnsDiv">
-        <div style="margin-top: 130px;">
-            <shiro:hasPermission name="/commomSet/update">
-                <button type="button" class="btn btn-sm btn-primary btns" onclick="save()">保存</button>
-            </shiro:hasPermission>
-        </div>
+        <shiro:hasPermission name="/commomSet/update">
+            <button type="button" class="btn btn-sm btn-primary btns" onclick="save()">保存</button>
+        </shiro:hasPermission>
     </div>
 </div>
 <script type="text/javascript" src="${path}/static/js/otherManage/commomSet.js?t=4"></script>

src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomList.jsp

@@ -123,6 +123,9 @@
             cursor: pointer;
         }
         .fht-cell{width:85px!important;}
+        .fixed-table-body-columns{
+            top:41px!important;
+        }
     </style>
 </head>
 <body>

src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomList1.jsp

@@ -3,6 +3,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <c:set var="path" value="${pageContext.request.contextPath}"/>
 <%@ include file="/WEB-INF/jspf/common.jspf" %>
+<%@ include file="/WEB-INF/jspf/ztreeCommom.jsp" %>
 <%@ include file="/WEB-INF/jspf/boostrapSelect.jspf" %>
 <!DOCTYPE html>
 <html lang="en">
@@ -13,12 +14,15 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta http-equiv=X-UA-Compatible IE=EmulateIE7>
     <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
+    <link href="${path}/static/css/updatePic/common.css" type="text/css" rel="stylesheet">
+    <link href="${path}/static/css/updatePic/index.css" type="text/css" rel="stylesheet">
     <!--[if lt IE 9]>
     <script type="text/javascript" src="${path}/static/js/html5shiv.min.js"></script>
     <script type="text/javascript" src="${path}/static/js/jquery-1.11.3.min.js"></script>
     <script type="text/javascript" src="${path}/static/js/respond.min.js"></script>
     <![endif]-->
     <script type="text/javascript" src="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.js?time=2019-12-25"></script>
+    <script type="text/javascript" src="${path}/static/js/udpatePic/imgUp.js"></script>
     <script>
         var path = "${path}";
     </script>
@@ -41,15 +45,12 @@
         }
         /*按钮组*/
         .btns{
-            width:102%;
+            width:100%;
             background-color: #fff;
             text-align: right;
             margin-top:5px;
             margin-bottom: 5px;
         }
-        .btn{
-            margin-left:-1%;
-        }
         /*tableDiv*/
         .tableDiv{
             /*margin-top: 1%;*/
@@ -132,6 +133,27 @@
         .detail{
             width:30px;
         }
+        .panel-body {
+            padding: 15px 0 0 0;
+        }
+        .row {
+            margin-right: 25px;
+        }
+        /**
+         *多选下拉框
+         */
+        .dropdown-toggle{
+            height: 30px!important;
+        }
+        .filter-option-inner{
+            font-size: 12px;
+        }
+        .tab-content{
+            margin-top: 10px;
+        }
+        .z_photo{
+            width: 56%;
+        }
     </style>
 </head>
 <body>
@@ -167,7 +189,7 @@
                         <input type="hidden" id="showPrint" value="${CURRENT_USER.userAge}">
                         <input type="hidden" id="flag" value="home_addr">
                         <!--查询的sql ORDER BY 语句-->
-                        <input type="hidden" id="orderBys">
+                        <input type="hidden" id="orderBys" value=" order by commomtable.dis_date desc">
                         <!--该用户申请的审批过了且未过期的病案，不可重复申请，可查看的病案主键patientId-->
                         <input type="hidden" id="approves">
                         <!--该用户下载申请的审批过了且未过期的病案，不可重复申请，可查看的病案主键patientId-->
@@ -183,11 +205,11 @@
                             </div>
                         </div>
                         <!--表格头-->
-                        <input type="hidden" id="tableThNames" value="脐血编号,协议号,产妇姓名,身份证号">
+                        <input type="hidden" id="tableThNames" value="脐血编号,协议号,产妇姓名,协议类型,脐血状态,身份证号">
                         <!--查询字段-->
-                        <input type="hidden" id="englishFields" value="commomtable.inpatient_no,commomtable.admiss_id,commomtable.name,commomtable.main_dis_thing">
+                        <input type="hidden" id="englishFields" value="commomtable.inpatient_no,commomtable.admiss_id,commomtable.name,commomtable.main_diag_name,commomtable.main_diag_code,commomtable.main_dis_thing">
                         <!--数据字段-->
-                        <input type="hidden" id="fields" value="inpatientNo,admissId,name,mainDisThing">
+                        <input type="hidden" id="fields" value="inpatientNo,admissId,name,mainDiagName,mainDiagCode,mainDisThing">
                         <!--显示字段-->
                         <input type="hidden" id="fieldCns">
                         <!--查询总行数-->
@@ -213,8 +235,6 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row">
                             <div class="col-sm-4">
                                 <div class="form-group">
                                     <div class="col-sm-4 labelDiv">
@@ -225,23 +245,35 @@
                                     </div>
                                 </div>
                             </div>
+                        </div>
+                        <div class="row">
                             <div class="col-sm-4">
                                 <div class="form-group">
                                     <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">身份证号：</label>
+                                        <label class="control-label">协议类型：</label>
+                                    </div>
+                                    <div class="col-sm-8 inputDiv">
+                                        <select class="selectpicker form-control input-sm inputValue" id="main_diag_name" style="max-height:400px!important;overflow:scroll;" data-live-search="true"></select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-4">
+                                <div class="form-group">
+                                    <div class="col-sm-4 labelDiv">
+                                        <label class="control-label">脐血状态：</label>
                                     </div>
                                     <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm inputValue" id="dis_thing" maxlength="16">
+                                        <select class="selectpicker form-control input-sm inputValue" id="main_diag_code" style="max-height:400px!important;overflow:scroll;" data-live-search="true"></select>
                                     </div>
                                 </div>
                             </div>
                             <div class="col-sm-4">
                                 <div class="form-group">
-                                    <div class="searchDiv left">
-                                        <button type="button" class="btn btn-sm btn-primary" onclick="search()">开始搜索</button>
+                                    <div class="col-sm-4 labelDiv">
+                                        <label class="control-label">身份证号：</label>
                                     </div>
-                                    <div class="clearDiv left">
-                                        <button type="button" class="btn btn-sm btn-default" onclick="clearForm()">&nbsp;&nbsp;清&nbsp;&nbsp;空&nbsp;&nbsp;</button>
+                                    <div class="col-sm-8 inputDiv">
+                                        <input type="text" class="form-control input-sm inputValue" id="main_dis_thing" maxlength="16">
                                     </div>
                                 </div>
                             </div>
@@ -252,6 +284,12 @@
         </div>
     </div>
     <div class="row btns">
+        <div class="btn">
+            <button type="button" id="searchBtn" class="btn btn-sm btn-primary" onclick="search()">开始搜索</button>
+        </div>
+        <div class="btn">
+            <button type="button" class="btn btn-sm btn-default" onclick="clearForm()">&nbsp;&nbsp;清&nbsp;&nbsp;空&nbsp;&nbsp;</button>
+        </div>
         <shiro:hasPermission name="/commom/exportExcel">
             <div class="btn">
                 <button type="button"  id= "aa" class="btn btn-sm btn-success" onclick="exportExcel()">导出excel</button>
@@ -268,12 +306,12 @@
             </div>
         </shiro:hasPermission>--%>
         <shiro:hasPermission name="/commom/addApplyApprove">
-            <div class="btn">
+            <div class="btn" id="borrowingsBox">
                 <button type="button" class="btn btn-sm btn-primary" id="borrowings" onclick="borrowings()">批量借阅申请</button>
             </div>
         </shiro:hasPermission>
         <shiro:hasPermission name="/commom/exportExcel">
-            <div class="btn">
+            <div class="btn" id="downBorrowingsBox">
                 <button type="button" class="btn btn-sm btn-success" id="downBorrowings" onclick="downBorrowings()">批量下载申请</button>
             </div>
         </shiro:hasPermission>
@@ -287,81 +325,214 @@
                 <button type="button" class="btn btn-sm btn-success" onclick="unlocks()">批量解锁</button>
             </div>
         </shiro:hasPermission>
+        <shiro:hasPermission name="/commom/addRecord">
+            <div class="btn">
+                <button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#myModal2" onclick="addRecord()">新建档案</button>
+            </div>
+        </shiro:hasPermission>
     </div>
     <!--数据表格-->
     <div id="tableDiv" class="table-responsive tableDiv" style="overflow:scroll;">
         <table id="mytab" class="table text-nowrap table-bordered" data-toggle="table" data-height="200">
         </table>
     </div>
-
-    <!-- 模态框1（Modal）借阅申请 -->
-    <div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                        &times;
-                    </button>
-                    <h4 class="modal-title" style="font-weight: bold">
-                        申请信息
-                    </h4>
-                </div>
-                <div class="modal-body">
-                    <form class="form-horizontal" role="form">
-                        <input type="hidden" name="formToken" id="formToken" value="${formToken}">
-                        <input type="hidden" id="checks">
-                        <input type="hidden" id="check">
-                        <input type="hidden" id="approveId">
-                        <!--隐藏申请过的集合input Id-->
-                        <input type="hidden" id="typeId">
-                        <div class="row">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">有效时间：</label>
-                                <div class="col-sm-7">
-                                    <input type="text" class="form-control input-sm input" id="effeTime" name="effeTime" maxlength="10">
-                                </div>
-                                <div class="col-sm-1"></div>
+</div>
+<!-- 模态框1（Modal）借阅申请 -->
+<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    &times;
+                </button>
+                <h4 class="modal-title" style="font-weight: bold">
+                    申请信息
+                </h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal" role="form">
+                    <input type="hidden" name="formToken" id="formToken" value="${formToken}">
+                    <input type="hidden" id="checks">
+                    <input type="hidden" id="check">
+                    <input type="hidden" id="approveId">
+                    <!--隐藏申请过的集合input Id-->
+                    <input type="hidden" id="typeId">
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">有效时间：</label>
+                            <div class="col-sm-7">
+                                <input type="text" class="form-control input-sm input" id="effeTime" name="effeTime" maxlength="10">
                             </div>
+                            <div class="col-sm-1"></div>
                         </div>
-                        <div class="row">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">申请天数：</label>
-                                <div class="col-sm-7">
-                                    <input type="number" class="form-control input-sm input" id="effeDays" name="effeDays" oninput="if(value.length>3)value=value.slice(0,3)">
-                                </div>
-                                <div class="col-sm-1"></div>
+                    </div>
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">申请天数：</label>
+                            <div class="col-sm-7">
+                                <input type="number" class="form-control input-sm input" id="effeDays" name="effeDays" oninput="if(value.length>3)value=value.slice(0,3)">
                             </div>
+                            <div class="col-sm-1"></div>
                         </div>
-                        <div class="row">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">申请类型：</label>
-                                <div class="col-sm-7">
-                                    <select class="form-control input-sm  input" name="applyType" id="applyType"></select>
+                    </div>
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">申请类型：</label>
+                            <div class="col-sm-7">
+                                <select class="form-control input-sm  input" name="applyType" id="applyType"></select>
+                            </div>
+                            <div class="col-sm-1"></div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">申请理由：</label>
+                            <div class="col-sm-7">
+                                <textarea class="form-control input-sm  input" id="applyReason" name="applyReason" maxlength="250"></textarea>
+                            </div>
+                            <div class="col-sm-1"></div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-sm btn-default" data-dismiss="modal">关闭
+                </button>
+                <button type="button" class="btn btn-sm btn-primary" onclick="save()">
+                    暂时保存
+                </button>
+                <button type="button" class="btn btn-sm btn-primary" onclick="add()">
+                    确认提交
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- 模态框2（Modal）新建档案 -->
+<div class="modal fade" id="myModal2" tabindex="-1" role="dialog" data-target=".bs-example-modal-lg" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content addRecordModal">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    &times;
+                </button>
+                <h4 class="modal-title" style="font-weight: bold">
+                    新建档案
+                </h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal" role="form" id="addRecordForm" enctype="multipart/form-data">
+                    <input type="hidden" name="formToken" id="formToken1">
+                    <input type="hidden" name="patientId" id="patientId">
+                    <ul  class="nav nav-tabs">
+                        <li class="active">
+                            <a href="#home" data-toggle="tab">
+                                基本信息
+                            </a>
+                        </li>
+                        <li><a href="#pic" data-toggle="tab">图片</a></li>
+                    </ul>
+                    <div class="tab-content">
+                        <div class="tab-pane fade in active" id="home">
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label">脐血编号:</label>
+                                        <div class="col-sm-7">
+                                            <input type="text" name="inpatientNo" id="inpatientNo" class="form-control input-sm input" maxlength="15"/>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label">协议号:</label>
+                                        <div class="col-sm-7">
+                                            <input type="text" class="form-control input-sm input" name="admissId" id="admissId" maxlength="15"/>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label">产妇姓名:</label>
+                                        <div class="col-sm-7">
+                                            <input type="text" class="form-control input-sm input" id="name1" name="name" maxlength="30"/>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label">协议类型:</label>
+                                        <div class="col-sm-7">
+                                            <select class="input-sm input form-control" id="main_diag_name1" name="mainDiagName"></select>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label">脐血状态:</label>
+                                        <div class="col-sm-7">
+                                            <select class="input-sm input form-control" id="main_diag_code1" name="mainDiagCode"></select>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label">身份证号:</label>
+                                        <div class="col-sm-7">
+                                            <input type="text" class="form-control input-sm input" id="main_dis_thing1" name="mainDisThing" maxlength="10"/>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
                                 </div>
-                                <div class="col-sm-1"></div>
                             </div>
                         </div>
-                        <div class="row">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label">申请理由：</label>
-                                <div class="col-sm-7">
-                                    <textarea class="form-control input-sm  input" id="applyReason" name="applyReason" maxlength="250"></textarea>
+                        <div class="tab-pane fade" id="pic">
+                            <div class="row">
+                                <!--左侧分类树-->
+                                <div class="col-sm-3">
+                                    <div class="zTreeDemo">
+                                        <ul id="ztree" class="ztree"></ul>
+                                    </div>
+                                </div>
+                                <!--右侧分类图片-->
+                                <div class="col-sm-9">
+                                    <div class="img-box full">
+                                        <section class="img-section">
+                                            <div class="z_photo upimg-div clear" >
+                                                <section class="z_file fl">
+                                                    <img src="${path}/static/img/a11.png" class="add-img">
+                                                    <input type="file" name="file" id="file" class="file" value="" accept="image/jpg,image/jpeg,image/png,image/bmp" multiple />
+                                                </section>
+                                            </div>
+                                        </section>
+                                    </div>
+                                    <aside class="mask works-mask">
+                                        <div class="mask-content">
+                                            <p class="del-p ">您确定要删除这张图片吗？</p>
+                                            <p class="check-p"><span class="del-com wsdel-ok">确定</span><span class="wsdel-no">取消</span></p>
+                                        </div>
+                                    </aside>
                                 </div>
-                                <div class="col-sm-1"></div>
                             </div>
                         </div>
-                    </form>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-sm btn-default" data-dismiss="modal">关闭
-                    </button>
-                    <button type="button" class="btn btn-sm btn-primary" onclick="save()">
-                        暂时保存
-                    </button>
-                    <button type="button" class="btn btn-sm btn-primary" onclick="add()">
-                        确认提交
-                    </button>
-                </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-sm btn-default" onclick="$('#addRecordForm')[0].reset()">清空
+                </button>
+                <button type="button" class="btn btn-sm btn-primary" onclick="addRecordBlood()">
+                    确认提交
+                </button>
             </div>
         </div>
     </div>
@@ -372,12 +543,9 @@
     })
 </script>
 <script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/commomListBlood.js?t=1"></script>
-<%--
-<script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/commomList.js?t=1"></script>
---%>
-<%--<script type="text/javascript" src="${path}/static/js/recordManage/templateSearch/searchCommomMethod.js?t=2019-11-20"></script>--%>
 <script type="text/javascript" src="${path}/static/js/recordManage/templateSearch/searchCommomMethodBlood.js?t=2019-11-20"></script>
 <script type="text/javascript" src="${path}/static/js/dateUtil.js"></script>
 <script type="text/javascript" src="${path}/static/js/approveManage/approveList/approveDateCommmomMethod.js"></script>
+<script type="text/javascript" src="${path}/static/js/commom.js"></script>
 </body>
 </html>

src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordBlood.jsp

@@ -1,5 +1,6 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page import="java.net.URLEncoder" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <c:set var="path" value="${pageContext.request.contextPath}"/>
 <%@ include file="/WEB-INF/jspf/common.jspf" %>
 <%@ include file="/WEB-INF/jspf/ztreeCommom.jsp" %>
@@ -22,7 +23,6 @@
     <script>
         var path = "${path}";
     </script>
-    <script type="text/javascript" src="${path}/static/js/jquery.media.js"></script>
     <script type="text/javascript" src="${path}/static/js/udpatePic/imgUp.js"></script>
     <style type="text/css">
         body{
@@ -34,7 +34,7 @@
         }
         .searchDiv{
             width:100%;
-            height:13%;
+            max-height:35%;
             background-color: #FFF;
         }
         .contentDiv{
@@ -48,12 +48,9 @@
             padding-right: 0;
             text-align: right;
         }
-        .rowDiv{
-            margin-left: -30px;
-            padding-top:0.5%;
-        }
         .inputDiv{
             padding:0!important;
+            margin: 5px -15px;
         }
         .modal-header{
             height:6%;
@@ -64,64 +61,6 @@
             font-size: 1.0em;
             font-weight: bold;
         }
-        .left{
-            float:left;
-            width:30%;
-            height:100%;
-        }
-        .line1{
-            float:left;
-            width:1px;
-            height:100%;
-            background: darkgray;
-        }
-        .right{
-            float:left;
-            width:69%;
-            height:100%;
-        }
-        .treeSearch{
-            width:80%;
-            margin:4px auto;
-        }
-        .addCode{
-            margin:6px 27px;
-        }
-        .form{
-            float:left;
-            width: 100%;
-            padding-top:1%;
-        }
-        .flagDiv{
-            width:80%;
-            float:left;
-            padding-top: 3%;
-        }
-        .codeBtn{
-            float:right;
-            width:20%;
-        }
-        .formInput{
-            width:100%;
-        }
-        .input-group{
-            width:80%;
-            padding-left: 9%;
-            margin-top:-2%;
-        }
-        .typeBtn{
-            width: 80%;
-            padding-left: 34%;
-        }
-        .formDiv{
-            display: none;
-        }
-        .formHead{
-            font-color: blue;
-            padding-left: 18%;
-            font-size: 1.5em;
-            margin-bottom: 2%;
-        }
         hr{
             margin:0!important;
         }
@@ -132,11 +71,6 @@
         .collectDiv{
             margin-top:2%;
         }
-        .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
-            width: 295px;}
-        .modal-title{
-            margin-top: -6px;
-        }
         .seal-result{
             width: 60px;
             height: 60px;
@@ -156,22 +90,46 @@
         }
         /*按钮组*/
         .btns{
-            width:102%;
+            width:100%;
             background-color: #fff;
             text-align: right;
             margin-top:5px;
-            margin-bottom: 5px;
+            margin-bottom: 10px;
+        }
+        .btn{
+            margin-left: 3px;
+        }
+        .remark{
+            /*border: 1px red solid;*/
+            width:97%;
+            margin-left:35px;
+            max-height: 58px;
+            overflow: hidden;
+            color:red;
+            text-overflow: ellipsis;
+            word-wrap: break-word;
+            cursor: pointer;
+        }
+        /*
+        * 陈列已删除图片的陈列框
+        */
+        #z_photo1{
+            width: 73%;
         }
-        .divX
-        {
-            z-index:200;
-            -moz-border-radius:20px;
-            -webkit-border-radius:20px;
-            line-height:10px;
-            text-align:center;
-            font-weight:bold;
-            cursor:pointer;
-            font-size:10px;
+        /*
+       * 已删除图片的复选框
+       */
+        .deledPicCheckbox{
+            position:absolute;
+            top:0;
+            right:0;
+            z-index:1000
+        }
+        /*
+        *图片的a标签
+         */
+        .up-span{
+            cursor: pointer;
         }
     </style>
 </head>
@@ -222,491 +180,35 @@
                 </div>
             </div>
         </div>
+        <p class="remark"  id="memo"></p>
         <c:if test="${printCount == '1'}">
             <div class="seal-result">已打印</div>
         </c:if>
-        <div class="row rowDiv">
-            <div class="btns">
-                    <shiro:hasPermission name="/commom/addCode">
-                        <%--<div class="col-sm-2 right">
-                            <a  href="${path}/commom/codeTable?patientId=${patientId}" target="_blank"><button type="button" class="btn btn-sm btn-primary" &lt;%&ndash;onclick="insertCode()" data-toggle="modal" data-target="#myModal1"&ndash;%&gt;>编码录入</button></a>
-                        </div>--%>
-                    </shiro:hasPermission>
-                    <shiro:hasPermission name="/collect/addCollect">
-                        <div style="width:5%;float:right;margin-right:3%">
-                            <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>
-                        </div>
-                    </shiro:hasPermission>
-                    <shiro:hasPermission name="/commom/updatePic">
-                        <div style="width:5%;float:right;margin-right:3%">
-                            <button type="button" class="btn btn-sm btn-primary"  data-toggle="modal" data-target="#myModal3" onclick="addPic()">新增扫描图片</button>
-                        </div>
-                    </shiro:hasPermission>
-            </div>
+        <div class="row btns">
+            <shiro:hasPermission name="/commom/addRemark">
+                <div class="btn">
+                    <button type="button" class="btn btn-sm btn-primary"  data-toggle="modal" data-target="#myModal4" onclick="">修改备注</button>
+                </div>
+            </shiro:hasPermission>
+            <shiro:hasPermission name="/commom/updatePic">
+                <div class="btn">
+                    <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="btn">
+                    <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>
+                </div>
+            </shiro:hasPermission>
         </div>
     </div>
     <div class="contentDiv">
-    <iframe width="100%" height="100%" src=""  id="iframe" frameborder="0" scrolling="no"></iframe>
-</div>
-</div>
-<!-- 模态框1（Modal）编码信息 -->
-<div class="modal fade bs-example-modal-lg" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <input type="hidden" id="roleId" value="${user.roleId}">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content modal1Content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                    &times;
-                </button>
-                <h4 class="modal-title">
-                    编码信息
-                </h4>
-            </div>
-            <div class="modal-body code-body">
-                <a  target="_blank"><iframe class="row-fluid" style="width:100%;height: 100%" src="" id="iFrame1" name="iFrame1" scrolling="yes" frameborder="0"></iframe></a>
-               <%-- <!--左边树-->
-                <div class="left">
-                    <div class="treeSearch">
-                        <input type="text" id="key" value="" class="form-control input-sm "
-                               placeholder="名称"/>
-                    </div>
-                    <div class="addCode">
-                        <button type="button" class="btn btn-sm btn-primary" onclick="addCodeType()">添加编码类别</button>
-                    </div>
-                    <div class="zTreeDemo">
-                        <ul id="ztree" class="ztree"></ul>
-                    </div>
-                </div>
-                <div class="line1"></div>
-                <div class="right">
-                    <!--后边内容-->
-                    <div class="form">
-                        <!--类别-->
-                        <div class="typeDiv formDiv" id="div1">
-                            <form>
-                                <input type="hidden" id="codeTypeId">
-                                <input type="hidden" id="treeId">
-                                <div class="flagDiv">
-                                    <div class="form-group input-group">
-                                        <div class="col-sm-4 labelDiv">
-                                            <label class="control-label">类别标志：</label>
-                                        </div>
-                                        <div class="col-sm-8 inputDiv">
-                                            <input type="text" class="form-control input-sm " id="typeFlag">
-                                        </div>
-                                    </div>
-                                    <div class="form-group input-group">
-                                        <div class="col-sm-4 labelDiv">
-                                            <label class="control-label">类别名称：</label>
-                                        </div>
-                                        <div class="col-sm-8 inputDiv">
-                                            <input type="text" class="form-control input-sm  formInput" id="typeName">
-                                        </div>
-                                    </div>
-                                    <div class="form-group input-group">
-                                        <div class="col-sm-4 labelDiv">
-                                            <label class="control-label">有效否：</label>
-                                        </div>
-                                        <div class="col-sm-8 inputDiv">
-                                            <select class="form-control input-sm input" name="effective" id="typeEffective">
-                                                <option value="1">是</option>
-                                                <option value="0">否</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="form-group typeBtn" id="codeTypeBtn">
-                                        <shiro:hasPermission name="/commom/addCodeType">
-                                            <div class="col-sm-6">
-                                                <button type="button" class="btn input-sm btn-primary" onclick="saveCodeType()">保存</button>
-                                            </div>
-                                        </shiro:hasPermission>
-                                        <shiro:hasPermission name="/commom/delCodeTypeById">
-                                            <div class="col-sm-6">
-                                                <button type="button" class="btn input-sm btn-danger" onclick="delCodeType()">删除</button>
-                                            </div>
-                                        </shiro:hasPermission>
-                                    </div>
-                                </div>
-                                <div class="codeBtn">
-                                    <shiro:hasPermission name="/collect/addCollect">
-                                        <div class="btn">
-                                            <button type="button" class="btn btn-sm btn-success" onclick="addCode()">添加编码</button>
-                                        </div>
-                                    </shiro:hasPermission>
-                                </div>
-                            </form>
-                        </div>
-                        <!--手术编码-->
-                        <div class="typeDiv formDiv" id="div2">
-                            <form>
-                                <input type="hidden" id="formToken1">
-                                <div class="formHead">
-                                    <span style="color:blue">手术编码信息</span>
-                                    <hr>
-                                </div>
-                                <!--该手术序号-->
-                                <input type="hidden" id="currentOperateNo">
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">手术序号：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="number" class="form-control input-sm formInput" id="operateNo" oninput="if(value.length>3)value=value.slice(0,3)">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">手术编码：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="selectpicker" data-live-search="true" id="operateCode">
-                                            <c:forEach items="${cm3s}" var="cm3">
-                                                <option value="${cm3.code}">${cm3.code}</option>
-                                            </c:forEach>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">手术名称：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="selectpicker" data-live-search="true" id="operateName">
-                                            <c:forEach items="${cm3s}" var="cm3">
-                                                <option value="${cm3.name}">${cm3.name}</option>
-                                             </c:forEach>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">手术日期：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control formInput input-sm  datepicker" id="operateDate">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">手术医生：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput" id="operator" maxlength="25">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">I助：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput" id="assistant1" maxlength="25">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">II助：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput" id="assistant2" maxlength="25">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">麻醉方式：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="selectpicker" data-live-search="true" id="anaesthesiaType">
-                                            <c:forEach items="${anaesthesias}" var="anaesthesia">
-                                                <option value="${anaesthesia.code}">${anaesthesia.name}</option>
-                                            </c:forEach>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">切口愈合等级：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="selectpicker" data-live-search="true" id="cut">
-                                            <c:forEach items="${cutHealGrades}" var="cutHealGrade">
-                                                <option value="${cutHealGrade.code}">${cutHealGrade.name}</option>
-                                            </c:forEach>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">麻醉医生：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput" id="anaesthesiaName" maxlength="25">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">手术类型：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="form-control input-sm input" id="operateClass">
-                                            <c:forEach items="${operateClasses}" var="operateClass">
-                                                <option value="${operateClass.code}">${operateClass.name}</option>
-                                            </c:forEach>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="formHead">
-                                    <span style="color:blue">录入员信息</span>
-                                    <hr>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">录入员编号：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput" id="operCode" value="${user.userId}">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">录入员姓名：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput" id="operName" value="${user.userName}">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">录入日期：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" readonly class="form-control input-sm formInput" id="operDate">
-                                    </div>
-                                </div>
-                                <div class="form-group typeBtn">
-                                    <shiro:hasPermission name="/commom/addOperCode">
-                                        <div class="col-sm-6">
-                                            <button type="button" class="btn btn-sm btn-primary" onclick="saveOperCode()">保存</button>
-                                        </div>
-                                    </shiro:hasPermission>
-                                    <shiro:hasPermission name="/commom/deleteOperCode">
-                                        <div class="col-sm-6">
-                                            <button type="button" class="btn btn-sm btn-danger" onclick="delOperCode()">删除</button>
-                                        </div>
-                                    </shiro:hasPermission>
-                                </div>
-                            </form>
-                        </div>
-                        <!--西医诊断编码-->
-                        <div class="typeDiv formDiv" id="div3">
-                            <form>
-                                <input type="hidden" id="formToken2">
-                                <div class="formHead">
-                                    <span style="color:blue">西医诊断信息</span>
-                                    <hr>
-                                </div>
-                                <!--该诊断序号-->
-                                <input type="hidden" id="currentDiagNo">
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">诊断序号：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="number" class="form-control input-sm formInput" id="diagNo" oninput="if(value.length>3)value=value.slice(0,3)">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">西医诊断ICD：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="selectpicker" data-live-search="true" id="diagCode">
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">西医诊断病名：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="selectpicker" data-live-search="true" id="diagName1">
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">诊断类型：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="form-control input-sm input" id="diagType">
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">转归情况：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="form-control input-sm input" id="disThing">
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">病理切片号：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput" id="pathologyCut" maxlength="5">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">X光片号：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput" id="xRay" maxlength="15">
-                                    </div>
-                                </div>
-                                <div class="formHead">
-                                    <span style="color:blue">录入员信息</span>
-                                    <hr>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">录入员编号：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput" id="diagOperCode" value="${user.userId}">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">录入员姓名：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput operName" id="diagOperName" value="${user.userName}">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">录入日期：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" readonly class="form-control input-sm formInput" id="diagOperDate">
-                                    </div>
-                                </div>
-                                <div class="form-group typeBtn">
-                                    <shiro:hasPermission name="/commom/addOperCode">
-                                        <div class="col-sm-6">
-                                            <button type="button" class="btn btn-sm btn-primary" onclick="saveDiag()">保存</button>
-                                        </div>
-                                    </shiro:hasPermission>
-                                    <shiro:hasPermission name="/commom/deleteOperCode">
-                                        <div class="col-sm-6">
-                                            <button type="button" class="btn btn-sm btn-danger" onclick="deleteDiag()">删除</button>
-                                        </div>
-                                    </shiro:hasPermission>
-                                </div>
-                            </form>
-                        </div>
-                        <!--中医诊断编码-->
-                        <div class="typeDiv formDiv" id="div4">
-                            <form>
-                                <input type="hidden" id="formToken3">
-                                <div class="formHead">
-                                    <span style="color:blue">中医诊断信息</span>
-                                    <hr>
-                                </div>
-                                <input type="hidden" id="currentHerbDiagNo">
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">中医诊断序号：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="number" class="form-control input-sm formInput" id="herbNo" oninput="if(value.length>3)value=value.slice(0,3)">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">中医诊断ICD：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="selectpicker" data-live-search="true" id="herbCode">
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">中医诊断病名：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="selectpicker" data-live-search="true" id="herbName">
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">诊断类型：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="form-control input-sm input" id="herbType">
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">转归情况：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <select class="form-control input-sm input" id="herbThing">
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="formHead">
-                                    <span style="color:blue">录入员信息</span>
-                                    <hr>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">录入员编号：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput" value="${user.userId}" id="herbDiagOperCode">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">录入员姓名：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm formInput" value="${user.userName}" id="herbDiagOperName">
-                                    </div>
-                                </div>
-                                <div class="form-group input-group">
-                                    <div class="col-sm-4 labelDiv">
-                                        <label class="control-label">录入日期：</label>
-                                    </div>
-                                    <div class="col-sm-8 inputDiv">
-                                        <input type="text" readonly class="form-control input-sm formInput" id="herbDiagOperDate">
-                                    </div>
-                                </div>
-                                <div class="form-group typeBtn">
-                                    <shiro:hasPermission name="/commom/addOperCode">
-                                        <div class="col-sm-6">
-                                            <button type="button" class="btn btn-sm btn-primary" onclick="saveHerbDiag()">保存</button>
-                                        </div>
-                                    </shiro:hasPermission>
-                                    <shiro:hasPermission name="/commom/deleteOperCode">
-                                        <div class="col-sm-6">
-                                            <button type="button" class="btn btn-sm btn-danger" onclick="deleteHerbDiag()">删除</button>
-                                        </div>
-                                    </shiro:hasPermission>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>--%>
-            </div>
-        </div>
+        <iframe width="100%" height="100%" id="iframe" frameborder="0" scrolling="no"></iframe>
     </div>
 </div>
 <!-- 模态框2（Modal）添加收藏 -->
@@ -784,15 +286,6 @@
                         <div class="col-sm-1"></div>
                     </div>
                 </div>
-                <%--<div class="row collectDiv">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label collectLabel">住院次数：</label>
-                        <div class="col-sm-7">
-                            <input type="text" class="form-control input-sm input admissTimes" readonly id="admissTimes1">
-                        </div>
-                        <div class="col-sm-1"></div>
-                    </div>
-                </div>--%>
             </div>
         </div>
     </div>
@@ -819,36 +312,14 @@
                                 <select class="form-control input-sm input" name="assortId" id="assortId">
                                 </select>
                             </div>
-                            <%--<div class="col-sm-2">
-                                <input type="file" onchange="" name=""
-                                       accept="image/*" multiple id="file"/>
-                            </div>--%>
                             <div class="col-sm-3">
                                 <button type="button" class="btn btn-sm btn-primary" onclick="save()">确认上传</button>
                             </div>
                         </div>
                     </div>
-                   <%-- <div id="img_div_1">
-                        <input type="file" id="file_input" onchange="addFile(this);" />
-                        <div style="position: relative;">
-                            <img id="file_img" src="" width="75" onclick="file_input.click();" height="65" />
-                        </div>
-                        <div class="divX" id="img_zindex_div_1" onclick="del()">
-                            <img src="${path}/static/img/no.jpg" width="16" height="16" />
-                        </div>
-                    </div>--%>
                     <div class="img-box full">
                         <section class=" img-section">
                             <div class="z_photo upimg-div clear" >
-                                <!--<section class="up-section fl">
-                                     <span class="up-span"></span>
-                                     <img src="img/buyerCenter/a7.png" class="close-upimg">
-                                     <img src="img/buyerCenter/3c.png" class="type-upimg" alt="添加标签">
-                                     <img src="img/test2.jpg" class="up-img">
-                                     <p class="img-namep"></p>
-                                     <input id="taglocation" name="taglocation" value="" type="hidden">
-                                     <input id="tags" name="tags" value="" type="hidden">
-                                 </section>-->
                                 <section class="z_file fl">
                                     <img src="${path}/static/img/a11.png" class="add-img">
                                     <input type="file" name="file" id="file" class="file" value="" accept="image/jpg,image/jpeg,image/png,image/bmp" multiple />
@@ -867,6 +338,113 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecordBlood.js?t=2019-12-20"></script>
+<!-- 模态框4（Modal）修改病案备注 -->
+<div class="modal fade" id="myModal4" tabindex="-1" role="dialog" aria-labelledby="myModalLabe3" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content" style="width:80%">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    &times;
+                </button>
+                <h4 class="modal-title">
+                    病案备注
+                </h4>
+            </div>
+            <div class="modal-body" style="height:35%">
+                <form class="form-horizontal">
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">内容：</label>
+                            <div class="col-sm-7">
+                                <textarea class="form-control input-sm input" id="memo1" rows="3"></textarea>
+                            </div>
+                            <div class="col-sm-1"></div>
+                        </div>
+                    </div>
+                </form>
+                <div style="text-align: center">
+                    <button type="button" class="btn btn-sm btn-primary" onclick="saveRemark()">保存</button>
+                    <button type="button" class="btn btn-sm btn-default" onclick="clearRemark()">清空</button>
+                </div>
+                <div class="row collectDiv">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label collectLabel">脐血编号：</label>
+                        <div class="col-sm-7">
+                            <input type="text" class="form-control input-sm input" readonly id="inpatientNo2">
+                        </div>
+                        <div class="col-sm-1"></div>
+                    </div>
+                </div>
+                <div class="row collectDiv">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label collectLabel">姓名：</label>
+                        <div class="col-sm-7">
+                            <input type="text" class="form-control input-sm input" id="name2" readonly>
+                        </div>
+                        <div class="col-sm-1"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- 模态框5（Modal）恢复影像图片 -->
+<div class="modal fade" id="myModal5" tabindex="-1" role="dialog" aria-labelledby="myModalLabe3" aria-hidden="true">
+    <div class="modal-dialog" style="width:90%;height:90%">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    &times;
+                </button>
+                <h4 class="modal-title">
+                    恢复影像图片
+                </h4>
+            </div>
+            <div class="modal-body" style="min-height: 90%">
+                <div class="row">
+                    <!--左侧已删除图片的分类树-->
+                    <div class="col-sm-3">
+                        <div class="zTreeDemo">
+                            <ul id="ztree" class="ztree"></ul>
+                        </div>
+                    </div>
+                    <!--右侧已删除的分类图片-->
+                    <div class="col-sm-9">
+                        <div style="margin: 0 15px 15px 0">
+                            <button type="button" class="btn btn-sm btn-primary" onclick="saveDeledPic()">确认恢复</button>
+                            <label><input type="checkbox" id="checkAll">全选</label>
+                        </div>
+                        <form id="deledPicForm">
+                            <div class="img-box full">
+                                <section class="img-section">
+                                    <div class="z_photo upimg-div clear" id="z_photo1">
+                                        <%--<section class="up-section fl" id="pic1">
+                                            <a target="_blank" class="imgALink">
+                                                <span class="up-span"></span>
+                                            </a>
+                                            <div class="checkbox deledPicCheckbox">
+                                                <input type="checkbox" name="box" value="000242.jpg">
+                                            </div>
+                                            <img class="up-img">
+                                        </section>--%>
+
+                                    </div>
+                                </section>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 </body>
+<%--<script>
+    var src = encodeURIComponent("E:\\脐血库\\00003\\GDZT20121016045-3d2c5fb596764cdb89b247b138de8a0b\\000246.jpg")
+    var srcStr = "${path}/toFindImg?imgUrl="+src;
+    $(".up-img").prop("src",srcStr);
+    $(".imgALink").prop("href",srcStr);
+
+</script>--%>
+<script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecordBlood.js?t=2019-12-20"></script>
 </html>

src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp

@@ -45,17 +45,17 @@
 </head>
 <body style="scroll:auto" onkeydown="disabledPrint()">
 <input type="hidden" id="patientId"  value="${patientId}">
-<input type="hidden" id="flag"  value="${flag}">
 <input type="hidden" id="assortIds">
+<input type="hidden" id="sources">
 <!--是否有打印权限-->
 <input type="hidden" id="print" value="${printFlag}">
 <!--文件路径-->
 <input type="hidden" id="filePath">
 <div class="content-left">
     <div class="form-group">
-        <div class="col-sm-5">
+        <div class="col-sm-5" style="padding-right: 0">
             <c:if test="${fn:length(emrTypes) != 0}">
-                <select class="form-control input" id="typeId">
+                <select class="form-control input input-sm" id="typeId">
                     <c:forEach items="${emrTypes}" var="type">
                         <option value="${type.id}">${type.typeName}</option>
                     </c:forEach>

src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfame.jsp

@@ -35,7 +35,7 @@
             float:left;
         }
         .blockDiv{
-            margin-top:1%;
+            margin-top:5px;
             background-color: #fff
         }
         .hrDiv{
@@ -87,7 +87,7 @@
             height:100%;
         }
         .btns{
-            margin-left:26.5%!important;
+            margin-right:10px!important;
         }
         .btn{
             margin-left:-2%;
@@ -124,6 +124,9 @@
         .table-hover > tbody > tr:hover > th {
             cursor: pointer;
         }
+        .panel-group{
+            margin-bottom: 0px!important;
+        }
     </style>
 </head>
 <body style="background-color:#c1d7e3;">
@@ -150,7 +153,7 @@
 </div>
 <div class="bottomDiv">
     <div class="blockDiv">
-        <form id="block">
+        <form id="block" style="margin:5px auto">
 
         </form>
     </div>
@@ -182,11 +185,11 @@
                 <button type="button" class="btn btn-sm btn-success" onclick="exportExcel()">导出excel</button>
             </div>
         </shiro:hasPermission>
-        <shiro:hasPermission name="/commom/downloadZip">
+        <%--<shiro:hasPermission name="/commom/downloadZip">
             <div class="btn">
                 <button type="button" class="btn btn-sm  btn-warning" onclick="downloadZip('loads')">下载(批量)</button>
             </div>
-        </shiro:hasPermission>
+        </shiro:hasPermission>--%>
         <!--<shiro:hasPermission name="/template/downloadZip">
             <div class="btn">
                 <button type="button" class="btn btn-sm  btn-warning" onclick="downloadZip()">下载(批量)</button>
@@ -235,6 +238,8 @@
                         <input type="hidden" id="checks">
                         <input type="hidden" id="check">
                         <input type="hidden" id="approveId">
+                        <!--隐藏申请过的集合input Id-->
+                        <input type="hidden" id="typeId">
                         <div class="row">
                             <div class="form-group">
                                 <label class="col-sm-4 control-label">有效时间：</label>

src/main/webapp/index.jsp

@@ -241,7 +241,7 @@
             <div class="page-content-wrapper">
                 <div class="page-content">
                     <div class="container-fluid">
-                        <iframe class="row-fluid" style="width:100%;" src="${path}/commom/commomList"
+                        <iframe class="row-fluid" style="width:100%;"
                                 id="iFrame1" name="iFrame1" scrolling="yes" frameborder="0"></iframe>
                     </div>
                 </div>

src/main/webapp/static/css/comm.css

@@ -16,7 +16,6 @@
 .main{
     width:100%;
    /* height:100%;*/
-
     background-color: #c1d7e3;
 }
 /*

src/main/webapp/static/css/updatePic/index.css

@@ -1,17 +1,13 @@
 /*上传图片插件的样式*/
-.img-box{
-	margin-top: 40px;
-}
 .img-box .up-p{
 	margin-bottom: 20px;
 	font-size: 16px;
 	color: #555;
 }
 .z_photo{
-	width:97%;
+	width:91%;
 	padding: 18px;
-	border:2px dashed #E7E6E6;
-	/*padding: 18px;*/
+	border:1px dashed #E7E6E6;
 }
 .z_photo .z_file{
 	position: relative;

src/main/webapp/static/js/commom.js

@@ -26,5 +26,13 @@ function appendSelect(selectId,data,allFlag){
     }
 }
 
+//监听回车立即搜索
+//键盘回车查询
+$(document).keyup(function(event){
+    if(event.keyCode ==13){
+        $("#searchBtn").trigger("click");
+    }
+});
+
 
 

src/main/webapp/static/js/otherManage/bloodAndAgreeSet.js

@@ -0,0 +1,227 @@
+/********************************树操作开始*************************************/
+//树操作
+var zNodes;
+var menu = {
+	setting: {
+		view:{
+			fontCss : {"font-family": "微软雅黑","color":"blue"}
+		},
+		data:{
+			simpleData: {
+				enable: true,
+				idKey: "id",
+				pIdKey: "parentId",
+			}
+		},
+		callback: { //回调函数
+			onClick: zTreeOnClick }
+	},
+	loadMenuTree:function(){
+		$.ajax({
+			type: "post",
+			url:path+"/blood/selectBloodSetTree",
+			data:{code:$("#code").val(),rootName:$("#rootName").val()},
+			dataType:"json",
+			success:function(data){
+				$('#myModal').modal('hide');
+				$.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);
+				}
+				zNodes = data;
+			}
+		})
+	}
+};
+//加载树
+$().ready(function(data){
+	menu.loadMenuTree();
+	$("#loading").css("background","url("+path+"/static/img/load.gif) no-repeat 10px 50%");
+	$('#myModal').modal('show');
+});
+//加载树
+function reloadTree(){
+	//初始化模糊搜索方法
+	menu.loadMenuTree();
+	//获取选中节点
+	setTimeout(function(){
+		var currentId = $("#id").val();
+		if(currentId != ''){
+			var zTree = $.fn.zTree.getZTreeObj("ztree");
+			var node = zTree.getNodeByParam("id",currentId);
+			zTree.selectNode(node);
+		}
+	},500)
+}
+
+//树点击事件
+function zTreeOnClick(event, treeId, treeNode) {
+	$("#delBtn").prop("disabled",false);
+	var level = treeNode.level;
+	if(level == 1){
+		$("#id").val(treeNode.id);
+		$("#name").val(treeNode.name);
+		$("#initialsSimplified").val(treeNode.initialsSimplified);
+		$("#chineseSimplified").val(treeNode.chineseSimplified);
+		$("#effective").val(treeNode.effective);
+		$("#remark").val(treeNode.remark);
+	}else{
+		toastr.warning("请选中列表中的节点!")
+	}
+};
+/********************************树操作结束*************************************/
+/********************************业务操作开始***********************************/
+//添加按钮
+function add(){
+	$("#form")[0].reset();
+	$("#id").val("");
+	//删除按钮禁用
+	$("#delBtn").prop("disabled",true);
+}
+//验证名称重复
+$("#name").blur(function(){
+	var name = $("#name").val();
+	var code = $("#code").val();
+	var id = $("#id").val();
+	if(name != ''){
+		$.ajax({
+			type:'get',
+			url:path+"/blood/selectNameExist",
+			data:{name:name,code:code,id:id},
+			dataType:'json',
+			success:function(data){
+				if(data.code != 0){
+					toastr.warning(data.msg);
+					$("#name").val("");
+					$("#name").focus();
+				}
+			}
+		})
+	}
+})
+//保存
+function save(){
+	var name = $("#name").val();
+	//分类
+	if(name != ''){
+		var id = $("#id").val();
+		//首字母简写
+		var initialsSimplified = $("#initialsSimplified").val();
+		if(initialsSimplified == ''){
+			//name转换首字母简写
+			var value = makePy(name);
+			$("#initialsSimplified").val(value);
+		}
+		//全拼简写
+		var chineseSimplified= $("#chineseSimplified").val();
+		if(chineseSimplified == ''){
+			//name转换全拼简写
+			var value = ConvertPinyin(name);
+			$("#chineseSimplified").val(value);
+		}
+		var code = $("#code").val();
+		if(id == ''){
+			addMethod(code);
+		}else{
+			updateMethod(code);
+		}
+	}else{
+		toastr.warning("名称不能为空!");
+	}
+}
+
+//封装添加操作
+function  addMethod(code){
+	var url = '';
+	if(code == 'blood'){
+		url = path+'/blood/addBlood';
+	}else{
+		url = path+'/agree/addAgree';
+	}
+	$.ajax({
+		type:'post',
+		url:url,
+		data:$("#form").serialize(),
+		dataType:'json',
+		success:function(data){
+			if(data.code == 0){
+				toastr.success("保存成功!");
+				$("#id").val(data.msg);
+				reloadTree();
+				//删除按钮禁用
+				$("#delBtn").prop("disabled",false);
+			}else{
+				toastr.error(data.msg);
+			}
+		}
+	})
+}
+//封装修改操作
+function  updateMethod(code){
+	var url = '';
+	if(code == 'blood'){
+		url = path+'/blood/updateBlood';
+	}else{
+		url = path+'/agree/updateAgree';
+	}
+	$.ajax({
+		type:'post',
+		url:url,
+		data:$("#form").serialize(),
+		dataType:'json',
+		success:function(data){
+			if(data.code == 0){
+				toastr.success("保存成功!");
+				reloadTree();
+			}else{
+				toastr.error(data.msg);
+			}
+		}
+	})
+}
+//删除
+function del(){
+	var url = '';
+	var code = $("#code").val();
+	if(code == 'blood') {
+		url = path + '/blood/deleteBlood/'+$("#id").val();
+	}else {
+		url = path + '/agree/deleteAgree/'+$("#id").val();
+	}
+	Common.confirm({
+		title: "提示",
+		message: "请确认是否删除该对象?",
+		operate: function (reselt) {
+			if (reselt) {
+				$.ajax({
+					type: 'post',
+					url:url,
+					dataType: 'json',
+					success: function (data) {
+						//错误编号500，表示有重复
+						if (data.code == 0) {
+							toastr.success("删除成功！");
+						} else {
+							toastr.error("删除失败！");
+						}
+					}
+				})
+				setTimeout(function () {
+					window.location.reload();
+				}, 1000);
+			}
+		}
+	})
+}
+//树全部展开
+function expandAll(){
+	var treeObj=$.fn.zTree.getZTreeObj("ztree");
+	treeObj.expandAll(true);
+}
+//树全部关闭
+function collapseAll(){
+	var treeObj=$.fn.zTree.getZTreeObj("ztree");
+	treeObj.expandAll(false);
+}

src/main/webapp/static/js/otherManage/commomSet.js

@@ -23,7 +23,6 @@ function save(){
         toastr.warning("保存失败,组数不能为空");
     }
 }
-
 function checkNum(numName) {
     var maxNum = Number($("#maxDay").val());
     var defaultNum = Number($("#defaultDay").val());

src/main/webapp/static/js/otherManage/dictionaryList.js

@@ -291,7 +291,6 @@ function save(){
 	var typename = $("#typename").val();
 	var code = $("#code").val();
 	var name = $("#name").val();
-	debugger
 	//分类
 	if(parentId == 0){
 		if(typecode == ''){

src/main/webapp/static/js/pinying.js

@@ -55,407 +55,407 @@ return arrRslt;
 //两端去空格函数  
 String.prototype.trim = function() {    return this.replace(/(^\s*)|(\s*$)/g,""); }
 var PinYin = {
-    "a": "\u554a\u963f\u9515",
-    "ai": "\u57c3\u6328\u54ce\u5509\u54c0\u7691\u764c\u853c\u77ee\u827e\u788d\u7231\u9698\u8bf6\u6371\u55f3\u55cc\u5ad2\u7477\u66a7\u7839\u953f\u972d",
-    "an": "\u978d\u6c28\u5b89\u4ffa\u6309\u6697\u5cb8\u80fa\u6848\u8c19\u57ef\u63de\u72b4\u5eb5\u6849\u94f5\u9e4c\u9878\u9eef",
-    "ang": "\u80ae\u6602\u76ce",
-    "ao": "\u51f9\u6556\u71ac\u7ff1\u8884\u50b2\u5965\u61ca\u6fb3\u5773\u62d7\u55f7\u5662\u5c99\u5ed2\u9068\u5aaa\u9a9c\u8071\u87af\u93ca\u9ccc\u93d6",
-    "ba": "\u82ad\u634c\u6252\u53ed\u5427\u7b06\u516b\u75a4\u5df4\u62d4\u8dcb\u9776\u628a\u8019\u575d\u9738\u7f62\u7238\u8307\u83dd\u8406\u636d\u5c9c\u705e\u6777\u94af\u7c91\u9c85\u9b43",
-    "bai": "\u767d\u67cf\u767e\u6446\u4f70\u8d25\u62dc\u7a17\u859c\u63b0\u97b4",
-    "ban": "\u6591\u73ed\u642c\u6273\u822c\u9881\u677f\u7248\u626e\u62cc\u4f34\u74e3\u534a\u529e\u7eca\u962a\u5742\u8c73\u94a3\u7622\u764d\u8228",
-    "bang": "\u90a6\u5e2e\u6886\u699c\u8180\u7ed1\u68d2\u78c5\u868c\u9551\u508d\u8c24\u84a1\u8783",
-    "bao": "\u82de\u80de\u5305\u8912\u96f9\u4fdd\u5821\u9971\u5b9d\u62b1\u62a5\u66b4\u8c79\u9c8d\u7206\u52f9\u8446\u5b80\u5b62\u7172\u9e28\u8913\u8db5\u9f85",
-    "bo": "\u5265\u8584\u73bb\u83e0\u64ad\u62e8\u94b5\u6ce2\u535a\u52c3\u640f\u94c2\u7b94\u4f2f\u5e1b\u8236\u8116\u818a\u6e24\u6cca\u9a73\u4eb3\u8543\u5575\u997d\u6a97\u64d8\u7934\u94b9\u9e41\u7c38\u8ddb",
-    "bei": "\u676f\u7891\u60b2\u5351\u5317\u8f88\u80cc\u8d1d\u94a1\u500d\u72c8\u5907\u60eb\u7119\u88ab\u5b5b\u9642\u90b6\u57e4\u84d3\u5457\u602b\u6096\u789a\u9e4e\u8919\u943e",
-    "ben": "\u5954\u82ef\u672c\u7b28\u755a\u574c\u951b",
-    "beng": "\u5d29\u7ef7\u752d\u6cf5\u8e66\u8ff8\u552a\u5623\u750f",
-    "bi": "\u903c\u9f3b\u6bd4\u9119\u7b14\u5f7c\u78a7\u84d6\u853d\u6bd5\u6bd9\u6bd6\u5e01\u5e87\u75f9\u95ed\u655d\u5f0a\u5fc5\u8f9f\u58c1\u81c2\u907f\u965b\u5315\u4ef3\u4ffe\u8298\u835c\u8378\u5421\u54d4\u72f4\u5eb3\u610e\u6ed7\u6fde\u5f3c\u59a3\u5a62\u5b16\u74a7\u8d32\u7540\u94cb\u79d5\u88e8\u7b5a\u7b85\u7be6\u822d\u895e\u8df8\u9ac0",
-    "bian": "\u97ad\u8fb9\u7f16\u8d2c\u6241\u4fbf\u53d8\u535e\u8fa8\u8fa9\u8fab\u904d\u533e\u5f01\u82c4\u5fed\u6c74\u7f0f\u7178\u782d\u78a5\u7a39\u7a86\u8759\u7b3e\u9cca",
-    "biao": "\u6807\u5f6a\u8198\u8868\u5a4a\u9aa0\u98d1\u98d9\u98da\u706c\u9556\u9573\u762d\u88f1\u9cd4",
-    "bie": "\u9cd6\u618b\u522b\u762a\u8e69\u9cd8",
-    "bin": "\u5f6c\u658c\u6fd2\u6ee8\u5bbe\u6448\u50a7\u6d5c\u7f24\u73a2\u6ba1\u8191\u9554\u9acc\u9b13",
-    "bing": "\u5175\u51b0\u67c4\u4e19\u79c9\u997c\u70b3\u75c5\u5e76\u7980\u90b4\u6452\u7ee0\u678b\u69df\u71f9",
-    "bu": "\u6355\u535c\u54fa\u8865\u57e0\u4e0d\u5e03\u6b65\u7c3f\u90e8\u6016\u62ca\u535f\u900b\u74ff\u6661\u949a\u91ad",
-    "ca": "\u64e6\u5693\u7924",
-    "cai": "\u731c\u88c1\u6750\u624d\u8d22\u776c\u8e29\u91c7\u5f69\u83dc\u8521",
-    "can": "\u9910\u53c2\u8695\u6b8b\u60ed\u60e8\u707f\u9a96\u74a8\u7cb2\u9eea",
-    "cang": "\u82cd\u8231\u4ed3\u6ca7\u85cf\u4f27",
-    "cao": "\u64cd\u7cd9\u69fd\u66f9\u8349\u8279\u5608\u6f15\u87ac\u825a",
-    "ce": "\u5395\u7b56\u4fa7\u518c\u6d4b\u5202\u5e3b\u607b",
-    "ceng": "\u5c42\u8e6d\u564c",
-    "cha": "\u63d2\u53c9\u832c\u8336\u67e5\u78b4\u643d\u5bdf\u5c94\u5dee\u8be7\u7339\u9987\u6c4a\u59f9\u6748\u6942\u69ce\u6aab\u9497\u9538\u9572\u8869",
-    "chai": "\u62c6\u67f4\u8c7a\u4faa\u8308\u7625\u867f\u9f87",
-    "chan": "\u6400\u63ba\u8749\u998b\u8c17\u7f20\u94f2\u4ea7\u9610\u98a4\u5181\u8c04\u8c36\u8487\u5edb\u5fcf\u6f7a\u6fb6\u5b71\u7fbc\u5a75\u5b17\u9aa3\u89c7\u7985\u9561\u88e3\u87fe\u8e94",
-    "chang": "\u660c\u7316\u573a\u5c1d\u5e38\u957f\u507f\u80a0\u5382\u655e\u7545\u5531\u5021\u4f25\u9b2f\u82cc\u83d6\u5f9c\u6005\u60dd\u960a\u5a3c\u5ae6\u6636\u6c05\u9cb3",
-    "chao": "\u8d85\u6284\u949e\u671d\u5632\u6f6e\u5de2\u5435\u7092\u600a\u7ec9\u6641\u8016",
-    "che": "\u8f66\u626f\u64a4\u63a3\u5f7b\u6f88\u577c\u5c6e\u7817",
-    "chen": "\u90f4\u81e3\u8fb0\u5c18\u6668\u5ff1\u6c89\u9648\u8d81\u886c\u79f0\u8c0c\u62bb\u55d4\u5bb8\u741b\u6987\u809c\u80c2\u789c\u9f80",
-    "cheng": "\u6491\u57ce\u6a59\u6210\u5448\u4e58\u7a0b\u60e9\u6f84\u8bda\u627f\u901e\u9a8b\u79e4\u57d5\u5d4a\u5fb5\u6d48\u67a8\u67fd\u6a18\u665f\u584d\u77a0\u94d6\u88ce\u86cf\u9172",
-    "chi": "\u5403\u75f4\u6301\u5319\u6c60\u8fdf\u5f1b\u9a70\u803b\u9f7f\u4f88\u5c3a\u8d64\u7fc5\u65a5\u70bd\u50ba\u5880\u82aa\u830c\u640b\u53f1\u54e7\u557b\u55e4\u5f73\u996c\u6cb2\u5ab8\u6555\u80dd\u7719\u7735\u9e31\u761b\u892b\u86a9\u87ad\u7b1e\u7bea\u8c49\u8e05\u8e1f\u9b51",
-    "chong": "\u5145\u51b2\u866b\u5d07\u5ba0\u833a\u5fe1\u61a7\u94f3\u825f",
-    "chou": "\u62bd\u916c\u7574\u8e0c\u7a20\u6101\u7b79\u4ec7\u7ef8\u7785\u4e11\u4fe6\u5733\u5e31\u60c6\u6eb4\u59af\u7633\u96e0\u9c8b",
-    "chu": "\u81ed\u521d\u51fa\u6a71\u53a8\u8e87\u9504\u96cf\u6ec1\u9664\u695a\u7840\u50a8\u77d7\u6410\u89e6\u5904\u4e8d\u520d\u61b7\u7ecc\u6775\u696e\u6a17\u870d\u8e70\u9edc",
-    "chuan": "\u63e3\u5ddd\u7a7f\u693d\u4f20\u8239\u5598\u4e32\u63be\u821b\u60f4\u9044\u5ddb\u6c1a\u948f\u9569\u8221",
-    "chuang": "\u75ae\u7a97\u5e62\u5e8a\u95ef\u521b\u6006",
-    "chui": "\u5439\u708a\u6376\u9524\u5782\u9672\u68f0\u69cc",
-    "chun": "\u6625\u693f\u9187\u5507\u6df3\u7eaf\u8822\u4fc3\u83bc\u6c8c\u80ab\u6710\u9e51\u877d",
-    "chuo": "\u6233\u7ef0\u851f\u8fb6\u8f8d\u955e\u8e14\u9f8a",
-    "ci": "\u75b5\u8328\u78c1\u96cc\u8f9e\u6148\u74f7\u8bcd\u6b64\u523a\u8d50\u6b21\u8360\u5472\u5d6f\u9e5a\u8785\u7ccd\u8d91",
-    "cong": "\u806a\u8471\u56f1\u5306\u4ece\u4e1b\u506c\u82c1\u6dd9\u9aa2\u742e\u7481\u679e",
-    "cu": "\u51d1\u7c97\u918b\u7c07\u731d\u6b82\u8e59",
-    "cuan": "\u8e7f\u7be1\u7a9c\u6c46\u64ba\u6615\u7228",
-    "cui": "\u6467\u5d14\u50ac\u8106\u7601\u7cb9\u6dec\u7fe0\u8403\u60b4\u7480\u69b1\u96b9",
-    "cun": "\u6751\u5b58\u5bf8\u78cb\u5fd6\u76b4",
-    "cuo": "\u64ae\u6413\u63aa\u632b\u9519\u539d\u811e\u9509\u77ec\u75e4\u9e7e\u8e49\u8e9c",
-    "da": "\u642d\u8fbe\u7b54\u7629\u6253\u5927\u8037\u54d2\u55d2\u601b\u59b2\u75b8\u8921\u7b2a\u977c\u9791",
-    "dai": "\u5446\u6b79\u50a3\u6234\u5e26\u6b86\u4ee3\u8d37\u888b\u5f85\u902e\u6020\u57ed\u7519\u5454\u5cb1\u8fe8\u902f\u9a80\u7ed0\u73b3\u9edb",
-    "dan": "\u803d\u62c5\u4e39\u5355\u90f8\u63b8\u80c6\u65e6\u6c2e\u4f46\u60ee\u6de1\u8bde\u5f39\u86cb\u4ebb\u510b\u5369\u840f\u5556\u6fb9\u6a90\u6b9a\u8d55\u7708\u7605\u8043\u7baa",
-    "dang": "\u5f53\u6321\u515a\u8361\u6863\u8c20\u51fc\u83ea\u5b95\u7800\u94db\u88c6",
-    "dao": "\u5200\u6363\u8e48\u5012\u5c9b\u7977\u5bfc\u5230\u7a3b\u60bc\u9053\u76d7\u53e8\u5541\u5fc9\u6d2e\u6c18\u7118\u5fd1\u7e9b",
-    "de": "\u5fb7\u5f97\u7684\u951d",
-    "deng": "\u8e6c\u706f\u767b\u7b49\u77aa\u51f3\u9093\u5654\u5d9d\u6225\u78f4\u956b\u7c26",
-    "di": "\u5824\u4f4e\u6ef4\u8fea\u654c\u7b1b\u72c4\u6da4\u7fdf\u5ae1\u62b5\u5e95\u5730\u8482\u7b2c\u5e1d\u5f1f\u9012\u7f14\u6c10\u7c74\u8bcb\u8c1b\u90b8\u577b\u839c\u837b\u5600\u5a23\u67e2\u68e3\u89cc\u7825\u78b2\u7747\u955d\u7f9d\u9ab6",
-    "dian": "\u98a0\u6382\u6ec7\u7898\u70b9\u5178\u975b\u57ab\u7535\u4f43\u7538\u5e97\u60e6\u5960\u6dc0\u6bbf\u4e36\u963d\u576b\u57dd\u5dc5\u73b7\u765c\u766b\u7c1f\u8e2e",
-    "diao": "\u7889\u53fc\u96d5\u51cb\u5201\u6389\u540a\u9493\u8c03\u8f7a\u94de\u8729\u7c9c\u8c82",
-    "die": "\u8dcc\u7239\u789f\u8776\u8fed\u8c0d\u53e0\u4f5a\u57a4\u581e\u63f2\u558b\u6e2b\u8f76\u7252\u74de\u8936\u800b\u8e40\u9cbd\u9cce",
-    "ding": "\u4e01\u76ef\u53ee\u9489\u9876\u9f0e\u952d\u5b9a\u8ba2\u4e22\u4ec3\u5576\u738e\u815a\u7887\u753a\u94e4\u7594\u8035\u914a",
-    "dong": "\u4e1c\u51ac\u8463\u61c2\u52a8\u680b\u4f97\u606b\u51bb\u6d1e\u578c\u549a\u5cbd\u5cd2\u5902\u6c21\u80e8\u80f4\u7850\u9e2b",
-    "dou": "\u515c\u6296\u6597\u9661\u8c46\u9017\u75d8\u8538\u94ad\u7aa6\u7aac\u86aa\u7bfc\u9161",
-    "du": "\u90fd\u7763\u6bd2\u728a\u72ec\u8bfb\u5835\u7779\u8d4c\u675c\u9540\u809a\u5ea6\u6e21\u5992\u828f\u561f\u6e0e\u691f\u6a50\u724d\u8839\u7b03\u9ad1\u9ee9",
-    "duan": "\u7aef\u77ed\u953b\u6bb5\u65ad\u7f0e\u5f56\u6934\u7145\u7c16",
-    "dui": "\u5806\u5151\u961f\u5bf9\u603c\u619d\u7893",
-    "dun": "\u58a9\u5428\u8e72\u6566\u987f\u56e4\u949d\u76fe\u9041\u7096\u7818\u7905\u76f9\u9566\u8db8",
-    "duo": "\u6387\u54c6\u591a\u593a\u579b\u8eb2\u6735\u8dfa\u8235\u5241\u60f0\u5815\u5484\u54da\u7f0d\u67c1\u94ce\u88f0\u8e31",
-    "e": "\u86fe\u5ce8\u9e45\u4fc4\u989d\u8bb9\u5a25\u6076\u5384\u627c\u904f\u9102\u997f\u5669\u8c14\u57a9\u57ad\u82ca\u83aa\u843c\u5443\u6115\u5c59\u5a40\u8f6d\u66f7\u816d\u786a\u9507\u9537\u9e57\u989a\u9cc4",
-    "en": "\u6069\u84bd\u6441\u5514\u55ef",
-    "er": "\u800c\u513f\u8033\u5c14\u9975\u6d31\u4e8c\u8d30\u8fe9\u73e5\u94d2\u9e38\u9c95",
-    "fa": "\u53d1\u7f5a\u7b4f\u4f10\u4e4f\u9600\u6cd5\u73d0\u57a1\u781d",
-    "fan": "\u85e9\u5e06\u756a\u7ffb\u6a0a\u77fe\u9492\u7e41\u51e1\u70e6\u53cd\u8fd4\u8303\u8d29\u72af\u996d\u6cdb\u8629\u5e61\u72ad\u68b5\u6535\u71d4\u7548\u8e6f",
-    "fang": "\u574a\u82b3\u65b9\u80aa\u623f\u9632\u59a8\u4eff\u8bbf\u7eba\u653e\u531a\u90a1\u5f77\u94ab\u822b\u9c82",
-    "fei": "\u83f2\u975e\u5561\u98de\u80a5\u532a\u8bfd\u5420\u80ba\u5e9f\u6cb8\u8d39\u82be\u72d2\u60b1\u6ddd\u5983\u7ecb\u7eef\u69a7\u8153\u6590\u6249\u7953\u7829\u9544\u75f1\u871a\u7bda\u7fe1\u970f\u9cb1",
-    "fen": "\u82ac\u915a\u5429\u6c1b\u5206\u7eb7\u575f\u711a\u6c7e\u7c89\u594b\u4efd\u5fff\u6124\u7caa\u507e\u7035\u68fc\u610d\u9cbc\u9f22",
-    "feng": "\u4e30\u5c01\u67ab\u8702\u5cf0\u950b\u98ce\u75af\u70fd\u9022\u51af\u7f1d\u8bbd\u5949\u51e4\u4ff8\u9146\u8451\u6ca3\u781c",
-    "fu": "\u4f5b\u5426\u592b\u6577\u80a4\u5b75\u6276\u62c2\u8f90\u5e45\u6c1f\u7b26\u4f0f\u4fd8\u670d\u6d6e\u6daa\u798f\u88b1\u5f17\u752b\u629a\u8f85\u4fef\u91dc\u65a7\u812f\u8151\u5e9c\u8150\u8d74\u526f\u8986\u8d4b\u590d\u5085\u4ed8\u961c\u7236\u8179\u8d1f\u5bcc\u8ba3\u9644\u5987\u7f1a\u5490\u5310\u51eb\u90db\u8299\u82fb\u832f\u83a9\u83d4\u544b\u5e5e\u6ecf\u8274\u5b5a\u9a78\u7ec2\u6874\u8d59\u9efb\u9efc\u7f58\u7a03\u99a5\u864d\u86a8\u8709\u8760\u876e\u9eb8\u8dba\u8dd7\u9cc6",
-    "ga": "\u5676\u560e\u86e4\u5c2c\u5477\u5c15\u5c1c\u65ee\u9486",
-    "gai": "\u8be5\u6539\u6982\u9499\u76d6\u6e89\u4e10\u9654\u5793\u6224\u8d45\u80f2",
-    "gan": "\u5e72\u7518\u6746\u67d1\u7aff\u809d\u8d76\u611f\u79c6\u6562\u8d63\u5769\u82f7\u5c34\u64c0\u6cd4\u6de6\u6f89\u7ec0\u6a44\u65f0\u77f8\u75b3\u9150",
-    "gang": "\u5188\u521a\u94a2\u7f38\u809b\u7eb2\u5c97\u6e2f\u6206\u7f61\u9883\u7b7b",
-    "gong": "\u6760\u5de5\u653b\u529f\u606d\u9f9a\u4f9b\u8eac\u516c\u5bab\u5f13\u5de9\u6c5e\u62f1\u8d21\u5171\u857b\u5efe\u54a3\u73d9\u80b1\u86a3\u86e9\u89e5",
-    "gao": "\u7bd9\u768b\u9ad8\u818f\u7f94\u7cd5\u641e\u9550\u7a3f\u544a\u777e\u8bf0\u90dc\u84bf\u85c1\u7f1f\u69d4\u69c1\u6772\u9506",
-    "ge": "\u54e5\u6b4c\u6401\u6208\u9e3d\u80f3\u7599\u5272\u9769\u845b\u683c\u9601\u9694\u94ec\u4e2a\u5404\u9b32\u4ee1\u54ff\u5865\u55dd\u7ea5\u643f\u8188\u784c\u94ea\u9549\u88bc\u988c\u867c\u8238\u9abc\u9ac2",
-    "gei": "\u7ed9",
-    "gen": "\u6839\u8ddf\u4e98\u831b\u54cf\u826e",
-    "geng": "\u8015\u66f4\u5e9a\u7fb9\u57c2\u803f\u6897\u54fd\u8d53\u9ca0",
-    "gou": "\u94a9\u52fe\u6c9f\u82df\u72d7\u57a2\u6784\u8d2d\u591f\u4f5d\u8bdf\u5ca3\u9058\u5abe\u7f11\u89cf\u5f40\u9e32\u7b31\u7bdd\u97b2",
-    "gu": "\u8f9c\u83c7\u5495\u7b8d\u4f30\u6cbd\u5b64\u59d1\u9f13\u53e4\u86ca\u9aa8\u8c37\u80a1\u6545\u987e\u56fa\u96c7\u560f\u8bc2\u83f0\u54cc\u5d2e\u6c69\u688f\u8f71\u726f\u727f\u80cd\u81cc\u6bc2\u77bd\u7f5f\u94b4\u9522\u74e0\u9e2a\u9e44\u75fc\u86c4\u9164\u89da\u9cb4\u9ab0\u9e58",
-    "gua": "\u522e\u74dc\u5250\u5be1\u6302\u8902\u5366\u8bd6\u5471\u681d\u9e39",
-    "guai": "\u4e56\u62d0\u602a\u54d9",
-    "guan": "\u68fa\u5173\u5b98\u51a0\u89c2\u7ba1\u9986\u7f50\u60ef\u704c\u8d2f\u500c\u839e\u63bc\u6dab\u76e5\u9e73\u9ccf",
-    "guang": "\u5149\u5e7f\u901b\u72b7\u6844\u80f1\u7592",
-    "gui": "\u7470\u89c4\u572d\u7845\u5f52\u9f9f\u95fa\u8f68\u9b3c\u8be1\u7678\u6842\u67dc\u8dea\u8d35\u523d\u5326\u523f\u5e8b\u5b84\u59ab\u6867\u7085\u6677\u7688\u7c0b\u9c91\u9cdc",
-    "gun": "\u8f8a\u6eda\u68cd\u4e28\u886e\u7ef2\u78d9\u9ca7",
-    "guo": "\u9505\u90ed\u56fd\u679c\u88f9\u8fc7\u9998\u8803\u57da\u63b4\u5459\u56d7\u5e3c\u5d1e\u7313\u6901\u8662\u951e\u8052\u872e\u873e\u8748",
-    "ha": "\u54c8",
-    "hai": "\u9ab8\u5b69\u6d77\u6c26\u4ea5\u5bb3\u9a87\u54b4\u55e8\u988f\u91a2",
-    "han": "\u9163\u61a8\u90af\u97e9\u542b\u6db5\u5bd2\u51fd\u558a\u7f55\u7ff0\u64bc\u634d\u65f1\u61be\u608d\u710a\u6c57\u6c49\u9097\u83e1\u6496\u961a\u701a\u6657\u7113\u9894\u86b6\u9f3e",
-    "hen": "\u592f\u75d5\u5f88\u72e0\u6068",
-    "hang": "\u676d\u822a\u6c86\u7ed7\u73e9\u6841",
-    "hao": "\u58d5\u568e\u8c6a\u6beb\u90dd\u597d\u8017\u53f7\u6d69\u8585\u55e5\u5686\u6fe0\u704f\u660a\u7693\u98a2\u869d",
-    "he": "\u5475\u559d\u8377\u83cf\u6838\u79be\u548c\u4f55\u5408\u76d2\u8c89\u9602\u6cb3\u6db8\u8d6b\u8910\u9e64\u8d3a\u8bc3\u52be\u58d1\u85ff\u55d1\u55ec\u9616\u76cd\u86b5\u7fee",
-    "hei": "\u563f\u9ed1",
-    "heng": "\u54fc\u4ea8\u6a2a\u8861\u6052\u8a07\u8605",
-    "hong": "\u8f70\u54c4\u70d8\u8679\u9e3f\u6d2a\u5b8f\u5f18\u7ea2\u9ec9\u8ba7\u836d\u85a8\u95f3\u6cd3",
-    "hou": "\u5589\u4faf\u7334\u543c\u539a\u5019\u540e\u5820\u5f8c\u9005\u760a\u7bcc\u7cc7\u9c8e\u9aba",
-    "hu": "\u547c\u4e4e\u5ffd\u745a\u58f6\u846b\u80e1\u8774\u72d0\u7cca\u6e56\u5f27\u864e\u552c\u62a4\u4e92\u6caa\u6237\u51b1\u553f\u56eb\u5cb5\u7322\u6019\u60da\u6d52\u6ef9\u7425\u69f2\u8f77\u89f3\u70c0\u7173\u623d\u6248\u795c\u9e55\u9e71\u7b0f\u9190\u659b",
-    "hua": "\u82b1\u54d7\u534e\u733e\u6ed1\u753b\u5212\u5316\u8bdd\u5290\u6d4d\u9a85\u6866\u94e7\u7a1e",
-    "huai": "\u69d0\u5f8a\u6000\u6dee\u574f\u8fd8\u8e1d",
-    "huan": "\u6b22\u73af\u6853\u7f13\u6362\u60a3\u5524\u75ea\u8c62\u7115\u6da3\u5ba6\u5e7b\u90c7\u5942\u57b8\u64d0\u571c\u6d39\u6d63\u6f36\u5bf0\u902d\u7f33\u953e\u9ca9\u9b1f",
-    "huang": "\u8352\u614c\u9ec4\u78fa\u8757\u7c27\u7687\u51f0\u60f6\u714c\u6643\u5e4c\u604d\u8c0e\u968d\u5fa8\u6e5f\u6f62\u9051\u749c\u8093\u7640\u87e5\u7bc1\u9cc7",
-    "hui": "\u7070\u6325\u8f89\u5fbd\u6062\u86d4\u56de\u6bc1\u6094\u6167\u5349\u60e0\u6666\u8d3f\u79fd\u4f1a\u70e9\u6c47\u8bb3\u8bf2\u7ed8\u8bd9\u8334\u835f\u8559\u54d5\u5599\u96b3\u6d04\u5f57\u7f0b\u73f2\u6656\u605a\u867a\u87ea\u9ebe",
-    "hun": "\u8364\u660f\u5a5a\u9b42\u6d51\u6df7\u8be8\u9984\u960d\u6eb7\u7f17",
-    "huo": "\u8c41\u6d3b\u4f19\u706b\u83b7\u6216\u60d1\u970d\u8d27\u7978\u6509\u56af\u5925\u94ac\u952a\u956c\u8020\u8816",
-    "ji": "\u51fb\u573e\u57fa\u673a\u7578\u7a3d\u79ef\u7b95\u808c\u9965\u8ff9\u6fc0\u8ba5\u9e21\u59ec\u7ee9\u7f09\u5409\u6781\u68d8\u8f91\u7c4d\u96c6\u53ca\u6025\u75be\u6c72\u5373\u5ac9\u7ea7\u6324\u51e0\u810a\u5df1\u84df\u6280\u5180\u5b63\u4f0e\u796d\u5242\u60b8\u6d4e\u5bc4\u5bc2\u8ba1\u8bb0\u65e2\u5fcc\u9645\u5993\u7ee7\u7eaa\u5c45\u4e0c\u4e69\u525e\u4f76\u4f74\u8114\u58bc\u82a8\u82b0\u8401\u84ba\u857a\u638e\u53fd\u54ad\u54dc\u5527\u5c8c\u5d74\u6d0e\u5f50\u5c50\u9aa5\u757f\u7391\u696b\u6b9b\u621f\u6222\u8d4d\u89ca\u7284\u9f51\u77f6\u7f81\u5d47\u7a37\u7620\u7635\u866e\u7b08\u7b04\u66a8\u8dfb\u8dfd\u9701\u9c9a\u9cab\u9afb\u9e82",
-    "jia": "\u5609\u67b7\u5939\u4f73\u5bb6\u52a0\u835a\u988a\u8d3e\u7532\u94be\u5047\u7a3c\u4ef7\u67b6\u9a7e\u5ac1\u4f3d\u90cf\u62ee\u5cac\u6d43\u8fe6\u73c8\u621b\u80db\u605d\u94d7\u9553\u75c2\u86f1\u7b33\u8888\u8dcf",
-    "jian": "\u6b7c\u76d1\u575a\u5c16\u7b3a\u95f4\u714e\u517c\u80a9\u8270\u5978\u7f04\u8327\u68c0\u67ec\u78b1\u7877\u62e3\u6361\u7b80\u4fed\u526a\u51cf\u8350\u69db\u9274\u8df5\u8d31\u89c1\u952e\u7bad\u4ef6\u5065\u8230\u5251\u996f\u6e10\u6e85\u6da7\u5efa\u50ed\u8c0f\u8c2b\u83c5\u84b9\u641b\u56dd\u6e54\u8e47\u8b07\u7f23\u67a7\u67d9\u6957\u620b\u622c\u726e\u728d\u6bfd\u8171\u7751\u950f\u9e63\u88e5\u7b15\u7bb4\u7fe6\u8dbc\u8e3a\u9ca3\u97af",
-    "jiang": "\u50f5\u59dc\u5c06\u6d46\u6c5f\u7586\u848b\u6868\u5956\u8bb2\u5320\u9171\u964d\u8333\u6d1a\u7edb\u7f30\u729f\u7913\u8029\u7ce8\u8c47",
-    "jiao": "\u8549\u6912\u7901\u7126\u80f6\u4ea4\u90ca\u6d47\u9a84\u5a07\u56bc\u6405\u94f0\u77eb\u4fa5\u811a\u72e1\u89d2\u997a\u7f34\u7ede\u527f\u6559\u9175\u8f7f\u8f83\u53eb\u4f7c\u50ec\u832d\u6322\u564d\u5ce4\u5fbc\u59e3\u7e9f\u656b\u768e\u9e6a\u86df\u91ae\u8de4\u9c9b",
-    "jie": "\u7a96\u63ed\u63a5\u7686\u79f8\u8857\u9636\u622a\u52ab\u8282\u6854\u6770\u6377\u776b\u7aed\u6d01\u7ed3\u89e3\u59d0\u6212\u85c9\u82a5\u754c\u501f\u4ecb\u75a5\u8beb\u5c4a\u5048\u8ba6\u8bd8\u5588\u55df\u736c\u5a55\u5b51\u6840\u7352\u78a3\u9534\u7596\u88b7\u9889\u86a7\u7faf\u9c92\u9ab1\u9aeb",
-    "jin": "\u5dfe\u7b4b\u65a4\u91d1\u4eca\u6d25\u895f\u7d27\u9526\u4ec5\u8c28\u8fdb\u9773\u664b\u7981\u8fd1\u70ec\u6d78\u5c3d\u537a\u8369\u5807\u5664\u9991\u5ed1\u5997\u7f19\u747e\u69ff\u8d46\u89d0\u9485\u9513\u887f\u77dc",
-    "jing": "\u52b2\u8346\u5162\u830e\u775b\u6676\u9cb8\u4eac\u60ca\u7cbe\u7cb3\u7ecf\u4e95\u8b66\u666f\u9888\u9759\u5883\u656c\u955c\u5f84\u75c9\u9756\u7adf\u7ade\u51c0\u522d\u5106\u9631\u83c1\u734d\u61ac\u6cfe\u8ff3\u5f2a\u5a67\u80bc\u80eb\u8148\u65cc",
-    "jiong": "\u70af\u7a98\u5182\u8fe5\u6243",
-    "jiu": "\u63ea\u7a76\u7ea0\u7396\u97ed\u4e45\u7078\u4e5d\u9152\u53a9\u6551\u65e7\u81fc\u8205\u548e\u5c31\u759a\u50e6\u557e\u9604\u67e9\u6855\u9e6b\u8d73\u9b0f",
-    "ju": "\u97a0\u62d8\u72d9\u75bd\u9a79\u83ca\u5c40\u5480\u77e9\u4e3e\u6cae\u805a\u62d2\u636e\u5de8\u5177\u8ddd\u8e1e\u952f\u4ff1\u53e5\u60e7\u70ac\u5267\u5028\u8bb5\u82e3\u82f4\u8392\u63ac\u907d\u5c66\u741a\u67b8\u6910\u6998\u6989\u6a58\u728b\u98d3\u949c\u9514\u7aad\u88fe\u8d84\u91b5\u8e3d\u9f83\u96ce\u97ab",
-    "juan": "\u6350\u9e43\u5a1f\u5026\u7737\u5377\u7ee2\u9104\u72f7\u6d93\u684a\u8832\u9529\u954c\u96bd",
-    "jue": "\u6485\u652b\u6289\u6398\u5014\u7235\u89c9\u51b3\u8bc0\u7edd\u53a5\u5282\u8c32\u77cd\u8568\u5658\u5d1b\u7357\u5b53\u73cf\u6877\u6a5b\u721d\u9562\u8e76\u89d6",
-    "jun": "\u5747\u83cc\u94a7\u519b\u541b\u5cfb\u4fca\u7ae3\u6d5a\u90e1\u9a8f\u6343\u72fb\u76b2\u7b60\u9e87",
-    "ka": "\u5580\u5496\u5361\u4f67\u5494\u80e9",
-    "ke": "\u54af\u5777\u82db\u67ef\u68f5\u78d5\u9897\u79d1\u58f3\u54b3\u53ef\u6e34\u514b\u523b\u5ba2\u8bfe\u5ca2\u606a\u6e98\u9a92\u7f02\u73c2\u8f72\u6c2a\u778c\u94b6\u75b4\u7aa0\u874c\u9ac1",
-    "kai": "\u5f00\u63e9\u6977\u51ef\u6168\u5240\u57b2\u8488\u5ffe\u607a\u94e0\u950e",
-    "kan": "\u520a\u582a\u52d8\u574e\u780d\u770b\u4f83\u51f5\u83b0\u83b6\u6221\u9f9b\u77b0",
-    "kang": "\u5eb7\u6177\u7ce0\u625b\u6297\u4ea2\u7095\u5751\u4f09\u95f6\u94aa",
-    "kao": "\u8003\u62f7\u70e4\u9760\u5c3b\u6832\u7292\u94d0",
-    "ken": "\u80af\u5543\u57a6\u6073\u57a0\u88c9\u9880",
-    "keng": "\u542d\u5fd0\u94ff",
-    "kong": "\u7a7a\u6050\u5b54\u63a7\u5025\u5d06\u7b9c",
-    "kou": "\u62a0\u53e3\u6263\u5bc7\u82a4\u853b\u53e9\u770d\u7b58",
-    "ku": "\u67af\u54ed\u7a9f\u82e6\u9177\u5e93\u88e4\u5233\u5800\u55be\u7ed4\u9ab7",
-    "kua": "\u5938\u57ae\u630e\u8de8\u80ef\u4f89",
-    "kuai": "\u5757\u7b77\u4fa9\u5feb\u84af\u90d0\u8489\u72ef\u810d",
-    "kuan": "\u5bbd\u6b3e\u9acb",
-    "kuang": "\u5321\u7b50\u72c2\u6846\u77ff\u7736\u65f7\u51b5\u8bd3\u8bf3\u909d\u5739\u593c\u54d0\u7ea9\u8d36",
-    "kui": "\u4e8f\u76d4\u5cbf\u7aa5\u8475\u594e\u9b41\u5080\u9988\u6127\u6e83\u9997\u532e\u5914\u9697\u63c6\u55b9\u559f\u609d\u6126\u9615\u9035\u668c\u777d\u8069\u8770\u7bd1\u81fe\u8dec",
-    "kun": "\u5764\u6606\u6346\u56f0\u6083\u9603\u7428\u951f\u918c\u9cb2\u9ae1",
-    "kuo": "\u62ec\u6269\u5ed3\u9614\u86de",
-    "la": "\u5783\u62c9\u5587\u8721\u814a\u8fa3\u5566\u524c\u647a\u908b\u65ef\u782c\u760c",
-    "lai": "\u83b1\u6765\u8d56\u5d03\u5f95\u6d9e\u6fd1\u8d49\u7750\u94fc\u765e\u7c41",
-    "lan": "\u84dd\u5a6a\u680f\u62e6\u7bee\u9611\u5170\u6f9c\u8c30\u63fd\u89c8\u61d2\u7f06\u70c2\u6ee5\u5549\u5c9a\u61d4\u6f24\u6984\u6593\u7f71\u9567\u8934",
-    "lang": "\u7405\u6994\u72fc\u5eca\u90ce\u6717\u6d6a\u83a8\u8497\u5577\u9606\u9512\u7a02\u8782",
-    "lao": "\u635e\u52b3\u7262\u8001\u4f6c\u59e5\u916a\u70d9\u6d9d\u5520\u5d02\u6833\u94d1\u94f9\u75e8\u91aa",
-    "le": "\u52d2\u4e50\u808b\u4ec2\u53fb\u561e\u6cd0\u9cd3",
-    "lei": "\u96f7\u956d\u857e\u78ca\u7d2f\u5121\u5792\u64c2\u7c7b\u6cea\u7fb8\u8bd4\u837d\u54a7\u6f2f\u5ad8\u7f27\u6a91\u8012\u9179",
-    "ling": "\u68f1\u51b7\u62ce\u73b2\u83f1\u96f6\u9f84\u94c3\u4f36\u7f9a\u51cc\u7075\u9675\u5cad\u9886\u53e6\u4ee4\u9143\u5844\u82d3\u5464\u56f9\u6ce0\u7eeb\u67c3\u68c2\u74f4\u8046\u86c9\u7fce\u9cae",
-    "leng": "\u695e\u6123",
-    "li": "\u5398\u68a8\u7281\u9ece\u7bf1\u72f8\u79bb\u6f13\u7406\u674e\u91cc\u9ca4\u793c\u8389\u8354\u540f\u6817\u4e3d\u5389\u52b1\u783e\u5386\u5229\u5088\u4f8b\u4fd0\u75e2\u7acb\u7c92\u6ca5\u96b6\u529b\u7483\u54e9\u4fea\u4fda\u90e6\u575c\u82c8\u8385\u84e0\u85dc\u6369\u5456\u5533\u55b1\u7301\u6ea7\u6fa7\u9026\u5a0c\u5ae0\u9a8a\u7f21\u73de\u67a5\u680e\u8f79\u623e\u783a\u8a48\u7f79\u9502\u9e42\u75a0\u75ac\u86ce\u870a\u8821\u7b20\u7be5\u7c9d\u91b4\u8dde\u96f3\u9ca1\u9ce2\u9ee7",
-    "lian": "\u4fe9\u8054\u83b2\u8fde\u9570\u5ec9\u601c\u6d9f\u5e18\u655b\u8138\u94fe\u604b\u70bc\u7ec3\u631b\u8539\u5941\u6f4b\u6fc2\u5a08\u740f\u695d\u6b93\u81c1\u81a6\u88e2\u880a\u9ca2",
-    "liang": "\u7cae\u51c9\u6881\u7cb1\u826f\u4e24\u8f86\u91cf\u667e\u4eae\u8c05\u589a\u690b\u8e09\u9753\u9b49",
-    "liao": "\u64a9\u804a\u50da\u7597\u71ce\u5be5\u8fbd\u6f66\u4e86\u6482\u9563\u5ed6\u6599\u84fc\u5c25\u5639\u7360\u5bee\u7f2d\u948c\u9e69\u8022",
-    "lie": "\u5217\u88c2\u70c8\u52a3\u730e\u51bd\u57d2\u6d0c\u8d94\u8e90\u9b23",
-    "lin": "\u7433\u6797\u78f7\u9716\u4e34\u90bb\u9cde\u6dcb\u51db\u8d41\u541d\u853a\u5d99\u5eea\u9074\u6aa9\u8f9a\u77b5\u7cbc\u8e8f\u9e9f",
-    "liu": "\u6e9c\u7409\u69b4\u786b\u998f\u7559\u5218\u7624\u6d41\u67f3\u516d\u62a1\u507b\u848c\u6cd6\u6d4f\u905b\u9a9d\u7efa\u65d2\u7198\u950d\u954f\u9e68\u938f",
-    "long": "\u9f99\u804b\u5499\u7b3c\u7abf\u9686\u5784\u62e2\u9647\u5f04\u5785\u830f\u6cf7\u73d1\u680a\u80e7\u783b\u7643",
-    "lou": "\u697c\u5a04\u6402\u7bd3\u6f0f\u964b\u55bd\u5d5d\u9542\u7618\u8027\u877c\u9ac5",
-    "lu": "\u82a6\u5362\u9885\u5e90\u7089\u63b3\u5364\u864f\u9c81\u9e93\u788c\u9732\u8def\u8d42\u9e7f\u6f5e\u7984\u5f55\u9646\u622e\u5786\u6445\u64b8\u565c\u6cf8\u6e0c\u6f09\u7490\u680c\u6a79\u8f73\u8f82\u8f98\u6c07\u80ea\u9565\u9e2c\u9e6d\u7c0f\u823b\u9c88",
-    "lv": "\u9a74\u5415\u94dd\u4fa3\u65c5\u5c65\u5c61\u7f15\u8651\u6c2f\u5f8b\u7387\u6ee4\u7eff\u634b\u95fe\u6988\u8182\u7a06\u891b",
-    "luan": "\u5ce6\u5b6a\u6ee6\u5375\u4e71\u683e\u9e3e\u92ae",
-    "lue": "\u63a0\u7565\u950a",
-    "lun": "\u8f6e\u4f26\u4ed1\u6ca6\u7eb6\u8bba\u56f5",
-    "luo": "\u841d\u87ba\u7f57\u903b\u9523\u7ba9\u9aa1\u88f8\u843d\u6d1b\u9a86\u7edc\u502e\u8366\u645e\u7321\u6cfa\u6924\u8136\u9559\u7630\u96d2",
-    "ma": "\u5988\u9ebb\u739b\u7801\u8682\u9a6c\u9a82\u561b\u5417\u551b\u72b8\u5b37\u6769\u9ebd",
-    "mai": "\u57cb\u4e70\u9ea6\u5356\u8fc8\u8109\u52a2\u836c\u54aa\u973e",
-    "man": "\u7792\u9992\u86ee\u6ee1\u8513\u66fc\u6162\u6f2b\u8c29\u5881\u5e54\u7f26\u71b3\u9558\u989f\u87a8\u9cd7\u9794",
-    "mang": "\u8292\u832b\u76f2\u5fd9\u83bd\u9099\u6f2d\u6726\u786d\u87d2",
-    "meng": "\u6c13\u840c\u8499\u6aac\u76df\u9530\u731b\u68a6\u5b5f\u52d0\u750d\u77a2\u61f5\u791e\u867b\u8722\u8813\u824b\u8268\u9efe",
-    "miao": "\u732b\u82d7\u63cf\u7784\u85d0\u79d2\u6e3a\u5e99\u5999\u55b5\u9088\u7f08\u7f2a\u676a\u6dfc\u7707\u9e4b\u8731",
-    "mao": "\u8305\u951a\u6bdb\u77db\u94c6\u536f\u8302\u5192\u5e3d\u8c8c\u8d38\u4f94\u88a4\u52d6\u8306\u5cc1\u7441\u6634\u7266\u8004\u65c4\u61cb\u7780\u86d1\u8765\u87ca\u9ae6",
-    "me": "\u4e48",
-    "mei": "\u73ab\u679a\u6885\u9176\u9709\u7164\u6ca1\u7709\u5a92\u9541\u6bcf\u7f8e\u6627\u5bd0\u59b9\u5a9a\u5776\u8393\u5d4b\u7338\u6d7c\u6e44\u6963\u9545\u9e5b\u8882\u9b45",
-    "men": "\u95e8\u95f7\u4eec\u626a\u739f\u7116\u61d1\u9494",
-    "mi": "\u772f\u919a\u9761\u7cdc\u8ff7\u8c1c\u5f25\u7c73\u79d8\u89c5\u6ccc\u871c\u5bc6\u5e42\u8288\u5196\u8c27\u863c\u5627\u7315\u736f\u6c68\u5b93\u5f2d\u8112\u6549\u7cf8\u7e3b\u9e8b",
-    "mian": "\u68c9\u7720\u7ef5\u5195\u514d\u52c9\u5a29\u7f05\u9762\u6c94\u6e4e\u817c\u7704",
-    "mie": "\u8511\u706d\u54a9\u881b\u7bfe",
-    "min": "\u6c11\u62bf\u76bf\u654f\u60af\u95fd\u82e0\u5cb7\u95f5\u6cef\u73c9",
-    "ming": "\u660e\u879f\u9e23\u94ed\u540d\u547d\u51a5\u8317\u6e9f\u669d\u7791\u9169",
-    "miu": "\u8c2c",
-    "mo": "\u6478\u6479\u8611\u6a21\u819c\u78e8\u6469\u9b54\u62b9\u672b\u83ab\u58a8\u9ed8\u6cab\u6f20\u5bde\u964c\u8c1f\u8309\u84e6\u998d\u5aeb\u9546\u79e3\u763c\u8031\u87c6\u8c8a\u8c98",
-    "mou": "\u8c0b\u725f\u67d0\u53b6\u54de\u5a7a\u7738\u936a",
-    "mu": "\u62c7\u7261\u4ea9\u59c6\u6bcd\u5893\u66ae\u5e55\u52df\u6155\u6728\u76ee\u7766\u7267\u7a46\u4eeb\u82dc\u5452\u6c90\u6bea\u94bc",
-    "na": "\u62ff\u54ea\u5450\u94a0\u90a3\u5a1c\u7eb3\u5185\u637a\u80ad\u954e\u8872\u7bac",
-    "nai": "\u6c16\u4e43\u5976\u8010\u5948\u9f10\u827f\u8418\u67f0",
-    "nan": "\u5357\u7537\u96be\u56ca\u5583\u56e1\u6960\u8169\u877b\u8d67",
-    "nao": "\u6320\u8111\u607c\u95f9\u5b6c\u57b4\u7331\u7459\u7847\u94d9\u86f2",
-    "ne": "\u6dd6\u5462\u8bb7",
-    "nei": "\u9981",
-    "nen": "\u5ae9\u80fd\u6798\u6041",
-    "ni": "\u59ae\u9713\u502a\u6ce5\u5c3c\u62df\u4f60\u533f\u817b\u9006\u6eba\u4f32\u576d\u730a\u6029\u6ee0\u6635\u65ce\u7962\u615d\u7768\u94cc\u9cb5",
-    "nian": "\u852b\u62c8\u5e74\u78be\u64b5\u637b\u5ff5\u5eff\u8f87\u9ecf\u9c87\u9cb6",
-    "niang": "\u5a18\u917f",
-    "niao": "\u9e1f\u5c3f\u8311\u5b32\u8132\u8885",
-    "nie": "\u634f\u8042\u5b7d\u556e\u954a\u954d\u6d85\u4e5c\u9667\u8616\u55eb\u8080\u989e\u81ec\u8e51",
-    "nin": "\u60a8\u67e0",
-    "ning": "\u72de\u51dd\u5b81\u62e7\u6cde\u4f5e\u84e5\u549b\u752f\u804d",
-    "niu": "\u725b\u626d\u94ae\u7ebd\u72c3\u5ff8\u599e\u86b4",
-    "nong": "\u8113\u6d53\u519c\u4fac",
-    "nu": "\u5974\u52aa\u6012\u5476\u5e11\u5f29\u80ec\u5b65\u9a7d",
-    "nv": "\u5973\u6067\u9495\u8844",
-    "nuan": "\u6696",
-    "nuenue": "\u8650",
-    "nue": "\u759f\u8c11",
-    "nuo": "\u632a\u61e6\u7cef\u8bfa\u50a9\u6426\u558f\u9518",
-    "ou": "\u54e6\u6b27\u9e25\u6bb4\u85d5\u5455\u5076\u6ca4\u6004\u74ef\u8026",
-    "pa": "\u556a\u8db4\u722c\u5e15\u6015\u7436\u8469\u7b62",
-    "pai": "\u62cd\u6392\u724c\u5f98\u6e43\u6d3e\u4ff3\u848e",
-    "pan": "\u6500\u6f58\u76d8\u78d0\u76fc\u7554\u5224\u53db\u723f\u6cee\u88a2\u897b\u87e0\u8e52",
-    "pang": "\u4e53\u5e9e\u65c1\u802a\u80d6\u6ec2\u9004",
-    "pao": "\u629b\u5486\u5228\u70ae\u888d\u8dd1\u6ce1\u530f\u72cd\u5e96\u812c\u75b1",
-    "pei": "\u5478\u80da\u57f9\u88f4\u8d54\u966a\u914d\u4f69\u6c9b\u638a\u8f94\u5e14\u6de0\u65c6\u952b\u9185\u9708",
-    "pen": "\u55b7\u76c6\u6e53",
-    "peng": "\u7830\u62a8\u70f9\u6f8e\u5f6d\u84ec\u68da\u787c\u7bf7\u81a8\u670b\u9e4f\u6367\u78b0\u576f\u580b\u562d\u6026\u87db",
-    "pi": "\u7812\u9739\u6279\u62ab\u5288\u7435\u6bd7\u5564\u813e\u75b2\u76ae\u5339\u75de\u50fb\u5c41\u8b6c\u4e15\u9674\u90b3\u90eb\u572e\u9f19\u64d7\u567c\u5e80\u5ab2\u7eb0\u6787\u7513\u7765\u7f74\u94cd\u75e6\u7656\u758b\u868d\u8c94",
-    "pian": "\u7bc7\u504f\u7247\u9a97\u8c1d\u9a88\u728f\u80fc\u890a\u7fe9\u8e41",
-    "piao": "\u98d8\u6f02\u74e2\u7968\u527d\u560c\u5ad6\u7f25\u6b8d\u779f\u87b5",
-    "pie": "\u6487\u77a5\u4e3f\u82e4\u6c15",
-    "pin": "\u62fc\u9891\u8d2b\u54c1\u8058\u62da\u59d8\u5ad4\u6980\u725d\u98a6",
-    "ping": "\u4e52\u576a\u82f9\u840d\u5e73\u51ed\u74f6\u8bc4\u5c4f\u4fdc\u5a09\u67b0\u9c86",
-    "po": "\u5761\u6cfc\u9887\u5a46\u7834\u9b44\u8feb\u7c95\u53f5\u9131\u6ea5\u73c0\u948b\u94b7\u76a4\u7b38",
-    "pou": "\u5256\u88d2\u8e23",
-    "pu": "\u6251\u94fa\u4ec6\u8386\u8461\u83e9\u84b2\u57d4\u6734\u5703\u666e\u6d66\u8c31\u66dd\u7011\u530d\u5657\u6fee\u749e\u6c06\u9564\u9568\u8e7c",
-    "qi": "\u671f\u6b3a\u6816\u621a\u59bb\u4e03\u51c4\u6f06\u67d2\u6c8f\u5176\u68cb\u5947\u6b67\u7566\u5d0e\u8110\u9f50\u65d7\u7948\u7941\u9a91\u8d77\u5c82\u4e5e\u4f01\u542f\u5951\u780c\u5668\u6c14\u8fc4\u5f03\u6c7d\u6ce3\u8bab\u4e9f\u4e93\u573b\u8291\u840b\u847a\u5601\u5c7a\u5c90\u6c54\u6dc7\u9a90\u7eee\u742a\u7426\u675e\u6864\u69ed\u6b39\u797a\u61a9\u789b\u86f4\u871e\u7da6\u7dae\u8dbf\u8e4a\u9ccd\u9e92",
-    "qia": "\u6390\u6070\u6d3d\u845c",
-    "qian": "\u7275\u6266\u948e\u94c5\u5343\u8fc1\u7b7e\u4edf\u8c26\u4e7e\u9ed4\u94b1\u94b3\u524d\u6f5c\u9063\u6d45\u8c34\u5811\u5d4c\u6b20\u6b49\u4f65\u9621\u828a\u82a1\u8368\u63ae\u5c8d\u60ad\u614a\u9a9e\u6434\u8930\u7f31\u6920\u80b7\u6106\u94a4\u8654\u7b9d",
-    "qiang": "\u67aa\u545b\u8154\u7f8c\u5899\u8537\u5f3a\u62a2\u5af1\u6a2f\u6217\u709d\u9516\u9535\u956a\u8941\u8723\u7f9f\u8deb\u8dc4",
-    "qiao": "\u6a47\u9539\u6572\u6084\u6865\u77a7\u4e54\u4fa8\u5de7\u9798\u64ac\u7fd8\u5ced\u4fcf\u7a8d\u5281\u8bee\u8c2f\u835e\u6100\u6194\u7f32\u6a35\u6bf3\u7857\u8df7\u9792",
-    "qie": "\u5207\u8304\u4e14\u602f\u7a83\u90c4\u553c\u60ec\u59be\u6308\u9532\u7ba7",
-    "qin": "\u94a6\u4fb5\u4eb2\u79e6\u7434\u52e4\u82b9\u64d2\u79bd\u5bdd\u6c81\u82a9\u84c1\u8572\u63ff\u5423\u55ea\u5659\u6eb1\u6a8e\u8793\u887e",
-    "qing": "\u9752\u8f7b\u6c22\u503e\u537f\u6e05\u64ce\u6674\u6c30\u60c5\u9877\u8bf7\u5e86\u5029\u82d8\u570a\u6aa0\u78ec\u873b\u7f44\u7b90\u8b26\u9cad\u9ee5",
-    "qiong": "\u743c\u7a77\u909b\u8315\u7a79\u7b47\u928e",
-    "qiu": "\u79cb\u4e18\u90b1\u7403\u6c42\u56da\u914b\u6cc5\u4fc5\u6c3d\u5def\u827d\u72b0\u6e6b\u9011\u9052\u6978\u8d47\u9e20\u866c\u86af\u8764\u88d8\u7cd7\u9cc5\u9f3d",
-    "qu": "\u8d8b\u533a\u86c6\u66f2\u8eaf\u5c48\u9a71\u6e20\u53d6\u5a36\u9f8b\u8da3\u53bb\u8bce\u52ac\u8556\u8627\u5c96\u8862\u9612\u74a9\u89d1\u6c0d\u795b\u78f2\u766f\u86d0\u883c\u9eb4\u77bf\u9ee2",
-    "quan": "\u5708\u98a7\u6743\u919b\u6cc9\u5168\u75ca\u62f3\u72ac\u5238\u529d\u8be0\u8343\u737e\u609b\u7efb\u8f81\u754e\u94e8\u8737\u7b4c\u9b08",
-    "que": "\u7f3a\u7094\u7638\u5374\u9e4a\u69b7\u786e\u96c0\u9619\u60ab",
-    "qun": "\u88d9\u7fa4\u9021",
-    "ran": "\u7136\u71c3\u5189\u67d3\u82d2\u9aef",
-    "rang": "\u74e4\u58e4\u6518\u56b7\u8ba9\u79b3\u7a70",
-    "rao": "\u9976\u6270\u7ed5\u835b\u5a06\u6861",
-    "ruo": "\u60f9\u82e5\u5f31",
-    "re": "\u70ed\u504c",
-    "ren": "\u58ec\u4ec1\u4eba\u5fcd\u97e7\u4efb\u8ba4\u5203\u598a\u7eab\u4ede\u834f\u845a\u996a\u8f6b\u7a14\u887d",
-    "reng": "\u6254\u4ecd",
-    "ri": "\u65e5",
-    "rong": "\u620e\u8338\u84c9\u8363\u878d\u7194\u6eb6\u5bb9\u7ed2\u5197\u5d58\u72e8\u7f1b\u6995\u877e",
-    "rou": "\u63c9\u67d4\u8089\u7cc5\u8e42\u97a3",
-    "ru": "\u8339\u8815\u5112\u5b7a\u5982\u8fb1\u4e73\u6c5d\u5165\u8925\u84d0\u85b7\u5685\u6d33\u6ebd\u6fe1\u94f7\u8966\u98a5",
-    "ruan": "\u8f6f\u962e\u670a",
-    "rui": "\u854a\u745e\u9510\u82ae\u8564\u777f\u868b",
-    "run": "\u95f0\u6da6",
-    "sa": "\u6492\u6d12\u8428\u5345\u4ee8\u6332\u98d2",
-    "sai": "\u816e\u9cc3\u585e\u8d5b\u567b",
-    "san": "\u4e09\u53c1\u4f1e\u6563\u5f61\u9993\u6c35\u6bf5\u7cc1\u9730",
-    "sang": "\u6851\u55d3\u4e27\u6421\u78c9\u98a1",
-    "sao": "\u6414\u9a9a\u626b\u5ac2\u57fd\u81ca\u7619\u9ccb",
-    "se": "\u745f\u8272\u6da9\u556c\u94e9\u94ef\u7a51",
-    "sen": "\u68ee",
-    "seng": "\u50e7",
-    "sha": "\u838e\u7802\u6740\u5239\u6c99\u7eb1\u50bb\u5565\u715e\u810e\u6b43\u75e7\u88df\u970e\u9ca8",
-    "shai": "\u7b5b\u6652\u917e",
-    "shan": "\u73ca\u82eb\u6749\u5c71\u5220\u717d\u886b\u95ea\u9655\u64c5\u8d61\u81b3\u5584\u6c55\u6247\u7f2e\u5261\u8baa\u912f\u57cf\u829f\u6f78\u59d7\u9a9f\u81bb\u9490\u759d\u87ee\u8222\u8dda\u9cdd",
-    "shang": "\u5892\u4f24\u5546\u8d4f\u664c\u4e0a\u5c1a\u88f3\u57a7\u7ef1\u6b87\u71b5\u89de",
-    "shao": "\u68a2\u634e\u7a0d\u70e7\u828d\u52fa\u97f6\u5c11\u54e8\u90b5\u7ecd\u52ad\u82d5\u6f72\u86f8\u7b24\u7b72\u8244",
-    "she": "\u5962\u8d4a\u86c7\u820c\u820d\u8d66\u6444\u5c04\u6151\u6d89\u793e\u8bbe\u538d\u4f58\u731e\u7572\u9e9d",
-    "shen": "\u7837\u7533\u547b\u4f38\u8eab\u6df1\u5a20\u7ec5\u795e\u6c88\u5ba1\u5a76\u751a\u80be\u614e\u6e17\u8bdc\u8c02\u5432\u54c2\u6e16\u6939\u77e7\u8703",
-    "sheng": "\u58f0\u751f\u7525\u7272\u5347\u7ef3\u7701\u76db\u5269\u80dc\u5723\u4e1e\u6e11\u5ab5\u771a\u7b19",
-    "shi": "\u5e08\u5931\u72ee\u65bd\u6e7f\u8bd7\u5c38\u8671\u5341\u77f3\u62fe\u65f6\u4ec0\u98df\u8680\u5b9e\u8bc6\u53f2\u77e2\u4f7f\u5c4e\u9a76\u59cb\u5f0f\u793a\u58eb\u4e16\u67ff\u4e8b\u62ed\u8a93\u901d\u52bf\u662f\u55dc\u566c\u9002\u4ed5\u4f8d\u91ca\u9970\u6c0f\u5e02\u6043\u5ba4\u89c6\u8bd5\u8c25\u57d8\u83b3\u84cd\u5f11\u5511\u9963\u8f7c\u8006\u8d33\u70bb\u793b\u94c8\u94ca\u87ab\u8210\u7b6e\u8c55\u9ca5\u9cba",
-    "shou": "\u6536\u624b\u9996\u5b88\u5bff\u6388\u552e\u53d7\u7626\u517d\u624c\u72e9\u7ef6\u824f",
-    "shu": "\u852c\u67a2\u68b3\u6b8a\u6292\u8f93\u53d4\u8212\u6dd1\u758f\u4e66\u8d4e\u5b70\u719f\u85af\u6691\u66d9\u7f72\u8700\u9ecd\u9f20\u5c5e\u672f\u8ff0\u6811\u675f\u620d\u7ad6\u5885\u5eb6\u6570\u6f31\u6055\u500f\u587e\u83fd\u5fc4\u6cad\u6d91\u6f8d\u59dd\u7ebe\u6bf9\u8167\u6bb3\u956f\u79eb\u9e6c",
-    "shua": "\u5237\u800d\u5530\u6dae",
-    "shuai": "\u6454\u8870\u7529\u5e05\u87c0",
-    "shuan": "\u6813\u62f4\u95e9",
-    "shuang": "\u971c\u53cc\u723d\u5b40",
-    "shui": "\u8c01\u6c34\u7761\u7a0e",
-    "shun": "\u542e\u77ac\u987a\u821c\u6042",
-    "shuo": "\u8bf4\u7855\u6714\u70c1\u84b4\u6420\u55cd\u6fef\u5981\u69ca\u94c4",
-    "si": "\u65af\u6495\u5636\u601d\u79c1\u53f8\u4e1d\u6b7b\u8086\u5bfa\u55e3\u56db\u4f3a\u4f3c\u9972\u5df3\u53ae\u4fdf\u5155\u83e5\u549d\u6c5c\u6cd7\u6f8c\u59d2\u9a77\u7f0c\u7940\u7960\u9536\u9e36\u801c\u86f3\u7b25",
-    "song": "\u677e\u8038\u6002\u9882\u9001\u5b8b\u8bbc\u8bf5\u51c7\u83d8\u5d27\u5d69\u5fea\u609a\u6dde\u7ae6",
-    "sou": "\u641c\u8258\u64de\u55fd\u53df\u55d6\u55fe\u998a\u6eb2\u98d5\u778d\u953c\u878b",
-    "su": "\u82cf\u9165\u4fd7\u7d20\u901f\u7c9f\u50f3\u5851\u6eaf\u5bbf\u8bc9\u8083\u5919\u8c21\u850c\u55c9\u612b\u7c0c\u89eb\u7a23",
-    "suan": "\u9178\u849c\u7b97",
-    "sui": "\u867d\u968b\u968f\u7ee5\u9ad3\u788e\u5c81\u7a57\u9042\u96a7\u795f\u84d1\u51ab\u8c07\u6fc9\u9083\u71e7\u772d\u7762",
-    "sun": "\u5b59\u635f\u7b0b\u836a\u72f2\u98e7\u69ab\u8de3\u96bc",
-    "suo": "\u68ad\u5506\u7f29\u7410\u7d22\u9501\u6240\u5522\u55e6\u5a11\u686b\u7743\u7fa7",
-    "ta": "\u584c\u4ed6\u5b83\u5979\u5854\u736d\u631e\u8e4b\u8e0f\u95fc\u6ebb\u9062\u69bb\u6c93",
-    "tai": "\u80ce\u82d4\u62ac\u53f0\u6cf0\u915e\u592a\u6001\u6c70\u90b0\u85b9\u80bd\u70b1\u949b\u8dc6\u9c90",
-    "tan": "\u574d\u644a\u8d2a\u762b\u6ee9\u575b\u6a80\u75f0\u6f6d\u8c2d\u8c08\u5766\u6bef\u8892\u78b3\u63a2\u53f9\u70ad\u90ef\u8548\u6619\u94bd\u952c\u8983",
-    "tang": "\u6c64\u5858\u642a\u5802\u68e0\u819b\u5510\u7cd6\u50a5\u9967\u6e8f\u746d\u94f4\u9557\u8025\u8797\u87b3\u7fb0\u91a3",
-    "thang": "\u5018\u8eba\u6dcc",
-    "theng": "\u8d9f\u70eb",
-    "tao": "\u638f\u6d9b\u6ed4\u7ee6\u8404\u6843\u9003\u6dd8\u9676\u8ba8\u5957\u6311\u9f17\u5555\u97ec\u9955",
-    "te": "\u7279",
-    "teng": "\u85e4\u817e\u75bc\u8a8a\u6ed5",
-    "ti": "\u68af\u5254\u8e22\u9511\u63d0\u9898\u8e44\u557c\u4f53\u66ff\u568f\u60d5\u6d95\u5243\u5c49\u8351\u608c\u9016\u7ee8\u7f07\u9e48\u88fc\u918d",
-    "tian": "\u5929\u6dfb\u586b\u7530\u751c\u606c\u8214\u8146\u63ad\u5fdd\u9617\u6b84\u754b\u94bf\u86ba",
-    "tiao": "\u6761\u8fe2\u773a\u8df3\u4f7b\u7967\u94eb\u7a95\u9f86\u9ca6",
-    "tie": "\u8d34\u94c1\u5e16\u841c\u992e",
-    "ting": "\u5385\u542c\u70c3\u6c40\u5ef7\u505c\u4ead\u5ead\u633a\u8247\u839b\u8476\u5a77\u6883\u8713\u9706",
-    "tong": "\u901a\u6850\u916e\u77b3\u540c\u94dc\u5f64\u7ae5\u6876\u6345\u7b52\u7edf\u75db\u4f5f\u50ee\u4edd\u833c\u55f5\u6078\u6f7c\u783c",
-    "tou": "\u5077\u6295\u5934\u900f\u4ea0",
-    "tu": "\u51f8\u79c3\u7a81\u56fe\u5f92\u9014\u6d82\u5c60\u571f\u5410\u5154\u580d\u837c\u83df\u948d\u9174",
-    "tuan": "\u6e4d\u56e2\u7583",
-    "tui": "\u63a8\u9893\u817f\u8715\u892a\u9000\u5fd2\u717a",
-    "tun": "\u541e\u5c6f\u81c0\u9968\u66be\u8c5a\u7a80",
-    "tuo": "\u62d6\u6258\u8131\u9e35\u9640\u9a6e\u9a7c\u692d\u59a5\u62d3\u553e\u4e47\u4f57\u5768\u5eb9\u6cb1\u67dd\u7823\u7ba8\u8204\u8dce\u9f0d",
-    "wa": "\u6316\u54c7\u86d9\u6d3c\u5a03\u74e6\u889c\u4f64\u5a32\u817d",
-    "wai": "\u6b6a\u5916",
-    "wan": "\u8c4c\u5f2f\u6e7e\u73a9\u987d\u4e38\u70f7\u5b8c\u7897\u633d\u665a\u7696\u60cb\u5b9b\u5a49\u4e07\u8155\u525c\u8284\u82cb\u83c0\u7ea8\u7efe\u742c\u8118\u7579\u873f\u7ba2",
-    "wang": "\u6c6a\u738b\u4ea1\u6789\u7f51\u5f80\u65fa\u671b\u5fd8\u5984\u7f54\u5c22\u60d8\u8f8b\u9b4d",
-    "wei": "\u5a01\u5dcd\u5fae\u5371\u97e6\u8fdd\u6845\u56f4\u552f\u60df\u4e3a\u6f4d\u7ef4\u82c7\u840e\u59d4\u4f1f\u4f2a\u5c3e\u7eac\u672a\u851a\u5473\u754f\u80c3\u5582\u9b4f\u4f4d\u6e2d\u8c13\u5c09\u6170\u536b\u502d\u504e\u8bff\u9688\u8473\u8587\u5e0f\u5e37\u5d34\u5d6c\u7325\u732c\u95f1\u6ca9\u6d27\u6da0\u9036\u5a13\u73ae\u97ea\u8ece\u709c\u7168\u71a8\u75ff\u8249\u9c94",
-    "wen": "\u761f\u6e29\u868a\u6587\u95fb\u7eb9\u543b\u7a33\u7d0a\u95ee\u520e\u6120\u960c\u6c76\u74ba\u97eb\u6b81\u96ef",
-    "weng": "\u55e1\u7fc1\u74ee\u84ca\u8579",
-    "wo": "\u631d\u8717\u6da1\u7a9d\u6211\u65a1\u5367\u63e1\u6c83\u83b4\u5e44\u6e25\u674c\u809f\u9f8c",
-    "wu": "\u5deb\u545c\u94a8\u4e4c\u6c61\u8bec\u5c4b\u65e0\u829c\u68a7\u543e\u5434\u6bcb\u6b66\u4e94\u6342\u5348\u821e\u4f0d\u4fae\u575e\u620a\u96fe\u6664\u7269\u52ff\u52a1\u609f\u8bef\u5140\u4ef5\u9622\u90ac\u572c\u82b4\u5e91\u6003\u5fe4\u6d6f\u5be4\u8fd5\u59a9\u9a9b\u727e\u7110\u9e49\u9e5c\u8708\u92c8\u9f2f",
-    "xi": "\u6614\u7199\u6790\u897f\u7852\u77fd\u6670\u563b\u5438\u9521\u727a\u7a00\u606f\u5e0c\u6089\u819d\u5915\u60dc\u7184\u70ef\u6eaa\u6c50\u7280\u6a84\u88ad\u5e2d\u4e60\u5ab3\u559c\u94e3\u6d17\u7cfb\u9699\u620f\u7ec6\u50d6\u516e\u96b0\u90d7\u831c\u8478\u84f0\u595a\u550f\u5f99\u9969\u960b\u6d60\u6dc5\u5c63\u5b09\u73ba\u6a28\u66e6\u89cb\u6b37\u71b9\u798a\u79a7\u94b8\u7699\u7a78\u8725\u87cb\u823e\u7fb2\u7c9e\u7fd5\u91af\u9f37",
-    "xia": "\u778e\u867e\u5323\u971e\u8f96\u6687\u5ce1\u4fa0\u72ed\u4e0b\u53a6\u590f\u5413\u6380\u846d\u55c4\u72ce\u9050\u7455\u7856\u7615\u7f45\u9ee0",
-    "xian": "\u9528\u5148\u4ed9\u9c9c\u7ea4\u54b8\u8d24\u8854\u8237\u95f2\u6d8e\u5f26\u5acc\u663e\u9669\u73b0\u732e\u53bf\u817a\u9985\u7fa1\u5baa\u9677\u9650\u7ebf\u51bc\u85d3\u5c98\u7303\u66b9\u5a34\u6c19\u7946\u9e47\u75eb\u86ac\u7b45\u7c7c\u9170\u8df9",
-    "xiang": "\u76f8\u53a2\u9576\u9999\u7bb1\u8944\u6e58\u4e61\u7fd4\u7965\u8be6\u60f3\u54cd\u4eab\u9879\u5df7\u6a61\u50cf\u5411\u8c61\u8297\u8459\u9977\u5ea0\u9aa7\u7f03\u87d3\u9c9e\u98e8",
-    "xiao": "\u8427\u785d\u9704\u524a\u54ee\u56a3\u9500\u6d88\u5bb5\u6dc6\u6653\u5c0f\u5b5d\u6821\u8096\u5578\u7b11\u6548\u54d3\u54bb\u5d24\u6f47\u900d\u9a81\u7ee1\u67ad\u67b5\u7b71\u7bab\u9b48",
-    "xie": "\u6954\u4e9b\u6b47\u874e\u978b\u534f\u631f\u643a\u90aa\u659c\u80c1\u8c10\u5199\u68b0\u5378\u87f9\u61c8\u6cc4\u6cfb\u8c22\u5c51\u5055\u4eb5\u52f0\u71ee\u85a4\u64b7\u5ee8\u7023\u9082\u7ec1\u7f2c\u69ad\u698d\u6b59\u8e9e",
-    "xin": "\u85aa\u82af\u950c\u6b23\u8f9b\u65b0\u5ffb\u5fc3\u4fe1\u8845\u56df\u99a8\u8398\u6b46\u94fd\u946b",
-    "xing": "\u661f\u8165\u7329\u60fa\u5174\u5211\u578b\u5f62\u90a2\u884c\u9192\u5e78\u674f\u6027\u59d3\u9649\u8347\u8365\u64e4\u60bb\u784e",
-    "xiong": "\u5144\u51f6\u80f8\u5308\u6c79\u96c4\u718a\u828e",
-    "xiu": "\u4f11\u4fee\u7f9e\u673d\u55c5\u9508\u79c0\u8896\u7ee3\u83a0\u5cab\u9990\u5ea5\u9e3a\u8c85\u9af9",
-    "xu": "\u589f\u620c\u9700\u865a\u5618\u987b\u5f90\u8bb8\u84c4\u9157\u53d9\u65ed\u5e8f\u755c\u6064\u7d6e\u5a7f\u7eea\u7eed\u8bb4\u8be9\u5729\u84ff\u6035\u6d2b\u6e86\u987c\u6829\u7166\u7809\u76f1\u80e5\u7cc8\u9191",
-    "xuan": "\u8f69\u55a7\u5ba3\u60ac\u65cb\u7384\u9009\u7663\u7729\u7eda\u5107\u8c16\u8431\u63ce\u9994\u6ceb\u6d35\u6e32\u6f29\u7487\u6966\u6684\u70ab\u714a\u78b9\u94c9\u955f\u75c3",
-    "xue": "\u9774\u859b\u5b66\u7a74\u96ea\u8840\u5671\u6cf6\u9cd5",
-    "xun": "\u52cb\u718f\u5faa\u65ec\u8be2\u5bfb\u9a6f\u5de1\u6b89\u6c5b\u8bad\u8baf\u900a\u8fc5\u5dfd\u57d9\u8340\u85b0\u5ccb\u5f87\u6d54\u66db\u7aa8\u91ba\u9c9f",
-    "ya": "\u538b\u62bc\u9e26\u9e2d\u5440\u4e2b\u82bd\u7259\u869c\u5d16\u8859\u6daf\u96c5\u54d1\u4e9a\u8bb6\u4f22\u63e0\u5416\u5c88\u8fd3\u5a05\u740a\u6860\u6c29\u7811\u775a\u75d6",
-    "yan": "\u7109\u54bd\u9609\u70df\u6df9\u76d0\u4e25\u7814\u8712\u5ca9\u5ef6\u8a00\u989c\u960e\u708e\u6cbf\u5944\u63a9\u773c\u884d\u6f14\u8273\u5830\u71d5\u538c\u781a\u96c1\u5501\u5f66\u7130\u5bb4\u8c1a\u9a8c\u53a3\u9765\u8d5d\u4fe8\u5043\u5156\u8ba0\u8c33\u90fe\u9122\u82ab\u83f8\u5d26\u6079\u95eb\u960f\u6d07\u6e6e\u6edf\u598d\u5ae3\u7430\u664f\u80ed\u814c\u7131\u7f68\u7b75\u917d\u9b47\u990d\u9f39",
-    "yang": "\u6b83\u592e\u9e2f\u79e7\u6768\u626c\u4f6f\u75a1\u7f8a\u6d0b\u9633\u6c27\u4ef0\u75d2\u517b\u6837\u6f3e\u5f89\u600f\u6cf1\u7080\u70ca\u6059\u86d8\u9785",
-    "yao": "\u9080\u8170\u5996\u7476\u6447\u5c27\u9065\u7a91\u8c23\u59da\u54ac\u8200\u836f\u8981\u8000\u592d\u723b\u5406\u5d3e\u5fad\u7039\u5e7a\u73e7\u6773\u66dc\u80b4\u9e5e\u7a88\u7e47\u9cd0",
-    "ye": "\u6930\u564e\u8036\u7237\u91ce\u51b6\u4e5f\u9875\u6396\u4e1a\u53f6\u66f3\u814b\u591c\u6db2\u8c12\u90ba\u63f6\u9980\u6654\u70e8\u94d8",
-    "yi": "\u4e00\u58f9\u533b\u63d6\u94f1\u4f9d\u4f0a\u8863\u9890\u5937\u9057\u79fb\u4eea\u80f0\u7591\u6c82\u5b9c\u59e8\u5f5d\u6905\u8681\u501a\u5df2\u4e59\u77e3\u4ee5\u827a\u6291\u6613\u9091\u5c79\u4ebf\u5f79\u81c6\u9038\u8084\u75ab\u4ea6\u88d4\u610f\u6bc5\u5fc6\u4e49\u76ca\u6ea2\u8be3\u8bae\u8c0a\u8bd1\u5f02\u7ffc\u7fcc\u7ece\u5208\u5293\u4f7e\u8bd2\u572a\u572f\u57f8\u61ff\u82e1\u858f\u5f08\u5955\u6339\u5f0b\u5453\u54a6\u54bf\u566b\u5cc4\u5db7\u7317\u9974\u603f\u6021\u6092\u6f2a\u8fe4\u9a7f\u7f22\u6baa\u8d3b\u65d6\u71a0\u9487\u9552\u9571\u75cd\u7617\u7654\u7fca\u8864\u8734\u8223\u7fbf\u7ff3\u914f\u9edf",
-    "yin": "\u8335\u836b\u56e0\u6bb7\u97f3\u9634\u59fb\u541f\u94f6\u6deb\u5bc5\u996e\u5c39\u5f15\u9690\u5370\u80e4\u911e\u5819\u831a\u5591\u72fa\u5924\u6c24\u94df\u763e\u8693\u972a\u9f88",
-    "ying": "\u82f1\u6a31\u5a74\u9e70\u5e94\u7f28\u83b9\u8424\u8425\u8367\u8747\u8fce\u8d62\u76c8\u5f71\u9896\u786c\u6620\u5b34\u90e2\u8314\u83ba\u8426\u6484\u5624\u81ba\u6ee2\u6f46\u701b\u745b\u748e\u6979\u9e66\u763f\u988d\u7f42",
-    "yo": "\u54df\u5537",
-    "yong": "\u62e5\u4f63\u81c3\u75c8\u5eb8\u96cd\u8e0a\u86f9\u548f\u6cf3\u6d8c\u6c38\u607f\u52c7\u7528\u4fd1\u58c5\u5889\u6175\u9095\u955b\u752c\u9cd9\u9954",
-    "you": "\u5e7d\u4f18\u60a0\u5fe7\u5c24\u7531\u90ae\u94c0\u72b9\u6cb9\u6e38\u9149\u6709\u53cb\u53f3\u4f51\u91c9\u8bf1\u53c8\u5e7c\u5363\u6538\u4f91\u83b8\u5466\u56ff\u5ba5\u67da\u7337\u7256\u94d5\u75a3\u8763\u9c7f\u9edd\u9f2c",
-    "yu": "\u8fc2\u6de4\u4e8e\u76c2\u6986\u865e\u611a\u8206\u4f59\u4fde\u903e\u9c7c\u6109\u6e1d\u6e14\u9685\u4e88\u5a31\u96e8\u4e0e\u5c7f\u79b9\u5b87\u8bed\u7fbd\u7389\u57df\u828b\u90c1\u5401\u9047\u55bb\u5cea\u5fa1\u6108\u6b32\u72f1\u80b2\u8a89\u6d74\u5bd3\u88d5\u9884\u8c6b\u9a6d\u79ba\u6bd3\u4f1b\u4fe3\u8c00\u8c15\u8438\u84e3\u63c4\u5581\u5704\u5709\u5d5b\u72f3\u996b\u5ebe\u9608\u59aa\u59a4\u7ea1\u745c\u6631\u89ce\u8174\u6b24\u65bc\u715c\u71e0\u807f\u94b0\u9e46\u7610\u7600\u7ab3\u8753\u7afd\u8201\u96e9\u9f89",
-    "yuan": "\u9e33\u6e0a\u51a4\u5143\u57a3\u8881\u539f\u63f4\u8f95\u56ed\u5458\u5706\u733f\u6e90\u7f18\u8fdc\u82d1\u613f\u6028\u9662\u586c\u6c85\u5a9b\u7457\u6a7c\u7230\u7722\u9e22\u8788\u9f0b",
-    "yue": "\u66f0\u7ea6\u8d8a\u8dc3\u94a5\u5cb3\u7ca4\u6708\u60a6\u9605\u9fa0\u6a3e\u5216\u94ba",
-    "yun": "\u8018\u4e91\u90e7\u5300\u9668\u5141\u8fd0\u8574\u915d\u6655\u97f5\u5b55\u90d3\u82b8\u72c1\u607d\u7ead\u6b92\u6600\u6c32",
-    "za": "\u531d\u7838\u6742\u62f6\u5482",
-    "zai": "\u683d\u54c9\u707e\u5bb0\u8f7d\u518d\u5728\u54b1\u5d3d\u753e",
-    "zan": "\u6512\u6682\u8d5e\u74d2\u661d\u7c2a\u7ccc\u8db1\u933e",
-    "zang": "\u8d43\u810f\u846c\u5958\u6215\u81e7",
-    "zao": "\u906d\u7cdf\u51ff\u85fb\u67a3\u65e9\u6fa1\u86a4\u8e81\u566a\u9020\u7682\u7076\u71e5\u5523\u7f2b",
-    "ze": "\u8d23\u62e9\u5219\u6cfd\u4ec4\u8d5c\u5567\u8fee\u6603\u7b2e\u7ba6\u8234",
-    "zei": "\u8d3c",
-    "zen": "\u600e\u8c2e",
-    "zeng": "\u589e\u618e\u66fe\u8d60\u7f2f\u7511\u7f7e\u9503",
-    "zha": "\u624e\u55b3\u6e23\u672d\u8f67\u94e1\u95f8\u7728\u6805\u69a8\u548b\u4e4d\u70b8\u8bc8\u63f8\u5412\u54a4\u54f3\u600d\u781f\u75c4\u86b1\u9f44",
-    "zhai": "\u6458\u658b\u5b85\u7a84\u503a\u5be8\u7826",
-    "zhan": "\u77bb\u6be1\u8a79\u7c98\u6cbe\u76cf\u65a9\u8f97\u5d2d\u5c55\u8638\u6808\u5360\u6218\u7ad9\u6e5b\u7efd\u8c35\u640c\u65c3",
-    "zhang": "\u6a1f\u7ae0\u5f70\u6f33\u5f20\u638c\u6da8\u6756\u4e08\u5e10\u8d26\u4ed7\u80c0\u7634\u969c\u4ec9\u9123\u5e5b\u5d82\u7350\u5adc\u748b\u87d1",
-    "zhao": "\u62db\u662d\u627e\u6cbc\u8d75\u7167\u7f69\u5146\u8087\u53ec\u722a\u8bcf\u68f9\u948a\u7b0a",
-    "zhe": "\u906e\u6298\u54f2\u86f0\u8f99\u8005\u9517\u8517\u8fd9\u6d59\u8c2a\u966c\u67d8\u8f84\u78d4\u9e67\u891a\u8707\u8d6d",
-    "zhen": "\u73cd\u659f\u771f\u7504\u7827\u81fb\u8d1e\u9488\u4fa6\u6795\u75b9\u8bca\u9707\u632f\u9547\u9635\u7f1c\u6862\u699b\u8f78\u8d48\u80d7\u6715\u796f\u755b\u9e29",
-    "zheng": "\u84b8\u6323\u7741\u5f81\u72f0\u4e89\u6014\u6574\u62ef\u6b63\u653f\u5e27\u75c7\u90d1\u8bc1\u8be4\u5ce5\u94b2\u94ee\u7b5d",
-    "zhi": "\u829d\u679d\u652f\u5431\u8718\u77e5\u80a2\u8102\u6c41\u4e4b\u7ec7\u804c\u76f4\u690d\u6b96\u6267\u503c\u4f84\u5740\u6307\u6b62\u8dbe\u53ea\u65e8\u7eb8\u5fd7\u631a\u63b7\u81f3\u81f4\u7f6e\u5e1c\u5cd9\u5236\u667a\u79e9\u7a1a\u8d28\u7099\u75d4\u6ede\u6cbb\u7a92\u536e\u965f\u90c5\u57f4\u82b7\u646d\u5e19\u5fee\u5f58\u54ab\u9a98\u6809\u67b3\u6800\u684e\u8f75\u8f7e\u6534\u8d3d\u81a3\u7949\u7957\u9ef9\u96c9\u9e37\u75e3\u86ed\u7d77\u916f\u8dd6\u8e2c\u8e2f\u8c78\u89ef",
-    "zhong": "\u4e2d\u76c5\u5fe0\u949f\u8877\u7ec8\u79cd\u80bf\u91cd\u4ef2\u4f17\u51a2\u953a\u87bd\u8202\u822f\u8e35",
-    "zhou": "\u821f\u5468\u5dde\u6d32\u8bcc\u7ca5\u8f74\u8098\u5e1a\u5492\u76b1\u5b99\u663c\u9aa4\u5544\u7740\u501c\u8bf9\u836e\u9b3b\u7ea3\u80c4\u78a1\u7c40\u8233\u914e\u9cb7",
-    "zhu": "\u73e0\u682a\u86db\u6731\u732a\u8bf8\u8bdb\u9010\u7af9\u70db\u716e\u62c4\u77a9\u5631\u4e3b\u8457\u67f1\u52a9\u86c0\u8d2e\u94f8\u7b51\u4f4f\u6ce8\u795d\u9a7b\u4f2b\u4f8f\u90be\u82ce\u8331\u6d19\u6e1a\u6f74\u9a7a\u677c\u69e0\u6a65\u70b7\u94e2\u75b0\u7603\u86b0\u7afa\u7bb8\u7fe5\u8e85\u9e88",
-    "zhua": "\u6293",
-    "zhuai": "\u62fd",
-    "zhuan": "\u4e13\u7816\u8f6c\u64b0\u8d5a\u7bc6\u629f\u556d\u989b",
-    "zhuang": "\u6869\u5e84\u88c5\u5986\u649e\u58ee\u72b6\u4e2c",
-    "zhui": "\u690e\u9525\u8ffd\u8d58\u5760\u7f00\u8411\u9a93\u7f12",
-    "zhun": "\u8c06\u51c6",
-    "zhuo": "\u6349\u62d9\u5353\u684c\u7422\u8301\u914c\u707c\u6d4a\u502c\u8bfc\u5ef4\u855e\u64e2\u555c\u6d5e\u6dbf\u6753\u712f\u799a\u65ab",
-    "zi": "\u5179\u54a8\u8d44\u59ff\u6ecb\u6dc4\u5b5c\u7d2b\u4ed4\u7c7d\u6ed3\u5b50\u81ea\u6e0d\u5b57\u8c18\u5d6b\u59ca\u5b73\u7f01\u6893\u8f8e\u8d40\u6063\u7726\u9531\u79ed\u8014\u7b2b\u7ca2\u89dc\u8a3e\u9cbb\u9aed",
-    "zong": "\u9b03\u68d5\u8e2a\u5b97\u7efc\u603b\u7eb5\u8159\u7cbd",
-    "zou": "\u90b9\u8d70\u594f\u63cd\u9139\u9cb0",
-    "zu": "\u79df\u8db3\u5352\u65cf\u7956\u8bc5\u963b\u7ec4\u4fce\u83f9\u5550\u5f82\u9a75\u8e74",
-    "zuan": "\u94bb\u7e82\u6525\u7f35",
-    "zui": "\u5634\u9189\u6700\u7f6a",
-    "zun": "\u5c0a\u9075\u6499\u6a3d\u9cdf",
-    "zuo": "\u6628\u5de6\u4f50\u67de\u505a\u4f5c\u5750\u5ea7\u961d\u963c\u80d9\u795a\u9162",
-    "cou": "\u85ae\u6971\u8f8f\u8160",
-    "nang": "\u652e\u54dd\u56d4\u9995\u66e9",
-    "o": "\u5594",
-    "dia": "\u55f2",
-    "chuai": "\u562c\u81aa\u8e39",
-    "cen": "\u5c91\u6d94",
-    "diu": "\u94e5",
-    "nou": "\u8028",
-    "fou": "\u7f36",
-    "bia": "\u9adf"
+    "A": "\u554a\u963f\u9515",
+    "AI": "\u57c3\u6328\u54ce\u5509\u54c0\u7691\u764c\u853c\u77ee\u827e\u788d\u7231\u9698\u8bf6\u6371\u55f3\u55cc\u5ad2\u7477\u66a7\u7839\u953f\u972d",
+    "AN": "\u978d\u6c28\u5b89\u4ffa\u6309\u6697\u5cb8\u80fa\u6848\u8c19\u57ef\u63de\u72b4\u5eb5\u6849\u94f5\u9e4c\u9878\u9eef",
+    "ANG": "\u80ae\u6602\u76ce",
+    "AO": "\u51f9\u6556\u71ac\u7ff1\u8884\u50b2\u5965\u61ca\u6fb3\u5773\u62d7\u55f7\u5662\u5c99\u5ed2\u9068\u5aaa\u9a9c\u8071\u87af\u93ca\u9ccc\u93d6",
+    "BA": "\u82ad\u634c\u6252\u53ed\u5427\u7b06\u516b\u75a4\u5df4\u62d4\u8dcb\u9776\u628a\u8019\u575d\u9738\u7f62\u7238\u8307\u83dd\u8406\u636d\u5c9c\u705e\u6777\u94af\u7c91\u9c85\u9b43",
+    "BAI": "\u767d\u67cf\u767e\u6446\u4f70\u8d25\u62dc\u7a17\u859c\u63b0\u97b4",
+    "BAN": "\u6591\u73ed\u642c\u6273\u822c\u9881\u677f\u7248\u626e\u62cc\u4f34\u74e3\u534a\u529e\u7eca\u962a\u5742\u8c73\u94a3\u7622\u764d\u8228",
+    "BANG": "\u90a6\u5e2e\u6886\u699c\u8180\u7ed1\u68d2\u78c5\u868c\u9551\u508d\u8c24\u84a1\u8783",
+    "BAO": "\u82de\u80de\u5305\u8912\u96f9\u4fdd\u5821\u9971\u5b9d\u62b1\u62a5\u66b4\u8c79\u9c8d\u7206\u52f9\u8446\u5b80\u5b62\u7172\u9e28\u8913\u8db5\u9f85",
+    "BO": "\u5265\u8584\u73bb\u83e0\u64ad\u62e8\u94b5\u6ce2\u535a\u52c3\u640f\u94c2\u7b94\u4f2f\u5e1b\u8236\u8116\u818a\u6e24\u6cca\u9a73\u4eb3\u8543\u5575\u997d\u6a97\u64d8\u7934\u94b9\u9e41\u7c38\u8ddb",
+    "BEI": "\u676f\u7891\u60b2\u5351\u5317\u8f88\u80cc\u8d1d\u94a1\u500d\u72c8\u5907\u60eb\u7119\u88ab\u5b5b\u9642\u90b6\u57e4\u84d3\u5457\u602b\u6096\u789a\u9e4e\u8919\u943e",
+    "BEN": "\u5954\u82ef\u672c\u7b28\u755a\u574c\u951b",
+    "BENG": "\u5d29\u7ef7\u752d\u6cf5\u8e66\u8ff8\u552a\u5623\u750f",
+    "BI": "\u903c\u9f3b\u6bd4\u9119\u7b14\u5f7c\u78a7\u84d6\u853d\u6bd5\u6bd9\u6bd6\u5e01\u5e87\u75f9\u95ed\u655d\u5f0a\u5fc5\u8f9f\u58c1\u81c2\u907f\u965b\u5315\u4ef3\u4ffe\u8298\u835c\u8378\u5421\u54d4\u72f4\u5eb3\u610e\u6ed7\u6fde\u5f3c\u59a3\u5a62\u5b16\u74a7\u8d32\u7540\u94cb\u79d5\u88e8\u7b5a\u7b85\u7be6\u822d\u895e\u8df8\u9ac0",
+    "BIAN": "\u97ad\u8fb9\u7f16\u8d2c\u6241\u4fbf\u53d8\u535e\u8fa8\u8fa9\u8fab\u904d\u533e\u5f01\u82c4\u5fed\u6c74\u7f0f\u7178\u782d\u78a5\u7a39\u7a86\u8759\u7b3e\u9cca",
+    "BIAO": "\u6807\u5f6a\u8198\u8868\u5a4a\u9aa0\u98d1\u98d9\u98da\u706c\u9556\u9573\u762d\u88f1\u9cd4",
+    "BIE": "\u9cd6\u618b\u522b\u762a\u8e69\u9cd8",
+    "BIN": "\u5f6c\u658c\u6fd2\u6ee8\u5bbe\u6448\u50a7\u6d5c\u7f24\u73a2\u6ba1\u8191\u9554\u9acc\u9b13",
+    "BING": "\u5175\u51b0\u67c4\u4e19\u79c9\u997c\u70b3\u75c5\u5e76\u7980\u90b4\u6452\u7ee0\u678b\u69df\u71f9",
+    "BU": "\u6355\u535c\u54fa\u8865\u57e0\u4e0d\u5e03\u6b65\u7c3f\u90e8\u6016\u62ca\u535f\u900b\u74ff\u6661\u949a\u91ad",
+    "CA": "\u64e6\u5693\u7924",
+    "CAI": "\u731c\u88c1\u6750\u624d\u8d22\u776c\u8e29\u91c7\u5f69\u83dc\u8521",
+    "CAN": "\u9910\u53c2\u8695\u6b8b\u60ed\u60e8\u707f\u9a96\u74a8\u7cb2\u9eea",
+    "CANG": "\u82cd\u8231\u4ed3\u6ca7\u85cf\u4f27",
+    "CAO": "\u64cd\u7cd9\u69fd\u66f9\u8349\u8279\u5608\u6f15\u87ac\u825a",
+    "CE": "\u5395\u7b56\u4fa7\u518c\u6d4b\u5202\u5e3b\u607b",
+    "CENG": "\u5c42\u8e6d\u564c",
+    "CHA": "\u63d2\u53c9\u832c\u8336\u67e5\u78b4\u643d\u5bdf\u5c94\u5dee\u8be7\u7339\u9987\u6c4a\u59f9\u6748\u6942\u69ce\u6aab\u9497\u9538\u9572\u8869",
+    "CHAI": "\u62c6\u67f4\u8c7a\u4faa\u8308\u7625\u867f\u9f87",
+    "CHAN": "\u6400\u63ba\u8749\u998b\u8c17\u7f20\u94f2\u4ea7\u9610\u98a4\u5181\u8c04\u8c36\u8487\u5edb\u5fcf\u6f7a\u6fb6\u5b71\u7fbc\u5a75\u5b17\u9aa3\u89c7\u7985\u9561\u88e3\u87fe\u8e94",
+    "CHANG": "\u660c\u7316\u573a\u5c1d\u5e38\u957f\u507f\u80a0\u5382\u655e\u7545\u5531\u5021\u4f25\u9b2f\u82cc\u83d6\u5f9c\u6005\u60dd\u960a\u5a3c\u5ae6\u6636\u6c05\u9cb3",
+    "CHAO": "\u8d85\u6284\u949e\u671d\u5632\u6f6e\u5de2\u5435\u7092\u600a\u7ec9\u6641\u8016",
+    "CHE": "\u8f66\u626f\u64a4\u63a3\u5f7b\u6f88\u577c\u5c6e\u7817",
+    "CHEN": "\u90f4\u81e3\u8fb0\u5c18\u6668\u5ff1\u6c89\u9648\u8d81\u886c\u79f0\u8c0c\u62bb\u55d4\u5bb8\u741b\u6987\u809c\u80c2\u789c\u9f80",
+    "CHENG": "\u6491\u57ce\u6a59\u6210\u5448\u4e58\u7a0b\u60e9\u6f84\u8bda\u627f\u901e\u9a8b\u79e4\u57d5\u5d4a\u5fb5\u6d48\u67a8\u67fd\u6a18\u665f\u584d\u77a0\u94d6\u88ce\u86cf\u9172",
+    "CHI": "\u5403\u75f4\u6301\u5319\u6c60\u8fdf\u5f1b\u9a70\u803b\u9f7f\u4f88\u5c3a\u8d64\u7fc5\u65a5\u70bd\u50ba\u5880\u82aa\u830c\u640b\u53f1\u54e7\u557b\u55e4\u5f73\u996c\u6cb2\u5ab8\u6555\u80dd\u7719\u7735\u9e31\u761b\u892b\u86a9\u87ad\u7b1e\u7bea\u8c49\u8e05\u8e1f\u9b51",
+    "CHONG": "\u5145\u51b2\u866b\u5d07\u5ba0\u833a\u5fe1\u61a7\u94f3\u825f",
+    "CHOU": "\u62bd\u916c\u7574\u8e0c\u7a20\u6101\u7b79\u4ec7\u7ef8\u7785\u4e11\u4fe6\u5733\u5e31\u60c6\u6eb4\u59af\u7633\u96e0\u9c8b",
+    "CHU": "\u81ed\u521d\u51fa\u6a71\u53a8\u8e87\u9504\u96cf\u6ec1\u9664\u695a\u7840\u50a8\u77d7\u6410\u89e6\u5904\u4e8d\u520d\u61b7\u7ecc\u6775\u696e\u6a17\u870d\u8e70\u9edc",
+    "CHUAN": "\u63e3\u5ddd\u7a7f\u693d\u4f20\u8239\u5598\u4e32\u63be\u821b\u60f4\u9044\u5ddb\u6c1a\u948f\u9569\u8221",
+    "CHUANG": "\u75ae\u7a97\u5e62\u5e8a\u95ef\u521b\u6006",
+    "CHUI": "\u5439\u708a\u6376\u9524\u5782\u9672\u68f0\u69cc",
+    "CHUN": "\u6625\u693f\u9187\u5507\u6df3\u7eaf\u8822\u4fc3\u83bc\u6c8c\u80ab\u6710\u9e51\u877d",
+    "CHUO": "\u6233\u7ef0\u851f\u8fb6\u8f8d\u955e\u8e14\u9f8a",
+    "CI": "\u75b5\u8328\u78c1\u96cc\u8f9e\u6148\u74f7\u8bcd\u6b64\u523a\u8d50\u6b21\u8360\u5472\u5d6f\u9e5a\u8785\u7ccd\u8d91",
+    "CONG": "\u806a\u8471\u56f1\u5306\u4ece\u4e1b\u506c\u82c1\u6dd9\u9aa2\u742e\u7481\u679e",
+    "CU": "\u51d1\u7c97\u918b\u7c07\u731d\u6b82\u8e59",
+    "CUAN": "\u8e7f\u7be1\u7a9c\u6c46\u64ba\u6615\u7228",
+    "CUI": "\u6467\u5d14\u50ac\u8106\u7601\u7cb9\u6dec\u7fe0\u8403\u60b4\u7480\u69b1\u96b9",
+    "CUN": "\u6751\u5b58\u5bf8\u78cb\u5fd6\u76b4",
+    "CUO": "\u64ae\u6413\u63aa\u632b\u9519\u539d\u811e\u9509\u77ec\u75e4\u9e7e\u8e49\u8e9c",
+    "DA": "\u642d\u8fbe\u7b54\u7629\u6253\u5927\u8037\u54d2\u55d2\u601b\u59b2\u75b8\u8921\u7b2a\u977c\u9791",
+    "DAI": "\u5446\u6b79\u50a3\u6234\u5e26\u6b86\u4ee3\u8d37\u888b\u5f85\u902e\u6020\u57ed\u7519\u5454\u5cb1\u8fe8\u902f\u9a80\u7ed0\u73b3\u9edb",
+    "DAN": "\u803d\u62c5\u4e39\u5355\u90f8\u63b8\u80c6\u65e6\u6c2e\u4f46\u60ee\u6de1\u8bde\u5f39\u86cb\u4ebb\u510b\u5369\u840f\u5556\u6fb9\u6a90\u6b9a\u8d55\u7708\u7605\u8043\u7baa",
+    "DANG": "\u5f53\u6321\u515a\u8361\u6863\u8c20\u51fc\u83ea\u5b95\u7800\u94db\u88c6",
+    "DAO": "\u5200\u6363\u8e48\u5012\u5c9b\u7977\u5bfc\u5230\u7a3b\u60bc\u9053\u76d7\u53e8\u5541\u5fc9\u6d2e\u6c18\u7118\u5fd1\u7e9b",
+    "DE": "\u5fb7\u5f97\u7684\u951d",
+    "DENG": "\u8e6c\u706f\u767b\u7b49\u77aa\u51f3\u9093\u5654\u5d9d\u6225\u78f4\u956b\u7c26",
+    "DI": "\u5824\u4f4e\u6ef4\u8fea\u654c\u7b1b\u72c4\u6da4\u7fdf\u5ae1\u62b5\u5e95\u5730\u8482\u7b2c\u5e1d\u5f1f\u9012\u7f14\u6c10\u7c74\u8bcb\u8c1b\u90b8\u577b\u839c\u837b\u5600\u5a23\u67e2\u68e3\u89cc\u7825\u78b2\u7747\u955d\u7f9d\u9ab6",
+    "DIAN": "\u98a0\u6382\u6ec7\u7898\u70b9\u5178\u975b\u57ab\u7535\u4f43\u7538\u5e97\u60e6\u5960\u6dc0\u6bbf\u4e36\u963d\u576b\u57dd\u5dc5\u73b7\u765c\u766b\u7c1f\u8e2e",
+    "DIAO": "\u7889\u53fc\u96d5\u51cb\u5201\u6389\u540a\u9493\u8c03\u8f7a\u94de\u8729\u7c9c\u8c82",
+    "DIE": "\u8dcc\u7239\u789f\u8776\u8fed\u8c0d\u53e0\u4f5a\u57a4\u581e\u63f2\u558b\u6e2b\u8f76\u7252\u74de\u8936\u800b\u8e40\u9cbd\u9cce",
+    "DING": "\u4e01\u76ef\u53ee\u9489\u9876\u9f0e\u952d\u5b9a\u8ba2\u4e22\u4ec3\u5576\u738e\u815a\u7887\u753a\u94e4\u7594\u8035\u914a",
+    "DONG": "\u4e1c\u51ac\u8463\u61c2\u52a8\u680b\u4f97\u606b\u51bb\u6d1e\u578c\u549a\u5cbd\u5cd2\u5902\u6c21\u80e8\u80f4\u7850\u9e2b",
+    "DOU": "\u515c\u6296\u6597\u9661\u8c46\u9017\u75d8\u8538\u94ad\u7aa6\u7aac\u86aa\u7bfc\u9161",
+    "DU": "\u90fd\u7763\u6bd2\u728a\u72ec\u8bfb\u5835\u7779\u8d4c\u675c\u9540\u809a\u5ea6\u6e21\u5992\u828f\u561f\u6e0e\u691f\u6a50\u724d\u8839\u7b03\u9ad1\u9ee9",
+    "DUAN": "\u7aef\u77ed\u953b\u6bb5\u65ad\u7f0e\u5f56\u6934\u7145\u7c16",
+    "DUI": "\u5806\u5151\u961f\u5bf9\u603c\u619d\u7893",
+    "DUN": "\u58a9\u5428\u8e72\u6566\u987f\u56e4\u949d\u76fe\u9041\u7096\u7818\u7905\u76f9\u9566\u8db8",
+    "DUO": "\u6387\u54c6\u591a\u593a\u579b\u8eb2\u6735\u8dfa\u8235\u5241\u60f0\u5815\u5484\u54da\u7f0d\u67c1\u94ce\u88f0\u8e31",
+    "E": "\u86fe\u5ce8\u9e45\u4fc4\u989d\u8bb9\u5a25\u6076\u5384\u627c\u904f\u9102\u997f\u5669\u8c14\u57a9\u57ad\u82ca\u83aa\u843c\u5443\u6115\u5c59\u5a40\u8f6d\u66f7\u816d\u786a\u9507\u9537\u9e57\u989a\u9cc4",
+    "EN": "\u6069\u84bd\u6441\u5514\u55ef",
+    "ER": "\u800c\u513f\u8033\u5c14\u9975\u6d31\u4e8c\u8d30\u8fe9\u73e5\u94d2\u9e38\u9c95",
+    "FA": "\u53d1\u7f5a\u7b4f\u4f10\u4e4f\u9600\u6cd5\u73d0\u57a1\u781d",
+    "FAN": "\u85e9\u5e06\u756a\u7ffb\u6a0a\u77fe\u9492\u7e41\u51e1\u70e6\u53cd\u8fd4\u8303\u8d29\u72af\u996d\u6cdb\u8629\u5e61\u72ad\u68b5\u6535\u71d4\u7548\u8e6f",
+    "FANG": "\u574a\u82b3\u65b9\u80aa\u623f\u9632\u59a8\u4eff\u8bbf\u7eba\u653e\u531a\u90a1\u5f77\u94ab\u822b\u9c82",
+    "FEI": "\u83f2\u975e\u5561\u98de\u80a5\u532a\u8bfd\u5420\u80ba\u5e9f\u6cb8\u8d39\u82be\u72d2\u60b1\u6ddd\u5983\u7ecb\u7eef\u69a7\u8153\u6590\u6249\u7953\u7829\u9544\u75f1\u871a\u7bda\u7fe1\u970f\u9cb1",
+    "FEN": "\u82ac\u915a\u5429\u6c1b\u5206\u7eb7\u575f\u711a\u6c7e\u7c89\u594b\u4efd\u5fff\u6124\u7caa\u507e\u7035\u68fc\u610d\u9cbc\u9f22",
+    "FENG": "\u4e30\u5c01\u67ab\u8702\u5cf0\u950b\u98ce\u75af\u70fd\u9022\u51af\u7f1d\u8bbd\u5949\u51e4\u4ff8\u9146\u8451\u6ca3\u781c",
+    "FU": "\u4f5b\u5426\u592b\u6577\u80a4\u5b75\u6276\u62c2\u8f90\u5e45\u6c1f\u7b26\u4f0f\u4fd8\u670d\u6d6e\u6daa\u798f\u88b1\u5f17\u752b\u629a\u8f85\u4fef\u91dc\u65a7\u812f\u8151\u5e9c\u8150\u8d74\u526f\u8986\u8d4b\u590d\u5085\u4ed8\u961c\u7236\u8179\u8d1f\u5bcc\u8ba3\u9644\u5987\u7f1a\u5490\u5310\u51eb\u90db\u8299\u82fb\u832f\u83a9\u83d4\u544b\u5e5e\u6ecf\u8274\u5b5a\u9a78\u7ec2\u6874\u8d59\u9efb\u9efc\u7f58\u7a03\u99a5\u864d\u86a8\u8709\u8760\u876e\u9eb8\u8dba\u8dd7\u9cc6",
+    "GA": "\u5676\u560e\u86e4\u5c2c\u5477\u5c15\u5c1c\u65ee\u9486",
+    "GAI": "\u8be5\u6539\u6982\u9499\u76d6\u6e89\u4e10\u9654\u5793\u6224\u8d45\u80f2",
+    "GAN": "\u5e72\u7518\u6746\u67d1\u7aff\u809d\u8d76\u611f\u79c6\u6562\u8d63\u5769\u82f7\u5c34\u64c0\u6cd4\u6de6\u6f89\u7ec0\u6a44\u65f0\u77f8\u75b3\u9150",
+    "GANG": "\u5188\u521a\u94a2\u7f38\u809b\u7eb2\u5c97\u6e2f\u6206\u7f61\u9883\u7b7b",
+    "GONG": "\u6760\u5de5\u653b\u529f\u606d\u9f9a\u4f9b\u8eac\u516c\u5bab\u5f13\u5de9\u6c5e\u62f1\u8d21\u5171\u857b\u5efe\u54a3\u73d9\u80b1\u86a3\u86e9\u89e5",
+    "GAO": "\u7bd9\u768b\u9ad8\u818f\u7f94\u7cd5\u641e\u9550\u7a3f\u544a\u777e\u8bf0\u90dc\u84bf\u85c1\u7f1f\u69d4\u69c1\u6772\u9506",
+    "GE": "\u54e5\u6b4c\u6401\u6208\u9e3d\u80f3\u7599\u5272\u9769\u845b\u683c\u9601\u9694\u94ec\u4e2a\u5404\u9b32\u4ee1\u54ff\u5865\u55dd\u7ea5\u643f\u8188\u784c\u94ea\u9549\u88bc\u988c\u867c\u8238\u9abc\u9ac2",
+    "GEI": "\u7ed9",
+    "GEN": "\u6839\u8ddf\u4e98\u831b\u54cf\u826e",
+    "GENG": "\u8015\u66f4\u5e9a\u7fb9\u57c2\u803f\u6897\u54fd\u8d53\u9ca0",
+    "GOU": "\u94a9\u52fe\u6c9f\u82df\u72d7\u57a2\u6784\u8d2d\u591f\u4f5d\u8bdf\u5ca3\u9058\u5abe\u7f11\u89cf\u5f40\u9e32\u7b31\u7bdd\u97b2",
+    "GU": "\u8f9c\u83c7\u5495\u7b8d\u4f30\u6cbd\u5b64\u59d1\u9f13\u53e4\u86ca\u9aa8\u8c37\u80a1\u6545\u987e\u56fa\u96c7\u560f\u8bc2\u83f0\u54cc\u5d2e\u6c69\u688f\u8f71\u726f\u727f\u80cd\u81cc\u6bc2\u77bd\u7f5f\u94b4\u9522\u74e0\u9e2a\u9e44\u75fc\u86c4\u9164\u89da\u9cb4\u9ab0\u9e58",
+    "GUA": "\u522e\u74dc\u5250\u5be1\u6302\u8902\u5366\u8bd6\u5471\u681d\u9e39",
+    "GUAI": "\u4e56\u62d0\u602a\u54d9",
+    "GUAN": "\u68fa\u5173\u5b98\u51a0\u89c2\u7ba1\u9986\u7f50\u60ef\u704c\u8d2f\u500c\u839e\u63bc\u6dab\u76e5\u9e73\u9ccf",
+    "GUANG": "\u5149\u5e7f\u901b\u72b7\u6844\u80f1\u7592",
+    "GUI": "\u7470\u89c4\u572d\u7845\u5f52\u9f9f\u95fa\u8f68\u9b3c\u8be1\u7678\u6842\u67dc\u8dea\u8d35\u523d\u5326\u523f\u5e8b\u5b84\u59ab\u6867\u7085\u6677\u7688\u7c0b\u9c91\u9cdc",
+    "GUN": "\u8f8a\u6eda\u68cd\u4e28\u886e\u7ef2\u78d9\u9ca7",
+    "GUO": "\u9505\u90ed\u56fd\u679c\u88f9\u8fc7\u9998\u8803\u57da\u63b4\u5459\u56d7\u5e3c\u5d1e\u7313\u6901\u8662\u951e\u8052\u872e\u873e\u8748",
+    "HA": "\u54c8",
+    "HAI": "\u9ab8\u5b69\u6d77\u6c26\u4ea5\u5bb3\u9a87\u54b4\u55e8\u988f\u91a2",
+    "HAN": "\u9163\u61a8\u90af\u97e9\u542b\u6db5\u5bd2\u51fd\u558a\u7f55\u7ff0\u64bc\u634d\u65f1\u61be\u608d\u710a\u6c57\u6c49\u9097\u83e1\u6496\u961a\u701a\u6657\u7113\u9894\u86b6\u9f3e",
+    "HEN": "\u592f\u75d5\u5f88\u72e0\u6068",
+    "HANG": "\u676d\u822a\u6c86\u7ed7\u73e9\u6841",
+    "HAO": "\u58d5\u568e\u8c6a\u6beb\u90dd\u597d\u8017\u53f7\u6d69\u8585\u55e5\u5686\u6fe0\u704f\u660a\u7693\u98a2\u869d",
+    "HE": "\u5475\u559d\u8377\u83cf\u6838\u79be\u548c\u4f55\u5408\u76d2\u8c89\u9602\u6cb3\u6db8\u8d6b\u8910\u9e64\u8d3a\u8bc3\u52be\u58d1\u85ff\u55d1\u55ec\u9616\u76cd\u86b5\u7fee",
+    "HEI": "\u563f\u9ed1",
+    "HENG": "\u54fc\u4ea8\u6a2a\u8861\u6052\u8a07\u8605",
+    "HONG": "\u8f70\u54c4\u70d8\u8679\u9e3f\u6d2a\u5b8f\u5f18\u7ea2\u9ec9\u8ba7\u836d\u85a8\u95f3\u6cd3",
+    "HOU": "\u5589\u4faf\u7334\u543c\u539a\u5019\u540e\u5820\u5f8c\u9005\u760a\u7bcc\u7cc7\u9c8e\u9aba",
+    "HU": "\u547c\u4e4e\u5ffd\u745a\u58f6\u846b\u80e1\u8774\u72d0\u7cca\u6e56\u5f27\u864e\u552c\u62a4\u4e92\u6caa\u6237\u51b1\u553f\u56eb\u5cb5\u7322\u6019\u60da\u6d52\u6ef9\u7425\u69f2\u8f77\u89f3\u70c0\u7173\u623d\u6248\u795c\u9e55\u9e71\u7b0f\u9190\u659b",
+    "HUA": "\u82b1\u54d7\u534e\u733e\u6ed1\u753b\u5212\u5316\u8bdd\u5290\u6d4d\u9a85\u6866\u94e7\u7a1e",
+    "HUAI": "\u69d0\u5f8a\u6000\u6dee\u574f\u8fd8\u8e1d",
+    "HUAN": "\u6b22\u73af\u6853\u7f13\u6362\u60a3\u5524\u75ea\u8c62\u7115\u6da3\u5ba6\u5e7b\u90c7\u5942\u57b8\u64d0\u571c\u6d39\u6d63\u6f36\u5bf0\u902d\u7f33\u953e\u9ca9\u9b1f",
+    "HUANG": "\u8352\u614c\u9ec4\u78fa\u8757\u7c27\u7687\u51f0\u60f6\u714c\u6643\u5e4c\u604d\u8c0e\u968d\u5fa8\u6e5f\u6f62\u9051\u749c\u8093\u7640\u87e5\u7bc1\u9cc7",
+    "HUI": "\u7070\u6325\u8f89\u5fbd\u6062\u86d4\u56de\u6bc1\u6094\u6167\u5349\u60e0\u6666\u8d3f\u79fd\u4f1a\u70e9\u6c47\u8bb3\u8bf2\u7ed8\u8bd9\u8334\u835f\u8559\u54d5\u5599\u96b3\u6d04\u5f57\u7f0b\u73f2\u6656\u605a\u867a\u87ea\u9ebe",
+    "HUN": "\u8364\u660f\u5a5a\u9b42\u6d51\u6df7\u8be8\u9984\u960d\u6eb7\u7f17",
+    "HUO": "\u8c41\u6d3b\u4f19\u706b\u83b7\u6216\u60d1\u970d\u8d27\u7978\u6509\u56af\u5925\u94ac\u952a\u956c\u8020\u8816",
+    "JI": "\u51fb\u573e\u57fa\u673a\u7578\u7a3d\u79ef\u7b95\u808c\u9965\u8ff9\u6fc0\u8ba5\u9e21\u59ec\u7ee9\u7f09\u5409\u6781\u68d8\u8f91\u7c4d\u96c6\u53ca\u6025\u75be\u6c72\u5373\u5ac9\u7ea7\u6324\u51e0\u810a\u5df1\u84df\u6280\u5180\u5b63\u4f0e\u796d\u5242\u60b8\u6d4e\u5bc4\u5bc2\u8ba1\u8bb0\u65e2\u5fcc\u9645\u5993\u7ee7\u7eaa\u5c45\u4e0c\u4e69\u525e\u4f76\u4f74\u8114\u58bc\u82a8\u82b0\u8401\u84ba\u857a\u638e\u53fd\u54ad\u54dc\u5527\u5c8c\u5d74\u6d0e\u5f50\u5c50\u9aa5\u757f\u7391\u696b\u6b9b\u621f\u6222\u8d4d\u89ca\u7284\u9f51\u77f6\u7f81\u5d47\u7a37\u7620\u7635\u866e\u7b08\u7b04\u66a8\u8dfb\u8dfd\u9701\u9c9a\u9cab\u9afb\u9e82",
+    "JIA": "\u5609\u67b7\u5939\u4f73\u5bb6\u52a0\u835a\u988a\u8d3e\u7532\u94be\u5047\u7a3c\u4ef7\u67b6\u9a7e\u5ac1\u4f3d\u90cf\u62ee\u5cac\u6d43\u8fe6\u73c8\u621b\u80db\u605d\u94d7\u9553\u75c2\u86f1\u7b33\u8888\u8dcf",
+    "JIAN": "\u6b7c\u76d1\u575a\u5c16\u7b3a\u95f4\u714e\u517c\u80a9\u8270\u5978\u7f04\u8327\u68c0\u67ec\u78b1\u7877\u62e3\u6361\u7b80\u4fed\u526a\u51cf\u8350\u69db\u9274\u8df5\u8d31\u89c1\u952e\u7bad\u4ef6\u5065\u8230\u5251\u996f\u6e10\u6e85\u6da7\u5efa\u50ed\u8c0f\u8c2b\u83c5\u84b9\u641b\u56dd\u6e54\u8e47\u8b07\u7f23\u67a7\u67d9\u6957\u620b\u622c\u726e\u728d\u6bfd\u8171\u7751\u950f\u9e63\u88e5\u7b15\u7bb4\u7fe6\u8dbc\u8e3a\u9ca3\u97af",
+    "JIANG": "\u50f5\u59dc\u5c06\u6d46\u6c5f\u7586\u848b\u6868\u5956\u8bb2\u5320\u9171\u964d\u8333\u6d1a\u7edb\u7f30\u729f\u7913\u8029\u7ce8\u8c47",
+    "JIAO": "\u8549\u6912\u7901\u7126\u80f6\u4ea4\u90ca\u6d47\u9a84\u5a07\u56bc\u6405\u94f0\u77eb\u4fa5\u811a\u72e1\u89d2\u997a\u7f34\u7ede\u527f\u6559\u9175\u8f7f\u8f83\u53eb\u4f7c\u50ec\u832d\u6322\u564d\u5ce4\u5fbc\u59e3\u7e9f\u656b\u768e\u9e6a\u86df\u91ae\u8de4\u9c9b",
+    "JIE": "\u7a96\u63ed\u63a5\u7686\u79f8\u8857\u9636\u622a\u52ab\u8282\u6854\u6770\u6377\u776b\u7aed\u6d01\u7ed3\u89e3\u59d0\u6212\u85c9\u82a5\u754c\u501f\u4ecb\u75a5\u8beb\u5c4a\u5048\u8ba6\u8bd8\u5588\u55df\u736c\u5a55\u5b51\u6840\u7352\u78a3\u9534\u7596\u88b7\u9889\u86a7\u7faf\u9c92\u9ab1\u9aeb",
+    "JIN": "\u5dfe\u7b4b\u65a4\u91d1\u4eca\u6d25\u895f\u7d27\u9526\u4ec5\u8c28\u8fdb\u9773\u664b\u7981\u8fd1\u70ec\u6d78\u5c3d\u537a\u8369\u5807\u5664\u9991\u5ed1\u5997\u7f19\u747e\u69ff\u8d46\u89d0\u9485\u9513\u887f\u77dc",
+    "JING": "\u52b2\u8346\u5162\u830e\u775b\u6676\u9cb8\u4eac\u60ca\u7cbe\u7cb3\u7ecf\u4e95\u8b66\u666f\u9888\u9759\u5883\u656c\u955c\u5f84\u75c9\u9756\u7adf\u7ade\u51c0\u522d\u5106\u9631\u83c1\u734d\u61ac\u6cfe\u8ff3\u5f2a\u5a67\u80bc\u80eb\u8148\u65cc",
+    "JIONG": "\u70af\u7a98\u5182\u8fe5\u6243",
+    "JIU": "\u63ea\u7a76\u7ea0\u7396\u97ed\u4e45\u7078\u4e5d\u9152\u53a9\u6551\u65e7\u81fc\u8205\u548e\u5c31\u759a\u50e6\u557e\u9604\u67e9\u6855\u9e6b\u8d73\u9b0f",
+    "JU": "\u97a0\u62d8\u72d9\u75bd\u9a79\u83ca\u5c40\u5480\u77e9\u4e3e\u6cae\u805a\u62d2\u636e\u5de8\u5177\u8ddd\u8e1e\u952f\u4ff1\u53e5\u60e7\u70ac\u5267\u5028\u8bb5\u82e3\u82f4\u8392\u63ac\u907d\u5c66\u741a\u67b8\u6910\u6998\u6989\u6a58\u728b\u98d3\u949c\u9514\u7aad\u88fe\u8d84\u91b5\u8e3d\u9f83\u96ce\u97ab",
+    "JUAN": "\u6350\u9e43\u5a1f\u5026\u7737\u5377\u7ee2\u9104\u72f7\u6d93\u684a\u8832\u9529\u954c\u96bd",
+    "JUE": "\u6485\u652b\u6289\u6398\u5014\u7235\u89c9\u51b3\u8bc0\u7edd\u53a5\u5282\u8c32\u77cd\u8568\u5658\u5d1b\u7357\u5b53\u73cf\u6877\u6a5b\u721d\u9562\u8e76\u89d6",
+    "JUN": "\u5747\u83cc\u94a7\u519b\u541b\u5cfb\u4fca\u7ae3\u6d5a\u90e1\u9a8f\u6343\u72fb\u76b2\u7b60\u9e87",
+    "KA": "\u5580\u5496\u5361\u4f67\u5494\u80e9",
+    "KE": "\u54af\u5777\u82db\u67ef\u68f5\u78d5\u9897\u79d1\u58f3\u54b3\u53ef\u6e34\u514b\u523b\u5ba2\u8bfe\u5ca2\u606a\u6e98\u9a92\u7f02\u73c2\u8f72\u6c2a\u778c\u94b6\u75b4\u7aa0\u874c\u9ac1",
+    "KAI": "\u5f00\u63e9\u6977\u51ef\u6168\u5240\u57b2\u8488\u5ffe\u607a\u94e0\u950e",
+    "KAN": "\u520a\u582a\u52d8\u574e\u780d\u770b\u4f83\u51f5\u83b0\u83b6\u6221\u9f9b\u77b0",
+    "KANG": "\u5eb7\u6177\u7ce0\u625b\u6297\u4ea2\u7095\u5751\u4f09\u95f6\u94aa",
+    "KAO": "\u8003\u62f7\u70e4\u9760\u5c3b\u6832\u7292\u94d0",
+    "KEN": "\u80af\u5543\u57a6\u6073\u57a0\u88c9\u9880",
+    "KENG": "\u542d\u5fd0\u94ff",
+    "KONG": "\u7a7a\u6050\u5b54\u63a7\u5025\u5d06\u7b9c",
+    "KOU": "\u62a0\u53e3\u6263\u5bc7\u82a4\u853b\u53e9\u770d\u7b58",
+    "KU": "\u67af\u54ed\u7a9f\u82e6\u9177\u5e93\u88e4\u5233\u5800\u55be\u7ed4\u9ab7",
+    "KUA": "\u5938\u57ae\u630e\u8de8\u80ef\u4f89",
+    "KUAI": "\u5757\u7b77\u4fa9\u5feb\u84af\u90d0\u8489\u72ef\u810d",
+    "KUAN": "\u5bbd\u6b3e\u9acb",
+    "KUANG": "\u5321\u7b50\u72c2\u6846\u77ff\u7736\u65f7\u51b5\u8bd3\u8bf3\u909d\u5739\u593c\u54d0\u7ea9\u8d36",
+    "KUI": "\u4e8f\u76d4\u5cbf\u7aa5\u8475\u594e\u9b41\u5080\u9988\u6127\u6e83\u9997\u532e\u5914\u9697\u63c6\u55b9\u559f\u609d\u6126\u9615\u9035\u668c\u777d\u8069\u8770\u7bd1\u81fe\u8dec",
+    "KUN": "\u5764\u6606\u6346\u56f0\u6083\u9603\u7428\u951f\u918c\u9cb2\u9ae1",
+    "KUO": "\u62ec\u6269\u5ed3\u9614\u86de",
+    "LA": "\u5783\u62c9\u5587\u8721\u814a\u8fa3\u5566\u524c\u647a\u908b\u65ef\u782c\u760c",
+    "LAI": "\u83b1\u6765\u8d56\u5d03\u5f95\u6d9e\u6fd1\u8d49\u7750\u94fc\u765e\u7c41",
+    "LAN": "\u84dd\u5a6a\u680f\u62e6\u7bee\u9611\u5170\u6f9c\u8c30\u63fd\u89c8\u61d2\u7f06\u70c2\u6ee5\u5549\u5c9a\u61d4\u6f24\u6984\u6593\u7f71\u9567\u8934",
+    "LANG": "\u7405\u6994\u72fc\u5eca\u90ce\u6717\u6d6a\u83a8\u8497\u5577\u9606\u9512\u7a02\u8782",
+    "LAO": "\u635e\u52b3\u7262\u8001\u4f6c\u59e5\u916a\u70d9\u6d9d\u5520\u5d02\u6833\u94d1\u94f9\u75e8\u91aa",
+    "LE": "\u52d2\u4e50\u808b\u4ec2\u53fb\u561e\u6cd0\u9cd3",
+    "LEI": "\u96f7\u956d\u857e\u78ca\u7d2f\u5121\u5792\u64c2\u7c7b\u6cea\u7fb8\u8bd4\u837d\u54a7\u6f2f\u5ad8\u7f27\u6a91\u8012\u9179",
+    "LING": "\u68f1\u51b7\u62ce\u73b2\u83f1\u96f6\u9f84\u94c3\u4f36\u7f9a\u51cc\u7075\u9675\u5cad\u9886\u53e6\u4ee4\u9143\u5844\u82d3\u5464\u56f9\u6ce0\u7eeb\u67c3\u68c2\u74f4\u8046\u86c9\u7fce\u9cae",
+    "LENG": "\u695e\u6123",
+    "LI": "\u5398\u68a8\u7281\u9ece\u7bf1\u72f8\u79bb\u6f13\u7406\u674e\u91cc\u9ca4\u793c\u8389\u8354\u540f\u6817\u4e3d\u5389\u52b1\u783e\u5386\u5229\u5088\u4f8b\u4fd0\u75e2\u7acb\u7c92\u6ca5\u96b6\u529b\u7483\u54e9\u4fea\u4fda\u90e6\u575c\u82c8\u8385\u84e0\u85dc\u6369\u5456\u5533\u55b1\u7301\u6ea7\u6fa7\u9026\u5a0c\u5ae0\u9a8a\u7f21\u73de\u67a5\u680e\u8f79\u623e\u783a\u8a48\u7f79\u9502\u9e42\u75a0\u75ac\u86ce\u870a\u8821\u7b20\u7be5\u7c9d\u91b4\u8dde\u96f3\u9ca1\u9ce2\u9ee7",
+    "LIAN": "\u4fe9\u8054\u83b2\u8fde\u9570\u5ec9\u601c\u6d9f\u5e18\u655b\u8138\u94fe\u604b\u70bc\u7ec3\u631b\u8539\u5941\u6f4b\u6fc2\u5a08\u740f\u695d\u6b93\u81c1\u81a6\u88e2\u880a\u9ca2",
+    "LIANG": "\u7cae\u51c9\u6881\u7cb1\u826f\u4e24\u8f86\u91cf\u667e\u4eae\u8c05\u589a\u690b\u8e09\u9753\u9b49",
+    "LIAO": "\u64a9\u804a\u50da\u7597\u71ce\u5be5\u8fbd\u6f66\u4e86\u6482\u9563\u5ed6\u6599\u84fc\u5c25\u5639\u7360\u5bee\u7f2d\u948c\u9e69\u8022",
+    "LIE": "\u5217\u88c2\u70c8\u52a3\u730e\u51bd\u57d2\u6d0c\u8d94\u8e90\u9b23",
+    "LIN": "\u7433\u6797\u78f7\u9716\u4e34\u90bb\u9cde\u6dcb\u51db\u8d41\u541d\u853a\u5d99\u5eea\u9074\u6aa9\u8f9a\u77b5\u7cbc\u8e8f\u9e9f",
+    "LIU": "\u6e9c\u7409\u69b4\u786b\u998f\u7559\u5218\u7624\u6d41\u67f3\u516d\u62a1\u507b\u848c\u6cd6\u6d4f\u905b\u9a9d\u7efa\u65d2\u7198\u950d\u954f\u9e68\u938f",
+    "LONG": "\u9f99\u804b\u5499\u7b3c\u7abf\u9686\u5784\u62e2\u9647\u5f04\u5785\u830f\u6cf7\u73d1\u680a\u80e7\u783b\u7643",
+    "LOU": "\u697c\u5a04\u6402\u7bd3\u6f0f\u964b\u55bd\u5d5d\u9542\u7618\u8027\u877c\u9ac5",
+    "LU": "\u82a6\u5362\u9885\u5e90\u7089\u63b3\u5364\u864f\u9c81\u9e93\u788c\u9732\u8def\u8d42\u9e7f\u6f5e\u7984\u5f55\u9646\u622e\u5786\u6445\u64b8\u565c\u6cf8\u6e0c\u6f09\u7490\u680c\u6a79\u8f73\u8f82\u8f98\u6c07\u80ea\u9565\u9e2c\u9e6d\u7c0f\u823b\u9c88",
+    "LV": "\u9a74\u5415\u94dd\u4fa3\u65c5\u5c65\u5c61\u7f15\u8651\u6c2f\u5f8b\u7387\u6ee4\u7eff\u634b\u95fe\u6988\u8182\u7a06\u891b",
+    "LUAN": "\u5ce6\u5b6a\u6ee6\u5375\u4e71\u683e\u9e3e\u92ae",
+    "LUE": "\u63a0\u7565\u950a",
+    "LUN": "\u8f6e\u4f26\u4ed1\u6ca6\u7eb6\u8bba\u56f5",
+    "LUO": "\u841d\u87ba\u7f57\u903b\u9523\u7ba9\u9aa1\u88f8\u843d\u6d1b\u9a86\u7edc\u502e\u8366\u645e\u7321\u6cfa\u6924\u8136\u9559\u7630\u96d2",
+    "MA": "\u5988\u9ebb\u739b\u7801\u8682\u9a6c\u9a82\u561b\u5417\u551b\u72b8\u5b37\u6769\u9ebd",
+    "MAI": "\u57cb\u4e70\u9ea6\u5356\u8fc8\u8109\u52a2\u836c\u54aa\u973e",
+    "MAN": "\u7792\u9992\u86ee\u6ee1\u8513\u66fc\u6162\u6f2b\u8c29\u5881\u5e54\u7f26\u71b3\u9558\u989f\u87a8\u9cd7\u9794",
+    "MANG": "\u8292\u832b\u76f2\u5fd9\u83bd\u9099\u6f2d\u6726\u786d\u87d2",
+    "MENG": "\u6c13\u840c\u8499\u6aac\u76df\u9530\u731b\u68a6\u5b5f\u52d0\u750d\u77a2\u61f5\u791e\u867b\u8722\u8813\u824b\u8268\u9efe",
+    "MIAO": "\u732b\u82d7\u63cf\u7784\u85d0\u79d2\u6e3a\u5e99\u5999\u55b5\u9088\u7f08\u7f2a\u676a\u6dfc\u7707\u9e4b\u8731",
+    "MAO": "\u8305\u951a\u6bdb\u77db\u94c6\u536f\u8302\u5192\u5e3d\u8c8c\u8d38\u4f94\u88a4\u52d6\u8306\u5cc1\u7441\u6634\u7266\u8004\u65c4\u61cb\u7780\u86d1\u8765\u87ca\u9ae6",
+    "ME": "\u4e48",
+    "MEI": "\u73ab\u679a\u6885\u9176\u9709\u7164\u6ca1\u7709\u5a92\u9541\u6bcf\u7f8e\u6627\u5bd0\u59b9\u5a9a\u5776\u8393\u5d4b\u7338\u6d7c\u6e44\u6963\u9545\u9e5b\u8882\u9b45",
+    "MEN": "\u95e8\u95f7\u4eec\u626a\u739f\u7116\u61d1\u9494",
+    "MI": "\u772f\u919a\u9761\u7cdc\u8ff7\u8c1c\u5f25\u7c73\u79d8\u89c5\u6ccc\u871c\u5bc6\u5e42\u8288\u5196\u8c27\u863c\u5627\u7315\u736f\u6c68\u5b93\u5f2d\u8112\u6549\u7cf8\u7e3b\u9e8b",
+    "MIAN": "\u68c9\u7720\u7ef5\u5195\u514d\u52c9\u5a29\u7f05\u9762\u6c94\u6e4e\u817c\u7704",
+    "MIE": "\u8511\u706d\u54a9\u881b\u7bfe",
+    "MIN": "\u6c11\u62bf\u76bf\u654f\u60af\u95fd\u82e0\u5cb7\u95f5\u6cef\u73c9",
+    "MING": "\u660e\u879f\u9e23\u94ed\u540d\u547d\u51a5\u8317\u6e9f\u669d\u7791\u9169",
+    "MIU": "\u8c2c",
+    "MO": "\u6478\u6479\u8611\u6a21\u819c\u78e8\u6469\u9b54\u62b9\u672b\u83ab\u58a8\u9ed8\u6cab\u6f20\u5bde\u964c\u8c1f\u8309\u84e6\u998d\u5aeb\u9546\u79e3\u763c\u8031\u87c6\u8c8a\u8c98",
+    "MOU": "\u8c0b\u725f\u67d0\u53b6\u54de\u5a7a\u7738\u936a",
+    "MU": "\u62c7\u7261\u4ea9\u59c6\u6bcd\u5893\u66ae\u5e55\u52df\u6155\u6728\u76ee\u7766\u7267\u7a46\u4eeb\u82dc\u5452\u6c90\u6bea\u94bc",
+    "NA": "\u62ff\u54ea\u5450\u94a0\u90a3\u5a1c\u7eb3\u5185\u637a\u80ad\u954e\u8872\u7bac",
+    "NAI": "\u6c16\u4e43\u5976\u8010\u5948\u9f10\u827f\u8418\u67f0",
+    "NAN": "\u5357\u7537\u96be\u56ca\u5583\u56e1\u6960\u8169\u877b\u8d67",
+    "NAO": "\u6320\u8111\u607c\u95f9\u5b6c\u57b4\u7331\u7459\u7847\u94d9\u86f2",
+    "NE": "\u6dd6\u5462\u8bb7",
+    "NEI": "\u9981",
+    "NEN": "\u5ae9\u80fd\u6798\u6041",
+    "NI": "\u59ae\u9713\u502a\u6ce5\u5c3c\u62df\u4f60\u533f\u817b\u9006\u6eba\u4f32\u576d\u730a\u6029\u6ee0\u6635\u65ce\u7962\u615d\u7768\u94cc\u9cb5",
+    "NIAN": "\u852b\u62c8\u5e74\u78be\u64b5\u637b\u5ff5\u5eff\u8f87\u9ecf\u9c87\u9cb6",
+    "NIANG": "\u5a18\u917f",
+    "NIAO": "\u9e1f\u5c3f\u8311\u5b32\u8132\u8885",
+    "NIE": "\u634f\u8042\u5b7d\u556e\u954a\u954d\u6d85\u4e5c\u9667\u8616\u55eb\u8080\u989e\u81ec\u8e51",
+    "NIN": "\u60a8\u67e0",
+    "NING": "\u72de\u51dd\u5b81\u62e7\u6cde\u4f5e\u84e5\u549b\u752f\u804d",
+    "NIU": "\u725b\u626d\u94ae\u7ebd\u72c3\u5ff8\u599e\u86b4",
+    "NONG": "\u8113\u6d53\u519c\u4fac",
+    "NU": "\u5974\u52aa\u6012\u5476\u5e11\u5f29\u80ec\u5b65\u9a7d",
+    "NV": "\u5973\u6067\u9495\u8844",
+    "NUAN": "\u6696",
+    "NUENUE": "\u8650",
+    "NUE": "\u759f\u8c11",
+    "NUO": "\u632a\u61e6\u7cef\u8bfa\u50a9\u6426\u558f\u9518",
+    "OU": "\u54e6\u6b27\u9e25\u6bb4\u85d5\u5455\u5076\u6ca4\u6004\u74ef\u8026",
+    "PA": "\u556a\u8db4\u722c\u5e15\u6015\u7436\u8469\u7b62",
+    "PAI": "\u62cd\u6392\u724c\u5f98\u6e43\u6d3e\u4ff3\u848e",
+    "PAN": "\u6500\u6f58\u76d8\u78d0\u76fc\u7554\u5224\u53db\u723f\u6cee\u88a2\u897b\u87e0\u8e52",
+    "PANG": "\u4e53\u5e9e\u65c1\u802a\u80d6\u6ec2\u9004",
+    "PAO": "\u629b\u5486\u5228\u70ae\u888d\u8dd1\u6ce1\u530f\u72cd\u5e96\u812c\u75b1",
+    "PEI": "\u5478\u80da\u57f9\u88f4\u8d54\u966a\u914d\u4f69\u6c9b\u638a\u8f94\u5e14\u6de0\u65c6\u952b\u9185\u9708",
+    "PEN": "\u55b7\u76c6\u6e53",
+    "PENG": "\u7830\u62a8\u70f9\u6f8e\u5f6d\u84ec\u68da\u787c\u7bf7\u81a8\u670b\u9e4f\u6367\u78b0\u576f\u580b\u562d\u6026\u87db",
+    "PI": "\u7812\u9739\u6279\u62ab\u5288\u7435\u6bd7\u5564\u813e\u75b2\u76ae\u5339\u75de\u50fb\u5c41\u8b6c\u4e15\u9674\u90b3\u90eb\u572e\u9f19\u64d7\u567c\u5e80\u5ab2\u7eb0\u6787\u7513\u7765\u7f74\u94cd\u75e6\u7656\u758b\u868d\u8c94",
+    "PIAN": "\u7bc7\u504f\u7247\u9a97\u8c1d\u9a88\u728f\u80fc\u890a\u7fe9\u8e41",
+    "PIAO": "\u98d8\u6f02\u74e2\u7968\u527d\u560c\u5ad6\u7f25\u6b8d\u779f\u87b5",
+    "PIE": "\u6487\u77a5\u4e3f\u82e4\u6c15",
+    "PIN": "\u62fc\u9891\u8d2b\u54c1\u8058\u62da\u59d8\u5ad4\u6980\u725d\u98a6",
+    "PING": "\u4e52\u576a\u82f9\u840d\u5e73\u51ed\u74f6\u8bc4\u5c4f\u4fdc\u5a09\u67b0\u9c86",
+    "PO": "\u5761\u6cfc\u9887\u5a46\u7834\u9b44\u8feb\u7c95\u53f5\u9131\u6ea5\u73c0\u948b\u94b7\u76a4\u7b38",
+    "POU": "\u5256\u88d2\u8e23",
+    "PU": "\u6251\u94fa\u4ec6\u8386\u8461\u83e9\u84b2\u57d4\u6734\u5703\u666e\u6d66\u8c31\u66dd\u7011\u530d\u5657\u6fee\u749e\u6c06\u9564\u9568\u8e7c",
+    "QI": "\u671f\u6b3a\u6816\u621a\u59bb\u4e03\u51c4\u6f06\u67d2\u6c8f\u5176\u68cb\u5947\u6b67\u7566\u5d0e\u8110\u9f50\u65d7\u7948\u7941\u9a91\u8d77\u5c82\u4e5e\u4f01\u542f\u5951\u780c\u5668\u6c14\u8fc4\u5f03\u6c7d\u6ce3\u8bab\u4e9f\u4e93\u573b\u8291\u840b\u847a\u5601\u5c7a\u5c90\u6c54\u6dc7\u9a90\u7eee\u742a\u7426\u675e\u6864\u69ed\u6b39\u797a\u61a9\u789b\u86f4\u871e\u7da6\u7dae\u8dbf\u8e4a\u9ccd\u9e92",
+    "QIA": "\u6390\u6070\u6d3d\u845c",
+    "QIAN": "\u7275\u6266\u948e\u94c5\u5343\u8fc1\u7b7e\u4edf\u8c26\u4e7e\u9ed4\u94b1\u94b3\u524d\u6f5c\u9063\u6d45\u8c34\u5811\u5d4c\u6b20\u6b49\u4f65\u9621\u828a\u82a1\u8368\u63ae\u5c8d\u60ad\u614a\u9a9e\u6434\u8930\u7f31\u6920\u80b7\u6106\u94a4\u8654\u7b9d",
+    "QIANG": "\u67aa\u545b\u8154\u7f8c\u5899\u8537\u5f3a\u62a2\u5af1\u6a2f\u6217\u709d\u9516\u9535\u956a\u8941\u8723\u7f9f\u8deb\u8dc4",
+    "QIAO": "\u6a47\u9539\u6572\u6084\u6865\u77a7\u4e54\u4fa8\u5de7\u9798\u64ac\u7fd8\u5ced\u4fcf\u7a8d\u5281\u8bee\u8c2f\u835e\u6100\u6194\u7f32\u6a35\u6bf3\u7857\u8df7\u9792",
+    "QIE": "\u5207\u8304\u4e14\u602f\u7a83\u90c4\u553c\u60ec\u59be\u6308\u9532\u7ba7",
+    "QIN": "\u94a6\u4fb5\u4eb2\u79e6\u7434\u52e4\u82b9\u64d2\u79bd\u5bdd\u6c81\u82a9\u84c1\u8572\u63ff\u5423\u55ea\u5659\u6eb1\u6a8e\u8793\u887e",
+    "QING": "\u9752\u8f7b\u6c22\u503e\u537f\u6e05\u64ce\u6674\u6c30\u60c5\u9877\u8bf7\u5e86\u5029\u82d8\u570a\u6aa0\u78ec\u873b\u7f44\u7b90\u8b26\u9cad\u9ee5",
+    "QIONG": "\u743c\u7a77\u909b\u8315\u7a79\u7b47\u928e",
+    "QIU": "\u79cb\u4e18\u90b1\u7403\u6c42\u56da\u914b\u6cc5\u4fc5\u6c3d\u5def\u827d\u72b0\u6e6b\u9011\u9052\u6978\u8d47\u9e20\u866c\u86af\u8764\u88d8\u7cd7\u9cc5\u9f3d",
+    "QU": "\u8d8b\u533a\u86c6\u66f2\u8eaf\u5c48\u9a71\u6e20\u53d6\u5a36\u9f8b\u8da3\u53bb\u8bce\u52ac\u8556\u8627\u5c96\u8862\u9612\u74a9\u89d1\u6c0d\u795b\u78f2\u766f\u86d0\u883c\u9eb4\u77bf\u9ee2",
+    "QUAN": "\u5708\u98a7\u6743\u919b\u6cc9\u5168\u75ca\u62f3\u72ac\u5238\u529d\u8be0\u8343\u737e\u609b\u7efb\u8f81\u754e\u94e8\u8737\u7b4c\u9b08",
+    "QUE": "\u7f3a\u7094\u7638\u5374\u9e4a\u69b7\u786e\u96c0\u9619\u60ab",
+    "QUN": "\u88d9\u7fa4\u9021",
+    "RAN": "\u7136\u71c3\u5189\u67d3\u82d2\u9aef",
+    "RANG": "\u74e4\u58e4\u6518\u56b7\u8ba9\u79b3\u7a70",
+    "RAO": "\u9976\u6270\u7ed5\u835b\u5a06\u6861",
+    "RUO": "\u60f9\u82e5\u5f31",
+    "RE": "\u70ed\u504c",
+    "REN": "\u58ec\u4ec1\u4eba\u5fcd\u97e7\u4efb\u8ba4\u5203\u598a\u7eab\u4ede\u834f\u845a\u996a\u8f6b\u7a14\u887d",
+    "RENG": "\u6254\u4ecd",
+    "RI": "\u65e5",
+    "RONG": "\u620e\u8338\u84c9\u8363\u878d\u7194\u6eb6\u5bb9\u7ed2\u5197\u5d58\u72e8\u7f1b\u6995\u877e",
+    "ROU": "\u63c9\u67d4\u8089\u7cc5\u8e42\u97a3",
+    "RU": "\u8339\u8815\u5112\u5b7a\u5982\u8fb1\u4e73\u6c5d\u5165\u8925\u84d0\u85b7\u5685\u6d33\u6ebd\u6fe1\u94f7\u8966\u98a5",
+    "RUAN": "\u8f6f\u962e\u670a",
+    "RUI": "\u854a\u745e\u9510\u82ae\u8564\u777f\u868b",
+    "RUN": "\u95f0\u6da6",
+    "SA": "\u6492\u6d12\u8428\u5345\u4ee8\u6332\u98d2",
+    "SAI": "\u816e\u9cc3\u585e\u8d5b\u567b",
+    "SAN": "\u4e09\u53c1\u4f1e\u6563\u5f61\u9993\u6c35\u6bf5\u7cc1\u9730",
+    "SANG": "\u6851\u55d3\u4e27\u6421\u78c9\u98a1",
+    "SAO": "\u6414\u9a9a\u626b\u5ac2\u57fd\u81ca\u7619\u9ccb",
+    "SE": "\u745f\u8272\u6da9\u556c\u94e9\u94ef\u7a51",
+    "SEN": "\u68ee",
+    "SENG": "\u50e7",
+    "SHA": "\u838e\u7802\u6740\u5239\u6c99\u7eb1\u50bb\u5565\u715e\u810e\u6b43\u75e7\u88df\u970e\u9ca8",
+    "SHAI": "\u7b5b\u6652\u917e",
+    "SHAN": "\u73ca\u82eb\u6749\u5c71\u5220\u717d\u886b\u95ea\u9655\u64c5\u8d61\u81b3\u5584\u6c55\u6247\u7f2e\u5261\u8baa\u912f\u57cf\u829f\u6f78\u59d7\u9a9f\u81bb\u9490\u759d\u87ee\u8222\u8dda\u9cdd",
+    "SHANG": "\u5892\u4f24\u5546\u8d4f\u664c\u4e0a\u5c1a\u88f3\u57a7\u7ef1\u6b87\u71b5\u89de",
+    "SHAO": "\u68a2\u634e\u7a0d\u70e7\u828d\u52fa\u97f6\u5c11\u54e8\u90b5\u7ecd\u52ad\u82d5\u6f72\u86f8\u7b24\u7b72\u8244",
+    "SHE": "\u5962\u8d4a\u86c7\u820c\u820d\u8d66\u6444\u5c04\u6151\u6d89\u793e\u8bbe\u538d\u4f58\u731e\u7572\u9e9d",
+    "SHEN": "\u7837\u7533\u547b\u4f38\u8eab\u6df1\u5a20\u7ec5\u795e\u6c88\u5ba1\u5a76\u751a\u80be\u614e\u6e17\u8bdc\u8c02\u5432\u54c2\u6e16\u6939\u77e7\u8703",
+    "SHENG": "\u58f0\u751f\u7525\u7272\u5347\u7ef3\u7701\u76db\u5269\u80dc\u5723\u4e1e\u6e11\u5ab5\u771a\u7b19",
+    "SHI": "\u5e08\u5931\u72ee\u65bd\u6e7f\u8bd7\u5c38\u8671\u5341\u77f3\u62fe\u65f6\u4ec0\u98df\u8680\u5b9e\u8bc6\u53f2\u77e2\u4f7f\u5c4e\u9a76\u59cb\u5f0f\u793a\u58eb\u4e16\u67ff\u4e8b\u62ed\u8a93\u901d\u52bf\u662f\u55dc\u566c\u9002\u4ed5\u4f8d\u91ca\u9970\u6c0f\u5e02\u6043\u5ba4\u89c6\u8bd5\u8c25\u57d8\u83b3\u84cd\u5f11\u5511\u9963\u8f7c\u8006\u8d33\u70bb\u793b\u94c8\u94ca\u87ab\u8210\u7b6e\u8c55\u9ca5\u9cba",
+    "SHOU": "\u6536\u624b\u9996\u5b88\u5bff\u6388\u552e\u53d7\u7626\u517d\u624c\u72e9\u7ef6\u824f",
+    "SHU": "\u852c\u67a2\u68b3\u6b8a\u6292\u8f93\u53d4\u8212\u6dd1\u758f\u4e66\u8d4e\u5b70\u719f\u85af\u6691\u66d9\u7f72\u8700\u9ecd\u9f20\u5c5e\u672f\u8ff0\u6811\u675f\u620d\u7ad6\u5885\u5eb6\u6570\u6f31\u6055\u500f\u587e\u83fd\u5fc4\u6cad\u6d91\u6f8d\u59dd\u7ebe\u6bf9\u8167\u6bb3\u956f\u79eb\u9e6c",
+    "SHUA": "\u5237\u800d\u5530\u6dae",
+    "SHUAI": "\u6454\u8870\u7529\u5e05\u87c0",
+    "SHUAN": "\u6813\u62f4\u95e9",
+    "SHUANG": "\u971c\u53cc\u723d\u5b40",
+    "SHUI": "\u8c01\u6c34\u7761\u7a0e",
+    "SHUN": "\u542e\u77ac\u987a\u821c\u6042",
+    "SHUO": "\u8bf4\u7855\u6714\u70c1\u84b4\u6420\u55cd\u6fef\u5981\u69ca\u94c4",
+    "SI": "\u65af\u6495\u5636\u601d\u79c1\u53f8\u4e1d\u6b7b\u8086\u5bfa\u55e3\u56db\u4f3a\u4f3c\u9972\u5df3\u53ae\u4fdf\u5155\u83e5\u549d\u6c5c\u6cd7\u6f8c\u59d2\u9a77\u7f0c\u7940\u7960\u9536\u9e36\u801c\u86f3\u7b25",
+    "SONG": "\u677e\u8038\u6002\u9882\u9001\u5b8b\u8bbc\u8bf5\u51c7\u83d8\u5d27\u5d69\u5fea\u609a\u6dde\u7ae6",
+    "SOU": "\u641c\u8258\u64de\u55fd\u53df\u55d6\u55fe\u998a\u6eb2\u98d5\u778d\u953c\u878b",
+    "SU": "\u82cf\u9165\u4fd7\u7d20\u901f\u7c9f\u50f3\u5851\u6eaf\u5bbf\u8bc9\u8083\u5919\u8c21\u850c\u55c9\u612b\u7c0c\u89eb\u7a23",
+    "SUAN": "\u9178\u849c\u7b97",
+    "SUI": "\u867d\u968b\u968f\u7ee5\u9ad3\u788e\u5c81\u7a57\u9042\u96a7\u795f\u84d1\u51ab\u8c07\u6fc9\u9083\u71e7\u772d\u7762",
+    "SUN": "\u5b59\u635f\u7b0b\u836a\u72f2\u98e7\u69ab\u8de3\u96bc",
+    "SUO": "\u68ad\u5506\u7f29\u7410\u7d22\u9501\u6240\u5522\u55e6\u5a11\u686b\u7743\u7fa7",
+    "TA": "\u584c\u4ed6\u5b83\u5979\u5854\u736d\u631e\u8e4b\u8e0f\u95fc\u6ebb\u9062\u69bb\u6c93",
+    "TAI": "\u80ce\u82d4\u62ac\u53f0\u6cf0\u915e\u592a\u6001\u6c70\u90b0\u85b9\u80bd\u70b1\u949b\u8dc6\u9c90",
+    "TAN": "\u574d\u644a\u8d2a\u762b\u6ee9\u575b\u6a80\u75f0\u6f6d\u8c2d\u8c08\u5766\u6bef\u8892\u78b3\u63a2\u53f9\u70ad\u90ef\u8548\u6619\u94bd\u952c\u8983",
+    "TANG": "\u6c64\u5858\u642a\u5802\u68e0\u819b\u5510\u7cd6\u50a5\u9967\u6e8f\u746d\u94f4\u9557\u8025\u8797\u87b3\u7fb0\u91a3",
+    "THANG": "\u5018\u8eba\u6dcc",
+    "THENG": "\u8d9f\u70eb",
+    "TAO": "\u638f\u6d9b\u6ed4\u7ee6\u8404\u6843\u9003\u6dd8\u9676\u8ba8\u5957\u6311\u9f17\u5555\u97ec\u9955",
+    "TE": "\u7279",
+    "TENG": "\u85e4\u817e\u75bc\u8a8a\u6ed5",
+    "TI": "\u68af\u5254\u8e22\u9511\u63d0\u9898\u8e44\u557c\u4f53\u66ff\u568f\u60d5\u6d95\u5243\u5c49\u8351\u608c\u9016\u7ee8\u7f07\u9e48\u88fc\u918d",
+    "TIAN": "\u5929\u6dfb\u586b\u7530\u751c\u606c\u8214\u8146\u63ad\u5fdd\u9617\u6b84\u754b\u94bf\u86ba",
+    "TIAO": "\u6761\u8fe2\u773a\u8df3\u4f7b\u7967\u94eb\u7a95\u9f86\u9ca6",
+    "TIE": "\u8d34\u94c1\u5e16\u841c\u992e",
+    "TING": "\u5385\u542c\u70c3\u6c40\u5ef7\u505c\u4ead\u5ead\u633a\u8247\u839b\u8476\u5a77\u6883\u8713\u9706",
+    "TONG": "\u901a\u6850\u916e\u77b3\u540c\u94dc\u5f64\u7ae5\u6876\u6345\u7b52\u7edf\u75db\u4f5f\u50ee\u4edd\u833c\u55f5\u6078\u6f7c\u783c",
+    "TOU": "\u5077\u6295\u5934\u900f\u4ea0",
+    "TU": "\u51f8\u79c3\u7a81\u56fe\u5f92\u9014\u6d82\u5c60\u571f\u5410\u5154\u580d\u837c\u83df\u948d\u9174",
+    "TUAN": "\u6e4d\u56e2\u7583",
+    "TUI": "\u63a8\u9893\u817f\u8715\u892a\u9000\u5fd2\u717a",
+    "TUN": "\u541e\u5c6f\u81c0\u9968\u66be\u8c5a\u7a80",
+    "TUO": "\u62d6\u6258\u8131\u9e35\u9640\u9a6e\u9a7c\u692d\u59a5\u62d3\u553e\u4e47\u4f57\u5768\u5eb9\u6cb1\u67dd\u7823\u7ba8\u8204\u8dce\u9f0d",
+    "WA": "\u6316\u54c7\u86d9\u6d3c\u5a03\u74e6\u889c\u4f64\u5a32\u817d",
+    "WAI": "\u6b6a\u5916",
+    "WAN": "\u8c4c\u5f2f\u6e7e\u73a9\u987d\u4e38\u70f7\u5b8c\u7897\u633d\u665a\u7696\u60cb\u5b9b\u5a49\u4e07\u8155\u525c\u8284\u82cb\u83c0\u7ea8\u7efe\u742c\u8118\u7579\u873f\u7ba2",
+    "WANG": "\u6c6a\u738b\u4ea1\u6789\u7f51\u5f80\u65fa\u671b\u5fd8\u5984\u7f54\u5c22\u60d8\u8f8b\u9b4d",
+    "WEI": "\u5a01\u5dcd\u5fae\u5371\u97e6\u8fdd\u6845\u56f4\u552f\u60df\u4e3a\u6f4d\u7ef4\u82c7\u840e\u59d4\u4f1f\u4f2a\u5c3e\u7eac\u672a\u851a\u5473\u754f\u80c3\u5582\u9b4f\u4f4d\u6e2d\u8c13\u5c09\u6170\u536b\u502d\u504e\u8bff\u9688\u8473\u8587\u5e0f\u5e37\u5d34\u5d6c\u7325\u732c\u95f1\u6ca9\u6d27\u6da0\u9036\u5a13\u73ae\u97ea\u8ece\u709c\u7168\u71a8\u75ff\u8249\u9c94",
+    "WEN": "\u761f\u6e29\u868a\u6587\u95fb\u7eb9\u543b\u7a33\u7d0a\u95ee\u520e\u6120\u960c\u6c76\u74ba\u97eb\u6b81\u96ef",
+    "WENG": "\u55e1\u7fc1\u74ee\u84ca\u8579",
+    "WO": "\u631d\u8717\u6da1\u7a9d\u6211\u65a1\u5367\u63e1\u6c83\u83b4\u5e44\u6e25\u674c\u809f\u9f8c",
+    "WU": "\u5deb\u545c\u94a8\u4e4c\u6c61\u8bec\u5c4b\u65e0\u829c\u68a7\u543e\u5434\u6bcb\u6b66\u4e94\u6342\u5348\u821e\u4f0d\u4fae\u575e\u620a\u96fe\u6664\u7269\u52ff\u52a1\u609f\u8bef\u5140\u4ef5\u9622\u90ac\u572c\u82b4\u5e91\u6003\u5fe4\u6d6f\u5be4\u8fd5\u59a9\u9a9b\u727e\u7110\u9e49\u9e5c\u8708\u92c8\u9f2f",
+    "XI": "\u6614\u7199\u6790\u897f\u7852\u77fd\u6670\u563b\u5438\u9521\u727a\u7a00\u606f\u5e0c\u6089\u819d\u5915\u60dc\u7184\u70ef\u6eaa\u6c50\u7280\u6a84\u88ad\u5e2d\u4e60\u5ab3\u559c\u94e3\u6d17\u7cfb\u9699\u620f\u7ec6\u50d6\u516e\u96b0\u90d7\u831c\u8478\u84f0\u595a\u550f\u5f99\u9969\u960b\u6d60\u6dc5\u5c63\u5b09\u73ba\u6a28\u66e6\u89cb\u6b37\u71b9\u798a\u79a7\u94b8\u7699\u7a78\u8725\u87cb\u823e\u7fb2\u7c9e\u7fd5\u91af\u9f37",
+    "XIA": "\u778e\u867e\u5323\u971e\u8f96\u6687\u5ce1\u4fa0\u72ed\u4e0b\u53a6\u590f\u5413\u6380\u846d\u55c4\u72ce\u9050\u7455\u7856\u7615\u7f45\u9ee0",
+    "XIAN": "\u9528\u5148\u4ed9\u9c9c\u7ea4\u54b8\u8d24\u8854\u8237\u95f2\u6d8e\u5f26\u5acc\u663e\u9669\u73b0\u732e\u53bf\u817a\u9985\u7fa1\u5baa\u9677\u9650\u7ebf\u51bc\u85d3\u5c98\u7303\u66b9\u5a34\u6c19\u7946\u9e47\u75eb\u86ac\u7b45\u7c7c\u9170\u8df9",
+    "XIANG": "\u76f8\u53a2\u9576\u9999\u7bb1\u8944\u6e58\u4e61\u7fd4\u7965\u8be6\u60f3\u54cd\u4eab\u9879\u5df7\u6a61\u50cf\u5411\u8c61\u8297\u8459\u9977\u5ea0\u9aa7\u7f03\u87d3\u9c9e\u98e8",
+    "XIAO": "\u8427\u785d\u9704\u524a\u54ee\u56a3\u9500\u6d88\u5bb5\u6dc6\u6653\u5c0f\u5b5d\u6821\u8096\u5578\u7b11\u6548\u54d3\u54bb\u5d24\u6f47\u900d\u9a81\u7ee1\u67ad\u67b5\u7b71\u7bab\u9b48",
+    "XIE": "\u6954\u4e9b\u6b47\u874e\u978b\u534f\u631f\u643a\u90aa\u659c\u80c1\u8c10\u5199\u68b0\u5378\u87f9\u61c8\u6cc4\u6cfb\u8c22\u5c51\u5055\u4eb5\u52f0\u71ee\u85a4\u64b7\u5ee8\u7023\u9082\u7ec1\u7f2c\u69ad\u698d\u6b59\u8e9e",
+    "XIN": "\u85aa\u82af\u950c\u6b23\u8f9b\u65b0\u5ffb\u5fc3\u4fe1\u8845\u56df\u99a8\u8398\u6b46\u94fd\u946b",
+    "XING": "\u661f\u8165\u7329\u60fa\u5174\u5211\u578b\u5f62\u90a2\u884c\u9192\u5e78\u674f\u6027\u59d3\u9649\u8347\u8365\u64e4\u60bb\u784e",
+    "XIONG": "\u5144\u51f6\u80f8\u5308\u6c79\u96c4\u718a\u828e",
+    "XIU": "\u4f11\u4fee\u7f9e\u673d\u55c5\u9508\u79c0\u8896\u7ee3\u83a0\u5cab\u9990\u5ea5\u9e3a\u8c85\u9af9",
+    "XU": "\u589f\u620c\u9700\u865a\u5618\u987b\u5f90\u8bb8\u84c4\u9157\u53d9\u65ed\u5e8f\u755c\u6064\u7d6e\u5a7f\u7eea\u7eed\u8bb4\u8be9\u5729\u84ff\u6035\u6d2b\u6e86\u987c\u6829\u7166\u7809\u76f1\u80e5\u7cc8\u9191",
+    "XUAN": "\u8f69\u55a7\u5ba3\u60ac\u65cb\u7384\u9009\u7663\u7729\u7eda\u5107\u8c16\u8431\u63ce\u9994\u6ceb\u6d35\u6e32\u6f29\u7487\u6966\u6684\u70ab\u714a\u78b9\u94c9\u955f\u75c3",
+    "XUE": "\u9774\u859b\u5b66\u7a74\u96ea\u8840\u5671\u6cf6\u9cd5",
+    "XUN": "\u52cb\u718f\u5faa\u65ec\u8be2\u5bfb\u9a6f\u5de1\u6b89\u6c5b\u8bad\u8baf\u900a\u8fc5\u5dfd\u57d9\u8340\u85b0\u5ccb\u5f87\u6d54\u66db\u7aa8\u91ba\u9c9f",
+    "YA": "\u538b\u62bc\u9e26\u9e2d\u5440\u4e2b\u82bd\u7259\u869c\u5d16\u8859\u6daf\u96c5\u54d1\u4e9a\u8bb6\u4f22\u63e0\u5416\u5c88\u8fd3\u5a05\u740a\u6860\u6c29\u7811\u775a\u75d6",
+    "YAN": "\u7109\u54bd\u9609\u70df\u6df9\u76d0\u4e25\u7814\u8712\u5ca9\u5ef6\u8a00\u989c\u960e\u708e\u6cbf\u5944\u63a9\u773c\u884d\u6f14\u8273\u5830\u71d5\u538c\u781a\u96c1\u5501\u5f66\u7130\u5bb4\u8c1a\u9a8c\u53a3\u9765\u8d5d\u4fe8\u5043\u5156\u8ba0\u8c33\u90fe\u9122\u82ab\u83f8\u5d26\u6079\u95eb\u960f\u6d07\u6e6e\u6edf\u598d\u5ae3\u7430\u664f\u80ed\u814c\u7131\u7f68\u7b75\u917d\u9b47\u990d\u9f39",
+    "YANG": "\u6b83\u592e\u9e2f\u79e7\u6768\u626c\u4f6f\u75a1\u7f8a\u6d0b\u9633\u6c27\u4ef0\u75d2\u517b\u6837\u6f3e\u5f89\u600f\u6cf1\u7080\u70ca\u6059\u86d8\u9785",
+    "YAO": "\u9080\u8170\u5996\u7476\u6447\u5c27\u9065\u7a91\u8c23\u59da\u54ac\u8200\u836f\u8981\u8000\u592d\u723b\u5406\u5d3e\u5fad\u7039\u5e7a\u73e7\u6773\u66dc\u80b4\u9e5e\u7a88\u7e47\u9cd0",
+    "YE": "\u6930\u564e\u8036\u7237\u91ce\u51b6\u4e5f\u9875\u6396\u4e1a\u53f6\u66f3\u814b\u591c\u6db2\u8c12\u90ba\u63f6\u9980\u6654\u70e8\u94d8",
+    "YI": "\u4e00\u58f9\u533b\u63d6\u94f1\u4f9d\u4f0a\u8863\u9890\u5937\u9057\u79fb\u4eea\u80f0\u7591\u6c82\u5b9c\u59e8\u5f5d\u6905\u8681\u501a\u5df2\u4e59\u77e3\u4ee5\u827a\u6291\u6613\u9091\u5c79\u4ebf\u5f79\u81c6\u9038\u8084\u75ab\u4ea6\u88d4\u610f\u6bc5\u5fc6\u4e49\u76ca\u6ea2\u8be3\u8bae\u8c0a\u8bd1\u5f02\u7ffc\u7fcc\u7ece\u5208\u5293\u4f7e\u8bd2\u572a\u572f\u57f8\u61ff\u82e1\u858f\u5f08\u5955\u6339\u5f0b\u5453\u54a6\u54bf\u566b\u5cc4\u5db7\u7317\u9974\u603f\u6021\u6092\u6f2a\u8fe4\u9a7f\u7f22\u6baa\u8d3b\u65d6\u71a0\u9487\u9552\u9571\u75cd\u7617\u7654\u7fca\u8864\u8734\u8223\u7fbf\u7ff3\u914f\u9edf",
+    "YIN": "\u8335\u836b\u56e0\u6bb7\u97f3\u9634\u59fb\u541f\u94f6\u6deb\u5bc5\u996e\u5c39\u5f15\u9690\u5370\u80e4\u911e\u5819\u831a\u5591\u72fa\u5924\u6c24\u94df\u763e\u8693\u972a\u9f88",
+    "YING": "\u82f1\u6a31\u5a74\u9e70\u5e94\u7f28\u83b9\u8424\u8425\u8367\u8747\u8fce\u8d62\u76c8\u5f71\u9896\u786c\u6620\u5b34\u90e2\u8314\u83ba\u8426\u6484\u5624\u81ba\u6ee2\u6f46\u701b\u745b\u748e\u6979\u9e66\u763f\u988d\u7f42",
+    "YO": "\u54df\u5537",
+    "YONG": "\u62e5\u4f63\u81c3\u75c8\u5eb8\u96cd\u8e0a\u86f9\u548f\u6cf3\u6d8c\u6c38\u607f\u52c7\u7528\u4fd1\u58c5\u5889\u6175\u9095\u955b\u752c\u9cd9\u9954",
+    "YOU": "\u5e7d\u4f18\u60a0\u5fe7\u5c24\u7531\u90ae\u94c0\u72b9\u6cb9\u6e38\u9149\u6709\u53cb\u53f3\u4f51\u91c9\u8bf1\u53c8\u5e7c\u5363\u6538\u4f91\u83b8\u5466\u56ff\u5ba5\u67da\u7337\u7256\u94d5\u75a3\u8763\u9c7f\u9edd\u9f2c",
+    "YU": "\u8fc2\u6de4\u4e8e\u76c2\u6986\u865e\u611a\u8206\u4f59\u4fde\u903e\u9c7c\u6109\u6e1d\u6e14\u9685\u4e88\u5a31\u96e8\u4e0e\u5c7f\u79b9\u5b87\u8bed\u7fbd\u7389\u57df\u828b\u90c1\u5401\u9047\u55bb\u5cea\u5fa1\u6108\u6b32\u72f1\u80b2\u8a89\u6d74\u5bd3\u88d5\u9884\u8c6b\u9a6d\u79ba\u6bd3\u4f1b\u4fe3\u8c00\u8c15\u8438\u84e3\u63c4\u5581\u5704\u5709\u5d5b\u72f3\u996b\u5ebe\u9608\u59aa\u59a4\u7ea1\u745c\u6631\u89ce\u8174\u6b24\u65bc\u715c\u71e0\u807f\u94b0\u9e46\u7610\u7600\u7ab3\u8753\u7afd\u8201\u96e9\u9f89",
+    "YUAN": "\u9e33\u6e0a\u51a4\u5143\u57a3\u8881\u539f\u63f4\u8f95\u56ed\u5458\u5706\u733f\u6e90\u7f18\u8fdc\u82d1\u613f\u6028\u9662\u586c\u6c85\u5a9b\u7457\u6a7c\u7230\u7722\u9e22\u8788\u9f0b",
+    "YUE": "\u66f0\u7ea6\u8d8a\u8dc3\u94a5\u5cb3\u7ca4\u6708\u60a6\u9605\u9fa0\u6a3e\u5216\u94ba",
+    "YUN": "\u8018\u4e91\u90e7\u5300\u9668\u5141\u8fd0\u8574\u915d\u6655\u97f5\u5b55\u90d3\u82b8\u72c1\u607d\u7ead\u6b92\u6600\u6c32",
+    "ZA": "\u531d\u7838\u6742\u62f6\u5482",
+    "ZAI": "\u683d\u54c9\u707e\u5bb0\u8f7d\u518d\u5728\u54b1\u5d3d\u753e",
+    "ZAN": "\u6512\u6682\u8d5e\u74d2\u661d\u7c2a\u7ccc\u8db1\u933e",
+    "ZANG": "\u8d43\u810f\u846c\u5958\u6215\u81e7",
+    "ZAO": "\u906d\u7cdf\u51ff\u85fb\u67a3\u65e9\u6fa1\u86a4\u8e81\u566a\u9020\u7682\u7076\u71e5\u5523\u7f2b",
+    "ZE": "\u8d23\u62e9\u5219\u6cfd\u4ec4\u8d5c\u5567\u8fee\u6603\u7b2e\u7ba6\u8234",
+    "ZEI": "\u8d3c",
+    "ZEN": "\u600e\u8c2e",
+    "ZENG": "\u589e\u618e\u66fe\u8d60\u7f2f\u7511\u7f7e\u9503",
+    "ZHA": "\u624e\u55b3\u6e23\u672d\u8f67\u94e1\u95f8\u7728\u6805\u69a8\u548b\u4e4d\u70b8\u8bc8\u63f8\u5412\u54a4\u54f3\u600d\u781f\u75c4\u86b1\u9f44",
+    "ZHAI": "\u6458\u658b\u5b85\u7a84\u503a\u5be8\u7826",
+    "ZHAN": "\u77bb\u6be1\u8a79\u7c98\u6cbe\u76cf\u65a9\u8f97\u5d2d\u5c55\u8638\u6808\u5360\u6218\u7ad9\u6e5b\u7efd\u8c35\u640c\u65c3",
+    "ZHANG": "\u6a1f\u7ae0\u5f70\u6f33\u5f20\u638c\u6da8\u6756\u4e08\u5e10\u8d26\u4ed7\u80c0\u7634\u969c\u4ec9\u9123\u5e5b\u5d82\u7350\u5adc\u748b\u87d1",
+    "ZHAO": "\u62db\u662d\u627e\u6cbc\u8d75\u7167\u7f69\u5146\u8087\u53ec\u722a\u8bcf\u68f9\u948a\u7b0a",
+    "ZHE": "\u906e\u6298\u54f2\u86f0\u8f99\u8005\u9517\u8517\u8fd9\u6d59\u8c2a\u966c\u67d8\u8f84\u78d4\u9e67\u891a\u8707\u8d6d",
+    "ZHEN": "\u73cd\u659f\u771f\u7504\u7827\u81fb\u8d1e\u9488\u4fa6\u6795\u75b9\u8bca\u9707\u632f\u9547\u9635\u7f1c\u6862\u699b\u8f78\u8d48\u80d7\u6715\u796f\u755b\u9e29",
+    "ZHENG": "\u84b8\u6323\u7741\u5f81\u72f0\u4e89\u6014\u6574\u62ef\u6b63\u653f\u5e27\u75c7\u90d1\u8bc1\u8be4\u5ce5\u94b2\u94ee\u7b5d",
+    "ZHI": "\u829d\u679d\u652f\u5431\u8718\u77e5\u80a2\u8102\u6c41\u4e4b\u7ec7\u804c\u76f4\u690d\u6b96\u6267\u503c\u4f84\u5740\u6307\u6b62\u8dbe\u53ea\u65e8\u7eb8\u5fd7\u631a\u63b7\u81f3\u81f4\u7f6e\u5e1c\u5cd9\u5236\u667a\u79e9\u7a1a\u8d28\u7099\u75d4\u6ede\u6cbb\u7a92\u536e\u965f\u90c5\u57f4\u82b7\u646d\u5e19\u5fee\u5f58\u54ab\u9a98\u6809\u67b3\u6800\u684e\u8f75\u8f7e\u6534\u8d3d\u81a3\u7949\u7957\u9ef9\u96c9\u9e37\u75e3\u86ed\u7d77\u916f\u8dd6\u8e2c\u8e2f\u8c78\u89ef",
+    "ZHONG": "\u4e2d\u76c5\u5fe0\u949f\u8877\u7ec8\u79cd\u80bf\u91cd\u4ef2\u4f17\u51a2\u953a\u87bd\u8202\u822f\u8e35",
+    "ZHOU": "\u821f\u5468\u5dde\u6d32\u8bcc\u7ca5\u8f74\u8098\u5e1a\u5492\u76b1\u5b99\u663c\u9aa4\u5544\u7740\u501c\u8bf9\u836e\u9b3b\u7ea3\u80c4\u78a1\u7c40\u8233\u914e\u9cb7",
+    "ZHU": "\u73e0\u682a\u86db\u6731\u732a\u8bf8\u8bdb\u9010\u7af9\u70db\u716e\u62c4\u77a9\u5631\u4e3b\u8457\u67f1\u52a9\u86c0\u8d2e\u94f8\u7b51\u4f4f\u6ce8\u795d\u9a7b\u4f2b\u4f8f\u90be\u82ce\u8331\u6d19\u6e1a\u6f74\u9a7a\u677c\u69e0\u6a65\u70b7\u94e2\u75b0\u7603\u86b0\u7afa\u7bb8\u7fe5\u8e85\u9e88",
+    "ZHUA": "\u6293",
+    "ZHUAI": "\u62fd",
+    "ZHUAN": "\u4e13\u7816\u8f6c\u64b0\u8d5a\u7bc6\u629f\u556d\u989b",
+    "ZHUANG": "\u6869\u5e84\u88c5\u5986\u649e\u58ee\u72b6\u4e2c",
+    "ZHUI": "\u690e\u9525\u8ffd\u8d58\u5760\u7f00\u8411\u9a93\u7f12",
+    "ZHUN": "\u8c06\u51c6",
+    "ZHUO": "\u6349\u62d9\u5353\u684c\u7422\u8301\u914c\u707c\u6d4a\u502c\u8bfc\u5ef4\u855e\u64e2\u555c\u6d5e\u6dbf\u6753\u712f\u799a\u65ab",
+    "ZI": "\u5179\u54a8\u8d44\u59ff\u6ecb\u6dc4\u5b5c\u7d2b\u4ed4\u7c7d\u6ed3\u5b50\u81ea\u6e0d\u5b57\u8c18\u5d6b\u59ca\u5b73\u7f01\u6893\u8f8e\u8d40\u6063\u7726\u9531\u79ed\u8014\u7b2b\u7ca2\u89dc\u8a3e\u9cbb\u9aed",
+    "ZONG": "\u9b03\u68d5\u8e2a\u5b97\u7efc\u603b\u7eb5\u8159\u7cbd",
+    "ZOU": "\u90b9\u8d70\u594f\u63cd\u9139\u9cb0",
+    "ZU": "\u79df\u8db3\u5352\u65cf\u7956\u8bc5\u963b\u7ec4\u4fce\u83f9\u5550\u5f82\u9a75\u8e74",
+    "ZUAN": "\u94bb\u7e82\u6525\u7f35",
+    "ZUI": "\u5634\u9189\u6700\u7f6a",
+    "ZUN": "\u5c0a\u9075\u6499\u6a3d\u9cdf",
+    "ZUO": "\u6628\u5de6\u4f50\u67de\u505a\u4f5c\u5750\u5ea7\u961d\u963c\u80d9\u795a\u9162",
+    "COU": "\u85ae\u6971\u8f8f\u8160",
+    "NANG": "\u652e\u54dd\u56d4\u9995\u66e9",
+    "O": "\u5594",
+    "DIA": "\u55f2",
+    "CHUAI": "\u562c\u81aa\u8e39",
+    "CEN": "\u5c91\u6d94",
+    "DIU": "\u94e5",
+    "NOU": "\u8028",
+    "FOU": "\u7f36",
+    "BIA": "\u9adf"
 };
 
 function ConvertPinyin(l1) {

src/main/webapp/static/js/recordManage/commomSearch/commomList.js

@@ -101,7 +101,7 @@ function getSql(){
 	var inputValue = getInputValue();
 	if(inputValue != ''){
 		//select语句字符串
-		var selectNames = 'select ' + commomtable + '.patient_id,CASE WHEN emr_apply_approve.id is null THEN 0 ELSE 1 END isShowDetail,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,archive_master.checked_datetime,';
+		var selectNames = 'select ' + commomtable + '.patient_id,CASE WHEN emr_apply_approve.id is null THEN 0 ELSE 1 END isShowDetail,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,';
 		selectNames += $("#englishFields").val();
 		//from语句字符串
 		var fromTableNames = ' from ';

src/main/webapp/static/js/recordManage/commomSearch/commomListBlood.js

@@ -5,7 +5,73 @@ $(function () {
 	})
 	//加载表格
 	freshTable();
+	//权限控制按钮
+	permissionControlButton();
+	//加载协议类型和脐血状态
+	loadBloodAndAgree();
 });
+//权限控制按钮
+function permissionControlButton() {
+	var show = $("#showRecord").val();
+	var load = $("#downloadRecord").val();
+	//批量借阅申请权限判断
+	if (show == 1) {
+		$("#borrowingsBox").hide();
+	} else {
+		$("#borrowingsBox").show();
+	}
+	//批量下载申请权限判断
+	if (load == 1) {
+		$("#downBorrowingsBox").hide();//批量下载申请按钮不显示
+		$("#downBorrowingBox").show();//下载按钮显示
+	} else {
+		$("#downBorrowingsBox").show();//批量下载申请按钮显示
+		$("#downBorrowingBox").hide();//下载按钮不显示
+	}
+}
+//加载协议类型和脐血状态
+function loadBloodAndAgree(){
+	$.ajax({
+		type:'get',
+		url:path+"/blood/selectAll",
+		dataType:'json',
+		success:function(data){
+			if(data.code == 0){
+				var result = data.data;
+				//脐血状态html
+				var bloodHtml = '<option value="">不限</option>';
+				//协议类型html
+				var agreeHtml = '<option value="">不限</option>';
+				//脐血状态1html
+				var bloodHtml1 = '';
+				//协议类型1html
+				var agreeHtml1 = '';
+				for (var i = 0; i < result.length; i++) {
+					var code = result[i].code;
+					var name = result[i].name;
+					var initialsSimplified = result[i].initialsSimplified;
+					var chineseSimplified = result[i].chineseSimplified;
+					if(code == 'blood'){
+						bloodHtml += '<option data-tokens="' + name + '|' + initialsSimplified + '|' + chineseSimplified + '" value="' + name + '">' + name + '</option>';
+						bloodHtml1 += '<option  value="' + name + '">' + name + '</option>';
+					}else{
+						agreeHtml += '<option data-tokens="' + name + '|' + initialsSimplified + '|' + chineseSimplified + '" value="' + name + '">' + name + '</option>';
+						agreeHtml1 += '<option  value="' + name + '">' + name + '</option>';
+					}
+				}
+				//刷新多选
+				$("#main_diag_code").append(bloodHtml);
+				$("#main_diag_code").selectpicker('refresh');
+				$("#main_diag_name").append(agreeHtml);
+				$("#main_diag_name").selectpicker('refresh');
+				$("#main_diag_code1").append(bloodHtml1);
+				$("#main_diag_name1").append(agreeHtml1);
+			}else{
+				toastr.warning("查询协议状态出错了,请联系系统管理员")
+			}
+		}
+	})
+}
 
 //时间格式属性名集合
 var commomtable = 'commomtable';
@@ -89,45 +155,30 @@ function getSql(){
 				whereNames += commomtable+"."+name+" LIKE '%"+$("#"+name).val()+"%' AND ";
 			}
 		}
-		//病案号
+		//脐血编号
 		var inpatientNo = $("#inpatient_no").val();
 		if(inpatientNo != ''){
-			name = 'inpatient_no';
-			inpatientNo = inpatientNo.replace(/(^\s*)|(\s*$)/g, "");
-			//1.逗号隔开
-			if(inpatientNo.indexOf(",")!=-1 || inpatientNo.indexOf("，")!=-1){
-				if(inpatientNo.indexOf(",")!=-1){
-					inpatientNo = inpatientNo.split(",");
-				}else if(inpatientNo.indexOf("，")!=-1){
-					inpatientNo = inpatientNo.split("，");
-				}
-				for (var i = 0; i < inpatientNo.length; i++) {
-					if(inpatientNo[i] != ''){
-						//拼接前括号
-						if(i == 0){
-							whereNames += "(";
-						}
-						if(i != inpatientNo.length-1){
-							whereNames += commomtable+"."+name+" LIKE '%"+inpatientNo[i]+"%' OR ";
-						}else{
-							whereNames += commomtable+"."+name+" LIKE '%"+inpatientNo[i]+"%')";
-						}
-					}
-				}
-				whereNames += " AND ";
-			}else{
-				whereNames += commomtable+"."+name+" LIKE '%"+$("#"+name).val()+"%' AND ";
-			}
+			whereNames = searchWhere(inpatientNo,'inpatient_no',whereNames);
 		}
-		//ID号
-		if($("#admiss_id").val() != ''){
-			name = 'admiss_id';
-			whereNames += commomtable+"."+name+" LIKE '%"+$("#"+name).val()+"%' AND ";
+		//协议号
+		var admissId = $("#admiss_id").val();
+		if(admissId != ''){
+			whereNames = searchWhere(admissId,'admiss_id',whereNames);
 		}
-		//病状转归
-		if($("#dis_thing").val() != ''){
-			name = 'main_dis_thing';
-			whereNames += commomtable+"."+name+" like '%"+$("#dis_thing").val()+"%' AND ";
+		//协议类型
+		var mainDiagName = $("#main_diag_name").val();
+		if(mainDiagName != ''){
+			whereNames = searchWhere(mainDiagName,'main_diag_name',whereNames);
+		}
+		//脐血状态
+		var mainDiagCode = $("#main_diag_code").val();
+		if(mainDiagCode != ''){
+			whereNames = searchWhere(mainDiagCode,'main_diag_code',whereNames);
+		}
+		//身份证号
+		var mainDisThing = $("#main_dis_thing").val();
+		if(mainDisThing != ''){
+			whereNames = searchWhere(mainDisThing,'main_dis_thing',whereNames);
 		}
 		var userName = "'" +$("#userId").val()+ "'";
 		fromTableNames += ' left join emr_apply_approve on ' + commomtable + '.patient_id = emr_apply_approve.patient_id and emr_apply_approve.apply_type != 3' +
@@ -147,16 +198,41 @@ function getSql(){
 		$("#sql").val("");
 	}
 }
+//组织各个搜索字段
+function searchWhere(searchValue,columnName,whereNames){
+	searchValue = searchValue.replace(/(^\s*)|(\s*$)/g, "");
+	//1.逗号隔开
+	if(searchValue.indexOf(",")!=-1 || searchValue.indexOf("，")!=-1){
+		if(searchValue.indexOf(",")!=-1){
+			searchValue = searchValue.split(",");
+		}else if(searchValue.indexOf("，")!=-1){
+			searchValue = searchValue.split("，");
+		}
+		for (var i = 0; i < searchValue.length; i++) {
+			if(searchValue[i] != ''){
+				//拼接前括号
+				if(i == 0){
+					whereNames += "(";
+				}
+				if(i != searchValue.length-1){
+					whereNames += "commomtable."+columnName+" LIKE '%"+searchValue[i]+"%' OR ";
+				}else{
+					whereNames += "commomtable."+columnName+" LIKE '%"+searchValue[i]+"%')";
+				}
+			}
+		}
+		whereNames += " AND ";
+	}else{
+		whereNames += "commomtable."+columnName+" LIKE '%"+$("#"+columnName).val()+"%' AND ";
+	}
+	return whereNames;
+}
+
 //搜索功能
 function search() {
 	getSql();
 	freshTable();
 }
-//查看详情
-function showDetail(patientId){
-	//隐藏模板选项
-	//window.location.href=path+"/commom/showRecord?patientId="+patientId;
-}
 //导出excel功能
 function exportExcel(){
     var checks = $("#checks").val();
@@ -165,7 +241,7 @@ function exportExcel(){
 	}else {
 		getSql();
 		var userName = "'" + $("#userName").val() + "'";
-		var sql1 = "select  commomtable.patient_id,CASE WHEN emr_apply_approve.id is null THEN 0 ELSE 1 END isShowDetail,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,commomtable.inpatient_no,commomtable.admiss_id,commomtable.name,commomtable.main_dis_thing from commomtable left join emr_apply_approve on commomtable.patient_id = emr_apply_approve.patient_id and emr_apply_approve.approve_state = 1 and emr_apply_approve.effe_time > GETDATE()-1 and emr_apply_approve.applyer = " +userName+ " left join emr_lock on commomtable.patient_id = emr_lock.patient_id and emr_lock.lock_state = 1";
+		var sql1 = "select  commomtable.patient_id,CASE WHEN emr_apply_approve.id is null THEN 0 ELSE 1 END isShowDetail,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,commomtable.inpatient_no,commomtable.admiss_id,commomtable.name,commomtable.main_dis_thing,commomtable.main_diag_name,commomtable.main_diag_code from commomtable left join emr_apply_approve on commomtable.patient_id = emr_apply_approve.patient_id and emr_apply_approve.approve_state = 1 and emr_apply_approve.effe_time > GETDATE()-1 and emr_apply_approve.applyer = " +userName+ " left join emr_lock on commomtable.patient_id = emr_lock.patient_id and emr_lock.lock_state = 1";
 		var sql = $("#sql").val();
 		if(sql == ''){
 			sql = sql1;
@@ -333,3 +409,89 @@ function setLocation(id){
 	popNode.style.left = left+"px";
 	document.getElementById(id+"Content_table").style.width=width+"px";
 }
+/*********************************新建档案开始********************************/
+//监听关闭模态框刷新事件
+$('#myModal2').on('hide.bs.modal', function () {
+	window.location.reload();
+});
+//新建档案按钮
+function addRecord(){
+	setFormToken();
+	$("#patientId").val("");
+	menu.loadMenuTree();
+}
+function addRecordBlood(){
+	var inpatientNo = $("#inpatientNo").val();
+	var name = $("#name1").val();
+	if(inpatientNo == ''){
+		toastr.warning("脐血编号不能为空");
+		$("#inpatientNo").val("");
+		$("#inpatientNo").focus();
+	}else{
+		if(name == ''){
+			toastr.warning("孕妇姓名不能为空");
+			$("#name").val("");
+			$("#name").focus();
+		}else{
+			$.ajax({
+				type:'post',
+				url:path+"/commom/addRecord",
+				data:$("#addRecordForm").serialize(),
+				dataType:'json',
+				success:function(data){
+					if(data.code == 0){
+						toastr.success("添加成功");
+					}else{
+						toastr.error(data.msg);
+					}
+				}
+			})
+		}
+	}
+}
+//树操作
+//树操作
+var menu = {
+	setting: {
+		view:{
+			fontCss : {"font-family": "微软雅黑","color":"blue"}
+		},
+		data:{
+			key:{
+				name:"assortName"
+			},
+			simpleData: {
+				enable: true,
+				idKey: "assortId",
+				pIdKey: "printFlag",
+			},
+		},
+		callback: { //回调函数
+			onClick:onClick}
+	},
+	loadMenuTree:function(){
+		$.ajax({
+			type: "post",
+			url:path+"/commom/selectRecordTree",
+			dataType:"json",
+			success:function(data){
+				if(data != null){
+					$.fn.zTree.init($("#ztree"), menu.setting, data);
+					zTree = $.fn.zTree.getZTreeObj("ztree");
+					var nodes = zTree.getNodes();
+					//展开第一个
+					zTree.expandNode(nodes[0], true, false, true);
+				}
+			}
+		})
+	}
+};
+//树点击事件
+function onClick(e,treeId,treeNode) {
+	//选中节点时
+	//图片集合
+	var scanPageList = treeNode.scanPageList;
+	var srcs = treeNode.srcs;
+	var assortNames = treeNode.assortNames;
+};
+/*********************************新建档案结束********************************/

src/main/webapp/static/js/recordManage/commomSearch/showRecord.js

@@ -63,7 +63,7 @@ function loadRecord(){
 				$("#disDate").val(data.disDate);
 				$("#disDeptName").val(data.disDept);
 				$("#diagName").val(data.mainDiagName);
-				$("#otherDiagName").val(data.otherDiagName);
+				//$("#otherDiagName").val(data.otherDiagName);
 			}
 		}
 	})

src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js

@@ -63,7 +63,7 @@ function loadRecord(){
 				$("#disDate").val(data.disDate);
 				$("#disDeptName").val(data.disDept);
 				$("#diagName").val(data.mainDiagName);
-				$("#otherDiagName").val(data.otherDiagName);
+				//$("#otherDiagName").val(data.otherDiagName);
 			}
 		}
 	})

src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.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;
-	}
-}
 //树操作
 var menu = {
 	setting: {
@@ -24,7 +6,7 @@ var menu = {
 		},
 		data:{
 			key:{
-				name:"assortName"
+				name:"newName"
 			},
 			simpleData: {
 				chkStyle: "checkbox",
@@ -37,7 +19,8 @@ var menu = {
 			enable:true
 		},
 		callback: { //回调函数
-			onCheck: onCheck }
+			onCheck: onCheck,
+			onClick:onClick}
 	},
 	loadMenuTree:function(){
 		$.ajax({
@@ -48,15 +31,22 @@ var menu = {
 			success:function(data){
 				$("#assortIds").val("");
 				if(data != null){
+					//图片相对路径集合
 					var assortIds = '';
+					//图片来源集合
+					var sources = '';
 					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+",";
+							assortIds +=  data[i].assortName+",";
+							sources += data[i].source + ",";
 						}
 					}
+					//去掉后面逗号
 					if(assortIds != ''){
 						assortIds = assortIds.substring(0,assortIds.length-1);
 						$("#assortIds").val(assortIds);
+						sources = sources.substring(0,sources.length-1);
+						$("#sources").val(sources);
 					}
 					$.fn.zTree.init($("#ztree"), menu.setting, data);
 					zTree = $.fn.zTree.getZTreeObj("ztree");
@@ -74,46 +64,45 @@ var menu = {
 //加载树
 $().ready(function(data){
 	menu.loadMenuTree();
-	//loadFilePath();
 });
 
-//加载图片根路径
-function loadFilePath(){
-	$.ajax({
-		type:'get',
-		url:path+'/commom/getFilePath',
-		data:{patientId:$("#patientId").val()},
-		async:false,
-		dataType:'json',
-		success:function(data){
-			if(data.code == 0){
-				$("#filePath").val(data.data.homeAddr);
-			}else{
-				toastr.error(data.msg);
-			}
-		}
-	})
-}
-
 //树选中事件
 function onCheck(e, treeId, treeNode) {
 	var treeObj=$.fn.zTree.getZTreeObj("ztree");
 	nodes=treeObj.getCheckedNodes(true);
 	var assortIds = '';
+	var sources = '';
 	for (var i = 0; i < nodes.length; i++) {
 		if(nodes[i].level == 2){
-			if(i == 0){
-				assortIds = nodes[i].assortName+",";
+			if(i != (nodes.length-1)){
+				assortIds += nodes[i].assortName+",";
+				sources += + nodes[i].source+",";
 			}else{
-				if(i != (nodes.length-1)){
-					assortIds += nodes[i].assortName+",";
-				}else{
-					assortIds += nodes[i].assortName;
-				}
+				assortIds +=  nodes[i].assortName + "";
+				sources += nodes[i].source;
 			}
 		}
 	}
 	$("#assortIds").val(assortIds);
+	$("#sources").val(sources);
+};
+
+//树点击事件
+function onClick(e, treeId, treeNode) {
+	var treeLevel = treeNode.level;
+	//选中图片节点时
+	if(treeLevel == 2){
+		//加载pdf
+		var patientId = $("#patientId").val();
+		//图片集合
+		var scanPages = treeNode.assortName;
+		//来源集合
+		var sources = treeNode.source;
+		//根目录字段识别名称
+		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));
+	}
 };
 //打印分类变更事件
 $("#typeId").change(function(){
@@ -122,10 +111,14 @@ $("#typeId").change(function(){
 //加载pdf按钮功能
 function onloadPdf(){
 	var patientId = $("#patientId").val();
-	var filePath = $("#filePath").val();
-	var assortIds = $("#assortIds").val()+".emr_record";
-	var flag = $("#flag").val();
-	$("#iframe1").attr("src",path+"/static/pdfjs/web/viewer1.html?file="+path+"/commom/showRecordContentBlood/"+flag+"/"+patientId+"/"+assortIds);
+	//图片集合
+	var scanPages = $("#assortIds").val();
+	//来源集合
+	var sources = $("#sources").val();
+	//根目录字段识别名称
+	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));
 }
 //下载pdf按钮功能
 function onloadJpgForPdf(){
@@ -140,7 +133,7 @@ function onloadJpgForPdf(){
             if (reselt) {
                 var patientId = "'" + $("#patientId").val() + "'";
                 var assortIds = $("#assortIds").val();
-                var flag = $("#flag").val();
+                var flag = parent.$("#flag").val();
                 post(path + '/template/downloadPdfBlood', {
                     "patientIds": patientId,
                     "assortIds": assortIds,
@@ -151,31 +144,7 @@ function onloadJpgForPdf(){
         }
     })
 }
-//记录打印记录
-function printInfoBlood(){
-	var patientId = "'"+$("#patientId").val()+"'";
-	var assortIds = $("#assortIds").val();
-	var typeId = $("#typeId").val();
-	if(typeId == undefined){
-		typeId = '';
-	}
-	var flag = $("#flag").val();
-	$.ajax({
-		type:'post',
-		url:path+'/template/printInfoBlood',
-		data:{"patientIds":patientId,"assortIds":assortIds,"typeId":typeId,"flag":flag},
-		dataType:'json',
-		success:function(data){
-			if(data.code == 0){
-				toastr.success("打印成功")
-			}else{
-				toastr.success(data.msg)
-			}
-		}
-	})
-	//post(path+'/template/printInfoBlood',{"patientIds":patientId,"assortIds":assortIds,"typeId":typeId,"flag":flag});
-}
-//确定按钮功能
+//重新归页确定按钮功能
 function sure(){
 	Common.confirm({
 		title: "提示",
@@ -191,7 +160,7 @@ function sure(){
 						$.ajax({
 							type: 'post',
 							url: path + '/commom/updateScanAssortByBlood',
-							data: {patientId: patientId, assortIds: assortIds,newAssortId: newAssortId},
+							data: {patientId: patientId, name:parent.$("#name").val(),assortIds: assortIds,newAssortId: newAssortId},
 							dataType: 'json',
 							success: function (data) {
 								if (data.code == 0) {
@@ -211,10 +180,11 @@ function sure(){
 		}
 	})
 }
+//删除图片
 function delPic(){
 	Common.confirm({
 		title: "提示",
-		message: "确认将左侧树选中的图片删除,删除就不可恢复?",
+		message: "确认将左侧树选中的图片删除?",
 		operate: function (reselt) {
 			if (reselt) {
 				var patientId = $("#patientId").val();
@@ -223,7 +193,7 @@ function delPic(){
 					$.ajax({
 						type: 'post',
 						url: path + '/commom/delScanAssortByBlood',
-						data: {patientId: patientId, assortIds: assortIds},
+						data: {patientId: patientId, name:parent.$("#name").val(),assortIds: assortIds},
 						dataType: 'json',
 						success: function (data) {
 							if (data.code == 0) {
@@ -238,39 +208,45 @@ function delPic(){
 		}
 	})
 }
-/*
-//确定按钮功能
-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("要重新分页，需选中其中下拉框其中一项！")
-				}
+
+//记录打印记录
+function printInfoBlood(){
+	var patientId = "'"+$("#patientId").val()+"'";
+	var assortIds = $("#assortIds").val();
+	var typeId = $("#typeId").val();
+	if(typeId == undefined){
+		typeId = '';
+	}
+	var flag = $("#flag").val();
+	$.ajax({
+		type:'post',
+		url:path+'/template/printInfoBlood',
+		data:{"patientIds":patientId,"assortIds":assortIds,"typeId":typeId,"flag":flag},
+		dataType:'json',
+		success:function(data){
+			if(data.code == 0){
+				toastr.success("打印成功")
+			}else{
+				toastr.success(data.msg)
 			}
 		}
 	})
-}*/
+}
+//屏蔽鼠标右键
+// 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;
+	}
+}

src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethod.js

@@ -193,7 +193,7 @@ function freshTable(){
 		onPageChange: function(num, type) {
 			pageNumber = num;
 		},
-		/*//选中单个复选框
+		//选中单个复选框
 		onCheck:function(row){
 			var checks = $("#checks").val();
 			$("#checks").val(checks+="'"+row.patientId + "',");
@@ -217,7 +217,7 @@ function freshTable(){
 		//全不选
 		onUncheckAll: function (rows) {
 			$("#checks").val("");
-		},*/
+		},
 
 		//双击事件
 		onDblClickRow: function (row) {
@@ -295,8 +295,6 @@ function getChecked(){
 			checks+="'"+idlist[i].patientId + "',";
 		}
 		$("#checks").val(checks);
-	}else{
-		$("#checks").val("");
 	}
 }
 function reLoadTable(){
@@ -596,6 +594,7 @@ function borrowings(){
 	document.forms[1].reset();
 	$("#approveId").val("");
 	getChecked();
+	debugger
 	if($("#checks").val() == ''){
 		//搜索框值不能为空
 		var flag = true;

src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js

@@ -129,7 +129,7 @@ function freshTable() {
     var sql = $("#sql").val();
     if (sql == '') {
         var userName = "'" + $("#userName").val() + "'";
-        sql = "select distinct commomtable.patient_id,CASE WHEN emr_apply_approve.id is null THEN 0 ELSE 1 END isShowDetail,CASE WHEN emr_apply_approve1.id is null THEN 0 ELSE 1 END isDownload,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,commomtable.inpatient_no,commomtable.admiss_id,commomtable.name,commomtable.main_dis_thing from commomtable "
+        sql = "select distinct commomtable.patient_id,CASE WHEN emr_apply_approve.id is null THEN 0 ELSE 1 END isShowDetail,CASE WHEN emr_apply_approve1.id is null THEN 0 ELSE 1 END isDownload,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,commomtable.inpatient_no,commomtable.admiss_id,commomtable.name,commomtable.main_dis_thing,commomtable.main_diag_name,commomtable.main_diag_code from commomtable "
             + "left join emr_apply_approve on commomtable.patient_id = emr_apply_approve.patient_id and emr_apply_approve.apply_type != 3 and emr_apply_approve.approve_state = 1 and emr_apply_approve.effe_time > GETDATE()-1 and emr_apply_approve.applyer = " + userName
             + "left join emr_apply_approve emr_apply_approve1 on commomtable.patient_id = emr_apply_approve1.patient_id and emr_apply_approve1.apply_type = 3 and emr_apply_approve1.approve_state = 1 and emr_apply_approve1.effe_time > GETDATE()-1 and emr_apply_approve1.applyer = " + userName
             + " left join emr_lock on commomtable.patient_id = emr_lock.patient_id and emr_lock.lock_state = 1";
@@ -141,7 +141,7 @@ function freshTable() {
     } else {
         flag = false;
     }
-    //sql += orderBys;
+    sql += orderBys;
     //生成用户数据
     $('#mytab').bootstrapTable({
         method: 'post',

src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js

@@ -72,6 +72,7 @@ $(document).keydown(function (event) {
 	}
 });
 function freshTable(){
+	var powerMenus = $("#powerMenus").val();
 	var powerMenus = $("#powerMenus").val().substring(1,$("#powerMenus").val().length-1);
 	var powerMenusArr = powerMenus.split(", ");
 	for (var i = 0; i < powerMenusArr.length; i++){

src/main/webapp/static/js/udpatePic/imgUp.js

@@ -11,11 +11,8 @@ $(function(){
 		var file = document.getElementById(idFile);
 		var imgContainer = $(this).parents(".z_photo"); //存放图片的父亲元素
 		var fileList = file.files; //获取的图片文件
-		var input = $(this).parent();//文本框的父亲元素
 		var imgArr = [];
 		//遍历得到的图片文件
-		var numUp = imgContainer.find(".up-section").length;
-		var totalNum = numUp + fileList.length;  //总的数量
 		fileList = validateUp(fileList);
 		for(var i = 0;i<fileList.length;i++){
 		 var imgUrl = window.URL.createObjectURL(fileList[i]);
@@ -48,7 +45,6 @@ $(function(){
              $(".up-section").removeClass("loading");
 		 	 $(".up-img").removeClass("up-opcity");
 		 },450);
-		 numUp = imgContainer.find(".up-section").length;
 	});
 
 
@@ -60,7 +56,6 @@ $(function(){
 	//删除确认
 	$(".wsdel-ok").click(function(){
 		$(".works-mask").hide();
-		var numUp = delParent.siblings().length;
 		//获取删除的该文件名
 		var filename = delParent.prevObject.attr("data-filename");
 		 delParent.remove();