拉取代码

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

@@ -1188,10 +1188,10 @@
                         </div>
                         <!-- 预约建单时间-患者其他服务--start -->
                         <div nz-col [nzSpan]="24" class="pos">
-                          <!-- 需要预约检查 -->
+                          <!-- 预约陪检 -->
                           <nz-form-item class="pos-item">
                             <nz-form-control>
-                              <label nz-checkbox [(ngModel)]="isYyInspect" (ngModelChange)="yyInspectChange($event)" [ngModelOptions]="{ standalone: true }" style="font-weight: bold">需要预约检查</label>
+                              <label nz-checkbox [(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>
@@ -1290,10 +1290,10 @@
                         </div>
                         <!-- 预约建单时间-其他临床服务--start -->
                         <div nz-col [nzSpan]="24" class="pos" *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value === 'other'">
-                          <!-- 需要预约检查 -->
+                          <!-- 预约陪检 -->
                           <nz-form-item class="pos-item">
                             <nz-form-control>
-                              <label nz-checkbox [(ngModel)]="isYyInspect" (ngModelChange)="yyInspectChange($event)" [ngModelOptions]="{ standalone: true }" style="font-weight: bold">需要预约检查</label>
+                              <label nz-checkbox [(ngModel)]="isYyInspect" (ngModelChange)="yyInspectChange($event)" [ngModelOptions]="{ standalone: true }" style="font-weight: bold">预约陪检</label>
                             </nz-form-control>
                           </nz-form-item>
                           <!-- 预约建单时间 -->

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

@@ -2668,7 +2668,7 @@
 }
 .patient{
   .modalBody{
-    width: 950px;
+    width: 80%;
     border-radius: 16px;
     padding: 16px 24px;
     .title{

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

@@ -3403,21 +3403,21 @@ export class HushijiandanComponent implements OnInit {
       .postCustom("nurse", "workOrder/buildTrip", postData)
       .subscribe((result) => {
         this.buildMsg = result;
-        if (result.remarksSwitch == 1) {
-					if(result.end){
-						if(result.end.end.departmentStrategy==202){
-							this.isEndFixedType = true
-						}else{
-							this.isEndFixedType = false
-						}
+				if(result.end){
+					if(result.end.end.departmentStrategy==202){
+						this.isEndFixedType = true
+					}else{
+						this.isEndFixedType = false
 					}
-					if(result.start){
-						if(result.start.start.departmentStrategy==202){
-							this.isStartFixedType = true
-						}else{
-							this.isStartFixedType = false
-						}
+				}
+				if(result.start){
+					if(result.start.start.departmentStrategy==202){
+						this.isStartFixedType = true
+					}else{
+						this.isStartFixedType = false
 					}
+				}
+        if (result.remarksSwitch == 1) {
           if (result.customRemarks === null || result.customRemarks === "") {
             this.customRemarks = [];
           } else {