song 1 개월 전
부모
커밋
3f2df74bfc

+ 3 - 2
Areas/Admin/Views/SuspectRecord/Index.cshtml

@@ -311,8 +311,9 @@
                         <a class="show-popover cursor-help" title="" data-content="@item.D_Disease_Category.DiseaseDescription">@diseaseType</a>
                     </td>
                     <td>
-                        @item.HNumber
-
+                        @*<a href="@Url.Action("NewReport", "Template", new {suspectRecordId = item.ID, hnumber = item.HNumber, diseaseType = item.D_Disease_Category.DiseaseType, typeNo = item.D_Disease_Category.Num, diseaseName = item.D_Disease_Category.DiseaseDescription, @version = 2})" target="_blank">*@
+                           @item.HNumber
+                        @*</a>*@
                         @if (item.Status != 2)
                         {
 

+ 2 - 0
Areas/Admin/Views/Template/NewReport.cshtml

@@ -320,6 +320,8 @@
 
 <input type="hidden" id="IsManual" value="@ViewBag.IsManual" />
 
+<input type="hidden" id="SuspectRecordDataInfo" value="@ViewBag.SuspectRecordDataInfo" />
+
 <div class="clearfix" style="height:100%;">
     <div id="content">
 

+ 1 - 1
Scripts/site.reportstats.DieaseIndexFinish.js

@@ -1181,7 +1181,7 @@ function InitEChart(data) {
         series: pars.series,
     };
 
-    var showDataTable = true;
+    var showDataTable = false;
     if (showDataTable) {
 
 

+ 1 - 1
Views/MAdmin/Set_LeakExtractRule.cshtml

@@ -79,7 +79,7 @@
 
                         <div class="@(isShowSuspectRecord?"":"hide")">
                             <p class="divider" style="border-bottom: 1px solid #e5e5e5;margin:15px 0; "></p>
-                            <div style=" font-size: 16px; margin-bottom: 10px; color: #317eac;">病例入组抽取设置</div>
+                            <div style=" font-size: 16px; margin-bottom: 10px; color: #317eac;">事中病例入组抽取设置</div>
                             <label class="checkbox">
                                 <input type="checkbox" id="ckIsOpenSuspectRecord" /> 启用
                             </label>

+ 1 - 1
_upgrade_.json

@@ -1,4 +1,4 @@
 {
   "Name": "Hospital.SDQM",
-  "Ver": "6.8.3"
+  "Ver": "6.8.4"
 }

BIN
bin/App_global.asax.dll


BIN
bin/Hospital.Common.dll


BIN
bin/Hospital.Model.dll


BIN
bin/HospitalLibrary.dll


BIN
bin/Hospitol.dll


BIN
bin/Kw.License.List.dll