解决冲突

angular.json

@@ -30,6 +30,11 @@
                 "glob": "**/*",
                 "input": "./node_modules/@ant-design/icons-angular/src/inline-svg/",
                 "output": "/assets/"
+              },
+              {
+                "glob": "login.html",
+                "input": "src",
+                "output": "/"
               }
             ],
             "styles": [

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.html

@@ -88,6 +88,16 @@
 									  <nz-form-label class="label">药单显示患者</nz-form-label>
 									  <nz-checkbox-group [(ngModel)]="item.postData.showPatientInfo"></nz-checkbox-group>
 									</div>
+                  <!-- 是否显示药品数、种类数 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">是否显示药品数、种类数</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.showDrugsBagTypeCount"></nz-checkbox-group>
+									</div>
+                  <!-- 是否支持查看药品详情信息 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">是否支持查看药品详情信息</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.showDrugsBagDetails"></nz-checkbox-group>
+									</div>
                 </div>
                 <!-- 自动建单配置 -->
                 <div *ngIf="tabModalName=='automaticOrderCreation'">

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.ts

@@ -61,6 +61,8 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+				showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
       }
     },
     {
@@ -79,6 +81,8 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
       }
     },
     {
@@ -97,6 +101,8 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
       }
     },
     {
@@ -115,6 +121,8 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
       }
     },
     {
@@ -133,6 +141,8 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
       }
     },
   ];
@@ -206,6 +216,8 @@ export class ConfigurationDrugComponent implements OnInit {
       drugsEndManual: this.activeDictionary.postData.drugsEndManual ? { id: this.activeDictionary.postData.drugsEndManual } : undefined,
       drugsEndPhoto: this.activeDictionary.postData.drugsEndPhoto[0].checked ? 1 : 0,
 			showPatientInfo: this.activeDictionary.postData.showPatientInfo[0].checked ? 1 : 0,
+			showDrugsBagTypeCount: this.activeDictionary.postData.showDrugsBagTypeCount[0].checked ? 1 : 0,
+			showDrugsBagDetails: this.activeDictionary.postData.showDrugsBagDetails[0].checked ? 1 : 0,
 		};
     this.btnLoading = true;
     this.mainService
@@ -301,6 +313,8 @@ export class ConfigurationDrugComponent implements OnInit {
           this.activeDictionary.postData.drugsEndManual = this.configs.drugsEndManual ? this.configs.drugsEndManual.id : undefined;
           this.activeDictionary.postData.drugsEndPhoto[0].checked = this.configs.drugsEndPhoto == 1;
 					this.activeDictionary.postData.showPatientInfo[0].checked = this.configs.showPatientInfo == 1;
+					this.activeDictionary.postData.showDrugsBagTypeCount[0].checked = this.configs.showDrugsBagTypeCount == 1;
+					this.activeDictionary.postData.showDrugsBagDetails[0].checked = this.configs.showDrugsBagDetails == 1;
 				}
       });
   }

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

@@ -10,7 +10,7 @@
       <div>发药科室：{{drugsBag.launch ? drugsBag.launch.dept : ''}}</div>
     </div>
     <div class="content">
