修改下载打印记录bug及监控中心查询下载量bug

src/main/java/com/emr/controller/distributionManage/DistributionController.java

@@ -20,6 +20,7 @@ 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.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

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

@@ -45,7 +45,9 @@ public class monitoringCenterController {
     public String monitoringCenter(Model model){
         int applyApproveNum = 0;
         int applyApproveNullNum = 0;
-        List<EmrPrintOrDownLoadInfoVo> emrPrintOrDownLoadInfoVos = emrPrintDownloadInfoMapper.selectAllCount();
+        EmrPrintOrDownLoadInfoVo vo = new EmrPrintOrDownLoadInfoVo();
+        vo.setOperType(Short.valueOf("2"));
+        List<EmrPrintOrDownLoadInfoVo> emrPrintOrDownLoadInfoVos = emrPrintDownloadInfoMapper.selectAll(vo);
         int commomNum = commomMapper.selectCommomCount();
         int lockNum = emrLockMapper.selectCountLocking();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

src/main/java/com/emr/dao/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.java

@@ -18,11 +18,4 @@ public interface EmrPrintDownloadInfoMapper {
     List<EmrPrintOrDownLoadInfoVo> selectAllByIds(@Param("ids")String ids,@Param("flag")String flag);
 
     List<EmrPrintOrDownLoadInfoVo> getPrintCount(@Param("patientId")String patientId);
-
-    /**
-     * 获取下载记录数
-     * @return
-     */
-    List<EmrPrintOrDownLoadInfoVo> selectAllCount();
-
 }

src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java

@@ -138,47 +138,52 @@ public class PrintOrDownLoadInfoService {
             for(EmrPrintOrDownLoadInfoVo vo : list){
                 //获取图片数据
                 String scanPage = vo.getScanPage();
-                //json数据转对象
-                Map<String,List> map = JSON.parseObject(scanPage, LinkedHashMap.class);
-                //定义图片分类字符串
-                String assortNames = "";
-                //定义图片名称字符串
-                String scanPages = "";
                 //定义页数
                 Integer printCount = 0;
-                //遍历map
+                //json数据转对象
-                for(Map.Entry<String,List> m : map.entrySet()){
+                Map<String,List> map = JSON.parseObject(scanPage, LinkedHashMap.class);
-                    //获取图片分类
+                if(!CollectionUtils.isEmpty(map)) {
-                    String assortId = m.getKey();
+                    //定义图片分类字符串
-                    //转换分类名称
+                    String assortNames = "";
-                    if(!CollectionUtils.isEmpty(assortList)){
+                    //定义图片名称字符串
-                        for(Zd_Assort assort : assortList){
+                    String scanPages = "";
-                            if(StringUtils.isNotBlank(assort.getAssortId()) &&
+                    //遍历map
-                            assortId.equals(assort.getAssortId())){
+                    for (Map.Entry<String, List> m : map.entrySet()) {
-                                if(StringUtils.isNotBlank(assort.getAssortName())){
+                        //获取图片分类
-                                    assortNames += assort.getAssortName() + ",";
+                        String assortId = m.getKey();
+                        //转换分类名称
+                        if (!CollectionUtils.isEmpty(assortList)) {
+                            for (Zd_Assort assort : assortList) {
+                                if (StringUtils.isNotBlank(assort.getAssortId()) &&
+                                        assortId.equals(assort.getAssortId())) {
+                                    if (StringUtils.isNotBlank(assort.getAssortName())) {
+                                        assortNames += assort.getAssortName() + ",";
+                                    }
+                                    break;
                                 }
-                                break;
                             }
                         }
+                        //获取图片名称
+                        List<String> scanPageList = m.getValue();
+                        //遍历图片名称
+                        for (String scanPageTemp : scanPageList) {
+                            scanPages += scanPageTemp + ",";
+                            printCount++;
+                        }
                     }
-                    //获取图片名称
+                    //去掉尾部逗号
-                    List<String> scanPageList = m.getValue();
+                    if (StringUtils.isNotBlank(assortNames)) {
-                    //遍历图片名称
+                        assortNames = assortNames.substring(0, assortNames.length() - 1);
-                    for (String scanPageTemp : scanPageList){
+                        vo.setAssortName(assortNames);
-                        scanPages += scanPageTemp + ",";
-                        printCount++;
                     }
-                }
+                    //去掉尾部逗号
-                //去掉尾部逗号
+                    if (StringUtils.isNotBlank(scanPages)) {
-                if(StringUtils.isNotBlank(assortNames)){
+                        scanPages = scanPages.substring(0, scanPages.length() - 1);
-                    assortNames = assortNames.substring(0,assortNames.length()-1);
+                        vo.setScanPage(scanPages);
-                    vo.setAssortName(assortNames);
+                    }
-                }
+                }else{
-                //去掉尾部逗号
+                    vo.setAssortName(null);
-                if(StringUtils.isNotBlank(scanPages)){
+                    vo.setScanPage(null);
-                    scanPages = scanPages.substring(0,scanPages.length()-1);
-                    vo.setScanPage(scanPages);
                 }
                 vo.setPrintCount(printCount);
             }

src/main/resources/mapper/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.xml

@@ -231,19 +231,6 @@
         emr_print_download_info.create_time DESC
   </select>
 
-  <select id="selectAllCount" resultMap="BaseResultMapVo">
-  SELECT
-    COUNT(emr_print_download_info.patient_id) printCount
-  FROM
-    emr_print_download_info
-      INNER JOIN commomtable ON emr_print_download_info.patient_id = commomtable.patient_id
-      LEFT JOIN emr_type ON emr_print_download_info.type_id = emr_type.id
-      INNER JOIN zd_assort ON emr_print_download_info.assort_id = zd_assort.assort_id
-  WHERE
-    emr_print_download_info.oper_type = 2
-  GROUP BY emr_print_download_info.create_time,emr_print_download_info.creater
-  </select>
-
   <!--批量插入-->
   <insert id="SimpleInsert" parameterType="java.util.List">
     insert into emr_print_download_info

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

@@ -75,6 +75,12 @@
         .tableDiv{
             margin-left: 1%;
         }
+        .hidden-xs{
+            max-width: 250px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
     </style>
 </head>
 <body>

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

@@ -75,6 +75,12 @@
         .tableDiv{
             margin-left: 1%;
         }
+        .hidden-xs{
+            max-width: 250px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
     </style>
 </head>
 <body>

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

@@ -71,10 +71,12 @@ $('#mytab').bootstrapTable({
         {
             title:'类别',
             field:'assortName',
+            formatter:paramsMatter
         },
         {
             title:'文件名',
             field:'scanPage',
+            formatter:paramsMatter
         },
         {
             title:'用途',
@@ -153,6 +155,13 @@ $('#mytab').bootstrapTable({
         pageNumber = num;
     }
 })
+//格式化
+function paramsMatter(value) {
+    if(value != null){
+        value = '<p class="hidden-xs" title="'+value+'">'+value+'</p>'
+        return value;
+    }
+}
 //查询按钮
 function refreshTable(){
     $("#checks").val("");

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

@@ -174,8 +174,10 @@ $('#mytab').bootstrapTable({
 })
 //格式化
 function paramsMatter(value) {
-    value = '<p class="hidden-xs" title="'+value+'">'+value+'</p>'
+    if(value != null){
-    return value;
+        value = '<p class="hidden-xs" title="'+value+'">'+value+'</p>'
+        return value;
+    }
 }
 //查询按钮
 function refreshTable(){