修复

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

@@ -1170,33 +1170,48 @@ export class HushijiandanComponent implements OnInit {
       idx: this.infoPageIdx - 1,
       sum: 10,
     };
-    // 患者信息
-    postData["surgery"] = {
-      searchKey: e ? e : this.tabSearchCont,
-      applyDateStart: format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss"),
-      applyDateEnd: format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss"),
-      hosId: this.currentHospital.id,
-    };
-    // 查询父级科室患者
-    // postData["surgery"]["parentIdOnly"] = true;
-    if (
-      this.currentDept.typeValue == "checkRoom2" ||
-      this.currentDept.typeValue == "outpatientDept" ||
-      this.currentDept.typeValue == "checkRoom"
-    ) {
-      delete postData["surgery"]["surgeryDept"]; //搜索范围为全院在院患者
-    } else {
-      postData["surgery"]["surgeryDept"] = this.loginUserDeptId;
+    if(this.currentDept.typeValue == 'surgery'){
+      // 手术安排信息
+      postData["surgery"] = {
+        searchKey: e ? e : this.tabSearchCont,
+        applyDateStart: format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss"),
+        applyDateEnd: format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss"),
+        hosId: this.currentHospital.id,
+        surgeryDept: this.loginUserDeptId
+      };
+    }else{
+      // 患者信息
+      postData["patient"] = {
+        keyWord: e ? e : this.tabSearchCont,
+      };
+      // 查询父级科室患者
+      postData["patient"]["parentIdOnly"] = true;
+      if (
+        this.currentDept.typeValue == "checkRoom2" ||
+        this.currentDept.typeValue == "outpatientDept" ||
+        this.currentDept.typeValue == "checkRoom"
+      ) {
+        delete postData["patient"]["department"]; //搜索范围为全院在院患者
+      } else {
+        postData["patient"]["department"] = { id: this.loginUserDeptId };
+      }
     }
+    
     this.snum++;
     this.mainService
-      .getFetchDataList("simple/data", "surgery", postData)
+      .getFetchDataList(this.currentDept.typeValue == 'surgery' ? "simple/data" : 'nurse', this.currentDept.typeValue == 'surgery' ? "surgery" : 'patient', postData)
       .subscribe((data) => {
         this.snum--;
         if (data.list.length > 0) {
           data.list.forEach((item) => {
-            if (item.patientDTO && item.patientDTO.focusPatient === undefined) {
-              item.patientDTO.focusPatient = 0;
+            if(this.currentDept.typeValue == 'surgery'){
+              if (item.patientDTO && item.patientDTO.focusPatient === undefined) {
+                item.patientDTO.focusPatient = 0;
+              }
+            }else{
+              if (item.focusPatient === undefined) {
+                item.focusPatient = 0;
+              }
             }
           });
         }