Merge remote-tracking branch 'origin/moly'

src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java

@@ -89,8 +89,8 @@ public class AssociateDiagosisDetailController {
     public String lis(Map model, ServletRequest request, HttpSession session)
             throws UnsupportedEncodingException, ParseException {
         List<Province> provinceList =(List<Province>) provinceDao.findProvince();
-        String timestamp1=getOld();//getLastMonth();
-        String  timestamp2=getNew();//getNow();
+        String timestamp1=getLastMonth();//getOld();
+        String  timestamp2=getNow();//getNew();
         List<Object[]> diagosisDetailsObj=associateDiagosisDetailService.findAssociateDiagosisDetailByWarnTimeBeginAndEnd(timestamp1,timestamp2);
         List<AssociateDiagosisDetail> associateDiagosisDetails=new ArrayList<AssociateDiagosisDetail>();
         for (Object[] objects : diagosisDetailsObj) {

src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDiagosisDetail.jsp

@@ -117,7 +117,7 @@
                                             <span class="glyphicon glyphicon-list"></span>
                                         </button>
                                         <div class="slide-menu-tags">
-                                            <%--<span id="detailPeriodTag" class="label label-info" data-placement="bottom">最近一个月</span>--%>
+                                            <span id="detailPeriodTag" class="label label-info" data-placement="bottom">最近一个月</span>
 
                                             <span id="detailTimeTag" class="label label-info"
                                                   data-placement="bottom"></span>
@@ -128,10 +128,10 @@
 
                                         </div>
                                         <div class="bt-list-import">
-                                            <a href="#" id="gzfxDetailUpload" class="">
+                                            <%--<a href="#" id="gzfxDetailUpload" class="">
                                                 <span class="glyphicon glyphicon-import"></span>
                                                 <span class="glyphicon-class">导出Excel</span>
-                                            </a>
+                                            </a>--%>
                                         </div>
                                     </div>