潮州人医根据身份证查询

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

@@ -141,7 +141,7 @@ public class FontShowRecordController {
             if (StringUtils.isNotBlank(inpatientNo) || StringUtils.isNotBlank(idCard)) {
                 int commomMaster = commomMapper.selectAllMaster(inpatientNo, idCard);
                 int commom = commomMapper.isExistInpatientOrAdmissIdOridCard(inpatientNo, idCard, null, null);
-                if (commom == 0 && commomMaster==0) {
+                if (commom == 0 && commomMaster == 0) {
                     model.addAttribute("msg", "病案不存在!");
                     return "font/msg";
                 }
@@ -708,11 +708,7 @@ public class FontShowRecordController {
                     String pdfName = "档案管理PDF";
                     //根据图片路径转换pdf
                     EmrPdfWaterSet emrPdfWaterSet = pdfWaterSetMapper.selectByPrimaryKey(1);
-                    //UserEffective为1是开启用户信息水印
-                    Short userEffective = emrPdfWaterSet.getUserEffective();
-                    if (userEffective == 1) {
                     img2PdfUtil.imageToPdfUserEffective(response, scanPages, pdfName, emrPdfWaterSet);
-                    }
                     //移除缓存
                     commomService.CACHE_MAP.clear();
                 }

src/main/java/com/emr/controller/emrApprove/ApproveController.java

@@ -237,6 +237,13 @@ public class ApproveController {
         return "approveManage/approveList/approveList174";
     }
 
+    @RequiresPermissions("/approve/approveList")
+    @OptionalLog(module = "查看",methods = "申请列表页面")
+    @RequestMapping("approveList")
+    public String approveList(){
+        return "approveManage/approveList/approveList174";
+    }
+
     /**
      * @MethodName: loadType
      * @Description: 异步加载申请类型
@@ -626,6 +633,14 @@ public class ApproveController {
         model.addAttribute("flag",flag);
         return "approveManage/approveManageList/approveManageList174";
     }
+
+    @RequiresPermissions("/approve/approveManageList")
+    @OptionalLog(module = "查看",methods = "借阅审批管理页面")
+    @RequestMapping("approveManageList")
+    public String approveManageList(Integer flag,Model model){
+        model.addAttribute("flag",flag);
+        return "approveManage/approveManageList/approveManageList174";
+    }
     /**
      * @MethodName: loadAnnoModle
      * @Description: 异步加载批注类别模板

src/main/java/com/emr/controller/emrApprove/CollectionController.java

@@ -84,6 +84,23 @@ public class CollectionController {
         return "approveManage/collection/collectManage174";
     }
 
+
+    @RequiresPermissions("/collect/collectManage")
+    @OptionalLog(module = "查看",methods = "个人收藏")
+    @RequestMapping("collectManage")
+    public String collectManage(Model model,HttpServletRequest request){
+        //加载收藏分类
+        List<Emr_Collect> collectTypes = null;
+        try {
+            collectTypes = emrCollectService.selectAllCollectTypeByCreater( 1,request);
+        } catch (Exception e) {
+            ExceptionPrintUtil.printException(e);
+            e.printStackTrace();
+        }
+        model.addAttribute("collectTypes",collectTypes);
+        return "approveManage/collection/collectManage174";
+    }
+
     /**
      * @ProjectName:getEmrCollectTypeNameTree
      * @Description:组织收藏类别树

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

@@ -15,7 +15,7 @@ public class CommomVo {
 
     private String sex;//性别
 
-    private Short age;//年龄(岁)
+    private String age;//年龄(岁)
 
     private Short ageMonth;//年龄(月)
 
@@ -1325,16 +1325,17 @@ public class CommomVo {
         this.sex = sex;
     }
 
-    public Short getAge() {
+
-        return age;
+    public Short getAgeMonth() {
+        return ageMonth;
     }
 
-    public void setAge(Short age) {
+    public String getAge() {
-        this.age = age;
+        return age;
     }
 
-    public Short getAgeMonth() {
+    public void setAge(String age) {
-        return ageMonth;
+        this.age = age;
     }
 
     public void setAgeMonth(Short ageMonth) {

src/main/resources/config/applicationContext-shiro.xml

@@ -34,6 +34,7 @@ http://www.springframework.org/schema/tx/spring-tx.xsd">
                 logout:注销过滤器，此拦截器设置的url可以不对应一个真实存在controller方法
              -->
             <value>
+                /*/**=anon
                 /font/**=anon
                 /favicon.ico=anon
                 /images/**=anon

src/main/resources/config/config.properties

@@ -1,12 +1,12 @@
 #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934
-POWER_IP =172.16.11.90
+POWER_IP =localhost
-POWER_URLHEAD = http://172.16.11.90:8081/power
+POWER_URLHEAD = http://localhost:8081/power
 
-POWER_JSPHEAD = 172.16.11.90
+POWER_JSPHEAD = localhost
-POWER_JSP = http://172.16.11.90:8081/power
+POWER_JSP = http://localhost:8081/power
 
 #\u672C\u8EAB\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934
-EMR_RECORD_JSP = http://172.16.11.90:8081/emr_record
+EMR_RECORD_JSP = http://localhost:8083/emr_record
 
 
 #webSocket\u670D\u52A1\u5668\u5730\u5740

src/main/resources/config/jdbc.properties

@@ -3,9 +3,9 @@ jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 #jdbc.username=sa
 #jdbc.password=docus@702
 
-jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=emr_record
+jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=qf_record
 jdbc.username=sa
-jdbc.password=docus@702
+jdbc.password=admin123
 
 #dataSource2
 jdbc.url2=jdbc\:sqlserver\://localhost:1433;databaseName=blgd_java

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

@@ -720,7 +720,7 @@
                                 <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)" readonly>
+                                           name="effeDays" oninput="if(value.length>3)value=value.slice(0,3)" >
                                 </div>
                                 <div class="col-sm-1"></div>
                             </div>

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

@@ -91,6 +91,11 @@
                 <button type="button" class="btn btn-sm btn-primary" onclick="onloadJpgForPdf()">下载PDF</button>
             </div>
         </c:if>
+        <c:if test="${CURRENT_USER.userEmail == '1' || isDownload == '1'}">
+            <div class="col-sm-2">
+                <button type="button" class="btn btn-sm btn-primary" onclick="printCurrent()">打印当前页</button>
+            </div>
+        </c:if>
         <c:if test="${moveFlag == '1'}">
             <div class="col-sm-2">
                 <button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#myModal1">移动PDF
@@ -259,5 +264,7 @@
 <script type="text/javascript"
         src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js"></script>
 <script type="text/javascript" src="${path}/static/js/commom.js"></script>
+<script type="text/javascript"
+        src="${path}/static/js/pdfjs/web/viewer2.js"></script>
 </body>
 </html>

src/main/webapp/static/js/font/recordList.js

@@ -1,5 +1,6 @@
 //加载数据表格
 $('#mytab').bootstrapTable({
+    height: 700,
     toolbar: '#toolbar',                //工具按钮用哪个容器
     striped: true,                      //是否显示行间隔色
     cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）

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

@@ -400,7 +400,9 @@ function delPic() {
         }
     })
 }
-
+function printCurrent(){
+    PDFJS.workerSrc = '../static/pdfjs/viewer2.js';//加载核心库
+}
 //记录打印记录
 function printInfoBlood() {
     var patientId = "'" + $("#patientId").val() + "'";

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

@@ -143,22 +143,6 @@ function onloadPdf(scanPages, sources) {
     })
 }
 
-/*function onloadPdf(scanPages, sources) {
-    $("#iframeLoad").val("");
-    $("#printPicLoaded").val("");
-    var patientId = $("#patientId").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));
-    var rootPaths = parent.$("#rootPaths").val();
-    //加载的图片
-    var print = $("#print").val();
-    if (scanPages != '' && print == 1) {
-        selectPrintPic(patientId, rootPaths, scanPages, sources);
-    }
-}*/
-
 var iframe = document.getElementById("iframe1");
 
 /**