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

src/app/share/dialog-surgery/dialog-surgery.component.html

@@ -6,7 +6,8 @@
       <div class="defeat" [innerHTML]="content | htmlTransform"></div>
       <ul class="list">
         <li *ngIf="dataObj.doctorNameFlag"><span>主刀医生：</span><span>{{ dataObj.doctorName }}</span></li>
-        <li *ngIf="dataObj.anesthetistNameFlag"><span>麻醉医师：</span><span>{{ dataObj.anesthetistName }}</span></li>
+        <!-- <li *ngIf="dataObj.anesthetistNameFlag"><span>麻醉医师：</span><span>{{ dataObj.anesthetistName }}</span></li> -->
+        <li *ngIf="dataObj.anesthetistNameFlag"><span>临床：</span><span>通知临床</span></li>
         <li *ngIf="dataObj.docAssistantInfosFlag"><span>助理医生：</span><span>{{ dataObj.docAssistantInfos }}</span></li>
         <li *ngIf="dataObj.patientNameFlag"><span>手术患者：</span><span>{{ dataObj.patientDTO ? dataObj.patientDTO.patientName : '' }}</span></li>
       </ul>

src/app/views/blood-search/blood-search.component.html

@@ -65,7 +65,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.applyCode || '无'}}</td>
             <td>{{ data.bloodCode || '无'}}</td>
             <td>{{ data.state?.name }}</td>

src/app/views/drug-search/drug-search.component.html

@@ -84,7 +84,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.launch?.dept}}</td>
             <td>{{ data.target?.dept }}</td>
             <td>{{ data.deliveryUser?.name }}</td>

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

@@ -1571,7 +1571,7 @@
                       </thead>
                       <tbody>
                         <tr *ngFor="let data of adviceList; let i = index">
-                          <td>{{ i + 1 }}</td>
+                          <td>{{i+(advicePageIndex-1) * advicePageSize + 1}}</td>
                           <td>{{ data.createTime.slice(0, 16) }}</td>
                           <td>
                             <span
@@ -1651,7 +1651,7 @@
                       </thead>
                       <tbody>
                         <tr *ngFor="let item of surgeryList;let i = index">
-                          <td>{{ i + 1 }}</td>
+                          <td>{{i+(surgeryPageIndex-1) * surgeryPageSize + 1}}</td>
                           <td>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.bedNum : '' }})<br>{{ item.patientDTO ? item.patientDTO.residenceNo : '' }}</td>
                           <td>{{ item.applyDate | date:'MM-dd HH:mm' }}</td>
                           <td>{{ item.areaDeptDTO ? (deptDisplay == 2 ? item.areaDeptDTO.deptalias : item.areaDeptDTO.dept) : '' }}</td>
@@ -1754,7 +1754,7 @@
                             let i = index
                           "
                         >
-                          <td>{{ i + 1 }}</td>
+                          <td>{{i+(historySpecimenPageIndex-1) * historySpecimenPageSize + 1}}</td>
                           <td>{{ data.stype ? data.stype.name : "-" }}</td>
                           <td>
                             {{ data.speState ? data.speState.name : "-" }}
@@ -1856,7 +1856,7 @@
                             let i = index
                           "
                         >
