护士端页面调整暂存

proxy.conf.json

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

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

@@ -39,14 +39,14 @@
               <div class="item" *ngFor="let item of patientList">
                 <div class="itemTit txtC" style="font-weight: bold">
                   <ng-container *ngIf="item.illnessState">
-                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
-                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
+                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip [nzTooltipTitle]="item.illnessState.name"></i>
+                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip [nzTooltipTitle]="item.illnessState.name"></i>
                   </ng-container>
                   <ng-container *ngIf="item.careLevel">
-                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
-                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
-                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
-                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip nzTooltipTitle="三级护理"></i>
+                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
                   </ng-container>
                   <span nz-tooltip [nzTooltipTitle]="recentInfo" nzTooltipPlacement="right" [nzMouseEnterDelay]="1" (mouseenter)="getRecentInfo(item.patientCode)">{{ item.patientName }}({{ item.bedNum }})</span>
                 </div>
@@ -86,14 +86,14 @@
               <div class="item" *ngFor="let item of patientList">
                 <div class="itemTit txtC" style="font-weight: bold">
                   <ng-container *ngIf="item.illnessState">
-                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
-                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
+                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip [nzTooltipTitle]="item.illnessState.name"></i>
+                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip [nzTooltipTitle]="item.illnessState.name"></i>
                   </ng-container>
                   <ng-container *ngIf="item.careLevel">
-                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
-                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
-                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
-                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11"  nz-tooltip nzTooltipTitle="三级护理"></i>
+                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
                   </ng-container>
                   <span nz-tooltip [nzTooltipTitle]="recentInfo" nzTooltipPlacement="right" [nzMouseEnterDelay]="1" (mouseenter)="getRecentInfo(item.patientCode)">{{ item.patientName }}({{ currentDept.typeValue == 'outpatientService' ? item.cardNo : item.bedNum }})</span>
                 </div>
@@ -146,14 +146,14 @@
               <div class="item" *ngFor="let item of patientList">
                 <div class="itemTit txtC" style="font-weight: bold">
                   <ng-container *ngIf="item.patientDTO && item.patientDTO.illnessState">
-                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
-                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip [nzTooltipTitle]="item.patientDTO.illnessState.name"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip [nzTooltipTitle]="item.patientDTO.illnessState.name"></i>
                   </ng-container>
                   <ng-container *ngIf="item.patientDTO && item.patientDTO.careLevel">
-                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
-                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
-                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
-                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip nzTooltipTitle="三级护理"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip [nzTooltipTitle]="item.patientDTO.careLevel.name"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip [nzTooltipTitle]="item.patientDTO.careLevel.name"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip [nzTooltipTitle]="item.patientDTO.careLevel.name"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip [nzTooltipTitle]="item.patientDTO.careLevel.name"></i>
                   </ng-container>
                   <span>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.residenceNo : '' }})</span>
                 </div>
@@ -264,13 +264,13 @@
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.illnessState.value === '2'"
                                   class="colorRed icon_transport transport-wei"
                                   nz-tooltip
-                                  nzTooltipTitle="病危"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.illnessState.name"
                                 ></i>
                                 <i
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.illnessState.value === '3'"
                                   class="colorRed icon_transport transport-zhong1"
                                   nz-tooltip
-                                  nzTooltipTitle="病重"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.illnessState.name"
                                 ></i>
                               </ng-container>
                               <ng-container *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.careLevel">
@@ -278,25 +278,25 @@
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.careLevel.value === '0'"
                                   class="icon_transport transport-te1"
                                   nz-tooltip
-                                  nzTooltipTitle="特级护理"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.careLevel.name"
                                 ></i>
                                 <i
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.careLevel.value === '1'"
                                   class="icon_transport transport-Bduanshuzi1"
                                   nz-tooltip
-                                  nzTooltipTitle="一级护理"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.careLevel.name"
                                 ></i>
                                 <i
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.careLevel.value === '2'"
                                   class="icon_transport transport-Bduanshuzi"
                                   nz-tooltip
-                                  nzTooltipTitle="二级护理"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.careLevel.name"
                                 ></i>
                                 <i
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.careLevel.value === '3'"
                                   class="icon_transport transport-Bduanshuzi11"
                                   nz-tooltip
