bugfix

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

@@ -1106,18 +1106,18 @@
                                 </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"></nz-checkbox-group>
                               </nz-form-control>
                             </nz-form-item>
                           </div>
                         </div>
-                        <div nz-col [nzSpan]="24">
+                        <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" *ngIf="workOrderInspectScoreList.length">陪检方式</nz-form-label>
+                              <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>

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

@@ -4721,6 +4721,7 @@ export class FuwutaiComponent implements OnInit {
   getAllGoods() {
     this.mainService.getDictionary("list", "goods").subscribe((data) => {
       let goodsNow = data || [];
+      this.goodsNow = [];
       goodsNow.forEach((e) => {
         this.goodsNow.push({
           label: e.name,
@@ -4735,7 +4736,7 @@ export class FuwutaiComponent implements OnInit {
   workOrderInspectScoreList:any[] = [];
   workOrderInspectScore:any;
   getWorkOrderInspectScore() {
-    let postData = { idx: 0, sum: 9999, workOrderInspectScore: { } };
+    let postData = { idx: 0, sum: 9999, workOrderInspectScore: { hosId: this.checkedHos } };
     this.mainService
       .getFetchDataList("simple/data", "workOrderInspectScore", postData)
       .subscribe((result) => {

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>
@@ -1638,13 +1637,7 @@
             </ng-container>
             <!-- 携带设备 -->
             <div class="display_flex justify-content_space-between align-items_center">
-              <nz-form-item class="display_flex align-items_center flex_1" *ngIf="goodsLis.length">
-                <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>
-              <nz-form-item class="display_flex align-items_center flex_1" *ngIf="workOrderInspectScoreList.length">
+              <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">
@@ -1652,6 +1645,12 @@
                   </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>

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

@@ -3160,7 +3160,7 @@ export class HushijiandanComponent implements OnInit {
   workOrderInspectScoreList:any[] = [];
   workOrderInspectScore:any;
   getWorkOrderInspectScore() {
-    let postData = { idx: 0, sum: 9999, workOrderInspectScore: { } };
+    let postData = { idx: 0, sum: 9999, workOrderInspectScore: { hosId: this.currentHospital.id } };
     this.mainService
       .getFetchDataList("simple/data", "workOrderInspectScore", postData)
       .subscribe((result) => {