-                          <td>{{ i + 1 }}</td>
+                          <td>{{i+(historyDrugsbagPageIndex-1) * historyDrugsbagPageSize + 1}}</td>
                           <td>{{ data.packid || "-" }}</td>
                           <td>
                             {{
@@ -2139,7 +2139,7 @@
                       </thead>
                       <tbody>
                         <tr *ngFor="let data of bxlbList; let i = index">
-                          <td>{{ i + 1 }}</td>
+                          <td>{{i+(bxlbPageIndex-1) * bxlbPageSize + 1}}</td>
                           <td>{{ data.description || "无" }}</td>
                           <td>
                             {{ data.startDate | date: "yyyy-MM-dd HH:mm" }}
@@ -2161,8 +2161,8 @@
                         [(nzPageIndex)]="bxlbPageIndex"
                         [(nzTotal)]="bxlbListLength"
                         [(nzPageSize)]="bxlbPageSize"
-                        (nzPageIndexChange)="getBxlb(bxlbPageIndex)"
-                        (nzPageSizeChange)="getBxlb(bxlbPageIndex)"
+                        (nzPageIndexChange)="getBxlb(false)"
+                        (nzPageSizeChange)="getBxlb(false)"
                       >
                       </nz-pagination>
                     </div>

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

@@ -3567,11 +3567,11 @@ export class HushijiandanComponent implements OnInit {
     this.selectOtherId = null;
     this.otherSearch = '';
     if (type === "surgery") {
-      this.getSurgery();
+      this.getSurgery(true);
     } else if (type === "historySpecimen") {
-      this.getHistorySpecimen();
+      this.getHistorySpecimen(true);
     } else if (type === "historyDrugsbag") {
-      this.getHistoryDrugsbag();
+      this.getHistoryDrugsbag(true);
     } else if (type === "bxlb" && this.isShowBx && this.coopBtns.repairList) {
       this.getBxlb(this.bxlbPageIndex);
       // this.getIncidentState();
@@ -3650,10 +3650,13 @@ export class HushijiandanComponent implements OnInit {
   adviceListLength: number = 10; //表格总数据量
   adviceSearchInp: string = ""; //意见箱搜索
   adviceLoading = false;
-  getAdvice() {
+  getAdvice(idx?) {
     if(!this.coopBtns.suggestionBox){
       return;
     }
+    if(idx){
+      this.advicePageIndex = 1;
+    }
     let that = this;
     let postData = {
       advice: {
@@ -3665,7 +3668,7 @@ export class HushijiandanComponent implements OnInit {
           id: that.loginUser.id,
         },
       },
-      idx: that.advicePageIndex - 1 < 0 ? 0 : that.advicePageIndex - 1,
+      idx: that.advicePageIndex - 1,
       sum: that.advicePageSize,
     };
     this.adviceLoading = true;
@@ -3814,6 +3817,7 @@ export class HushijiandanComponent implements OnInit {
     // 获取事件状态
     let postData = { type: "list", key: "incident_status" };
     this.iLoading = true;
+    this.bxlbLoading = true;
     this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
       this.iLoading = false;
       if (data.status == 200) {
@@ -3830,7 +3834,6 @@ export class HushijiandanComponent implements OnInit {
           this.bxlbPageIndex = 1;
         }
         let current = JSON.parse(localStorage.getItem("user"));
-        this.bxlbLoading = true;
         this.mainService
           .listWxIncident({
             idx: this.bxlbPageIndex - 1,

src/app/views/inspect-search/inspect-search.component.html

@@ -74,7 +74,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.patientName||'-' }}</td>
             <td>{{ data.residenceNo||'-' }}</td>
             <td>{{ data.applyDept ? data.applyDept.dept : '-' }}</td>

src/app/views/jp-search/jp-search.component.html

@@ -77,7 +77,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.launch?.dept}}</td>
             <td>{{ data.target?.dept }}</td>
             <td>{{ data.creatTime }}</td>

src/app/views/operation-notice/operation-notice.component.ts

@@ -59,7 +59,7 @@ export class OperationNoticeComponent implements OnInit {
   tabNames = {
     doctor: '主刀医生',
     docAssistant: '助理医生',
-    anesthetist: '麻醉医师',
+    anesthetist: '临床',
     patient: '手术患者',
   }
 

src/app/views/patient-search/patient-search.component.html

@@ -58,7 +58,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.patientName||'-' }}</td>
             <td>{{ data.residenceNo||'-' }}</td>
             <td>{{ data.bedNum||'-' }}</td>

src/app/views/quilt-washing-search/quilt-washing-search.component.html

@@ -48,7 +48,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.relatedDeptDTO?.dept }}</td>
             <td>{{ data.batchCode }}</td>
             <td>{{ data.clothesType?.name }}</td>

src/app/views/specimen-search/specimen-search.component.html

@@ -175,7 +175,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData; let i = index">
-            <td>{{ i + 1 }}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
             <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
             <td>{{ data.scode || "-" }}</td>