-                                  nzTooltipTitle="三级护理"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.careLevel.name"
                                 ></i>
                               </ng-container>
                               <strong>{{ surgeryWKOMsg.patientDTO ? surgeryWKOMsg.patientDTO.patientName : '' }}({{ surgeryWKOMsg.patientDTO ? surgeryWKOMsg.patientDTO.residenceNo : '' }})</strong>
@@ -1424,54 +1424,34 @@
 </div>
 
 <!-- 患者信息一键建单模态框 -->
-<div
-  class="save display_flex align-items_center justify-content_flex-center patient"
-  *ngIf="patientModal"
->
-  <div class="modalBody" style="width: 500px">
-    <div class="title">
-      患者送检<i
-        class="icon_transport transport-guanbi"
-        (click)="hidePatientOrder()"
-      ></i>
-    </div>
-    <overlay-scrollbars
-      #osComponentRef7
-      class="content"
-      style="max-height: 80vh"
-    >
-      <div class="jiTit borderB" *ngIf="checkedShowMsg.msg">
-        提示：您即将创建<b style="color: red">{{ patientMsg.patientName }}</b
-        >患者检查，{{ checkedShowMsg.msg }}
-      </div>
-      <div class="jiTit borderB" *ngIf="!checkedShowMsg.msg">
-        提示：您即将创建<b style="color: red">{{ patientMsg.patientName }}</b
-        >患者检查
-      </div>
-      <div class="jiTit borderB jiTitB">
-        如患者无预约检查无法进行“当天预约检查时”，可使用“特殊情况送检”进行建单。
+<div class="save display_flex align-items_center justify-content_flex-center patient" *ngIf="patientModal">
+  <div class="modalBody">
+    <div class="title">患者送检<i class="icon_transport transport-guanbi" (click)="hidePatientOrder()"></i></div>
+    <overlay-scrollbars #osComponentRef7 class="content" style="max-height: 80vh">
+      <div class="patientMsg">
+        <div class="patientMsgTips">患者姓名：{{patientMsg.patientName}}</div>
+        <div class="patientMsgTips">住院号：{{patientMsg.residenceNo}}</div>
+        <div class="patientMsgTips">护理级别：{{patientMsg.illnessState?.name}}</div>
+        <div class="patientMsgTips">危重等级：{{patientMsg.careLevel?.name}}</div>
       </div>
       <div>
         <form nz-form [formGroup]="patientForm" class="patientForm">
-          <nz-form-item class="datesControl">
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="checkedType"
-              >任务类型</nz-form-label
-            >
-            <nz-form-control nzErrorTip="请选择任务类型!" class="checkedType">
-              <nz-radio-group
-                class="radioGroup"
-                formControlName="checkedType"
-                (ngModelChange)="changeCheckedType()"
-              >
-                <label
-                  *ngFor="let item of checkTypeLis"
-                  nz-radio
-                  [nzValue]="item.id"
-                  >{{ item.taskName }}</label
-                >
-              </nz-radio-group>
-            </nz-form-control>
-          </nz-form-item>
+          <div class="pos">
+            <!-- 提示 -->
+            <nz-form-item class="pos-item pos-tip" *ngIf="checkedShowMsg.msg">
+              <nz-form-control>
+                <b class="pos-red">{{ checkedShowMsg.msg }}</b>
+              </nz-form-control>
+            </nz-form-item>
+            <nz-form-item class="datesControl">
+              <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="checkedType">任务类型</nz-form-label>
+              <nz-form-control nzErrorTip="请选择任务类型!" class="checkedType">
+                <nz-radio-group class="radioGroup" formControlName="checkedType" (ngModelChange)="changeCheckedType()">
+                  <label class="col6 ellipsis-oneline" [title]="item.taskName" *ngFor="let item of checkTypeLis" nz-radio [nzValue]="item.id">{{ item.taskName }}</label>
+                </nz-radio-group>
+              </nz-form-control>
+            </nz-form-item>
+          </div>
           <ng-container *ngIf="cLoading">
             <div style="text-align: center">
               <img src="../../../assets/images/loading.gif" alt="" />
