Merge branch 'lmm' into develop

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.96",
+    "target": "http://192.168.3.108",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/share/order-detail/order-detail.component.html

@@ -73,18 +73,22 @@
           <div class="info" nz-row>
             <div nz-col nzSpan="6">工单日期：{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
             <div nz-col nzSpan="6">总耗时：{{orderInfo.showTimeNum}}</div>
-            <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
-            <div nz-col nzSpan="4">支助人员信息：{{orderInfo.worker?orderInfo.worker.name:''}}</div>
+            <div nz-col nzSpan="6">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
+            <div nz-col nzSpan="6">支助人员信息：{{orderInfo.worker?orderInfo.worker.name:''}}</div>
           </div>
           <div class="info" nz-row>
-            <div nz-col nzSpan="4">申请科室：{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}
+            <div nz-col nzSpan="6">预计接收：{{orderInfo.expectReceiveNum}}</div>
+            <div nz-col nzSpan="6">送达：{{orderInfo.deliveryNum||'无'}}</div>
+            <div nz-col nzSpan="6">实际接收：{{orderInfo.actualReceiveNum||'无'}}</div>
+          </div>
+          <div class="info" nz-row>
+            <div nz-col nzSpan="24">申请科室：{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}
             </div>
-            <div nz-col nzSpan="9">
+          </div>
+          <div class="info" nz-row>
+            <div nz-col nzSpan="24">
               目标科室：{{endDepts}}
             </div>
-            <div nz-col nzSpan="4">预计接收：{{orderInfo.expectReceiveNum}}</div>
-            <div nz-col nzSpan="3">送达：{{orderInfo.deliveryNum}}</div>
-            <div nz-col nzSpan="4">实际接收：{{orderInfo.actualReceiveNum}}</div>
           </div>
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
             <div nz-col nzSpan="8">
@@ -244,7 +248,8 @@
     </overlay-scrollbars>
     <!-- 药品/静配配送类型工单信息 -->
     <overlay-scrollbars #osComponentRef6 style="max-height: 400px;">
-      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='drugsBag'||orderInfo.taskType.associationType.value=='jPBag')"
+      <div
+        *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='drugsBag'||orderInfo.taskType.associationType.value=='jPBag')"
         class="content orders">
         <div class="top">
           <div class="num">
@@ -353,7 +358,8 @@
     </overlay-scrollbars>
     <!-- 患者陪检/患者转运类型工单信息 -->
     <overlay-scrollbars #osComponentRef1 style="max-height: 400px;">
-      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='inspect'||orderInfo.taskType.associationType.value=='patientTransport')"
+      <div
+        *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='inspect'||orderInfo.taskType.associationType.value=='patientTransport')"
         class="content orders">
         <div class="top">
           <div class="num">

src/app/share/order-detail/order-detail.component.less

@@ -142,7 +142,7 @@
                   color: #e5e9ed;
 
                   &.green {
-                    color: #bee1a7;
+                    color: @primary-color;
                   }
                 }
               }

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

