瀏覽代碼

陪检方式

seimin 2 年之前
父節點
當前提交
20ab88e47c

+ 2 - 0
src/app/share/detail-patients/detail-patients.component.html

@@ -30,6 +30,8 @@
30 30
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
31 31
           <div nz-col nzSpan="8" *ngIf="orderInfo.taskType.associationType.value==='inspect'">
32 32
             是否半程陪检:{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
33
+          <div nz-col nzSpan="8" *ngIf="orderInfo.taskType.associationType.value==='inspect' || orderInfo.taskType.associationType.value==='patientTransport'">
34
+            陪检方式:{{orderInfo.inspectScore ? orderInfo.inspectScore.inspectMode : ""}}</div>
33 35
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
34 36
             特殊情况关闭原因:{{orderInfo.specialCloseReason}}
35 37
           </div>

+ 26 - 1
src/app/share/order-detail/order-detail.component.html

@@ -767,6 +767,13 @@
767 767
             >
768 768
               是否半程陪检:{{ orderInfo.isHalfInspect === 1 ? "是" : "否" }}
769 769
             </div>
770
+            <div
771
+              nz-col
772
+              nzSpan="6"
773
+              *ngIf="orderInfo.taskType.associationType.value == 'inspect' || orderInfo.taskType.associationType.value == 'patientTransport'"
774
+            >
775
+              陪检方式:{{ orderInfo.inspectScore ? orderInfo.inspectScore.inspectMode : "" }}
776
+            </div>
770 777
           </div>
771 778
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
772 779
             <div nz-col nzSpan="24" class="jiaji">
@@ -1155,7 +1162,7 @@
1155 1162
                 </td>
1156 1163
                 <td>{{ orderInfo.grade ? orderInfo.grade.baseGrade : "-" }}</td>
1157 1164
               </tr>
1158
-              <tr>
1165
+              <!-- <tr>
1159 1166
                 <td>评价分</td>
1160 1167
                 <td>
1161 1168
                   {{
@@ -1172,6 +1179,24 @@
1172 1179
                 <td>
1173 1180
                   {{ orderInfo.grade ? orderInfo.grade.evaluationGrade : "-" }}
1174 1181
                 </td>
1182
+              </tr> -->
1183
+              <tr>
1184
+                <td>陪检方式分</td>
1185
+                <td>
1186
+                  {{
1187
+                    orderInfo.grade
1188
+                      ? orderInfo.grade.estimateInspectModeGrade
1189
+                      : "-"
1190
+                  }}
1191
+                </td>
1192
+                <td>
1193
+                  {{
1194
+                    orderInfo.grade ? orderInfo.grade.inspectModeDetails : "-"
1195
+                  }}
1196
+                </td>
1197
+                <td>
1198
+                  {{ orderInfo.grade ? orderInfo.grade.inspectModeGrade : "-" }}
1199
+                </td>
1175 1200
               </tr>
1176 1201
               <tr>
1177 1202
                 <td>楼栋分</td>

+ 2 - 0
src/app/views/blood-products-config/blood-products-config.component.ts

@@ -131,6 +131,7 @@ export class BloodProductsConfigComponent implements OnInit {
131 131
           id: this.hosId
132 132
         },
133 133
         ordinaryField: {
134
+          key: 'ordinary_field',
134 135
           value: 'blood'
135 136
         }
136 137
       }
@@ -157,6 +158,7 @@ export class BloodProductsConfigComponent implements OnInit {
157 158
             id: this.hosId
158 159
           },
159 160
           ordinaryField: {
161
+            key: 'ordinary_field',
160 162
             value: 'blood'
161 163
           }
162 164
         }

+ 14 - 0
src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config-routing.module.ts

@@ -0,0 +1,14 @@
1
+import { NgModule } from '@angular/core';
2
+import { Routes, RouterModule } from '@angular/router';
3
+import { InspectAndPatientTransportConfigComponent } from './inspect-and-patient-transport-config.component';
4
+
5
+
6
+const routes: Routes = [
7
+  { path: '', component: InspectAndPatientTransportConfigComponent }
8
+];
9
+
10
+@NgModule({
11
+  imports: [RouterModule.forChild(routes)],
12
+  exports: [RouterModule]
13
+})
14
+export class InspectAndPatientTransportConfigRoutingModule { }

+ 61 - 0
src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.html

@@ -0,0 +1,61 @@
1
+<div class="TaskTypeManagement">
2
+  <div class="taskTypeInfo">
3
+    <div class="top">
4
+      <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
5
+        特性配置
6
+      </div>
7
+      <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
8
+        自动建单配置
9
+      </div>
10
+    </div>
11
+    <div class="list" *ngIf="!loading">
12
+      <!-- 特性配置 -->
13
+      <div *ngIf="tabModalName=='characteristics'">
14
+        <!-- 交接方式 -->
15
+        <!-- <div class="display_flex align-items_center">
16
+          <nz-form-label class="label" nzRequired>交接方式</nz-form-label>
17
+          <nz-select class="w320px" nzPlaceHolder="请选择交接方式" [(ngModel)]="handoverMode">
18
+            <nz-option *ngFor="let handoverMode of handoverModes" [nzLabel]="handoverMode.name" [nzValue]="handoverMode.id"></nz-option>
19
+          </nz-select>
20
+        </div> -->
21
+        <!-- 核对方式 -->
22
+        <!-- <div class="display_flex align-items_center mb8">
23
+          <nz-form-label class="label" nzRequired>核对方式</nz-form-label>
24
+          <nz-radio-group [(ngModel)]="radioCheckModesValue">
25
+            <label style="display: block;" nz-radio [nzValue]="item.value" *ngFor="let item of checkModes">{{ item.label }}</label>
26
+          </nz-radio-group>
27
+        </div> -->
28
+        <!-- 签到方式 -->
29
+        <div class="display_flex align-items_center mb8">
30
+          <nz-form-label class="label">签到方式</nz-form-label>
31
+          <nz-checkbox-group class="w320px" [(ngModel)]="checkInModes"></nz-checkbox-group>
32
+        </div>
33
+        <!-- 自动关单 -->
34
+        <!-- <div class="display_flex align-items_center mb8">
35
+          <nz-form-label class="label">自动关单</nz-form-label>
36
+          <nz-checkbox-group class="w320px" [(ngModel)]="automaticCustomsOrders"></nz-checkbox-group>
37
+        </div> -->
38
+      </div>
39
+      <!-- 自动建单配置 -->
40
+      <div *ngIf="tabModalName=='automaticOrderCreation'">
41
+        <!-- 自动建单 -->
42
+        <!-- <div class="display_flex align-items_center mb8">
43
+          <nz-form-label class="label">自动建单</nz-form-label>
44
+          <nz-checkbox-group [(ngModel)]="autoCreateOrders" (ngModelChange)="changeAutoCreateOrders($event)"></nz-checkbox-group>
45
+          <nz-checkbox-group [(ngModel)]="autoDepts" *ngIf="autoCreateOrders[0].checked"></nz-checkbox-group>
46
+        </div> -->
47
+      </div>
48
+      <div class="bottom">
49
+        <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
50
+      </div>
51
+    </div>
52
+    <div class="list" *ngIf="loading">
53
+      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
54
+        <div class="loadingFullInner">
55
+          <img src="../../../assets/images/loading.gif" alt="">
56
+          <div>加载中...</div>
57
+        </div>
58
+      </div>
59
+    </div>
60
+  </div>
61
+</div>

文件差異過大導致無法顯示
+ 1251 - 0
src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.less


+ 190 - 0
src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.ts

@@ -0,0 +1,190 @@
1
+import { Component, OnInit } from "@angular/core";
2
+import { MainService } from 'src/app/services/main.service';
3
+import { ToolService } from 'src/app/services/tool.service';
4
+import { NzMessageService } from 'ng-zorro-antd';
5
+
6
+@Component({
7
+  selector: "app-inspect-and-patient-transport-config",
8
+  templateUrl: "./inspect-and-patient-transport-config.component.html",
9
+  styleUrls: ["./inspect-and-patient-transport-config.component.less"],
10
+})
11
+export class InspectAndPatientTransportConfigComponent implements OnInit {
12
+  loading:boolean = false; //页面加载的loading
13
+  btnLoading:boolean = false; //提交按钮的loading
14
+  tabModalName:string = 'characteristics'; //当前选中的tab
15
+  hosId = this.tool.getCurrentHospital().id; //当前院区
16
+  // 交接方式
17
+  // handoverMode:any;
18
+  // handoverModes:any[] = [];
19
+  // 核对方式
20
+  // checkModes:any[] = [];
21
+  // 签到方式
22
+  checkInModes:any[] = [];
23
+  // 自动关单
24
+  // automaticCustomsOrders:any[] = [];
25
+  // 自动建单
26
+  // autoCreateOrders:any[] = [
27
+  //   {label:'是否开启',value: 0}
28
+  // ];
29
+  // 是否根据开通科室建单
30
+  // autoDepts:any[] = [
31
+  //   {label:'是否根据开通科室建单',value: 0}
32
+  // ];
33
+  // 配置
34
+  configs:any = {};
35
+  // 任务类型
36
+  tasktype:any = {};
37
+  constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
38
+
39
+  ngOnInit():void {
40
+    // todo
41
+    // this.getHandoverModes();
42
+    // this.getCheckModes();
43
+    this.getCheckInModes();
44
+  }
45
+
46
+  // 切换tab
47
+  tabModal(tabModalName:string){
48
+    this.tabModalName = tabModalName;
49
+  }
50
+  // 修改是否自动建单
51
+  // changeAutoCreateOrders(e){
52
+  //   console.log(e);
53
+  //   if(!e[0].checked){
54
+  //     this.autoDepts[0].checked = false;
55
+  //   }
56
+  // }
57
+  // 保存
58
+  submitForm() {
59
+    if(!this.tasktype.id){
60
+      this.msg.create("warning", "请先配置患者陪检任务类型!");
61
+      return;
62
+    }
63
+    // if(!this.handoverMode){
64
+    //   this.msg.create("warning", "请选择交接方式!");
65
+    //   return;
66
+    // }
67
+    // if(!this.radioCheckModesValue){
68
+    //   this.msg.create("warning", "请选择核对方式!");
69
+    //   return;
70
+    // }
71
+    let signTypeIds = this.checkInModes.filter(v => v.checked).map(v => v.value).toString();
72
+    // let closeTypeIds = this.automaticCustomsOrders.filter(v => v.checked).map(v => v.value).toString();
73
+    let postData:any = {
74
+      id: this.configs.id,
75
+      taskType: this.tasktype.id,
76
+      hosId: this.hosId,
77
+      // autoCreate: this.autoCreateOrders[0].checked ? 1 : 0,
78
+      // autoDept: this.autoDepts[0].checked ? 1 : 0,
79
+      // handoverType: {id: this.handoverMode},
80
+      // checkType: {id: this.radioCheckModesValue},
81
+      signTypeIds: signTypeIds || undefined,
82
+      // closeTypeIds: closeTypeIds || undefined,
83
+    };
84
+    this.btnLoading = true;
85
+    this.mainService
86
+      .simplePost("addData", "taskTypeConfig", postData)
87
+      .subscribe((result) => {
88
+        this.btnLoading = false;
89
+        if (result.status == 200) {
90
+          this.getConfig();
91
+        }
92
+      });
93
+  }
94
+
95
+  //获取交接方式
96
+  // getHandoverModes() {
97
+  //   this.mainService.getDictionary("list", "ttconfig_handover_type").subscribe((data) => {
98
+  //     this.handoverModes = data;
99
+  //     this.handoverMode = data[0].id;
100
+  //   });
101
+  // }
102
+  //获取核对方式
103
+  // getCheckModes() {
104
+  //   this.mainService.getDictionary("list", "ttconfig_check_type").subscribe((data) => {
105
+  //     this.checkModes = data.map(v => ({label:v.name, value: v.id}));
106
+  //   });
107
+  // }
108
+  //获取签到方式
109
+  getCheckInModes() {
110
+    this.loading = true;
111
+    this.mainService.getDictionary("list", "inspect_config_sign_type").subscribe((data) => {
112
+      this.checkInModes = data.map(v => ({label:v.name, value: v.id}));
113
+      // this.getAutomaticCustomsOrders();
114
+      this.getTaskType();
115
+    });
116
+  }
117
+  //获取自动关单
118
+  // getAutomaticCustomsOrders() {
119
+  //   this.mainService.getDictionary("list", "ttconfig_close_type").subscribe((data) => {
120
+  //     this.automaticCustomsOrders = data.map(v => ({label:v.name, value: v.id}));
121
+  //     this.getTaskType();
122
+  //   });
123
+  // }
124
+  //获取任务类型
125
+  getTaskType() {
126
+    let postData = {
127
+      idx: 0,
128
+      sum: 10,
129
+      taskType: {
130
+        simpleQuery: true,
131
+        hosId: {
132
+          id: this.hosId
133
+        },
134
+        associationType: {
135
+          key:"association_types",
136
+          value: 'inspect'
137
+        }
138
+      }
139
+    };
140
+    this.mainService
141
+      .getFetchDataList("simple/data", "taskType", postData)
142
+      .subscribe((result) => {
143
+        if (result.status == 200) {
144
+          this.tasktype = result.list[0] || {};
145
+          this.getConfig();
146
+        }
147
+      });
148
+  }
149
+  // 获取配置
150
+  // radioCheckModesValue = '';
151
+  getConfig() {
152
+    this.loading = true;
153
+    let postData = {
154
+      idx: 0,
155
+      sum: 10,
156
+      taskTypeConfig: {
157
+        taskTypeDTO: {
158
+          hosId: {
159
+            id: this.hosId
160
+          },
161
+          associationType: this.tasktype.associationType
162
+        }
163
+      }
164
+    };
165
+    this.mainService
166
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
167
+      .subscribe((result) => {
168
+        this.loading = false;
169
+        if (result.status == 200) {
170
+          this.configs = result.list[0] || {};
171
+          // this.handoverMode = this.configs.handoverType?this.configs.handoverType.id:undefined;
172
+          // this.radioCheckModesValue = this.configs.checkType.id;
173
+          // this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
174
+          // this.autoDepts[0].checked = this.configs.autoDept == 1;
175
+
176
+          if(this.configs.signTypeIds){
177
+            let ids = this.configs.signTypeIds.split(',');
178
+            this.checkInModes = this.checkInModes.map(v => ({...v, checked: ids.includes(v.value.toString())}));
179
+          }
180
+
181
+          // if(this.configs.closeTypeIds){
182
+          //   let ids = this.configs.closeTypeIds.split(',');
183
+          //   this.automaticCustomsOrders = this.automaticCustomsOrders.map(v => ({...v, checked: ids.includes(v.value.toString())}));
184
+          // }
185
+        }
186
+      });
187
+  }
188
+}
189
+
190
+

+ 17 - 0
src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.module.ts

@@ -0,0 +1,17 @@
1
+import { NgModule } from '@angular/core';
2
+import { CommonModule } from '@angular/common';
3
+
4
+import { InspectAndPatientTransportConfigRoutingModule } from './inspect-and-patient-transport-config-routing.module';
5
+import { ShareModule } from 'src/app/share/share.module';
6
+import { InspectAndPatientTransportConfigComponent } from './inspect-and-patient-transport-config.component';
7
+
8
+
9
+@NgModule({
10
+  declarations: [InspectAndPatientTransportConfigComponent],
11
+  imports: [
12
+    CommonModule,
13
+    InspectAndPatientTransportConfigRoutingModule,
14
+    ShareModule
15
+  ]
16
+})
17
+export class InspectAndPatientTransportConfigModule { }

+ 8 - 0
src/app/views/main/main-routing.module.ts

@@ -100,6 +100,14 @@ const routes: Routes = [
100 100
           ),
101 101
       },
102 102
       {
103
+        // 检查页面控制
104
+        path: "inspectAndPatientTransportConfig",
105
+        loadChildren: () =>
106
+          import("../inspect-and-patient-transport-config/inspect-and-patient-transport-config.module").then(
107
+            (m) => m.InspectAndPatientTransportConfigModule
108
+          ),
109
+      },
110
+      {
103 111
         // 工作分配方案列表
104 112
         path: "workAssignment",
105 113
         loadChildren: () =>

+ 1 - 1
src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
8 8
   enableProdMode();
9 9
   if (window) {
10 10
     window.console.log = function () { };
11
-    console.info('v2.4.17');
11
+    console.info('v2.4.18');
12 12
   }
13 13
 }
14 14
 platformBrowserDynamic().bootstrapModule(AppModule)