@@ -1481,225 +1461,73 @@
           <ng-container *ngIf="!cLoading">
             <!-- 检查 -->
             <nz-form-item *ngIf="checkedShowMsg.status == 200">
-              <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck"
-                >关联的检查</nz-form-label
-              >
+              <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
               <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
-                <nz-checkbox-wrapper
-                  class="linkCheckCheck"
-                  ngDefaultControl
-                  formControlName="linkCheck"
-                  (nzOnChange)="linkCheckLisChange($event)"
-                >
+                <nz-checkbox-wrapper class="linkCheckCheck" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
                   <div nz-row *ngFor="let item of linkCheckLis">
                     <div nz-col nzSpan="24">
-                      <label nz-checkbox [nzValue]="item">{{
-                        item.label
-                      }}</label>
-                      <i
-                        class="icon_transport transport-zu1468 priority"
-                        *ngIf="item.priority === 1 || item.priority === '1'"
-                      ></i>
+                      <label nz-checkbox [nzValue]="item">{{ item.label}}</label>
+                      <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1 || item.priority === '1'"></i>
                     </div>
                   </div>
                 </nz-checkbox-wrapper>
-                <div
-                  class="red"
-                  style="line-height: normal; font-weight: bold"
-                  *ngIf="currentTasktype.isMoreDept === 0 && isInspects"
-                >
+                <div class="red" style="line-height: normal; font-weight: bold" *ngIf="currentTasktype.isMoreDept === 0 && isInspects">
                   您选择的检查包含了多个科室，请您只包含一个科室。
                 </div>
               </nz-form-control>
               <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
             </nz-form-item>
-            <div
-              class="pos"
-              *ngIf="
-                (currentTasktype.associationType.value === 'patientTransport' &&
-                  appointmentZyBuildFlag == 1) ||
-                (currentTasktype.associationType.value === 'inspect' &&
-                  appointmentBuildFlag == 1)
-              "
-            >
+            <div class="pos" *ngIf="(currentTasktype.associationType.value === 'patientTransport' && appointmentZyBuildFlag == 1) || (currentTasktype.associationType.value === 'inspect' && appointmentBuildFlag == 1)">
               <!-- 需要预约检查 -->
               <nz-form-item class="pos-item">
                 <nz-form-control>
-                  <label
-                    nz-checkbox
-                    [nzDisabled]="
-                      (!linkCheckLisTrue &&
-                        currentTasktype.associationType.value === 'inspect') ||
-                      (linkCheckLisTrue &&
-                        allowUrgent == 1 &&
-                        currentTasktype.associationType.value === 'inspect') ||
-                      (allowUrgent == 1 &&
-                        currentTasktype.associationType.value ===
-                          'patientTransport')
-                    "
-                    [(ngModel)]="isYyInspect"
-                    (ngModelChange)="yyInspectChange($event)"
-                    [ngModelOptions]="{ standalone: true }"
-                    style="font-weight: bold"
-                    >需要预约检查</label
-                  >
+                  <label class="mt13" nz-checkbox [nzDisabled]="(!linkCheckLisTrue && currentTasktype.associationType.value === 'inspect') || (linkCheckLisTrue && allowUrgent == 1 && currentTasktype.associationType.value === 'inspect') || (allowUrgent == 1 && currentTasktype.associationType.value === 'patientTransport')" [(ngModel)]="isYyInspect" (ngModelChange)="yyInspectChange($event)" [ngModelOptions]="{ standalone: true }" style="font-weight: bold">需要预约检查</label>
+                  <span class="red pos-red">请您填写实际预约检查时间，系统会根据时间安排人员进行陪检!</span>
                 </nz-form-control>
               </nz-form-item>
               <!-- 预约建单时间-患者其他服务 -->
-              <nz-form-item
-                class="yyTime"
-                [ngClass]="{
-                  yyTimeError: (!yyTimeZy || !yyDateZy) && clickYYZyFlag
-                }"
-                *ngIf="
-                  currentTasktype.associationType.value === 'patientTransport'
-                "
-              >
-                <nz-form-label [nzSm]="24" [nzXs]="24"
-                  >预约建单时间</nz-form-label
-                >
+              <nz-form-item class="yyTime" [ngClass]="{yyTimeError: (!yyTimeZy || !yyDateZy) && clickYYZyFlag}" *ngIf="currentTasktype.associationType.value === 'patientTransport'">
+                <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
                 <nz-form-control [nzSm]="24" [nzXs]="24">