@@ -125,10 +125,13 @@ export class HushijiandanComponent implements OnInit {
   timerCloseTime = null;
   changeShow = true;
   currentHospital; //当前院区
+  currentUser; //当前用户
   logTimer = null; //综合日志定时器
   logTime = 0; //综合日志自动刷新秒数
   logTimeConst = 30; //综合日志自动刷新秒数
   ngOnInit() {
+    this.currentUser = this.tool.getCurrentUserDept();
+    console.log(this.currentUser, this.tabSearchCont);
     //防抖
     this.searchTabInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.getPatient(v);
@@ -614,13 +617,13 @@ export class HushijiandanComponent implements OnInit {
           that.othersList = [];
           that.patientMsgList = [];
           data.data.allTaskTypes.forEach((e) => {
-            if (e.associationType.value=='other') {
+            if (e.associationType.value == "other") {
               that.othersList.push(e);
-            } else if (e.associationType.value=='specimen') {
+            } else if (e.associationType.value == "specimen") {
               that.bbMsg = e;
             } else if (
-              e.associationType.value=='patientTransport' ||
-              e.associationType.value=='inspect'
+              e.associationType.value == "patientTransport" ||
+              e.associationType.value == "inspect"
             ) {
               that.patientMsgList.push(e);
             }
@@ -709,19 +712,37 @@ export class HushijiandanComponent implements OnInit {
   // 获取患者信息
   snum = 0;
   getPatient(e?) {
-    let that = this;
-    that.pLoading = true;
+    if (
+      (this.currentUser.typeValue == "checkRoom2" ||
+        this.currentUser.typeValue == "outpatientDept" ||
+        this.currentUser.typeValue == "checkRoom") &&
+      !this.tabSearchCont
+    ) {
+      this.pLoading = false;
+      this.patientList = [];
+      this.infoLength = 0;
+      return; //护士端如果登录后如果科室类型为“检查科室”、“门诊科室”、“检验科室”，默认不显示患者信息
+    }
+    this.pLoading = true;
     let postData = {
-      idx: that.infoPageIdx - 1,
-      sum: 9999,
+      idx: this.infoPageIdx - 1,
+      sum: 10,
     };
     // 患者信息
     postData["patient"] = {
-      keyWord: e ? e : that.tabSearchCont,
+      keyWord: e ? e : this.tabSearchCont,
     };
-    postData["patient"]["department"] = { id: that.loginUserDeptId };
+    if (
+      this.currentUser.typeValue == "checkRoom2" ||
+      this.currentUser.typeValue == "outpatientDept" ||
+      this.currentUser.typeValue == "checkRoom"
+    ) {
+      delete postData["patient"]["department"];//搜索范围为全院在院患者
+    } else {
+      postData["patient"]["department"] = { id: this.loginUserDeptId };
+    }
     this.snum++;
-    that.mainService
+    this.mainService
       .getFetchDataList("nurse", "patient", postData)
       .subscribe((data) => {
         this.snum--;
@@ -732,11 +753,11 @@ export class HushijiandanComponent implements OnInit {
             }
           });
         }
-        that.patientList = data.list || [];
+        this.patientList = data.list || [];
         if (this.snum === 0) {
-          that.pLoading = false;
+          this.pLoading = false;
         }
-        that.infoLength = data.totalNum || 0;
+        this.infoLength = data.totalNum || 0;
       });
   }
 
@@ -997,7 +1018,7 @@ export class HushijiandanComponent implements OnInit {
     let flag = this.checkTypeLis.some((item) => {
       return (
         item.id == this.patientForm.controls.checkedType.value &&
-        item.associationType.value=='patientTransport'
+        item.associationType.value == "patientTransport"
       );
     });
     //预约时间-患者陪检不能为空
@@ -1319,7 +1340,7 @@ export class HushijiandanComponent implements OnInit {
     let appointmentZyBuildFlag = this.checkTypeLis.filter(
       (item) =>
         item.id == this.patientForm.controls.checkedType.value &&
-        item.associationType.value=='patientTransport'
+        item.associationType.value == "patientTransport"
     );
     if (appointmentZyBuildFlag.length) {
       this.appointmentZyBuildFlag =

src/app/views/sys-config/sys-config.component.html

@@ -62,9 +62,9 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item class="formItem">
-          <nz-form-label [nzSpan]="10" nzFor="deptQRCode" nzRequired class="label">是否开通科室二维码设置
+          <nz-form-label [nzSpan]="11" nzFor="deptQRCode" nzRequired class="label">是否开通科室二维码设置
           </nz-form-label>
-          <nz-form-control [nzSpan]="14" nzErrorTip="是否开通科室二维码设置是必填项!">
+          <nz-form-control [nzSpan]="13" nzErrorTip="是否开通科室二维码设置是必填项!">
             <nz-radio-group formControlName="deptQRCode">
               <label nz-radio nzValue="1">是</label>
               <label nz-radio nzValue="0">否</label>
@@ -75,13 +75,13 @@
           <nz-form-label [nzSpan]="8" nzFor="workOrderSettings" nzRequired class="label">自动关闭工单设置
           </nz-form-label>
           <nz-form-control [nzSpan]="16" nzErrorTip="自动关闭工单设置是必填项!">
-            <nz-input-number formControlName="workOrderSettings" [nzMin]="5" [nzStep]="1"
+            <nz-input-number class="w100" formControlName="workOrderSettings" [nzMin]="5" [nzStep]="1"
               [nzFormatter]="formatterPercent" [nzParser]="parserPercent"></nz-input-number>
           </nz-form-control>
         </nz-form-item>
         <nz-form-item class="formItem">
           <nz-form-label [nzSpan]="6" nzFor="defaultRoleOfNurse" nzRequired class="label">护士默认角色</nz-form-label>
-          <nz-form-control [nzSpan]="12" nzErrorTip="护士默认角色是必填项!">
+          <nz-form-control [nzSpan]="18" nzErrorTip="护士默认角色是必填项!">
             <nz-select formControlName="defaultRoleOfNurse" nzPlaceHolder="请输入护士默认角色">
               <ng-container *ngFor="let role of roleList">
                 <nz-option *ngIf="!loading4" [nzValue]="role.id" [nzLabel]="role.role"></nz-option>