seimin 1 year ago
parent
commit
51c0dd6750

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

@@ -5,10 +5,10 @@
5 5
     <div class="content">
6 6
       <div class="defeat" [innerHTML]="content | htmlTransform"></div>
7 7
       <ul class="list">
8
-        <li><span>主刀医生:</span><span>{{ dataObj.doctorName }}</span></li>
9
-        <li><span>麻醉医师:</span><span>{{ dataObj.anesthetistName }}</span></li>
10
-        <li><span>助理医生:</span><span>{{ dataObj.docAssistantInfos }}</span></li>
11
-        <li><span>护士:</span><span>{{ dataObj.nurseName }}</span></li>
8
+        <li *ngIf="dataObj.doctorNameFlag"><span>主刀医生:</span><span>{{ dataObj.doctorName }}</span></li>
9
+        <li *ngIf="dataObj.anesthetistNameFlag"><span>麻醉医师:</span><span>{{ dataObj.anesthetistName }}</span></li>
10
+        <li *ngIf="dataObj.docAssistantInfosFlag"><span>助理医生:</span><span>{{ dataObj.docAssistantInfos }}</span></li>
11
+        <li *ngIf="dataObj.patientNameFlag"><span>手术患者:</span><span>{{ dataObj.patientName }}</span></li>
12 12
       </ul>
13 13
     </div>
14 14
     <div class="operate">

+ 1 - 6
src/app/share/dialog-surgery/dialog-surgery.component.less

@@ -12,7 +12,6 @@
12 12
 
13 13
   .modalBody {
14 14
     width: 600px;
15
-    min-height: 320px;
16 15
     background: #fff;
17 16
     border-radius: 8px;
18 17
     padding: 8px 28px;
@@ -38,7 +37,6 @@
38 37
 
39 38
     .content {
40 39
       flex: 1;
41
-      min-height: 227px;
42 40
       background: #f9fafb;
43 41
       border: 1px solid #e5e9ed;
44 42
       border-radius: 8px;
@@ -59,9 +57,7 @@
59 57
         margin: 0;
60 58
         padding: 8px 0;
61 59
         width: 100%;
62
-        & > li:last-of-type{
63
-          text-indent: 2em;
64
-        }
60
+
65 61
         li{
66 62
           padding: 6px 55px;
67 63
           display: flex;
@@ -69,7 +65,6 @@
69 65
           span:last-of-type{
70 66
             flex: 1;
71 67
             word-break: break-all;
72
-            text-indent: 0;
73 68
           }
74 69
         }
75 70
       }

+ 40 - 6
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1770,12 +1770,46 @@ export class HushijiandanComponent implements OnInit {
1770 1770
   // 手术安排信息-即将开始
1771 1771
   surgeryBegin(e, item){
1772 1772
     e.stopPropagation();
1773
-    this.surgeryModal = true;
1774
-    if(item.docAssistantInfos){
1775
-      item.docAssistantInfos = item.docAssistantInfos.split('|').map(v => v.split(',')[0]).join(' / ');
1776
-    }
1777
-    this.surgeryItem = item;
1778
-    this.surgeryInfo = `提示:您即将给以下工作人员发送短信/微信提醒,请确认以下信息`
1773
+    let maskFlag = this.message.loading("正在加载中..", {
1774
+      nzDuration: 0,
1775
+    }).messageId;
1776
+    let postData = {
1777
+      idx: 0,
1778
+      sum: 9999,
1779
+      transportMessage: {
1780
+        hosId: this.currentHospital.id,
1781
+        code: 'surgery_begin',
1782
+      },
1783
+    };
1784
+    this.mainService
1785
+      .getFetchDataList("simple/data", "transportMessage", postData)
1786
+      .subscribe((result:any) => {
1787
+        this.message.remove(maskFlag);
1788
+        if (result.status == 200) {
1789
+          result.list = result.list || [];
1790
+          if(result.list.length){
1791
+            let resultObj:any = {};
1792
+            result.list.forEach(v => {
1793
+              resultObj[v.role] = v;
1794
+            })
1795
+            item.doctorNameFlag = resultObj.doctor.phoneFlag == 1 || resultObj.doctor.wechatFlag == 1;
1796
+            item.docAssistantInfosFlag = resultObj.docAssistant.phoneFlag == 1 || resultObj.docAssistant.wechatFlag == 1;
1797
+            item.anesthetistNameFlag = resultObj.anesthetist.phoneFlag == 1 || resultObj.anesthetist.wechatFlag == 1;
1798
+            item.patientNameFlag = resultObj.patient.phoneFlag == 1 || resultObj.patient.wechatFlag == 1;
1799
+
1800
+            if(item.docAssistantInfosFlag && item.docAssistantInfos){
1801
+              item.docAssistantInfos = item.docAssistantInfos.split('|').map(v => v.split(',')[0]).join(' / ');
1802
+            }
1803
+            this.surgeryModal = true;
1804
+            this.surgeryItem = item;
1805
+            this.surgeryInfo = `提示:您即将给以下工作人员发送短信/微信提醒,请确认以下信息`;
1806
+          }else{
1807
+            this.showPromptModal("【手术即将开始通知】未配置", false, "失败");
1808
+          }
1809
+        }else{
1810
+          this.showPromptModal("接口获取数据", false, "失败");
1811
+        }
1812
+      });
1779 1813
   }
1780 1814
   // -----------------
1781 1815