-      <ng-container *ngIf="type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal'">
+      <ng-container *ngIf="configs.showDrugsBagDetails === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')">
         <!-- 新药品 -->
         <nz-table class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
           [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">

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

@@ -41,7 +41,7 @@
         </tbody>
       </nz-table>
       <!-- 新药品-一单一码 -->
-      <nz-table *ngIf="configs.drugsModel === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
+      <nz-table *ngIf="configs.showDrugsBagDetails === 1 && configs.drugsModel === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
         <thead>
           <tr class="thead">
@@ -70,8 +70,8 @@
             <th nzWidth="5%">序号</th>
             <th nzWidth="11%">单号</th>
 						<th nzWidth="10%" *ngIf="configs.showPatientInfo==1">患者信息</th>
-            <th nzWidth="8%">种类数</th>
-            <th nzWidth="8%">总数</th>
+            <th nzWidth="8%" *ngIf="configs.showDrugsBagTypeCount==1">种类数</th>
+            <th nzWidth="8%" *ngIf="configs.showDrugsBagTypeCount==1">总数</th>
             <th nzWidth="10%">收取人/交接人</th>
             <!-- <th nzWidth="10%">收取交接人</th> -->
             <th nzWidth="14%">收取时间</th>
@@ -81,14 +81,14 @@
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of drugsBugMultipleList;let i = index;" (click)="viewDetail(type, data.id)">
+          <tr *ngFor="let data of drugsBugMultipleList;let i = index;" (click)="viewDetail(type, data.id)" [ngStyle]="{ 'cursor': configs.showDrugsBagDetails == 1 ? 'pointer' : '' }">
             <td>{{i+1}}</td>
-            <td>{{ data.packid }}</td>
+						<td [ngStyle]="{ 'text-decoration': configs.showDrugsBagDetails == 1 ? 'underline' : '' }">{{ data.packid }}</td>
 						<td nz-tooltip [nzTooltipTitle]="data.patientNames" *ngIf="configs.showPatientInfo==1">
 							{{ data.patientNames }}
 						</td>
-            <td>{{ data.drugsTypeCount }}</td>
-            <td>{{ data.drugsCount }}</td>
+            <td *ngIf="configs.showDrugsBagTypeCount==1">{{ data.drugsTypeCount }}</td>
+            <td *ngIf="configs.showDrugsBagTypeCount==1">{{ data.drugsCount }}</td>
             <td>
 							<ng-container *ngIf="data.startLog">
 								<div>{{data.startLog.username}}</div>

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

@@ -433,6 +433,9 @@ export class BusinessDataDetailModalComponent implements OnInit {
   businessDataModalType = ''; //业务数据类型
   infoId = ''; //业务数据id
   viewDetail(type, id) {
+    if(this.configs.showDrugsBagDetails != 1){
+      return;
+    }
     this.infoId = id;
     this.businessDataModalType = type;
     this.businessDataModalShow = true;

src/app/views/batch-inspection/batch-inspection.component.html

@@ -31,7 +31,7 @@
       <tr class="thead">
         <th nzWidth="20%">患者信息</th>
         <th nzWidth="20%">护理信息</th>
-        <th nzWidth="20%">出行方式</th>
+        <th nzWidth="20%">陪检方式</th>
         <th nzWidth="20%">检查项目</th>
         <th nzWidth="20%">操作</th>
       </tr>

src/app/views/batch-inspection/batch-inspection.component.ts

@@ -46,7 +46,7 @@ export class BatchInspectionComponent implements OnInit {
     this.init();
   }
 
-  // 修改出行方式
+  // 修改陪检方式
   changeTripType(tripTypeId, id){
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
@@ -59,9 +59,9 @@ export class BatchInspectionComponent implements OnInit {
       this.maskFlag = false;
       this.getList();
       if (data.status == 200) {
-        this.message.success("修改出行方式成功");
+        this.message.success("修改陪检方式成功");
       } else {
-        this.message.success(data.msg || "修改出行方式失败");
+        this.message.success(data.msg || "修改陪检方式失败");
       }
     });
   }
@@ -366,7 +366,7 @@ export class BatchInspectionComponent implements OnInit {
   addYytime(){
     let obj1 = this.listOfData.find(v => !v.tripType);
     if(obj1){
-      this.message.warning(`${obj1.patientName}患者没有选择出行方式，请调整后提交申请！`)
+      this.message.warning(`${obj1.patientName}患者没有选择陪检方式，请调整后提交申请！`)
       return;
     }
 
@@ -485,7 +485,7 @@ export class BatchInspectionComponent implements OnInit {
       });
   }
 
-  //获取出行方式
+  //获取陪检方式
   workOrderInspectScoreList:any[] = [];
   getWorkOrderInspectScore() {
     let postData = { idx: 0, sum: 9999, workOrderInspectScore: { hosId: this.hosId } };

src/app/views/fuwutai/fuwutai.component.html

@@ -1106,10 +1106,22 @@
                                 </nz-select>
                               </nz-form-control>
                             </nz-form-item>
-                            <nz-form-item class="ml8" class="goods-control">
-                              <nz-form-label style="line-height: 40px;" class="label" nzFor="goods" *ngIf="goodsNow.length">携带设备</nz-form-label>
+                            <nz-form-item class="ml8" class="goods-control" *ngIf="inspectAndPatientTransportConfig.enableGoods == 1">
+                              <nz-form-label style="line-height: 40px;" class="label" nzFor="goods">携带设备</nz-form-label>
                               <nz-form-control class="control" nzErrorTip="请选择携带设备！">
-                                <nz-checkbox-group [(ngModel)]="goodsNow" formControlName="goods" (ngModelChange)="changeGoods($event)"></nz-checkbox-group>
+                                <nz-checkbox-group [(ngModel)]="goodsNow" formControlName="goods"></nz-checkbox-group>
+                              </nz-form-control>
+                            </nz-form-item>
+                          </div>
+                        </div>
+                        <div nz-col [nzSpan]="24" *ngIf="inspectAndPatientTransportConfig.enableTripType == 1">
+                          <div class="control-flex">
+                            <nz-form-item style="margin-left: 0;" class="goods-control">
+                              <nz-form-label style="line-height: 40px;" class="label" nzFor="inspectScore">陪检方式</nz-form-label>
+                              <nz-form-control class="control" nzErrorTip="请选择陪检方式！">
+                                <nz-radio-group formControlName="inspectScore" [(ngModel)]="workOrderInspectScore">
+                                  <label nz-radio [nzValue]="item.id" *ngFor="let item of workOrderInspectScoreList">{{item.inspectMode}}</label>
+                                </nz-radio-group>
                               </nz-form-control>
                             </nz-form-item>
                           </div>

src/app/views/fuwutai/fuwutai.component.ts

@@ -384,7 +384,7 @@ export class FuwutaiComponent implements OnInit {
     for (const i in this.validateFormZy.controls) {
       this.validateFormZy.controls[i].markAsDirty();
       this.validateFormZy.controls[i].updateValueAndValidity();
-      if (this.validateFormZy.controls[i].valid === false && i !== "goods") {
+      if (this.validateFormZy.controls[i].valid === false && i !== "goods" && i !== "inspectScore") {
         //携带设备非必填
         // if (this.validateFormZy.controls[i].valid === false && i !== 'goods' && i !== 'patient') {//携带设备非必填
         newOrderShowFlag = false;
@@ -430,6 +430,7 @@ export class FuwutaiComponent implements OnInit {
             patientCode: this.validateFormZy.controls.patient.value,
           },
           goods: goods,
+          inspectScore: this.validateFormZy.controls.inspectScore.value ? { id: this.validateFormZy.controls.inspectScore.value } : undefined,
           workOrderRemark: this.validateFormZy.controls.workOrderRemarkZy.value,
         },
       };
@@ -480,7 +481,7 @@ export class FuwutaiComponent implements OnInit {
     for (const i in this.validateFormZy.controls) {
       this.validateFormZy.controls[i].markAsDirty();
       this.validateFormZy.controls[i].updateValueAndValidity();
-      if (this.validateFormZy.controls[i].valid === false && i !== "goods") {
+      if (this.validateFormZy.controls[i].valid === false && i !== "goods" && i !== "inspectScore") {
         //携带设备非必填
         // if (this.validateFormZy.controls[i].valid === false && i !== 'goods' && i !== 'patient') {//携带设备非必填
         newOrderShowFlag = false;
@@ -514,6 +515,7 @@ export class FuwutaiComponent implements OnInit {
             patientCode: this.validateFormZy.controls.patient.value,
           },
           goods,
+          inspectScore: this.validateFormZy.controls.inspectScore.value ? { id: this.validateFormZy.controls.inspectScore.value } : undefined,
           workOrderRemark: this.validateFormZy.controls.workOrderRemarkZy.value,
         },
       };
@@ -950,6 +952,7 @@ export class FuwutaiComponent implements OnInit {
       patient: [null, [Validators.required]], //患者信息
       // patient: [null],//患者信息ca
       goods: [null], //携带设备
+      inspectScore: [null], //陪检方式
       workOrderRemarkZy: [null], //工单备注
     });
     //其他
@@ -2795,6 +2798,7 @@ export class FuwutaiComponent implements OnInit {
     this.endDeptZy = null;
     this.patientZy = null;
     this.goodsNow = [];
+    this.workOrderInspectScore = undefined;
     this.workOrderRemark = "";
     this.workOrderRemarkZy = "";
     this.deptZyList["startDept"] = [];
@@ -3733,6 +3737,7 @@ export class FuwutaiComponent implements OnInit {
     this.endDeptZy = null;
     this.patientZy = null;
     this.goodsNow = [];
+    this.workOrderInspectScore = undefined;
     // this.patientList = [];
     this.workOrderRemark = "";
     this.workOrderRemarkZy = "";
@@ -4691,7 +4696,6 @@ export class FuwutaiComponent implements OnInit {
     this.linkCheckLisTrue = e.length > 0;
   }
   // 转运类型选中类型（单选）触发
-  goodsNow; //携带的物品列表
   yyDateZy = null; //预约日期-患者其他服务
   yyDate = null; //预约日期-其他临床服务
   yyTimeZy = null; //预约时间-患者其他服务
@@ -4823,24 +4827,42 @@ export class FuwutaiComponent implements OnInit {
     });
     setTimeout(() => {
       // 获取携带设备
-      let arrObj = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
-      let arr = arrObj.value;
-      this.goodsNow = arr.filter(
-        (item) => item.id == value
-      )[0].taskType.carryEquipmentIds;
-      if (this.goodsNow) {
-        this.goodsNow = this.goodsNow.map((item) => {
-          return {
-            label: item.name,
-            value: item.id,
-            checked: false,
-          };
-        });
-      } else {
-        this.goodsNow = [];
-      }
+      this.getAllGoods();
+      this.getWorkOrderInspectScore();
     }, 0)
   }
+  //获取携带设备
+  goodsNow; //携带的物品列表
+  getAllGoods() {
+    this.mainService.getDictionary("list", "goods").subscribe((data) => {
+      let goodsNow = data || [];
+      this.goodsNow = [];
+      goodsNow.forEach((e) => {
+        this.goodsNow.push({
+          label: e.name,
+          value: e.id,
+          checked: false,
+        });
+      });
+    });
+  }
+
+  //获取陪检方式
+  workOrderInspectScoreList:any[] = [];
+  workOrderInspectScore:any;
+  getWorkOrderInspectScore() {
+    let postData = { idx: 0, sum: 9999, workOrderInspectScore: { hosId: this.checkedHos } };
+    this.mainService
+      .getFetchDataList("simple/data", "workOrderInspectScore", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.workOrderInspectScoreList = result.list || [];
+        } else {
+          this.msg.error("请求数据失败");
+        }
+      });
+  }
+
 	psValue:any;
 	taskType:any;
   radioChangeQt(value) {
@@ -4990,6 +5012,7 @@ export class FuwutaiComponent implements OnInit {
     this.endDeptZy = null;
     this.patientZy = null;
     this.goodsNow = [];
+    this.workOrderInspectScore = undefined;
     this.patientList = [];
     this.workOrderRemark = "";
     this.workOrderRemarkZy = "";
@@ -5003,11 +5026,6 @@ export class FuwutaiComponent implements OnInit {
     this.deptQtList["endStatus"] = 0;
   }
 
-  // 携带设备
-  changeGoods(value: object[]): void {
-    console.log(value);
-  }
-
   // 撤回
   // 打开撤回模态框
   openRecallModal(id) {

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1544,49 +1544,48 @@
             <nz-form-item *ngIf="checkedShowMsg.status == 100009">
               <div class="txtC">{{ checkedShowMsg.msg }}</div>
             </nz-form-item>
-            <!-- 100015 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
-            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013">
-              <nz-form-label [nzSpan]="3" nzRequired nzFor="originOffice">起点科室</nz-form-label>
-              <nz-form-control [nzSpan]="21" nzErrorTip="请选择起点科室!">
-                <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType"  (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
-                  <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
-                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
-                  </ng-container>
-                  <nz-option *ngIf="false" nzDisabled nzCustomContent>
-                    <i nz-icon nzType="loading" class="loading-icon"></i>
-                    搜索中...
-                  </nz-option>
-                </nz-select>
-              </nz-form-control>
-            </nz-form-item>
-            <!-- 其他情况 -->
-            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.start && (checkedShowMsg.status == 100014 || checkedShowMsg.status == 100012)">
-              <nz-form-label [nzSpan]="3" nzRequired nzFor="originOffice">起点科室</nz-form-label>
-              <nz-form-control [nzSpan]="21" nzErrorTip="请选择起点科室!">
-                <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.start.start.list[0].deptalias : checkedShowMsg.start.start.list[0].dept}}</span>
-              </nz-form-control>
-            </nz-form-item>
-            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.end && (checkedShowMsg.status == 100012 || checkedShowMsg.status == 100013)">
-              <nz-form-label [nzSpan]="3" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
-              <nz-form-control [nzSpan]="21" nzErrorTip="请选择目标科室!">
-                <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.end.end.list[0].deptalias : checkedShowMsg.end.end.list[0].dept}}</span>
-              </nz-form-control>
-            </nz-form-item>
-            <!-- 100014 （护士端一键建单展示策略）取终点科室和msg 值展示 -->
-            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015">
-              <nz-form-label [nzSpan]="3" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
-              <nz-form-control [nzSpan]="21" nzErrorTip="请选择目标科室!">
-                <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false"  [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType"  (nzOnSearch)="searchDept('target', checkedShowMsg, $event)" nzPlaceHolder="请选择目标科室">
-                  <ng-container *ngFor="let option of checkedShowMsg.end.end.list">
-                    <nz-option [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
-                  </ng-container>
-                <!--  <nz-option *ngIf="false" nzDisabled nzCustomContent>
-                    <i nz-icon nzType="loading" class="loading-icon"></i>
-                    搜索中...
-                  </nz-option> -->
-                </nz-select>
-              </nz-form-control>
-            </nz-form-item>
+            <div class="display_flex align-items_center">
+              <!-- 100015 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
+              <nz-form-item class="top16bottom0 w100" nz-row *ngIf="checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013">
+                <nz-form-label [nzSpan]="4" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+                <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
+                  <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType"  (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
+                    <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
+                      <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
+                    </ng-container>
+                    <nz-option *ngIf="false" nzDisabled nzCustomContent>
+                      <i nz-icon nzType="loading" class="loading-icon"></i>
+                      搜索中...
+                    </nz-option>
+                  </nz-select>
+                </nz-form-control>
+              </nz-form-item>
+              <!-- 其他情况 -->
+              <nz-form-item class="top16bottom0 w100" nz-row *ngIf="checkedShowMsg.start && (checkedShowMsg.status == 100014 || checkedShowMsg.status == 100012)">
+                <nz-form-label [nzSpan]="4" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+                <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
+                  <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.start.start.list[0].deptalias : checkedShowMsg.start.start.list[0].dept}}</span>
+                </nz-form-control>
+              </nz-form-item>
+              <nz-form-item class="top16bottom0 w100 ml8" nz-row *ngIf="checkedShowMsg.end && (checkedShowMsg.status == 100012 || checkedShowMsg.status == 100013)">
+                <nz-form-label [nzSpan]="4" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+                <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
+                  <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.end.end.list[0].deptalias : checkedShowMsg.end.end.list[0].dept}}</span>
+                </nz-form-control>
+              </nz-form-item>
+              <!-- 100014 （护士端一键建单展示策略）取终点科室和msg 值展示 -->
+              <nz-form-item class="top16bottom0 w100 ml8" nz-row *ngIf="checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015">
+                <nz-form-label [nzSpan]="4" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+                <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
+                  <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false"  [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType"  (nzOnSearch)="searchDept('target', checkedShowMsg, $event)" nzPlaceHolder="请选择目标科室">
+                    <ng-container *ngFor="let option of checkedShowMsg.end.end.list">
+                      <nz-option [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
+                    </ng-container>
+                  </nz-select>
+                </nz-form-control>
+              </nz-form-item>
+            </div>
+
             <div class="display_flex top16bottom0">
               <!-- 自动送回 -->
               <nz-form-item class="isRemand" *ngIf="checkedShowMsg.status != 200 && checkedShowMsg.isRemand == 1">
@@ -1596,7 +1595,7 @@
               </nz-form-item>
               <!-- 是否加急 -->
               <nz-form-item nz-row *ngIf="current_allowUrgent" class="allowUrgent">
-                <nz-form-label [nzSpan]="3" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
+                <nz-form-label [nzSpan]="2" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
                 <nz-form-control [nzSpan]="6">
                   <nz-radio-group [(ngModel)]="allowUrgent" (ngModelChange)="allowUrgentChange($event)" formControlName="allowUrgent">
                     <label nz-radio nzValue="1">是</label>
@@ -1637,12 +1636,22 @@
               </nz-form-item>
             </ng-container>
             <!-- 携带设备 -->
-            <nz-form-item nz-row *ngIf="goodsLis.length">
-              <nz-form-label [nzSpan]="3" nzFor="goods" class="goods">携带设备</nz-form-label>
-              <nz-form-control [nzSpan]="21">
-                <nz-checkbox-group formControlName="goods" [(ngModel)]="goodsLis"></nz-checkbox-group>
-              </nz-form-control>
-            </nz-form-item>
+            <div class="display_flex justify-content_space-between align-items_center">
+              <nz-form-item class="display_flex align-items_center flex_1" *ngIf="inspectAndPatientTransportConfig.enableTripType == 1">
+                <nz-form-label nzFor="inspectScore" class="goods mt8">陪检方式</nz-form-label>
+                <nz-form-control>
+                  <nz-radio-group formControlName="inspectScore" [(ngModel)]="workOrderInspectScore">
+                    <label nz-radio [nzValue]="item.id" *ngFor="let item of workOrderInspectScoreList">{{item.inspectMode}}</label>
+                  </nz-radio-group>
+                </nz-form-control>
+              </nz-form-item>
+              <nz-form-item class="display_flex align-items_center flex_1" *ngIf="inspectAndPatientTransportConfig.enableGoods == 1">
+                <nz-form-label nzFor="goods" class="goods mt8">携带设备</nz-form-label>
+                <nz-form-control>
+                  <nz-checkbox-group formControlName="goods" [(ngModel)]="goodsLis"></nz-checkbox-group>
+                </nz-form-control>
+              </nz-form-item>
+            </div>
           </ng-container>
         </form>
       </div>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -2674,7 +2674,7 @@
 }
 .patient{
   .modalBody{
-    width: 70%;
+    width: 1338px;
     border-radius: 16px;
     padding: 16px 24px;
     .title{

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -2221,6 +2221,7 @@ export class HushijiandanComponent implements OnInit {
             this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.confirmPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
               this.showPromptModal("创建", true, "");
               this.goodsLis = [];
+              this.workOrderInspectScore = undefined;
               this.getOrderList();
               this.getDeptTaskType();
               this.getTodayNum();
@@ -2228,6 +2229,7 @@ export class HushijiandanComponent implements OnInit {
           }else{
             this.showPromptModal("创建", true, "");
             this.goodsLis = [];
+            this.workOrderInspectScore = undefined;
             this.getOrderList();
             this.getDeptTaskType();
             this.getTodayNum();
@@ -2261,7 +2263,6 @@ export class HushijiandanComponent implements OnInit {
   checkTypeLis: any = [];
   // 患者信息一键建单关联检查
   linkCheckLis: any = [];
-  goodsLis: any = []; //携带设备
   isRemarks: boolean = false; //是否开启备注信息
   allowUrgent: any = "0"; //加急
   urgentReason: any = ""; //加急原因
@@ -2272,6 +2273,7 @@ export class HushijiandanComponent implements OnInit {
     this.patientForm = this.fb.group({
       checkedType: [null, [Validators.required]],
       goods: [null],
+      inspectScore: [null],
       workOrderRemark2: [null],
       linkCheck: [null, []],
       targetOffice: [null, [this.targetOfficeValidator]],
@@ -2776,6 +2778,11 @@ export class HushijiandanComponent implements OnInit {
       goods = goods.slice(0, goods.length - 1);
     }
     postData.workOrder["goods"] = goods;
+    // 陪检方式
+    if (that.patientForm.value.inspectScore) {
+      postData.workOrder["inspectScore"] = { id: that.patientForm.value.inspectScore };
+    }
+
     // 工单备注
     postData.workOrder["workOrderRemark"] = that.workOrderRemark2 || '';
     if (!yuyue && that.current_allowUrgent && this.allowUrgent == 1) {
@@ -2864,6 +2871,7 @@ export class HushijiandanComponent implements OnInit {
                 this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: postData.workOrder.patient.patientCode}).subscribe((resultData) => {
                   this.showPromptModal("创建", true, "");
                   this.goodsLis = [];
+                  this.workOrderInspectScore = undefined;
                   this.getOrderList();
                   this.getDeptTaskType();
                   this.getTodayNum();
@@ -2871,6 +2879,7 @@ export class HushijiandanComponent implements OnInit {
               }else{
                 this.showPromptModal("创建", true, "");
                 this.goodsLis = [];
+                this.workOrderInspectScore = undefined;
                 this.getOrderList();
                 this.getDeptTaskType();
                 this.getTodayNum();
@@ -2928,6 +2937,7 @@ export class HushijiandanComponent implements OnInit {
               this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
                 this.showPromptModal("创建", true, "");
                 this.goodsLis = [];
+                this.workOrderInspectScore = undefined;
                 this.getOrderList();
                 this.getDeptTaskType();
                 this.getTodayNum();
@@ -2935,6 +2945,7 @@ export class HushijiandanComponent implements OnInit {
             }else{
               this.showPromptModal("创建", true, "");
               this.goodsLis = [];
+              this.workOrderInspectScore = undefined;
               this.getOrderList();
               this.getDeptTaskType();
               this.getTodayNum();
@@ -2980,6 +2991,7 @@ export class HushijiandanComponent implements OnInit {
               this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
                 this.showPromptModal("创建", true, "");
                 this.goodsLis = [];
+                this.workOrderInspectScore = undefined;
                 this.getOrderList();
                 this.getDeptTaskType();
                 this.getTodayNum();
@@ -2987,6 +2999,7 @@ export class HushijiandanComponent implements OnInit {
             }else{
               this.showPromptModal("创建", true, "");
               this.goodsLis = [];
+              this.workOrderInspectScore = undefined;
               this.getOrderList();
               this.getDeptTaskType();
               this.getTodayNum();
@@ -3042,6 +3055,7 @@ export class HushijiandanComponent implements OnInit {
                 this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
                   this.showPromptModal("创建", true, "");
                   this.goodsLis = [];
+                  this.workOrderInspectScore = undefined;
                   this.getOrderList();
                   this.getDeptTaskType();
                   this.getTodayNum();
@@ -3049,6 +3063,7 @@ export class HushijiandanComponent implements OnInit {
               }else{
                 this.showPromptModal("创建", true, "");
                 this.goodsLis = [];
+                this.workOrderInspectScore = undefined;
                 this.getOrderList();
                 this.getDeptTaskType();
                 this.getTodayNum();
@@ -3094,6 +3109,7 @@ export class HushijiandanComponent implements OnInit {
                 this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
                   this.showPromptModal("创建", true, "");
                   this.goodsLis = [];
+                  this.workOrderInspectScore = undefined;
                   this.getOrderList();
                   this.getDeptTaskType();
                   this.getTodayNum();
@@ -3101,6 +3117,7 @@ export class HushijiandanComponent implements OnInit {
               }else{
                 this.showPromptModal("创建", true, "");
                 this.goodsLis = [];
+                this.workOrderInspectScore = undefined;
                 this.getOrderList();
                 this.getDeptTaskType();
                 this.getTodayNum();
@@ -3124,6 +3141,37 @@ export class HushijiandanComponent implements OnInit {
     }
   }
 
+  //获取携带设备
+  goodsLis: any = []; //携带设备
+  getAllGoods() {
+    this.mainService.getDictionary("list", "goods").subscribe((data) => {
+      let goodsLis = data || [];
+      goodsLis.forEach((e) => {
+        this.goodsLis.push({
+          label: e.name,
+          value: e.id,
+          checked: false,
+        });
+      });
+    });
+  }
+
+  //获取陪检方式
+  workOrderInspectScoreList:any[] = [];
+  workOrderInspectScore:any;
+  getWorkOrderInspectScore() {
+    let postData = { idx: 0, sum: 9999, workOrderInspectScore: { hosId: this.currentHospital.id } };
+    this.mainService
+      .getFetchDataList("simple/data", "workOrderInspectScore", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.workOrderInspectScoreList = result.list || [];
+        } else {
+          this.message.error("请求数据失败");
+        }
+      });
+  }
+
   // 切换患者送检检查项目
   checkedShowMsg: any = {}; //患者送检检查项目对应展示信息
   current_allowUrgent = false; //当前任务类型是否允许加急
@@ -3218,17 +3266,12 @@ export class HushijiandanComponent implements OnInit {
           that.isRemand = data.isRemand == 1 ? true : false;
         }
         that.goodsLis = [];
+        that.workOrderInspectScore = undefined;
         that.allowUrgent = "0"; //加急
         that.urgentReason = ""; //加急原因
-        if (data.goods && data.goods.length) {
-          data.goods.forEach((e) => {
-            that.goodsLis.push({
-              label: e.name,
-              value: e["id"],
-              checked: false,
-            });
-          });
-        }
+
+        that.getAllGoods();
+        that.getWorkOrderInspectScore();
         // 工单备注配置 start
         that.isRemarks = data.remarksSwitch == 1;
         if (data.remarksSwitch == 1) {
@@ -3949,6 +3992,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
+        this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();
@@ -3963,6 +4007,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
+        this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();
@@ -3977,6 +4022,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
+        this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();
@@ -3991,6 +4037,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
+        this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();
@@ -4005,6 +4052,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
+        this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();
@@ -4019,6 +4067,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
+        this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();

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

@@ -147,6 +147,16 @@
           <nz-form-label class="label">隐藏陪检小扫描</nz-form-label>
           <nz-checkbox-group [(ngModel)]="hideInspectScan"></nz-checkbox-group>
         </div>
+        <!-- 是否开启携带设备 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">是否开启携带设备</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="enableGoods"></nz-checkbox-group>
+        </div>
+        <!-- 是否开启陪检方式 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">是否开启陪检方式</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="enableTripType"></nz-checkbox-group>
+        </div>
         <!-- 检查预约不进行工单合并 -->
         <!-- <div class="display_flex align-items_center mb8">
           <nz-form-label class="label">检查预约不进行工单合并</nz-form-label>

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

@@ -84,6 +84,14 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
   hideInspectScan:any[] = [
     {label:'是否开启',value: 0}
   ];
+  // 是否开启携带设备
+  enableGoods:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 是否开启陪检方式
+  enableTripType:any[] = [
+    {label:'是否开启',value: 0}
+  ];
   // 检查预约不进行工单合并
   // yyInspectMergeOrder:any[] = [
   //   {label:'是否开启',value: 0}
@@ -282,6 +290,8 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       batchSignExecutionParent: this.batchSignExecutionParent[0].checked ? 1 : 0,
       batchSignEndParent: this.batchSignEndParent[0].checked ? 1 : 0,
       hideInspectScan: this.hideInspectScan[0].checked ? 1 : 0,
+      enableGoods: this.enableGoods[0].checked ? 1 : 0,
+      enableTripType: this.enableTripType[0].checked ? 1 : 0,
       // yyInspectMergeOrder: this.yyInspectMergeOrder[0].checked ? 1 : 0,
       addService: this.addService[0].checked ? 1 : 0,
       addServiceTaskIds: this.addServiceTaskIds.length ? this.addServiceTaskIds.toString() : undefined,
@@ -410,6 +420,8 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           this.batchSignExecutionParent[0].checked = this.configs.batchSignExecutionParent == 1;
           this.batchSignEndParent[0].checked = this.configs.batchSignEndParent == 1;
           this.hideInspectScan[0].checked = this.configs.hideInspectScan == 1;
+          this.enableGoods[0].checked = this.configs.enableGoods == 1;
+          this.enableTripType[0].checked = this.configs.enableTripType == 1;
           // this.yyInspectMergeOrder[0].checked = this.configs.yyInspectMergeOrder == 1;
           this.addService[0].checked = this.configs.addService == 1;
           this.addServiceTaskIds = this.configs.addServiceTaskIds ? this.configs.addServiceTaskIds.split(',').map(v => +v) : [];

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.component.html

@@ -55,7 +55,7 @@
         <th nzWidth="14%">科室信息</th>
         <th nzWidth="14%">患者信息</th>
         <th nzWidth="14%">护理信息</th>
-        <th nzWidth="14%">出行方式</th>
+        <th nzWidth="14%">陪检方式</th>
         <th nzWidth="16%">检查项目</th>
         <th nzWidth="14%">签到信息</th>
         <th nzWidth="14%">状态</th>

src/app/views/main/main.component.html

@@ -36,7 +36,7 @@
           <i class="icon_transport transport-tongji-2 green" *ngIf="newStatisticsRole" (click)="toNewStatistics()" nz-tooltip nzTooltipTitle="统计"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && !userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要上班"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要下班"></i>
-          <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole || sampling">
+          <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole || sampling || communicationBook || realtimeBroadcastRole || inspectClosedLoopViewRole">
             <i class="icon_transport transport-gengduoda-copy" (mouseenter)="showDropdown1 = true" (mouseleave)="showDropdown1 = false"></i>
             <div class="dropdown-content ct" [hidden]="!showDropdown1" (mouseenter)="showDropdown1 = true" (mouseleave)="showDropdown1 = false">
               <div class="dropdownItem" *ngIf="pharmacyRole" (click)="toPharmacy()">药房端</div>

src/app/views/nurse-config/nurse-config.component.html

@@ -12,6 +12,10 @@
   <ng-container *ngIf="activeTagLink === 'incidentConfigHospital'">
     <app-configuration-distribution-hospital [hospitalTabList]="hospitalTabList"></app-configuration-distribution-hospital>
   </ng-container>
+  <!-- 数据字典 -->
+  <ng-container *ngIf="activeTagLink === 'nurseDictionary'">
+    <app-configuration-dictionary [dictionaryKeyList]="dictionaryKeyList"></app-configuration-dictionary>
+  </ng-container>
 </div>
 
 

src/app/views/nurse-config/nurse-config.component.ts

@@ -16,11 +16,16 @@ export class NurseConfigComponent implements OnInit, AfterViewInit {
     // { id: 1, name: '快捷按钮配置',},
   ];
 
+  // 数据字典
+  dictionaryKeyList:any[] = [
+    { id: 1, name: '携带设备', key: "goods"},
+  ]
+
   // 院区配置
   hospitalTabList:any[] = [
     { id: 2, name: '评价', key: "evaluate"}
   ]
-	
+
   ngOnInit(): void {}
 
   ngAfterViewInit(){

src/app/views/nurse-config/nurse-config.module.ts

@@ -5,7 +5,7 @@ import { NurseConfigRoutingModule } from './nurse-config-routing.module';
 import { NurseConfigComponent } from './nurse-config.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationDistributionHospitalComponent } from 'src/app/components/configurationCenter/configuration-distribution-hospital/configuration-distribution-hospital.component';
-
+import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
 
 @NgModule({
   declarations: [
@@ -16,6 +16,7 @@ import { ConfigurationDistributionHospitalComponent } from 'src/app/components/c
     CommonModule,
     NurseConfigRoutingModule,
     ShareModule,
+    ConfigurationDictionaryModule,
   ]
 })
 export class NurseConfigModule { }

src/app/views/patient-inspect-log-detail/patient-inspect-log-detail.component.html

@@ -46,7 +46,7 @@
             <div nz-col nzSpan="6">关联检查项目：{{ orderInfo.state && (orderInfo.state.value == 1 || orderInfo.state.value == 2) ? orderInfo.planInspectCount : orderInfo. inspectCount }}</div>
             <div nz-col nzSpan="6">状态：{{ orderInfo.state?.name }}</div>
             <div nz-col nzSpan="6">携带设备：{{ orderInfo.goodsNames }}</div>
-            <div nz-col nzSpan="6">出行方式：{{ orderInfo.tripTypeDTO?.inspectMode }}</div>
+            <div nz-col nzSpan="6">陪检方式：{{ orderInfo.tripTypeDTO?.inspectMode }}</div>
           </div>
 
           <div class="info" nz-row>
@@ -78,8 +78,8 @@
                 <td>{{ item.operationType?.name }}</td>
                 <td>{{ item.operationTime | date: 'yyyy-MM-dd HH:mm' }}</td>
                 <td>{{ item.username }}</td>
-                <td></td>
-                <td></td>
+                <td>{{ item.sourceHandoverName }}</td>
+                <td>{{ item.handoverName }}</td>
                 <td>{{ item.remark }}</td>
               </tr>
             </tbody>

src/app/views/task-type-management/task-type-management.component.html

@@ -144,7 +144,7 @@
         </div>
         <div class="mb8 w100">
           <nz-form-label class="label" nzRequired>{{(association.value == 'inspect' || association.value == 'patientTransport') ? '是否需要注意事项' : '是否需要备注信息'}}</nz-form-label>
-          <nz-radio-group class="handlerType" [(ngModel)]="isRemarks" (ngModelChange)="isRemarksChange()">
+          <nz-radio-group class="handlerType" [(ngModel)]="isRemarks">
             <label nz-radio nzValue='1'>是</label>
             <label nz-radio nzValue='0'>否</label>
           </nz-radio-group>
@@ -277,10 +277,6 @@
           <nz-time-picker [(ngModel)]="reserveDate" nzFormat="HH:mm" class="mr8"></nz-time-picker>
           <input nz-input style="width: 300px;" class="handlerType" [(ngModel)]="reserveMsg" placeholder="请填写超出时间提示用语" nzSize="default" />
         </div> -->
-        <div nz-row *ngIf="association.value == 'inspect' || association.value == 'patientTransport'">
-          <nz-form-label class="label">携带设备</nz-form-label>
-          <nz-checkbox-group class="handlerType" [(ngModel)]="carryEquipmentIds"></nz-checkbox-group>
-        </div>
         <div nz-row class="mb8 display_flex align-items_center">
           <nz-form-label class="label">急单权重</nz-form-label>
           <input nz-input type="number" class="flex_1" [(ngModel)]="urgeWeight" placeholder="请填写急单权重" nzSize="default" />
@@ -1260,7 +1256,7 @@
         <div>
           <nz-form-label class="label" nzRequired>固定科室</nz-form-label>
           <nz-select class="mb8 w100" [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false" nzShowSearch
-            nzAllowClear nzPlaceHolder="请选择固定科室" nzShowSearch 
+            nzAllowClear nzPlaceHolder="请选择固定科室" nzShowSearch
 
              [(ngModel)]="departments">
             <ng-container *ngFor="let data of courseListDataAll">

src/app/views/task-type-management/task-type-management.component.ts

@@ -82,7 +82,6 @@ export class TaskTypeManagementComponent implements OnInit {
   allRelatedBusiness: Array<any>; //关联业务
   allTaskType = []; //任务类型列表
   allTaskTypeShow; //任务类型列表选择标识
-  allGoods: Array<any>; //携带设备
   allScheduleClass; //班次列表
   //基础信息详情字段
   taskName; //任务名称
@@ -103,7 +102,6 @@ export class TaskTypeManagementComponent implements OnInit {
     value: "",
   }; //关联业务
   simultaneousNumber; //同时接单数
-  carryEquipmentIds; //携带设备
   allowUrgent = "1"; //是否加急
   urgentAudit = "0"; //加急是否审核
   autoFlag = "0"; //调度台是否可以新建工单
@@ -333,7 +331,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.getAllAssociation(); // 获取所有关联类型
     this.getallStatisticsDateType(); // 获取统计分类
     this.getAllRelatedBusiness(); // 获取所有关联业务
-    this.getAllGoods(); //获取携带设备
+    // this.getAllGoods(); //获取携带设备
     this.getAllScheduleClass(); //获取班次列表
     this.getAllTaskType(); //任务类型列表
     this.getSearchTaskList(); //任务类型列表,可搜索
@@ -341,25 +339,25 @@ export class TaskTypeManagementComponent implements OnInit {
     this.getReserveType(); //获取是否限制业务发起时间-字典
 		this.changeInp("")
   }
-	
+
 	handleChange($event: ColorEvent){
 		console.log($event.color)
 		this.colorConfig.hex = $event.color.hex
 	}
-	
+
 	showSketch(){
 		this.colorShow = true
 	}
-	
+
 	hideColorModal(){
 		this.colorConfig.hex = '#333'
 		this.colorShow = false
 	}
-	
+
 	submitFormColor(){
 		this.colorShow = false
 	}
-	
+
   // 搜索科室
   optionList = [];
   isLoading = false;
@@ -759,16 +757,6 @@ export class TaskTypeManagementComponent implements OnInit {
         }
       });
   }
-  //获取携带设备
-  getAllGoods() {
-    var that = this;
-    that.mainService.getDictionary("list", "goods").subscribe((data) => {
-      this.carryEquipmentIds = data;
-      for (var i = 0; i < this.carryEquipmentIds.length; i++) {
-        this.carryEquipmentIds[i]["label"] = this.carryEquipmentIds[i].name;
-      }
-    });
-  }
   //多选框
   // logs(value, data): void {}
   //急查多选
@@ -938,24 +926,6 @@ export class TaskTypeManagementComponent implements OnInit {
       this.getCourseList(this.pageSize);
     }
     // this.simultaneousNumber = data.simultaneousNumber;
-    if (
-      data.associationType.value == "patientTransport" ||
-      data.associationType.value == "inspect"
-    ) {
-      for (var i = 0; i < this.carryEquipmentIds.length; i++) {
-        this.carryEquipmentIds[i]["label"] = this.carryEquipmentIds[i].name;
-        this.carryEquipmentIds[i]["checked"] = false;
-        if (data.carryEquipmentIds) {
-          for (var k = 0; k < data.carryEquipmentIds.length; k++) {
-            if (
-              this.carryEquipmentIds[i].name == data.carryEquipmentIds[k].name
-            ) {
-              this.carryEquipmentIds[i]["checked"] = true;
-            }
-          }
-        }
-      }
-    }
 
     this.scheduleClassChecked = [];
     this.autoClass = [];
@@ -1264,18 +1234,6 @@ export class TaskTypeManagementComponent implements OnInit {
     this.taskData.taskType["integralDetailedRules"] =
       this.integralDetailedRulesData;
     this.taskData.taskType["carryingCourses"] = this.carryingCourses;
-    if (this.carryEquipmentIds.length > 0) {
-      this.taskData.taskType["carryEquipmentIds"] = [];
-      for (var i = 0; i < this.carryEquipmentIds.length; i++) {
-        var carry = {
-          id: "",
-        };
-        if (this.carryEquipmentIds[i].checked == true) {
-          carry.id = this.carryEquipmentIds[i].id;
-          this.taskData.taskType.carryEquipmentIds.push(carry);
-        }
-      }
-    }
 
     if (this.allScheduleClass.length > 0) {
       this.taskData.taskType["classesIds"] = [];
@@ -1545,7 +1503,7 @@ export class TaskTypeManagementComponent implements OnInit {
       id: null,
       value: "",
     }; //关联类型
-    this.getAllGoods(); //获取携带设备
+    // this.getAllGoods(); //获取携带设备
     this.getAllScheduleClass(); //获取班次列表
     this.allowUrgent = "1"; //是否加急
     this.urgentAudit = "0"; //加急是否审核
@@ -2776,15 +2734,6 @@ export class TaskTypeManagementComponent implements OnInit {
     }, 100);
   }
 
-  //修改是否填写备注
-  isRemarksChange(){
-    if(this.isRemarks == 1){
-      this.carryEquipmentIds.forEach(v => {
-        v.checked = false;
-      });
-    }
-  }
-
    //修改是否需要填写工号
    isReserveUserSwitchChange(){
     if(this.reserveUserSwitch == '1'){

src/login.html

@@ -0,0 +1,5 @@
+<script>
+if(window.location.pathname === '/login.html'){
+  window.location.replace('/#/login' + window.location.search);
+}
+</script>