Ver Fonte

解决列表加载失败问题

hurugang há 3 anos atrás
pai
commit
8ec2d7030f

+ 6 - 0
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -509,6 +509,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     for (int i = 0; i < first.size(); i++) {
                         MzChargeDetail tempMzChargeDetail = first.get(i);
                         ZdChargeItem zdChargeItem = (ZdChargeItem) zdChargeItemMap.get(tempMzChargeDetail.getChargeItemCode());
+                        if(zdChargeItem==null || StringUtils.isBlank(zdChargeItem.getAuditCode())){
+                            continue;
+                        }
                         if (!Constants.AUDIT_ITEM_DR.equals(zdChargeItem.getAuditCode())) {
                             continue;
                         }
@@ -537,6 +540,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         for (int i = 0; i < secondTempMzChargeDetailList.size(); i++) {
                             MzChargeDetail tempMzChargeDetail = secondTempMzChargeDetailList.get(i);
                             ZdChargeItem zdChargeItem = (ZdChargeItem) zdChargeItemMap.get(tempMzChargeDetail.getChargeItemCode());
+                            if(zdChargeItem==null || StringUtils.isBlank(zdChargeItem.getAuditCode())){
+                                continue;
+                            }
                             if (!Constants.AUDIT_ITEM_DR.equals(zdChargeItem.getAuditCode())) {
                                 continue;
                             }

+ 0 - 42
src/main/resources/static/js/mz/clinic.js

@@ -337,51 +337,9 @@ $(function () {
             }
         }
     });
-
-
-    /*
-        //加载打印设置功能模块
-        $("[data-toggle='PRINT_SETUP']").each(function() {
-            var element = $(this);
-            element.popover({
-                trigger: 'manual',
-                html: true,
-                placement: 'top',
-                width:50,
-                content: function() {
-                    return content();
-                }
-            }).on("mouseenter", function() {
-                var _this = this;
-                $(this).popover("show");
-                $(this).siblings(".popover").on("mouseleave", function() {
-                    $(_this).popover('hide');
-                });
-            }).on("mouseleave", function() {
-                var _this = this;
-                setTimeout(function() {
-                    if(!$(".popover:hover").length) {
-                        $(_this).popover("hide")
-                    }
-                }, 100);
-            });
-
-        });
-    */
-
-
 });
 
 
-// //模拟动态加载内容(真实情况可能会跟后台进行ajax交互)
-// function  content()  {
-//     var  data  =  $('<button type="button" class="btn btn-primary "  onclick="test()" >打印设置</button>');
-//     return  data;
-// }
-// //模拟悬浮框里面的按钮点击操作
-// function  test()  {
-//     alert('关注成功');
-// }
 
 /**
  * 打开配置页面