-                  <nz-date-picker
-                    [nzDisabled]="!isYyInspect"
-                    [(ngModel)]="yyDateZy"
-                    (ngModelChange)="yyDateChange($event)"
-                    [ngModelOptions]="{ standalone: true }"
-                    [nzAllowClear]="false"
-                    [nzDisabledDate]="disabledyyDateZy"
-                    [nzShowToday]="false"
-                  ></nz-date-picker>
-                  <nz-time-picker
-                    [nzDisabled]="!isYyInspect || !yyDateZy"
-                    class="ml8"
-                    nzFormat="HH:mm"
-                    [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod"
-                    [nzSecondStep]="60"
-                    [(ngModel)]="yyTimeZy"
-                    (ngModelChange)="yyTimeZyChange($event)"
-                    [ngModelOptions]="{ standalone: true }"
-                    [nzDisabledHours]="disabledHours"
-                    [nzDisabledMinutes]="disabledMinutes"
-                    [nzAllowEmpty]="false"
-                  >
+                  <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDateZy" (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{ standalone: true }" [nzAllowClear]="false" [nzDisabledDate]="disabledyyDateZy" [nzShowToday]="false"></nz-date-picker>
+                  <nz-time-picker [nzDisabled]="!isYyInspect || !yyDateZy" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod" [nzSecondStep]="60" [(ngModel)]="yyTimeZy" (ngModelChange)="yyTimeZyChange($event)" [ngModelOptions]="{ standalone: true }" [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
                   </nz-time-picker>
-                  <button
-                    [disabled]="!isYyInspect || (isYyInspect && !yyDateZy)"
-                    nz-button
-                    nzType="primary"
-                    class="ml8"
-                    (click)="nextDayZy()"
-                  >
+                  <button [disabled]="!isYyInspect || (isYyInspect && !yyDateZy)" nz-button nzType="primary" class="ml8" (click)="nextDayZy()">
                     下一日
                   </button>
                 </nz-form-control>
-                <div
-                  class="red w100"
-                  *ngIf="(!yyTimeZy || !yyDateZy) && clickYYZyFlag"
-                >
+                <div class="red w100" *ngIf="(!yyTimeZy || !yyDateZy) && clickYYZyFlag">
                   请填写预约建单时间!
                 </div>
-                <div class="red">
-                  请您填写实际预约检查时间，系统会根据时间安排人员进行陪检!
-                </div>
               </nz-form-item>
               <!-- 预约建单时间 -->
-              <nz-form-item
-                class="yyTime"
-                [ngClass]="{ yyTimeError: (!yyTime || !yyDate) && clickYYFlag }"
-                *ngIf="currentTasktype.associationType.value === 'inspect'"
-              >
-                <nz-form-label [nzSm]="24" [nzXs]="24"
-                  >预约建单时间</nz-form-label
-                >
+              <nz-form-item class="yyTime" [ngClass]="{ yyTimeError: (!yyTime || !yyDate) && clickYYFlag }" *ngIf="currentTasktype.associationType.value === 'inspect'">
+                <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
                 <nz-form-control [nzSm]="24" [nzXs]="24">
-                  <nz-date-picker
-                    [nzDisabled]="!isYyInspect"
-                    [(ngModel)]="yyDate"
-                    (ngModelChange)="yyDateChange($event)"
-                    [ngModelOptions]="{ standalone: true }"
-                    [nzAllowClear]="false"
-                    [nzDisabledDate]="disabledyyDate"
-                    [nzShowToday]="false"
-                  >
+                  <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDate" (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{ standalone: true }" [nzAllowClear]="false" [nzDisabledDate]="disabledyyDate" [nzShowToday]="false">
                   </nz-date-picker>
-                  <nz-time-picker
-                    [nzDisabled]="!isYyInspect || !yyDate"
-                    class="ml8"
-                    nzFormat="HH:mm"
-                    [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod"
-                    [nzSecondStep]="60"
-                    [(ngModel)]="yyTime"
-                    (ngModelChange)="yyTimeChange($event)"
-                    [ngModelOptions]="{ standalone: true }"
-                    [nzDisabledHours]="disabledHours"
-                    [nzDisabledMinutes]="disabledMinutes"
-                    [nzAllowEmpty]="false"
-                  >
+                  <nz-time-picker [nzDisabled]="!isYyInspect || !yyDate" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod" [nzSecondStep]="60" [(ngModel)]="yyTime" (ngModelChange)="yyTimeChange($event)" [ngModelOptions]="{ standalone: true }" [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
                   </nz-time-picker>
-                  <button
-                    [disabled]="!isYyInspect || (isYyInspect && !yyDate)"
-                    nz-button
-                    nzType="primary"
-                    class="ml8"
-                    (click)="nextDay()"
-                  >
+                  <button [disabled]="!isYyInspect || (isYyInspect && !yyDate)" nz-button nzType="primary" class="ml8" (click)="nextDay()">
                     下一日
                   </button>
                 </nz-form-control>
-                <div
-                  class="red w100"
-                  *ngIf="(!yyTime || !yyDate) && clickYYFlag"
-                >
+                <div class="red w100" *ngIf="(!yyTime || !yyDate) && clickYYFlag">
                   请填写预约建单时间!
                 </div>
-                <div class="red">
-                  请您填写实际预约检查时间，系统会根据时间安排人员进行陪检!
-                </div>
               </nz-form-item>
             </div>
             <!-- 100009 科室任务类型状态码未配置 -->
-            <nz-form-item
-              *ngIf="
-                checkedShowMsg.status != 200 && checkedShowMsg.status == 100009
-              "
-            >
+            <nz-form-item *ngIf="checkedShowMsg.status != 200 && checkedShowMsg.status == 100009">
               <div class="txtC">{{ checkedShowMsg.msg }}</div>
             </nz-form-item>
             <!-- 100015 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
-            <nz-form-item
-              *ngIf="
-                checkedShowMsg.status != 200 &&
-                (checkedShowMsg.status == 100015 ||
-                  checkedShowMsg.status == 100013)
-              "
-            >
-              <nz-form-label
-                [nzSm]="6"
-                [nzXs]="24"
-                nzRequired
-                nzFor="originOffice"
-                >起点科室</nz-form-label
-              >
+            <nz-form-item *ngIf="checkedShowMsg.status != 200 && (checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013)">
+              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室</nz-form-label>
               <nz-form-control nzErrorTip="请选择起点科室!">
-                <nz-select
-                  class="w100"
-                  formControlName="originOffice"
-                  [nzDropdownMatchSelectWidth]="false"
-                  nzServerSearch
-                  nzShowSearch
-                  (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>
+                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (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>
@@ -1709,40 +1537,12 @@
               </nz-form-control>
             </nz-form-item>
             <!-- 100014 （护士端一键建单展示策略）取终点科室和msg 值展示 -->
-            <nz-form-item
-              *ngIf="
-                checkedShowMsg.status != 200 &&
-                (checkedShowMsg.status == 100014 ||
-                  checkedShowMsg.status == 100015)
-              "
-            >
-              <nz-form-label
-                [nzSm]="6"
-                [nzXs]="24"
-                nzRequired
-                nzFor="targetOffice"
-                >目标科室</nz-form-label
-              >
-              <nz-form-control nzErrorTip="请选择目标科室!">
-                <nz-select
-                  class="w100"
-                  formControlName="targetOffice"
-                  [nzDropdownMatchSelectWidth]="false"
-                  nzServerSearch
-                  nzShowSearch
-                  (nzOnSearch)="searchDept('target', checkedShowMsg, $event)"
-                  nzPlaceHolder="请选择目标科室"
-                >
-                  <ng-container
-                    *ngFor="let option of checkedShowMsg.end.end.list"
-                  >
-                    <nz-option
-                      *ngIf="true"
-                      [nzLabel]="
-                        deptDisplay == 2 ? option.deptalias : option.dept
-                      "
-                      [nzValue]="option.id"
-                    ></nz-option>
+            <nz-form-item nz-row *ngIf="checkedShowMsg.status != 200 && (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" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', checkedShowMsg, $event)" nzPlaceHolder="请选择目标科室">
+                  <ng-container *ngFor="let option of checkedShowMsg.end.end.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>
@@ -1752,18 +1552,19 @@
               </nz-form-control>
             </nz-form-item>
             <!-- 自动送回 -->
-            <nz-form-item
-              *ngIf="
-                checkedShowMsg.status != 200 && checkedShowMsg.isRemand == 1
-              "
-            >
+            <nz-form-item *ngIf="checkedShowMsg.status != 200 && checkedShowMsg.isRemand == 1">
               <nz-form-control>
-                <label
-                  nz-checkbox
-                  [(ngModel)]="isRemand"
-                  [ngModelOptions]="{ standalone: true }"
-                  >自动送回</label
-                >
+                <label nz-checkbox [(ngModel)]="isRemand" [ngModelOptions]="{ standalone: true }">自动送回</label>
+              </nz-form-control>
+            </nz-form-item>
+            <!-- 是否加急 -->
+            <nz-form-item *ngIf="current_allowUrgent">
+              <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
+              <nz-form-control>
+                <nz-radio-group [(ngModel)]="allowUrgent" (ngModelChange)="allowUrgentChange($event)" formControlName="allowUrgent">
+                  <label nz-radio nzValue="1">是</label>
+                  <label nz-radio nzValue="0">否</label>
+                </nz-radio-group>
               </nz-form-control>
             </nz-form-item>
             <!-- 工单备注 -->
@@ -1776,69 +1577,22 @@
                   </div>
                 </div>
                 <nz-form-control>
-                  <textarea
-                  nz-input
-                  [placeholder]="workOrderRemarkTips2"
-                  [nzAutosize]="{ minRows: 3, maxRows: 5 }"
-                  maxlength="100"
-                  formControlName="workOrderRemark2"
-                  [(ngModel)]="workOrderRemark2"
-                  #remarksEle2
-                ></textarea>
+                  <textarea nz-input [placeholder]="workOrderRemarkTips2" [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100" formControlName="workOrderRemark2" [(ngModel)]="workOrderRemark2" #remarksEle2></textarea>
                 </nz-form-control>
               </nz-form-item>
             </ng-container>
             <!-- 携带设备 -->
             <nz-form-item *ngIf="!isRemarks && goodsLis.length">
-              <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="goods" class="goods"
-                >携带设备</nz-form-label
-              >
+              <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="goods" class="goods">携带设备</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 *ngIf="current_allowUrgent">
-              <nz-form-label
-                [nzSm]="6"
-                [nzXs]="24"
-                nzFor="allowUrgent"
-                class="goods"
-                >是否加急</nz-form-label
-              >
-              <nz-form-control>
-                <nz-radio-group
-                  [(ngModel)]="allowUrgent"
-                  (ngModelChange)="allowUrgentChange($event)"
-                  formControlName="allowUrgent"
-                >
-                  <label nz-radio nzValue="1">是</label>
-                  <label nz-radio nzValue="0">否</label>
-                </nz-radio-group>
+                <nz-checkbox-group formControlName="goods" [(ngModel)]="goodsLis"></nz-checkbox-group>
               </nz-form-control>
             </nz-form-item>
             <!-- 加急原因 -->
             <nz-form-item *ngIf="current_allowUrgent && allowUrgent == 1">
-              <nz-form-label
-                [nzSm]="6"
-                [nzXs]="24"
-                nzRequired
-                nzFor="urgentReason"
-                class="goods"
-                >加急原因</nz-form-label
-              >
+              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="urgentReason" class="goods">加急原因</nz-form-label>
               <nz-form-control>
-                <textarea
-                  rows="4"
-                  placeholder="请输入加急原因"
-                  nz-input
-                  [(ngModel)]="urgentReason"
-                  formControlName="urgentReason"
-                ></textarea>
+                <textarea rows="4" placeholder="请输入加急原因" nz-input [(ngModel)]="urgentReason" formControlName="urgentReason"></textarea>
               </nz-form-control>
             </nz-form-item>
           </ng-container>
@@ -1846,54 +1600,16 @@
       </div>
     </overlay-scrollbars>
     <div class="btns display_flex justify-content_flex-center">
-      <button
-        nz-button
-        nzType="primary"
-        [nzLoading]="btnLoading1"
-        (click)="confirmPatient1('patient-yuyue')"
-        *ngIf="
-          currentTasktype.associationType.value === 'inspect' &&
-          isYyInspect &&
-          !(currentTasktype.isMoreDept === 0 && isInspects) && checkedShowMsg.status != 100009
-        "
-      >
+      <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-yuyue')" *ngIf="currentTasktype.associationType.value === 'inspect' && isYyInspect && !(currentTasktype.isMoreDept === 0 && isInspects) && checkedShowMsg.status != 100009">
         预约建单
       </button>
-      <button
-        nz-button
-        nzType="primary"
-        [nzLoading]="btnLoading1"
-        (click)="confirmPatient1('patient-zy-yuyue')"
-        *ngIf="
-          currentTasktype.associationType.value === 'patientTransport' &&
-          isYyInspect && checkedShowMsg.status != 100009
-        "
-      >
+      <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-zy-yuyue')" *ngIf="currentTasktype.associationType.value === 'patientTransport' && isYyInspect && checkedShowMsg.status != 100009">
         预约建单
       </button>
-      <button
-        nz-button
-        nzType="default"
-        [nzLoading]="btnLoading"
-        (click)="confirmPatient()"
-        class="orderThis"
-        *ngIf="
-          ((!isYyInspect &&
-            currentTasktype.associationType.value === 'inspect' &&
-            linkCheckLisTrue) ||
-            (!isYyInspect &&
-              currentTasktype.associationType.value === 'patientTransport')) &&
-          !(currentTasktype.isMoreDept === 0 && isInspects) && checkedShowMsg.status != 100009
-        "
-      >
+      <button nz-button nzType="default" [nzLoading]="btnLoading" (click)="confirmPatient()" class="orderThis" *ngIf="((!isYyInspect && currentTasktype.associationType.value === 'inspect' && linkCheckLisTrue) || (!isYyInspect && currentTasktype.associationType.value === 'patientTransport')) && !(currentTasktype.isMoreDept === 0 && isInspects) && checkedShowMsg.status != 100009">
         直接建单
       </button>
-      <button
-        class="btn cancel"
-        nz-button
-        nzType="default"
-        (click)="hidePatientOrder()"
-      >
+      <button class="btn cancel" nz-button nzType="default" (click)="hidePatientOrder()">
         取消
       </button>
     </div>

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

@@ -2569,3 +2569,79 @@
 .tabPermissionItem{
   padding: 0 16px;
 }
+
+.patient ::ng-deep .ant-form label{
+  font-size: 18px;
+  margin-top: 8px;
+  &.col6{
+    width: 16.666%;
+  }
+  &.mt13{
+    margin-top: 13px;
+  }
+}
+.patient ::ng-deep .ant-radio-wrapper{
+  margin-right: 0;
+  padding-right: 8px;
+}
+
+.patient ::ng-deep .ant-form-item-control{
+  line-height: normal;
+}
+.patient ::ng-deep .ant-radio-inner{
+  top: -3px;
+}
+.patient ::ng-deep .ant-form-item-label{
+  line-height: 32px!important;
+}
+.patient{
+  .modalBody{
+    width: 950px;
+    border-radius: 16px;
+    padding: 16px 24px;
+    .title{
+      font-size: 22px;
+      font-weight: bold;
+      i{
+        font-size: 24px;
+        padding: 0;
+      }
+    }
+    .content{
+      margin-top: 16px;
+      border-radius: 8px;
+      padding: 0;
+      .patientMsg{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 16px;
+        border-bottom: 2px solid #D1D1D1;
+        .patientMsgTips{
+          font-size: 18px;
+          color: #000000;
+        }
+      }
+      .patientForm{
+        padding: 16px 24px;
+        .radioGroup{
+          line-height: normal;
+        }
+        .pos-item{
+          left: 125px;
+          &.pos-tip{
+            left: 100px;
+            .pos-red{
+              margin-top: 13px;
+            }
+          }
+          .pos-red{
+            font-size: 18px;
+            margin-top: 8px;
+            display: inline-block;
+          }
+        }
+      }
+    }
+  }
+}