Selaa lähdekoodia

Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

maotao 3 viikkoa sitten
vanhempi
commit
79dd19b104

+ 2 - 1
src/app/share/edit-inspect-info2/edit-inspect-info2.component.ts

@@ -57,6 +57,7 @@ export class EditInspectInfo2Component implements OnInit {
57
     if(this.patient){
57
     if(this.patient){
58
       this.inspectData.patientId = this.patient.id;
58
       this.inspectData.patientId = this.patient.id;
59
       this.patientList = [this.patient];
59
       this.patientList = [this.patient];
60
+      this.patientDTO = this.patient;
60
     }
61
     }
61
 
62
 
62
     if(this.date){
63
     if(this.date){
@@ -193,7 +194,7 @@ export class EditInspectInfo2Component implements OnInit {
193
     }
194
     }
194
     this.submitFormHand.emit({
195
     this.submitFormHand.emit({
195
       applyDeptId: this.inspectData.applyDeptId,
196
       applyDeptId: this.inspectData.applyDeptId,
196
-      patientDTO: this.patientList.find(v => v.id == this.inspectData.patientId),
197
+      patientDTO: this.patientDTO,
197
       deptId: this.deptId,
198
       deptId: this.deptId,
198
       remark: this.remark,
199
       remark: this.remark,
199
       date: format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'),
200
       date: format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'),