Merge branch 'test' of http://192.168.2.236:10080/zhouna/AIPlatform into test

src/css/qcListOutHospital.less

@@ -23,8 +23,8 @@ h2{
 .main-body{
     .main-body-com;
     border: none;
-    border:10px @disColor solid;
-    // border-left:10px @disColor solid;
+    border-top:10px @disColor solid;
+    border-left:10px @disColor solid;
     margin: 44px 0 0;
     min-width: 1090px;
     min-height: calc(100% - 84px);

src/css/readmission.less

@@ -22,14 +22,21 @@ h2{
 }
 .main-body{
     .main-body-com;
-    border: none;
-    border:10px @disColor solid;
+    // border: none;
+    // // border:10px @disColor solid;
+    // border-top:10px @disColor solid;
     // border-left:10px @disColor solid;
-    margin: 44px 0 0;
+    // margin: 44px 0 0;
+    // min-width: 1090px;
+    // min-height: calc(100% - 84px);
+    // // overflow: auto;
+    // // height:  calc(100% - 44px);
+    // height: 100%;
+    border: none;
+    border-left:10px @disColor solid;
+    margin: 54px 0 0;
     min-width: 1090px;
-    min-height: calc(100% - 84px);
-    // overflow: auto;
-    height:  calc(100% - 44px);
+    min-height: calc(100% - 54px);
     .selectDefect{
         min-width: 120px;
         width: auto;

src/css/uccDetail.less

@@ -23,8 +23,9 @@ h2{
 .main-body{
     .main-body-com;
     border: none;
-    border:10px @disColor solid;
-    // border-left:10px @disColor solid;
+    // border:10px @disColor solid;
+    border-left:10px @disColor solid;
+    border-top:10px @disColor solid;
     margin: 44px 0 0;
     min-width: 1090px;
     min-height: calc(100% - 84px);

src/html/readmission.html

@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>病历质控评分</title>
+    <title>31日再入院病人数</title>
     
 </head>
 
@@ -109,8 +109,8 @@
                       <th class="beHospitalId textCenter">病案号</th>
                       <th class="beHospitalId textCenter">病人姓名</th>
                       <th class="beHospitalId textCenter">性别</th>
-                      <th class="beHospitalId textCenter">病例等级</th>
-                      <th class="beHospitalId textCenter">病例得分</th>
+                      <th class="beHospitalId textCenter">病历等级</th>
+                      <th class="beHospitalId textCenter">病历得分</th>
                       <th class="beHospitalId textCenter">科室</th>
                       <th class="beHospitalId textCenter">主诊断</th>
                       <th class="beHospitalId textCenter">入院日期</th>

src/js/console.js

@@ -572,7 +572,7 @@ function personNum(data){
         let chuyuantype = $(this).attr("data-type")
         let chuyuannum = $(this).attr("data-num")
         focusMenuItem("YH-ZKK-31TZRYRS");
-        $(parent.document).find("#contentIframe").attr("src","readmission.html?from=1&shijian=3"+"&outNum="+chuyuannum+"&outNumType="+chuyuantype+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+        $(parent.document).find("#contentIframe").attr("src","readmission.html?from=1&shijian=3&dateType=3"+"&outNum="+chuyuannum+"&outNumType="+chuyuantype+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     
     })
 }

src/js/readmission.js

@@ -24,6 +24,7 @@ let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
   $("th[code="+data_desc+"]").addClass("desc");
 }*/
 //setTitleTxt('',from)         //导航栏面包屑
+
 if(statisticsType == 1){
   setDatePicker($("#datepicker"),$("#datepicker2"),1)
 }else if(statisticsType == 2){
@@ -34,6 +35,18 @@ if(statisticsType == 1){
   setDatePicker($("#datepicker"),$("#datepicker2"),'default')
 }
 
+// $( "#datepicker" ).datepicker({
+//   changeMonth: true,
+//   changeYear: true,
+//   dateFormat:"yy/mm/dd",
+// }).datepicker( "setDate", new Date(startDateParam));
+// $( "#datepicker2" ).datepicker({
+//   changeMonth: true,
+//   changeYear: true,
+//   dateFormat:"yy/mm/dd"
+// }).datepicker( "setDate",new Date(endDateParam));
+
+
 if(from==2){
   // $(".export").css('display','none')
   // $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
@@ -45,7 +58,7 @@ if(from==2){
 }else if(from==3){
 //   $(".partTitle .titlePic ").html(`<a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>缺陷详情`)
 }else{
-  $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a>31天再入院人数`)
+  $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a>31日再入院病人数`)
 }
 
 if(!statisticsType){