Просмотр исходного кода

运输过程新增默认患者所在科室

seimin лет назад: 3
Родитель
Сommit
a9d5b37b8c
3 измененных файлов с 15 добавлено и 7 удалено
  1. 1 1
      proxy.conf.json
  2. 2 2
      src/app/views/fuwutai/fuwutai.component.html
  3. 12 4
      src/app/views/fuwutai/fuwutai.component.ts

+ 1 - 1
proxy.conf.json

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

+ 2 - 2
src/app/views/fuwutai/fuwutai.component.html

@@ -978,7 +978,7 @@
978
                           </nz-form-label>
978
                           </nz-form-label>
979
                           <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择起点科室!">
979
                           <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择起点科室!">
980
                             <nz-select formControlName="startDept"
980
                             <nz-select formControlName="startDept"
981
-                              [nzDisabled]="deptZyList.startStatus==201||deptZyList.startStatus==203"
981
+                              [nzDisabled]="deptZyList.startStatus==201||deptZyList.startStatus==203||deptZyList.startStatus==206"
982
                               [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
982
                               [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
983
                               (nzOnSearch)="searchHosDepartment(checkedHos,'start',$event)" nzAllowClear
983
                               (nzOnSearch)="searchHosDepartment(checkedHos,'start',$event)" nzAllowClear
984
                               nzPlaceHolder="请选择起点科室" [(ngModel)]="startDeptZy">
984
                               nzPlaceHolder="请选择起点科室" [(ngModel)]="startDeptZy">
@@ -998,7 +998,7 @@
998
                           </nz-form-label>
998
                           </nz-form-label>
999
                           <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室!">
999
                           <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室!">
1000
                             <nz-select formControlName="endDepts"
1000
                             <nz-select formControlName="endDepts"
1001
-                              [nzDisabled]="deptZyList.endStatus==201||deptZyList.endStatus==203"
1001
+                              [nzDisabled]="deptZyList.endStatus==201||deptZyList.endStatus==203||deptZyList.endStatus==206"
1002
                               [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
1002
                               [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
1003
                               (nzOnSearch)="searchHosDepartment(checkedHos,'end',$event)" nzAllowClear
1003
                               (nzOnSearch)="searchHosDepartment(checkedHos,'end',$event)" nzAllowClear
1004
                               nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptZy" (ngModelChange)="endDeptZyChange()">
1004
                               nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptZy" (ngModelChange)="endDeptZyChange()">

+ 12 - 4
src/app/views/fuwutai/fuwutai.component.ts

@@ -1572,7 +1572,13 @@ export class FuwutaiComponent implements OnInit {
1572
       this.getPatientList(this.endDeptZy, "");
1572
       this.getPatientList(this.endDeptZy, "");
1573
     } else {
1573
     } else {
1574
       //获取患者信息
1574
       //获取患者信息
1575
-      this.patientZy = null;
1575
+      console.log(this.deptZyList);
1576
+      if (
1577
+        this.deptZyList.startStatus != 206 &&
1578
+        this.deptZyList.endStatus != 206
1579
+      ) {
1580
+        this.patientZy = null;
1581
+      }
1576
       this.getPatientList(this.applyDept, "");
1582
       this.getPatientList(this.applyDept, "");
1577
     }
1583
     }
1578
   }
1584
   }
@@ -1693,10 +1699,12 @@ export class FuwutaiComponent implements OnInit {
1693
     // 返回值的status是203 则是固定科室,会返回单个科室
1699
     // 返回值的status是203 则是固定科室,会返回单个科室
1694
     // 返回值的status是204 则让前端自己调用科室搜索接口
1700
     // 返回值的status是204 则让前端自己调用科室搜索接口
1695
     // 返回值的status是205 则是固定科室类型,会返回科室列表
1701
     // 返回值的status是205 则是固定科室类型,会返回科室列表
1702
+    // 返回值的status是206 则是默认患者所在科室,把患者所在科室作为值
1696
     this.mainService.getdeptList(value).subscribe((data) => {
1703
     this.mainService.getdeptList(value).subscribe((data) => {
1697
       this.deptZyList = data;
1704
       this.deptZyList = data;
1705
+      console.log(this.deptZyList);
1698
       // 起点科室
1706
       // 起点科室
1699
-      if (data["startStatus"] == 201) {
1707
+      if (data["startStatus"] == 201 || data["startStatus"] == 206) {
1700
         if (this.applyDept) {
1708
         if (this.applyDept) {
1701
           //选择了申请科室,则起点科室就是申请科室
1709
           //选择了申请科室,则起点科室就是申请科室
1702
           this.deptZyList["startDept"] = this.applicationDepartmentList.filter(
1710
           this.deptZyList["startDept"] = this.applicationDepartmentList.filter(
@@ -1710,7 +1718,7 @@ export class FuwutaiComponent implements OnInit {
1710
         this.getHosDepartment(this.checkedHos, "start", "");
1718
         this.getHosDepartment(this.checkedHos, "start", "");
1711
       }
1719
       }
1712
       // 终点科室
1720
       // 终点科室
1713
-      if (data["endStatus"] == 201) {
1721
+      if (data["endStatus"] == 201 || data["endStatus"] == 206) {
1714
         if (this.applyDept) {
1722
         if (this.applyDept) {
1715
           //选择了申请科室,则终点科室就是申请科室
1723
           //选择了申请科室,则终点科室就是申请科室
1716
           this.deptZyList["endDept"] = this.applicationDepartmentList.filter(
1724
           this.deptZyList["endDept"] = this.applicationDepartmentList.filter(
@@ -1723,7 +1731,7 @@ export class FuwutaiComponent implements OnInit {
1723
       } else if (data["endStatus"] == 204 || data["endStatus"] == 205) {
1731
       } else if (data["endStatus"] == 204 || data["endStatus"] == 205) {
1724
         this.getHosDepartment(this.checkedHos, "end", "");
1732
         this.getHosDepartment(this.checkedHos, "end", "");
1725
       }
1733
       }
1726
-      // 终点科室患者信息列表,id是送病人回病房的任务类型,写死了
1734
+      // 终点科室患者信息列表,id是送病人回病房的任务类型
1727
       if (
1735
       if (
1728
         (data["endStatus"] == 201 || data["endStatus"] == 203) &&
1736
         (data["endStatus"] == 201 || data["endStatus"] == 203) &&
1729
         this.radioValueZy == this.deathTasktypeId
1737
         this.radioValueZy == this.deathTasktypeId