优化

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.223",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -101,13 +101,14 @@
         <thead>
           <tr class="thead">
             <th nzWidth="4%">序号</th>
-            <th nzWidth="14%">患者姓名（床号）</th>
-            <th nzWidth="14%">检查项目</th>
-            <th nzWidth="14%">预约时间</th>
-            <th nzWidth="14%">叫号信息</th>
-            <th nzWidth="14%">检查科室</th>
-            <th nzWidth="13%">检查状态</th>
-            <th nzWidth="13%">陪检人</th>
+            <th nzWidth="12%">患者姓名（床号）</th>
+            <th nzWidth="12%">检查项目</th>
+            <th nzWidth="12%">预约时间</th>
+            <th nzWidth="12%">叫号信息</th>
+            <th nzWidth="12%">检查科室</th>
+            <th nzWidth="12%">检查状态</th>
+            <th nzWidth="12%">陪检人</th>
+            <th nzWidth="12%">是否临时急查</th>
           </tr>
         </thead>
         <tbody>
@@ -120,6 +121,7 @@
             <td>{{ data.execDept ? data.execDept.dept : '' }}</td>
             <td>{{ data.inspectState?data.inspectState.name:''}}</td>
             <td>{{ data.workerName}}</td>
+            <td>{{ data.priority == 1 ? '是' : '否'}}</td>
           </tr>
         </tbody>
       </nz-table>

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -191,6 +191,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       canceled: this.dataInfo.canceled ? true : undefined,
+      priority: this.dataInfo.priority ? 0 : 1,
     }
     switch(this.dataInfo.type){
       case 'total':

src/app/views/building-inspection-rate-statistics/building-inspection-rate-statistics.component.ts

@@ -57,6 +57,7 @@ export class BuildingInspectionRateStatisticsComponent implements OnInit {
 
   checkOptionsOne: Array<any> = [
     { label: "不包含已取消已作废", value: "1", checked: true },
+    { label: "不包含临时急查医嘱", value: "2", checked: false },
   ];
 
   // 边输入边搜索节流阀
@@ -135,6 +136,7 @@ export class BuildingInspectionRateStatisticsComponent implements OnInit {
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
+      priority: this.checkOptionsOne[1].checked ? 0 : 1,
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
       buildingId: this.searchDto.building|| undefined,
     };
@@ -160,6 +162,7 @@ export class BuildingInspectionRateStatisticsComponent implements OnInit {
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
+      priority: this.checkOptionsOne[1].checked ? 0 : 1,
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
       buildingId: this.searchDto.building|| undefined,
     };

src/app/views/dept-inspection-rate-statistics/dept-inspection-rate-statistics.component.ts

@@ -57,6 +57,7 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
 
   checkOptionsOne: Array<any> = [
     { label: "不包含已取消已作废", value: "1", checked: true },
+    { label: "不包含临时急查医嘱", value: "2", checked: false },
   ];
 
   // 边输入边搜索节流阀
@@ -135,6 +136,7 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
+      priority: this.checkOptionsOne[1].checked ? 0 : 1,
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
       buildingId: this.searchDto.building|| undefined,
     };
@@ -174,6 +176,7 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
       canceled: this.checkOptionsOne[0].checked ? true : undefined,
+      priority: this.checkOptionsOne[1].checked ? 0 : 1,
       deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
       buildingId: this.searchDto.building|| undefined,
     };