批量添加患者接口修改

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

@@ -147,45 +147,32 @@ export class BatchInspectionComponent implements OnInit {
       this.message.info('请选择预约时间!');
       return;
     }
-    let postData = {
-      idx: 0,
-      sum: 9999,
-      patient: {
-        department: this.deptDTO,
-      }
-    };
+
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
-    this.mainService
-      .getFetchDataList("simple/data", "patient", postData)
-      .subscribe((data) => {
-        let patientList = data.list || [];
-        this.patientActiveList = patientList;
 
-        if(!this.patientActiveList.length){
-          this.message.warning('没有找到患者');
-          return;
-        }
+    let postData = {
+      startTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      endTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      inspectStateValue: 1,//待陪检
+      noneGdid: 1,//未绑定工单
+      nonePilId: 1,//未绑定患者闭环
+      deptId: this.deptDTO.id,
+    };
 
-        let postData = {
-          startTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
-          endTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
-          patientCodes: this.patientActiveList.map(v => v.patientCode).toString(),
-          inspectStateValue: 1,//待陪检
-          noneGdid: 1,//未绑定工单
-          nonePilId: 1,//未绑定患者闭环
-          deptId: this.deptDTO.id,
-        };
-
-        this.mainService
-          .getPatientInspectList(postData)
-          .subscribe((result:any) => {
-            this.message.remove(this.maskFlag);
-            this.maskFlag = false;
-            this.inspectActiveList = result.list || [];
-            this.showDelModal(this.patientActiveList, `您确认添加“<b class="red">${this.patientActiveList.length}</b>”位患者共“<b class="red">${this.inspectActiveList.length}</b>”项检查吗？`,'批量添加患者','add');
-          });
+    this.mainService
+      .getPatientInspectList(postData)
+      .subscribe((result:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.inspectActiveList = result.list || [];
+        this.patientActiveList = result.patientList || [];
+        if(this.patientActiveList.length){
+          this.showDelModal(this.patientActiveList, `您确认添加“<b class="red">${this.patientActiveList.length}</b>”位患者共“<b class="red">${this.inspectActiveList.length}</b>”项检查吗？`,'批量添加患者','add');
+        }else{
+          this.message.info('当前时间区间没有检查！');
+        }
       });
   }
 
@@ -298,7 +285,7 @@ export class BatchInspectionComponent implements OnInit {
     }else if (this.confirmDelType === "add") {
       //新增-患者陪检闭环
       let postData = {
-        patientIds: this.patientActiveList.map(v => v.id).toString() || undefined,
+        inspectIds: this.inspectActiveList.map(v => v.id).toString() || undefined,
       }
       this.mainService
         .bindPatientInspect(postData)