解决冲突

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.html

@@ -103,6 +103,11 @@
 									  <nz-form-label class="label">是否支持查看药品详情信息</nz-form-label>
 									  <nz-checkbox-group [(ngModel)]="item.postData.showDrugsBagDetails"></nz-checkbox-group>
 									</div>
+                  <!-- 待送达合并工单 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">待送达合并工单</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.sendingMergeOrder"></nz-checkbox-group>
+									</div>
                 </div>
                 <!-- 自动建单配置 -->
                 <div *ngIf="tabModalName=='automaticOrderCreation'">

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.ts

@@ -64,6 +64,7 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
 				showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -86,6 +87,7 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -108,6 +110,7 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+        sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -130,6 +133,7 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+        sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -152,13 +156,14 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+        sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
     },
   ];
-	
-	
+
+
 	// 获取药品状态
 	drugStateData:any = []
 	getDrugState(){
@@ -166,7 +171,7 @@ export class ConfigurationDrugComponent implements OnInit {
 			this.drugStateData = data
 		});
 	}
-	
+
   // 点击数据字典key
   activeDictionary:any;
   clickDictionaryKey(item){
@@ -238,6 +243,7 @@ export class ConfigurationDrugComponent implements OnInit {
 			showPatientInfo: this.activeDictionary.postData.showPatientInfo[0].checked ? 1 : 0,
 			showDrugsBagTypeCount: this.activeDictionary.postData.showDrugsBagTypeCount[0].checked ? 1 : 0,
 			showDrugsBagDetails: this.activeDictionary.postData.showDrugsBagDetails[0].checked ? 1 : 0,
+			sendingMergeOrder: this.activeDictionary.postData.sendingMergeOrder[0].checked ? 1 : 0,
 			autoCreate: this.activeDictionary.postData.autoCreate[0].checked ? 1 : 0,
 			autoCreateState:{
 				id:this.activeDictionary.postData.autoCreateState || undefined
@@ -339,6 +345,7 @@ export class ConfigurationDrugComponent implements OnInit {
 					this.activeDictionary.postData.showPatientInfo[0].checked = this.configs.showPatientInfo == 1;
 					this.activeDictionary.postData.showDrugsBagTypeCount[0].checked = this.configs.showDrugsBagTypeCount == 1;
 					this.activeDictionary.postData.showDrugsBagDetails[0].checked = this.configs.showDrugsBagDetails == 1;
+					this.activeDictionary.postData.sendingMergeOrder[0].checked = this.configs.sendingMergeOrder == 1;
 					this.activeDictionary.postData.autoCreate[0].checked = this.configs.autoCreate == 1;
 					this.activeDictionary.postData.autoCreateState = this.configs.autoCreateState && this.configs.autoCreateState.id || undefined;
 				}

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.html

@@ -85,19 +85,19 @@
                   <nz-form-label class="label">默认扫描标本进入标本扫描页</nz-form-label>
                   <nz-checkbox-group [(ngModel)]="defaultScanSpe"></nz-checkbox-group>
                 </div>
-								
+
 								<!-- 是否开通收取限制 -->
 								<div class="display_flex align-items_center mb8">
 								  <nz-form-label class="label">是否开通收取限制</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="speCollectLimit" (ngModelChange)="changeSpeCollect($event)"></nz-checkbox-group>
 								</div>
-								
+
 								<!-- 是否支持非起点科室收取 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 								  <nz-form-label class="label">是否支持非起点科室收取</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="speCollectSupportNotStartDept"></nz-checkbox-group>
 								</div>
-								
+
 								<!-- 限制标本状态收取 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 									<nz-form-label class="label">限制标本状态收取</nz-form-label>
@@ -107,7 +107,7 @@
 										</ng-container>
 									</nz-select>
 								</div>
-								
+
 								<!-- 限制终点科室收取 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 									<nz-form-label class="label">限制终点科室收取</nz-form-label>
@@ -121,7 +121,7 @@
 									  </nz-option>
 									</nz-select>
 								</div>
-								
+
 								<!-- 限制普通或紧急收取 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 									<nz-form-label class="label">限制普通或紧急收取</nz-form-label>
@@ -131,13 +131,13 @@
 										</ng-container>
 									</nz-select>
 								</div>
-								
+
 								<!-- 是否限制重复收取标本 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 								  <nz-form-label class="label">是否限制重复收取标本</nz-form-label>
 									<nz-checkbox-group [(ngModel)]="speCollectLimitRepeat"></nz-checkbox-group>
 								</div>
-								
+
 								<!-- 是否限制试管类型收取标本 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 								  <nz-form-label class="label">是否限制试管类型收取标本</nz-form-label>
@@ -147,18 +147,40 @@
 										</ng-container>
 									</nz-select>
 								</div>
-								
+
 								<!-- 是否开始收取前进入配置页 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 								  <nz-form-label class="label">是否开始收取前进入配置页</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="speStartCollectShowConfig"></nz-checkbox-group>
 								</div>
-								
+
 								<!-- 是否允许转派 -->
 								<div class="display_flex align-items_center mb8">
 								  <nz-form-label class="label">是否允许转派</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="handoverOrder"></nz-checkbox-group>
 								</div>
+
+                <!-- 标本交接默认界面 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">标本交接默认界面</nz-form-label>
+                  <nz-radio-group [(ngModel)]="speHandoverTubeType">
+                    <label nz-radio [nzValue]="1">患者</label>
+                    <label nz-radio [nzValue]="2">试管类型</label>
+                    <label nz-radio [nzValue]="3">检验标本</label>
+                  </nz-radio-group>
+                </div>
+
+                <!-- 交接是否展示试管类型 -->
+								<div class="display_flex align-items_center mb8">
+								  <nz-form-label class="label">交接是否展示试管类型</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speExpandTube" (ngModelChange)="changeSpeExpandTube($event)"></nz-checkbox-group>
+								</div>
+
+                <!-- 是否默认展开 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speExpandTube[0].checked">
+								  <nz-form-label class="label">是否默认展开</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speDefaultExpandTube"></nz-checkbox-group>
+								</div>
               </div>
               <!-- 自动建单配置 -->
               <div *ngIf="tabModalName=='automaticOrderCreation'">

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.ts

@@ -30,6 +30,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	];
 
   spePackageUnionReceive:any = undefined;//是否联合标本收取
+  speHandoverTubeType:any = undefined;//标本交接默认界面
   spePackageModel:any = undefined;//工单模式
   drugsCreateSign:any = [{ label:'是否开启', value: 0 }];//支持建单并签到
   drugsReceiveSign:any = [{ label:'是否开启', value: 0 }];//支持接单并签到
@@ -43,14 +44,24 @@ export class ConfigurationSpecimenComponent implements OnInit {
   spePackageUrgents:any[] = [{label: '急标', value: 1}, {label: '普标', value: 0}];//自动关联急标普标急标
   spePackageTubeIds:any[] = [];// 自动关联试管类型
   spePackageTubeList:any[] = [];// 自动关联试管类型列表
-  spePackageInventoryTypes:any[] = [{label: '患者', value: 1, disabled: true, checked: true}, {label: '试管', value: 2}];//清点方式
+  spePackageInventoryTypes:any[] = [{label: '患者', value: 1}, {label: '试管', value: 2}];//清点方式
   spePackageCreateOrder:any = [{ label:'是否开启', value: 0 }];//生成配送工单
   spePackageCodeSize:any = undefined;//条码打印尺寸
 	// 是否允许转派
 	handoverOrder:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-	
+
+  // 交接是否展示试管类型
+	speExpandTube:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+
+  // 是否默认展开
+	speDefaultExpandTube:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+
   // 工单模式
   spePackageModelList:any[] = [
     { label: '一单一包', value: 1 },
@@ -151,7 +162,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	speStartCollectShowConfig:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-	
+
 	// 速冻标本数量控制
 	pathologyFrozenSpecimenNum:any = '0';
 
@@ -284,6 +295,14 @@ export class ConfigurationSpecimenComponent implements OnInit {
       this.deptNotAlertIds = [];
     }
   }
+
+  // 交接是否展示试管类型
+  changeSpeExpandTube(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.speDefaultExpandTube[0].checked = false;
+    }
+  }
   // 收取时需扫描二维码
   changeArriveScanCode(e){
     console.log(e);
@@ -380,6 +399,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
       id: this.configs.id,
       taskType: this.tasktype.id,
       hosId: this.hosId,
+      speHandoverTubeType: this.speHandoverTubeType,
       deptNotAlert: this.deptNotAlert[0].checked ? 1 : 0,
       arriveScanCode: this.arriveScanCode[0].checked ? 1 : 0,
       arriveScanDynamicCode: this.arriveScanDynamicCode[0].checked ? 1 : 0,
@@ -399,6 +419,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			speCollectLimitEndDept: null,
 			speCollectLimitUrgent: null,
 			handoverOrder: this.handoverOrder[0].checked ? 1 : 0,
+			speExpandTube: this.speExpandTube[0].checked ? 1 : 0,
+			speDefaultExpandTube: this.speDefaultExpandTube[0].checked ? 1 : 0,
 		};
 		if(this.speCollectLimit[0].checked){
 			postData.speCollectSupportNotStartDept = this.speCollectSupportNotStartDept[0].checked ? 1 : 0;
@@ -603,7 +625,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
         if (result.status == 200) {
           this.configs = result.list[0] || {};
 					if(this.activeDictionaryKey=='examine'){
-						// 检验标本
+            // 检验标本
+            this.speHandoverTubeType = this.configs.speHandoverTubeType;
 						this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
 						this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;
 						this.arriveScanDynamicCode[0].checked = this.configs.arriveScanDynamicCode == 1;
@@ -617,6 +640,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
 						this.deptList = this.configs.deptNotAlertList || [];
             this.speCollectLimit[0].checked = this.configs.speCollectLimit == 1;
 						this.handoverOrder[0].checked = this.configs.handoverOrder == 1;
+						this.speExpandTube[0].checked = this.configs.speExpandTube == 1;
+						this.speDefaultExpandTube[0].checked = this.configs.speDefaultExpandTube == 1;
 						if(this.configs.speCollectLimit == 1){
 							this.speCollectSupportNotStartDept[0].checked = this.configs.speCollectSupportNotStartDept == 1;
 							this.speCollectLimitRepeat[0].checked  = this.configs.speCollectLimitRepeat == 1;

src/app/services/main.service.ts

@@ -516,6 +516,12 @@ export class MainService {
       headers: this.headers,
     });
   }
+  //数据核对-原始数据
+  queryDataSource(data = {}) {
+    return this.http.post(host.host + "/testData/queryDataSource", data, {
+      headers: this.headers,
+    });
+  }
   // 更新,新增，删除检查类型设置
   upDictionary(data) {
     return this.http.post(host.host + "/common/common/upDictionary", data, {
@@ -1235,4 +1241,11 @@ export class MainService {
 	    responseType: "arraybuffer",
 	  });
 	}
+
+  // 患者闭环-标记回科
+	setPatientInspectBackDept(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/setPatientInspectBackDept`, data, {
+		  headers: this.headers,
+		});
+	}
 }

src/app/services/tool.service.ts

@@ -103,13 +103,9 @@ export class ToolService {
   }
   //获取当前菜单的权限
   initCoopBtns(route) {
-    let link;
+    let link = route.parent.snapshot.routeConfig.path; //当前路由;
     let menu: any = JSON.parse(localStorage.getItem("menu")) || []; //菜单
-    if (route === "dataDictionary") {
-      link = route;
-    } else {
-      link = route.parent.snapshot.routeConfig.path; //当前路由
-    }
+
     let secondMenus = []; // 二级菜单
     let jurisdiction = []; //当前菜单的权限列表
 		let menuItem = null;
@@ -127,8 +123,8 @@ export class ToolService {
       }
     });
     if(!jurisdiction.length){
-      // type为panel路由
       menu.forEach(v => {
+        // type为panel路由
         if(v.type === 'panel' && v.link == link && v.childrens){
           jurisdiction = v.childrens || []; //匹配路由后，取得对应的权限
         }
@@ -318,6 +314,8 @@ export class ToolService {
 				case "viewGd":
 				  coopBtns.viewGd = true; //查看工单
 				  break;
+        case "tagBackDepartment":
+				  coopBtns.tagBackDepartment = true; //标记回科
 				case "updata":
 				  coopBtns.updata = true; //更新
 				  break;

src/app/share/add-inspect-two-modal/add-inspect-two-modal.component.html

@@ -0,0 +1,36 @@
+<div class="modal display_flex justify-content_flex-center align-items_center">
+  <div class="modalBody" style="width: 1200px;">
+    <div class="title">追加检查<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <div class="tableWrap">
+        <div class="inspectType">
+          检查类型：<u *ngFor="let item of inspectCheckItemList" (click)="clickInspectCheckItem(item.id)" [ngClass]="{ active: activeInspectCheckItemId == item.id }">{{item.name}}</u>
+        </div>
+        <nz-table class="hospitalTable" [nzData]="data2List" nzSize="middle" [nzShowPagination]="false"
+          [nzLoading]="hsLoading" (nzCurrentPageDataChange)="currentPageData2Change($event)" [nzScroll]="{ y: '385px' }">
+          <thead>
+            <tr class="thead">
+              <th nzWidth="4%" nzShowCheckbox [(nzChecked)]="isAllDisplayData2Checked" [nzIndeterminate]="isIndeterminateData2"
+                (nzCheckedChange)="checkAllData2($event)"></th>
+              <th nzWidth="32%">检查项目</th>
+              <th nzWidth="32%">检查地点</th>
+              <th nzWidth="32%">检查类型</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of data2List;let i = index;" (click)="selectedListData2(data.id)">
+              <td nzShowCheckbox [(nzChecked)]="mapOfCheckedData2Id[data.id]" (nzCheckedChange)="refreshData2Status()"></td>
+              <td>{{ data.name}}</td>
+              <td>{{ deptDisplay == 2 ? data.extra4DTO?.deptalias : data.extra4DTO?.dept }}</td>
+              <td>{{ data.extra5DTO?.name }}</td>
+            </tr>
+          </tbody>
+        </nz-table>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn" nz-button nzType="primary" (click)="confirmModal()">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/add-inspect-two-modal/add-inspect-two-modal.component.less

@@ -0,0 +1,194 @@
+@import "../../../../src/theme.less";
+.patient{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 56px;
+  font-size: 18px;
+  padding: 0 24px;
+}
+.tabs{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 45px;
+  font-size: 14px;
+  border-top: 1px solid #e5e9ed;
+  border-bottom: 1px solid #e5e9ed;
+  .tab{
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    cursor: pointer;
+    &.active{
+      background-color: #F0F6ED;
+    }
+  }
+}
+.tableWrap{
+  padding: 16px;
+  .inspectType{
+    padding-bottom: 16px;
+    text-align: left!important;
+    u{
+      margin-right: 8px;
+      cursor: pointer;
+      &.active{
+        color: @primary-color;
+      }
+    }
+  }
+}
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .modalBody {
+    width: 700px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      height: 603px;
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &.pagination {
+          font-size: 14px;
+          color: #666;
+          padding-top: 16px;
+          padding-bottom: 16px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/add-inspect-two-modal/add-inspect-two-modal.component.ts

@@ -0,0 +1,129 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { startOfDay, format } from 'date-fns';
+import { NzMessageService } from 'ng-zorro-antd';
+@Component({
+  selector: 'app-add-inspect-two-modal',
+  templateUrl: './add-inspect-two-modal.component.html',
+  styleUrls: ['./add-inspect-two-modal.component.less']
+})
+export class AddInspectTwoModalComponent implements OnInit {
+  // 切换科室，切换弹窗
+  isAllDisplayData2Checked = false;
+  listOfDisplayData2: any[] = [];
+  mapOfCheckedData2Id: { [key: string]: boolean } = {};
+  isIndeterminateData2 = false;
+  currentDept; //当前科室
+
+  hosId;
+  hsLoading = false;
+  data2List: any = [];// 列表
+
+  @Input() deptDisplay: any;
+
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.currentDept = this.tool.getCurrentUserDept();
+    this.getList();
+  }
+
+  currentPageData2Change($event: any[]): void {
+    this.listOfDisplayData2 = this.data2List; //改变页数，长度也要变
+    this.refreshData2Status();
+  }
+
+  refreshData2Status(): void {
+    this.isAllDisplayData2Checked = this.listOfDisplayData2.length ? this.listOfDisplayData2.every(
+      (item) => this.mapOfCheckedData2Id[item.id]
+    ) : false;
+    this.isIndeterminateData2 = this.listOfDisplayData2.some((item) => this.mapOfCheckedData2Id[item.id]) && !this.isAllDisplayData2Checked;
+  }
+
+  // 开通科室选择整行
+  selectedListData2(id) {
+    this.mapOfCheckedData2Id[id] = !this.mapOfCheckedData2Id[id];
+    this.refreshData2Status();
+  }
+
+  checkAllData2(value: boolean): void {
+    this.listOfDisplayData2.forEach(
+      (item) => (this.mapOfCheckedData2Id[item.id] = value)
+    );
+    this.refreshData2Status();
+  }
+
+  // 确认弹窗
+  confirmModal() {
+    console.log(this[`mapOfCheckedData2Id`]);
+    let list = [];
+    for (const key in this[`mapOfCheckedData2Id`]) {
+      if (this[`mapOfCheckedData2Id`][key]) {
+        list.push({id: key});
+      }
+    }
+    if(list.length == 0){
+      this.message.warning('请选择数据');
+      return;
+    }
+    this.confirmModelHs.emit(JSON.stringify({ show: false, list, type: 2 }));//emits(向上弹射)事件
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  getList(){
+    this.getInspectCheckItem();
+    this.getList2();
+  }
+
+  // 获取列表数据
+  getList2() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      dictionary: {
+        key: 'inspect_check_type',
+        extra5: this.activeInspectCheckItemId,
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList('simple/data','dictionary',postData).subscribe(data => {
+      this.hsLoading = false;
+      this.data2List = data.list || [];
+    })
+  }
+
+  // 获取检查项目
+  inspectCheckItemList:any[] = [];
+  activeInspectCheckItemId;
+  getInspectCheckItem() {
+    this.mainService.getDictionary("list", "inspect_check_item").subscribe((data) => {
+			this.inspectCheckItemList = data || [];
+		});
+  }
+
+  clickInspectCheckItem(id){
+    if(this.activeInspectCheckItemId == id){
+      this.activeInspectCheckItemId = undefined;
+    }else{
+      this.activeInspectCheckItemId = id;
+    }
+    this.getList2();
+  }
+
+}
+
+
+

src/app/share/share.module.ts

@@ -67,6 +67,7 @@ import { SpecimenPackageListModalComponent } from './specimen-package-list-modal
 import { NgxPrintModule } from 'ngx-print';
 import { SpecimenPackageLogPromptModalComponent } from './specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component';
 import { UploadFileComponent } from './upload-file/upload-file.component';
+import { AddInspectTwoModalComponent } from './add-inspect-two-modal/add-inspect-two-modal.component';
 
 @NgModule({
   declarations: [
@@ -131,6 +132,7 @@ import { UploadFileComponent } from './upload-file/upload-file.component';
     MedicalWasteLogPromptModalComponent,
     SelectDateComponent,
     AddInspectModalComponent,
+    AddInspectTwoModalComponent,
     SelectDateYytimeComponent,
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,
@@ -209,6 +211,7 @@ import { UploadFileComponent } from './upload-file/upload-file.component';
     MedicalWasteLogPromptModalComponent,
     SelectDateComponent,
     AddInspectModalComponent,
+    AddInspectTwoModalComponent,
     SelectDateYytimeComponent,
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,

src/app/views/common-document/common-document.component.html

@@ -10,7 +10,7 @@
 				<div class="item" (click)='editTree(3)'>修改</div>
 			</div>
 			<div class="tree-content">
-				<nz-tree [nzData]="nodes" 
+				<nz-tree [nzData]="nodes"
 				(nzClick)="nodeClick($event)"
 				[nzExpandedKeys]="defaultExpandedKeys"
 				[nzTreeTemplate]="nzTreeTemplate"
@@ -152,7 +152,7 @@
 <!-- 删除树结构模态框 -->
   <app-dialog-delete [delModal]="delTreeModal" (hideDelModalEvent)="hideTreeModal()" [btnLoading]="btnLoading"
     (confirmDelEvent)="confirmTree()" content="您确认要删除目录吗？"></app-dialog-delete>
-		
+
 <!-- 新增一级目录 -->
 <div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="addModal">
 	<div class="modalAddBody">
@@ -183,4 +183,4 @@
 			<button class="btn cancel" nz-button nzType="default" (click)="hideAddModal()">取消</button>
 		</div>
 	</div>
-</div>
+</div>

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

@@ -1484,6 +1484,9 @@
                 <button nz-button nzSize="small" nzType="default" class="pos-btn ml8" (click)="nextDayNew()">
                   下一日
                 </button>
+                <button nz-button nzSize="small" nzType="primary" class="ml8" (click)="addInspect()" *ngIf="inspectAndPatientTransportConfig.nurseAppendInspect == 1">
+                  追加检查
+                </button>
               </div>
               <!-- 检查 -->
               <nz-form-item>
@@ -1493,6 +1496,7 @@
                     <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
                       <div nz-col nzSpan="24">
                         <label nz-checkbox [nzValue]="item">{{ item.label}}</label>
+                        <i class="icon_transport transport-shanchu1 cur" *ngIf="item.manualCreate == 1" (click)="delInspect(item.value)"></i>
                         <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1 || item.priority === '1'"></i>
                       </div>
                     </div>
@@ -2346,6 +2350,14 @@
   (confirmDelEvent)="confirmDelAdvice()"
   content="您确认要删除此条意见吗？"
 ></app-dialog-delete>
+<!-- 删除检查模态框 -->
+<app-dialog-delete
+  [delModal]="delInspectModal"
+  (hideDelModalEvent)="hideDelInspectModal()"
+  [btnLoading]="btnLoading4"
+  (confirmDelEvent)="confirmDelInspect()"
+  content="您确认要删除此条检查吗？"
+></app-dialog-delete>
 <!-- 撤销报修 -->
 <app-dialog-delete
   [delModal]="delBxModal"
@@ -2760,3 +2772,6 @@
 
 <!-- 标本打包-数字点击 -->
 <app-specimen-package-list-modal *ngIf="isShowSpecimenPackageList" (closeModelHs)="closeSpecimenPackageList($event)" [specimenPackageStateValue]="specimenPackageStateValue"></app-specimen-package-list-modal>
+
+<!-- 追加检查 -->
+<app-add-inspect-two-modal *ngIf="isShowAddInspect" [deptDisplay]="deptDisplay" (closeModelHs)="closeAddInspectModel($event)" (confirmModelHs)="confirmAddInspectModel($event)"></app-add-inspect-two-modal>

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

@@ -3325,6 +3325,7 @@ export class HushijiandanComponent implements OnInit {
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,
               priority: e.priority,
+              manualCreate: e.manualCreate,
               label:
                 (e.yyTime || "") +
                 " " +
@@ -4622,6 +4623,32 @@ export class HushijiandanComponent implements OnInit {
   hideDelAdviceModal() {
     this.delAdviceModal = false;
   }
+  // 追加检查删除模态框
+  delInspectModal: boolean = false;
+  delInspectId: number; //删除id
+  btnLoading4:boolean = false;
+  delInspect(id) {
+    this.delInspectId = id;
+    this.delInspectModal = true;
+  }
+  confirmDelInspect() {
+    this.btnLoading4 = true;
+    this.mainService
+      .simplePost("rmvData", "inspect", [this.delInspectId])
+      .subscribe((data) => {
+        this.delInspectModal = false;
+        this.btnLoading4 = false;
+        if (data.status == 200) {
+          this.message.success('删除检查成功！')
+          this.refreshInspectList();
+        } else {
+          this.message.error(data.msg || '删除检查失败！')
+        }
+      });
+  }
+  hideDelInspectModal() {
+    this.delInspectModal = false;
+  }
   // 报修撤销模态框
   delBxModal: boolean = false;
   delBxData: any; //删除的data
@@ -5457,6 +5484,7 @@ export class HushijiandanComponent implements OnInit {
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,
               priority: e.priority,
+              manualCreate: e.manualCreate,
               label:
                 (e.yyTime || "") +
                 " " +
@@ -5485,4 +5513,50 @@ export class HushijiandanComponent implements OnInit {
   closeSpecimenPackageList(e) {
     this.isShowSpecimenPackageList = JSON.parse(e).show;
   }
+
+  // 追加检查
+  isShowAddInspect = false; //弹窗开关
+  addInspect(){
+    this.isShowAddInspect = true;
+  }
+  // 关闭弹窗
+  closeAddInspectModel(e) {
+    this.isShowAddInspect = JSON.parse(e).show;
+  }
+  // 确定弹窗
+  confirmAddInspectModel(e) {
+    console.log(e);
+    let obj = JSON.parse(e);
+    this.isShowAddInspect = obj.show;
+    if(obj.type == 2){
+      let user = JSON.parse(localStorage.getItem("user"));
+      // 手动添加
+      let postData:any = {
+        inspectList: obj.list.map(v => ({
+          patientCode: this.patientMsg.patientCode,
+          patientName: this.patientMsg.patientName,
+          barCode: this.patientMsg.barCode,
+          inspectCheckType: { id: v.id },
+          applyDeptId: user.user.dept.id,
+          bedNum: this.patientMsg.bedNum,
+          hosId: this.patientMsg.hosId,
+        })) || undefined,
+      };
+      this.maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+      this.mainService
+        .simplePost("addData", "inspect", postData)
+        .subscribe((data:any) => {
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+          if (data.status == 200) {
+            this.message.success('追加检查成功！')
+            this.refreshInspectList();
+          } else {
+            this.message.error(data.msg || '追加检查失败！')
+          }
+        });
+    }
+  }
 }

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

@@ -1,7 +1,7 @@
 <div class="list-template">
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
-      <div nz-col nzXl='16' class="list-template__searchBox">
+      <div nz-col nzXl='17' class="list-template__searchBox">
         <div class="list-template__searchItem">
           <span class="label">编码：</span>
           <input nz-input class="formItem" placeholder="请输入编码" [(ngModel)]="searchCriteria.id" />
@@ -9,7 +9,7 @@
         <div class="list-template__searchItem">
           <span class="label">类型：</span>
           <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzPlaceHolder="请选择类型"
-            [(ngModel)]="searchCriteria.target">
+            [(ngModel)]="searchCriteria.target" (ngModelChange)="changeTarget($event)">
             <ng-container *ngFor="let data of typeList">
               <nz-option *ngIf="!isLoading" nzLabel="{{data.name}}" nzValue="{{data.type}}"></nz-option>
             </ng-container>
@@ -18,8 +18,16 @@
             </nz-option>
           </nz-select>
         </div>
+        <div class="list-template__searchItem" *ngIf="searchCriteria.target === 'dataSource'">
+          <span class="label">时间范围</span>：
+          <nz-range-picker nzShowTime [(ngModel)]="dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
+        </div>
+        <div class="list-template__searchItem" *ngIf="searchCriteria.target === 'dataSource'">
+          <span class="label">业务标识：</span>
+          <input nz-input class="formItem" placeholder="请输入业务标识" [(ngModel)]="searchCriteria.busiType" />
+        </div>
       </div>
-      <div nz-col nzXl="8" class="list-template__btns">
+      <div nz-col nzXl="7" class="list-template__btns">
         <button nz-button class="btn default" (click)='reset()'>重置</button>
         <button nz-button class="btn default ml8" (click)='getList()'>搜索</button>
       </div>

src/app/views/info-search/info-search.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { MainService } from "src/app/services/main.service";
 import { ToolService } from "src/app/services/tool.service";
 import { NzModalService, NzMessageService } from "ng-zorro-antd";
+import { startOfDay, endOfDay, format } from 'date-fns';
 
 @Component({
   selector: "app-info-search",
@@ -16,10 +17,13 @@ export class InfoSearchComponent implements OnInit {
     private message: NzMessageService,
   ) {}
 
+  dateRange: any = []; //时间范围
+
   searchCriteria = {
     //搜索条件
     id: "", //编码
     target: "order", //类型
+    busiType: "", //业务标识
   };
   typeList = [
     {
@@ -57,12 +61,20 @@ export class InfoSearchComponent implements OnInit {
       panel.active = !panel.active;
     }
   }
+  // 日期选择
+  onCalendarChangeDate(dateArr){
+    if(dateArr.length == 2){
+      this.dateRange = [startOfDay(dateArr[0]), endOfDay(dateArr[1])];
+    }
+  }
   // 重置
   reset() {
+    this.dateRange = [];
     this.searchCriteria = {
       //搜索条件
       id: "",
       target: "order",
+      busiType: "",
     };
     this.getList();
   }
@@ -167,21 +179,48 @@ export class InfoSearchComponent implements OnInit {
       list: [],
     },
   ];
+  // 修改类型
+  changeTarget(e){
+    this.searchCriteria.id = '';
+    this.searchCriteria.busiType = '';
+    this.dateRange = [];
+  }
   // 获取数据
   getList() {
     this.loading1 = true;
-    let id = this.searchCriteria.id || "dsadmin";
-    console.log(id);
-    this.mainService
-      .infoSearch(this.searchCriteria.target, id)
-      .subscribe((result) => {
-        this.panels = this.panelsClone;
-        this.loading1 = false;
-        this.panels.forEach((item) => {
-          item.list = result[item.extra] || [];
+    console.log(this.dateRange)
+    if(this.searchCriteria.target == 'dataSource'){
+      // 原始数据
+      let postData = {
+        content: this.searchCriteria.id,
+        busiType: this.searchCriteria.busiType,
+        startTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        endTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      }
+      this.mainService
+        .queryDataSource(postData)
+        .subscribe((result) => {
+          this.panels = this.panelsClone;
+          this.loading1 = false;
+          this.panels.forEach((item) => {
+            item.list = result[item.extra] || [];
+          });
+          this.panels = this.panels.filter((item) => item.list.length > 0);
+        });
+    }else{
+      let id = this.searchCriteria.id || "dsadmin";
+      console.log(id);
+      this.mainService
+        .infoSearch(this.searchCriteria.target, id)
+        .subscribe((result) => {
+          this.panels = this.panelsClone;
+          this.loading1 = false;
+          this.panels.forEach((item) => {
+            item.list = result[item.extra] || [];
+          });
+          this.panels = this.panels.filter((item) => item.list.length > 0);
         });
-        this.panels = this.panels.filter((item) => item.list.length > 0);
-      });
+    }
   }
   // json弹窗
   toJson(json) {

src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.html

@@ -157,6 +157,11 @@
           <nz-form-label class="label">是否开启陪检方式</nz-form-label>
           <nz-checkbox-group [(ngModel)]="enableTripType"></nz-checkbox-group>
         </div>
+        <!-- 是否开启护士端追加检查 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">是否开启护士端追加检查</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="nurseAppendInspect"></nz-checkbox-group>
+        </div>
         <!-- 检查预约不进行工单合并 -->
         <!-- <div class="display_flex align-items_center mb8">
           <nz-form-label class="label">检查预约不进行工单合并</nz-form-label>

src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.ts

@@ -92,6 +92,10 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
   enableTripType:any[] = [
     {label:'是否开启',value: 0}
   ];
+  // 是否开启护士端追加检查
+  nurseAppendInspect:any[] = [
+    {label:'是否开启',value: 0}
+  ];
   // 检查预约不进行工单合并
   // yyInspectMergeOrder:any[] = [
   //   {label:'是否开启',value: 0}
@@ -292,6 +296,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       hideInspectScan: this.hideInspectScan[0].checked ? 1 : 0,
       enableGoods: this.enableGoods[0].checked ? 1 : 0,
       enableTripType: this.enableTripType[0].checked ? 1 : 0,
+      nurseAppendInspect: this.nurseAppendInspect[0].checked ? 1 : 0,
       // yyInspectMergeOrder: this.yyInspectMergeOrder[0].checked ? 1 : 0,
       addService: this.addService[0].checked ? 1 : 0,
       addServiceTaskIds: this.addServiceTaskIds.length ? this.addServiceTaskIds.toString() : undefined,
@@ -422,6 +427,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           this.hideInspectScan[0].checked = this.configs.hideInspectScan == 1;
           this.enableGoods[0].checked = this.configs.enableGoods == 1;
           this.enableTripType[0].checked = this.configs.enableTripType == 1;
+          this.nurseAppendInspect[0].checked = this.configs.nurseAppendInspect == 1;
           // this.yyInspectMergeOrder[0].checked = this.configs.yyInspectMergeOrder == 1;
           this.addService[0].checked = this.configs.addService == 1;
           this.addServiceTaskIds = this.configs.addServiceTaskIds ? this.configs.addServiceTaskIds.split(',').map(v => +v) : [];

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.component.html

@@ -52,13 +52,14 @@
   <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
     <thead>
       <tr class="thead">
-        <th nzWidth="14%">科室信息</th>
-        <th nzWidth="14%">患者信息</th>
-        <th nzWidth="14%">护理信息</th>
-        <th nzWidth="14%">陪检方式</th>
-        <th nzWidth="16%">检查项目</th>
-        <th nzWidth="14%">签到信息</th>
-        <th nzWidth="14%">状态</th>
+        <th nzWidth="13%">科室信息</th>
+        <th nzWidth="13%">患者信息</th>
+        <th nzWidth="13%">护理信息</th>
+        <th nzWidth="13%">陪检方式</th>
+        <th nzWidth="15%">检查项目</th>
+        <th nzWidth="13%">签到信息</th>
+        <th nzWidth="13%">状态</th>
+        <th nzWidth="7%">操作</th>
       </tr>
     </thead>
     <tbody>
@@ -70,6 +71,11 @@
         <td><ng-container *ngFor="let item of data.inspectList;let last = last">{{item.inspectName}}<ng-container *ngIf="!last"><br></ng-container></ng-container></td>
         <td>{{ data.signTime | date: "yyyy-MM-dd HH:mm" }}<br>{{ data.signDeptDTO?.dept }}<br>{{ data.signUserDTO?.name }}</td>
         <td>{{data.state?.name}}</td>
+        <td>
+          <div class="coop">
+            <span *ngIf="coopBtns.tagBackDepartment && data.state && data.state.value == '4'" (click)="showDelModal(data, '您确认' + data.patientName + '患者已回科吗？', '操作', 'tagBackDepartment')">已回科</span>
+          </div>
+        </td>
       </tr>
     </tbody>
   </nz-table>
@@ -77,3 +83,11 @@
 <div class="footer display_flex align-items_center justify-content_flex-end">
   <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" nzShowSizeChanger (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)"></nz-pagination>
 </div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.component.ts

@@ -41,6 +41,11 @@ export class InspectClosedLoopViewComponent implements OnInit, OnDestroy {
 
   searchTimerSubject = new Subject(); //防抖
 
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  coopData: any = {}; //当前操作列
+  btnLoading: boolean = false; //提交按钮loading状态
+
   ngOnInit() {
     //防抖
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -48,6 +53,7 @@ export class InspectClosedLoopViewComponent implements OnInit, OnDestroy {
       fun.call(this, v[1]);
     });
 
+    this.coopBtns = this.tool.initCoopBtns(this.route);
     this.init();
   }
 
@@ -55,6 +61,64 @@ export class InspectClosedLoopViewComponent implements OnInit, OnDestroy {
     clearInterval(this.timer);
   }
 
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "tagBackDepartment") {
+      let postData = {
+        pilId: this.coopData.id,
+      };
+      //标记回科
+      this.mainService
+        .setPatientInspectBackDept(postData)
+        .subscribe((data:any) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.state == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(1);
+  }
+
   // 日期选择
   onCalendarChangeDate(dateArr){
     if(dateArr.length == 2){

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

@@ -2,33 +2,59 @@
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
       <div nz-col nzXl='16' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">院区：</span>
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择院区" [(ngModel)]="searchCriteria.hosId" (ngModelChange)="changeHospitalSearch($event)">
+            <ng-container *ngFor="let option of hospitalSearchList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
         <div class="list-template__searchItem">
           <span class="label">患者姓名：</span>
           <input nz-input class="formItem" placeholder="请输入患者姓名" [(ngModel)]="searchCriteria.patientName" />
         </div>
         <div class="list-template__searchItem">
-          <span class="label">床号：</span>
-          <input nz-input class="formItem" placeholder="请输入床号" [(ngModel)]="searchCriteria.bedNum" />
+          <span class="label">当前科室：</span>
+          <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择当前科室" [(ngModel)]="searchCriteria.department" (nzOnSearch)="changeInp($event, 'departmentSearch')" (nzOpenChange)="openDepartmentSearch($event)">
+            <ng-container *ngFor="let data of deptSearchList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
         </div>
         <div class="list-template__searchItem">
-          <span class="label">当前科室：</span>
-          <nz-select
-            [nzDropdownMatchSelectWidth]="false"
-            class="formItem"
-            nzServerSearch
-            nzShowSearch
-            nzAllowClear
-            nzPlaceHolder="请选择当前科室"
-            [(ngModel)]="searchCriteria.department"
-            (nzOnSearch)="changeInp($event, 'search')"
-            (nzOpenChange)="changeSearch($event)"
-          >
-            <ng-container *ngFor="let data of departmentSearch">
-              <nz-option
-                *ngIf="!isLoading"
-                nzLabel="{{ data.dept }}"
-                nzValue="{{ data.id }}"
-              ></nz-option>
+          <span class="label">患者类别：</span>
+          <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzAllowClear nzPlaceHolder="请选择患者类别" [(ngModel)]="searchCriteria.patientType">
+            <ng-container *ngFor="let data of patientTypeList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">护理等级：</span>
+          <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzAllowClear nzPlaceHolder="请选择护理等级" [(ngModel)]="searchCriteria.careLevel">
+            <ng-container *ngFor="let data of careLevelList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">病情级别：</span>
+          <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzAllowClear nzPlaceHolder="请选择病情级别" [(ngModel)]="searchCriteria.illnessState">
+            <ng-container *ngFor="let data of illnessStateList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -39,6 +65,7 @@
       <div nz-col nzXl="8" class="list-template__btns">
         <button nz-button class="btn default" (click)='reset()'>重置</button>
         <button nz-button class="btn default ml8" (click)='getList(1)'>搜索</button>
+        <button nz-button *ngIf="coopBtns.add" class="btn ml8 default" (click)="showModal()">新增</button>
       </div>
     </div>
     <div class="list-template__bottom">
@@ -46,26 +73,40 @@
         [nzLoading]="loading1">
         <thead>
           <tr class="thead">
-            <th nzWidth="10%">序号</th>
-            <th nzWidth="15%">患者姓名</th>
-            <th nzWidth="15%">住院号</th>
-            <th nzWidth="15%">床号</th>
-            <th nzWidth="15%">当前科室</th>
-            <th nzWidth="15%">护理等级</th>
-            <th nzWidth="15%">病情级别</th>
-            <!-- <th nzWidth="9%">操作</th> -->
+            <th nzWidth="8%">患者类别</th>
+            <th nzWidth="8%">患者姓名</th>
+            <th nzWidth="8%">患者标识</th>
+            <th nzWidth="8%">住院号</th>
+            <th nzWidth="8%">条码号</th>
+            <th nzWidth="8%">床号</th>
+            <th nzWidth="8%">院区</th>
+            <th nzWidth="8%">当前科室</th>
+            <th nzWidth="8%">护理等级</th>
+            <th nzWidth="8%">病情级别</th>
+            <th nzWidth="8%">年龄</th>
+            <th nzWidth="8%">性别</th>
+            <th nzWidth="7%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.patientName||'-' }}</td>
-            <td>{{ data.residenceNo||'-' }}</td>
-            <td>{{ data.bedNum||'-' }}</td>
-            <td>{{data.department?data.department.dept:'-'}}</td>
-            <td>{{data.careLevel?data.careLevel.name:'-'}}</td>
-            <td>{{data.illnessState?data.illnessState.name:'-'}}</td>
-            <!-- <td><button (click)="viewSpecimenHistory(data)">查看</button></td> -->
+            <td>{{ data.patientType?.name }}</td>
+            <td>{{ data.patientName }}</td>
+            <td>{{ data.patientCode }}</td>
+            <td>{{ data.residenceNo }}</td>
+            <td>{{ data.barCode }}</td>
+            <td>{{ data.bedNum }}</td>
+            <td>{{ data.hospitalDTO?.hosName }}</td>
+            <td>{{ data.department?.dept }}</td>
+            <td>{{ data.careLevel?.name }}</td>
+            <td>{{ data.illnessState?.name }}</td>
+            <td>{{ data.age }}</td>
+            <td>{{ data.gender?.name }}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
+              </div>
+            </td>
           </tr>
         </tbody>
       </nz-table>
@@ -77,3 +118,148 @@
     </div>
   </div>
 </div>
+
+<!-- 新增/编辑模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+  <div class="modalBody">
+    <div class="title">{{add?"新增":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <overlay-scrollbars #osComponentRef1 class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="patientName">患者姓名</nz-form-label>
+          <nz-form-control nzErrorTip="请填写患者姓名!">
+            <nz-input-group>
+              <input type="text" nz-input formControlName="patientName" placeholder="请填写患者姓名" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label style="line-height:40px;" [nzSm]="3" [nzXs]="24" nzFor="gender">性别</nz-form-label>
+          <nz-form-control nzErrorTip="请选择性别!">
+            <nz-radio-group type="gender" formControlName="gender">
+              <label nz-radio [nzValue]="data.id" *ngFor="let data of genderList">{{data.name}}</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="age">年龄</nz-form-label>
+          <nz-form-control nzErrorTip="请填写年龄!">
+            <nz-input-group>
+              <nz-input-number class="w100" formControlName="age" placeholder="请填写年龄" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="patientCode">患者标识</nz-form-label>
+          <nz-form-control nzErrorTip="请填写患者标识!">
+            <nz-input-group>
+              <input type="text" nz-input formControlName="patientCode" placeholder="请填写患者标识" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="residenceNo">住院号</nz-form-label>
+          <nz-form-control nzErrorTip="请填写住院号!">
+            <nz-input-group>
+              <input type="text" nz-input formControlName="residenceNo" placeholder="请填写住院号" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="barCode">条码号</nz-form-label>
+          <nz-form-control nzErrorTip="请填写条码号!">
+            <nz-input-group>
+              <input type="text" nz-input formControlName="barCode" placeholder="请填写条码号" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="bedNum">床号</nz-form-label>
+          <nz-form-control nzErrorTip="请填写床号!">
+            <nz-input-group>
+              <input type="text" nz-input formControlName="bedNum" placeholder="请填写床号" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="hosId">院区</nz-form-label>
+          <nz-form-control nzErrorTip="请选择院区!">
+            <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择院区" formControlName="hosId" (ngModelChange)="changeHospital($event)">
+            <ng-container *ngFor="let option of hospitalList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="department">当前科室</nz-form-label>
+          <nz-form-control nzErrorTip="请选择当前科室!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="department" nzShowSearch nzAllowClear nzPlaceHolder="请选择当前科室" nzServerSearch (nzOnSearch)="changeInp($event, 'department')" (nzOpenChange)="openDepartment($event)">
+              <ng-container *ngFor="let data of deptList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id">
+                </nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="careLevel">护理等级</nz-form-label>
+          <nz-form-control nzErrorTip="请选择护理等级!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="careLevel" nzAllowClear nzPlaceHolder="请选择护理等级">
+              <ng-container *ngFor="let data of careLevelList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id">
+                </nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="illnessState">病情级别</nz-form-label>
+          <nz-form-control nzErrorTip="请选择病情级别!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="illnessState" nzAllowClear nzPlaceHolder="请选择病情级别">
+              <ng-container *ngFor="let data of illnessStateList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id">
+                </nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="patientType">患者类别</nz-form-label>
+          <nz-form-control nzErrorTip="请选择患者类别!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="patientType" nzAllowClear nzPlaceHolder="请选择患者类别">
+              <ng-container *ngFor="let data of patientTypeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id">
+                </nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </overlay-scrollbars>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>

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

@@ -103,7 +103,7 @@
 
         .addForm {
           .ant-form-item {
-            margin-bottom: 15px;
+            margin-bottom: 8px;
 
             .ant-form-item-label {
               line-height: 14px;

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

@@ -3,6 +3,8 @@ import { MainService } from "src/app/services/main.service";
 import { ToolService } from "src/app/services/tool.service";
 import { Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
+import { ActivatedRoute } from '@angular/router';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 
 @Component({
   selector: "app-patient-search",
@@ -10,96 +12,142 @@ import { debounceTime } from 'rxjs/operators';
   styleUrls: ["./patient-search.component.less"],
 })
 export class PatientSearchComponent implements OnInit {
-  constructor(private mainService: MainService, private tool: ToolService) {}
-
-  searchCriteria = {
-    //搜索条件
-    patientName: "",
-    bedNum: "",
-    hospital: null,
-    department: null,
-  };
-  allHospital: any = []; //院区下拉框
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private route: ActivatedRoute,
+    private fb: FormBuilder,
+  ) {}
+
+  hosId = this.tool.getCurrentHospital().id; //当前院区
+
+  searchCriteria:any = {};
   listOfData: any[] = []; //表格数据
   pageIndex: number = 1; //表格当前页码
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
   changeInpSubject = new Subject();
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
   ngOnInit() {
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
-      this.searchDepartment(v[0], v[1]);
+      if(v[1] === 'department'){
+        this.getDepartmentList(v[0]);
+      }else if(v[1] === 'departmentSearch'){
+        this.getDepartmentSearchList(v[0]);
+      }
     });
-    this.getAllHospital();
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.searchCriteria.hosId = this.tool.getCurrentHospital().id;
+    this.getList(1);
+    this.getGenderList();
+    this.getCareLevelList();
+    this.getIllnessStateList();
+    this.getPatientTypeList();
+    this.getHospitalList();
+    this.getHospitalSearchList();
   }
-  // 选择院区
-  changeHospital(id, type) {
-    if (type === "search") {
-      this.searchCriteria.department = null;
-    }
+
+  // 获取院区列表
+  hospitalList = [];
+  getHospitalList() {
+    this.hospitalList = this.tool.getHospitalList();
+  }
+
+  changeHospital(e){
+    this.deptList = [];
+    this.validateForm.controls.department.setValue(null);
   }
+
+  // 获取院区列表
+  hospitalSearchList = [];
+  getHospitalSearchList() {
+    this.hospitalSearchList = this.tool.getHospitalList();
+  }
+
+  changeHospitalSearch(e){
+    this.deptSearchList = [];
+    this.searchCriteria.department = undefined;
+  }
+
   // 搜索科室
-  departmentSearch = []; // 院区下的科室列表(搜索框)
-  deptKey = "";
+  deptList = []; // 院区下的科室列表(搜索框)
   isLoading = false;
-  searchDepartment(dept, type) {
+  getDepartmentList(dept) {
     let data = {
       department: {
+        searchType: 1,// 简单查询
         dept,
         hospital: {
-          id: this.searchCriteria.hospital,
+          id: this.validateForm.value.hosId,
         },
       },
       idx: 0,
       sum: 10,
     };
     this.mainService
-      .getFetchDataList("data", "department", data)
+      .getFetchDataList("simple/data", "department", data)
       .subscribe((data) => {
+        this.isLoading = false;
         if (data.status == 200) {
-          if (type === "search") {
-            if (this.deptKey === dept) {
-              this.isLoading = false;
-              this.departmentSearch = data.list;
-            }
-          }
+          this.deptList = data.list;
+        }else{
+          this.deptList = [];
+        }
+      });
+  }
+
+  // 搜索科室
+  deptSearchList = []; // 院区下的科室列表(搜索框)
+  getDepartmentSearchList(dept) {
+    let data = {
+      department: {
+        searchType: 1,// 简单查询
+        dept,
+        hospital: {
+          id: this.searchCriteria.hosId,
+        },
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "department", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        if (data.status == 200) {
+          this.deptSearchList = data.list;
+        }else{
+          this.deptSearchList = [];
         }
       });
   }
   changeInp(dept, type) {
-    if (!dept) {
-      return;
-    }
-    if (dept === "no") {
-      dept = "";
-    }
-    this.deptKey = dept;
     this.isLoading = true;
     this.changeInpSubject.next([dept, type]);
   }
   // 打开搜索框
-  changeSearch(flag) {
+  openDepartment(flag) {
     if (flag) {
-      this.changeInp("no", "search");
+      this.changeInp("", "department");
+    }
+  }
+  // 打开搜索框
+  openDepartmentSearch(flag) {
+    if (flag) {
+      this.changeInp("", "departmentSearch");
     }
   }
   // 重置
   reset() {
     this.searchCriteria = {
-      //搜索条件
-      patientName: "",
-      bedNum: "",
-      hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
-      department: null,
+      hosId: this.tool.getCurrentHospital().id,
     };
     this.getList(1);
   }
 
-  // 获取所有院区
-  getAllHospital() {
-    this.allHospital = [this.tool.getCurrentHospital()];
-    this.searchCriteria.hospital = this.tool.getCurrentHospital().id + "";
-    this.getList(1);
-  }
   // 查看标本历史记录
   historyPromptModalShow = false; //标本历史记录弹窗开关
   scode = ""; //查看历史记录携带
@@ -121,10 +169,12 @@ export class PatientSearchComponent implements OnInit {
     let postData = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      hosId: this.searchCriteria.hospital,
+      hosId: this.searchCriteria.hosId,
       patientName: this.searchCriteria.patientName,
-      bedNum: this.searchCriteria.bedNum,
       department: this.searchCriteria.department || undefined,
+      careLevel: this.searchCriteria.careLevel || undefined,
+      illnessState: this.searchCriteria.illnessState || undefined,
+      patientType: this.searchCriteria.patientType || undefined,
     };
     this.loading1 = true;
     this.mainService.listMsgByMain('listPatient',postData).subscribe((data) => {
@@ -135,4 +185,210 @@ export class PatientSearchComponent implements OnInit {
       }
     });
   }
+
+  // 新增弹框
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  showModal() {
+    this.add = true;
+    this.modal = true;
+    this.initForm();
+    this.validateForm.controls.hosId.setValue(this.searchCriteria.hosId);
+  }
+  hideModal() {
+    this.modal = false;
+  }
+
+  // 初始化新增form表单
+  initForm() {
+    if (this.add) {
+      this.deptList = [];
+    }
+    this.validateForm = this.fb.group({
+      patientName: ['', [Validators.required]],
+			gender: [null],
+			age: [undefined],
+			patientCode: ['', [Validators.required]],
+			residenceNo: ['', [Validators.required]],
+			barCode: ['', [Validators.required]],
+			bedNum: [''],
+      hosId: [null, [Validators.required]],
+      department: [null, [Validators.required]],
+      careLevel: [null, [Validators.required]],
+      illnessState: [null],
+      patientType: [null, [Validators.required]],
+    });
+  }
+  // 表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty({ onlySelf: true });
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) return;
+    this.btnLoading = true;
+    let postData = {};
+    if(this.add){
+			postData = {
+        patient: {
+          hosId: this.validateForm.value.hosId,
+          patientName: this.validateForm.value.patientName,
+          gender: {
+            id: this.validateForm.value.gender
+          },
+          age: this.validateForm.value.age,
+          patientCode: this.validateForm.value.patientCode,
+          residenceNo: this.validateForm.value.residenceNo,
+          barCode: this.validateForm.value.barCode,
+          bedNum: this.validateForm.value.bedNum,
+          department: {
+            id: this.validateForm.value.department,
+          },
+          careLevel: {
+            id: this.validateForm.value.careLevel,
+          },
+          illnessState: this.validateForm.value.illnessState ? {
+            id: this.validateForm.value.illnessState,
+          } : undefined,
+          patientType: {
+            id: this.validateForm.value.patientType,
+          },
+        }
+      }
+    }else{
+			postData = {
+        patient: {
+          ...this.coopData,
+          hosId: this.validateForm.value.hosId,
+          patientName: this.validateForm.value.patientName,
+          gender: {
+            id: this.validateForm.value.gender
+          },
+          age: this.validateForm.value.age,
+          patientCode: this.validateForm.value.patientCode,
+          residenceNo: this.validateForm.value.residenceNo,
+          barCode: this.validateForm.value.barCode,
+          bedNum: this.validateForm.value.bedNum,
+          department: {
+            id: this.validateForm.value.department,
+          },
+          careLevel: {
+            id: this.validateForm.value.careLevel,
+          },
+          illnessState: this.validateForm.value.illnessState ? {
+            id: this.validateForm.value.illnessState,
+          } : undefined,
+          patientType: {
+            id: this.validateForm.value.patientType,
+          },
+        }
+      }
+    }
+
+    this.mainService
+      .coopData("addData", "patient", postData)
+      .subscribe((data) => {
+        this.btnLoading = false;
+        this.hideModal();
+        if (data.status == 200) {
+          this.showPromptModal(this.add ? "新增" : "编辑", true, "");
+        } else{
+					this.showPromptModal(this.add ? "新增" : "编辑", false, data.msg);
+				}
+      });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(1);
+  }
+
+  // 编辑
+  maskFlag: any = false;
+  coopData = {};
+  edit(data) {
+    this.initForm();
+    this.validateForm.controls.hosId.setValue(data.hosId);
+    this.validateForm.controls.patientName.setValue(data.patientName);
+    if(data.gender){
+			this.validateForm.controls.gender.setValue(data.gender.id);
+		}else{
+      this.validateForm.controls.gender.setValue(null);
+    }
+    this.validateForm.controls.age.setValue(data.age);
+    this.validateForm.controls.patientCode.setValue(data.patientCode);
+    this.validateForm.controls.residenceNo.setValue(data.residenceNo);
+    this.validateForm.controls.barCode.setValue(data.barCode);
+    this.validateForm.controls.bedNum.setValue(data.bedNum);
+    if(data.department){
+      this.deptList = [data.department];
+      this.validateForm.controls.department.setValue(data.department.id);
+    }else{
+      this.validateForm.controls.department.setValue(null);
+    }
+    if(data.careLevel){
+      this.validateForm.controls.careLevel.setValue(data.careLevel.id);
+    }else{
+      this.validateForm.controls.careLevel.setValue(null);
+    }
+    if(data.illnessState){
+      this.validateForm.controls.illnessState.setValue(data.illnessState.id);
+    }else{
+      this.validateForm.controls.illnessState.setValue(null);
+    }
+    if(data.patientType){
+      this.validateForm.controls.patientType.setValue(data.patientType.id);
+    }else{
+      this.validateForm.controls.patientType.setValue(null);
+    }
+
+    this.modal = true;
+    this.add = false;
+    this.coopData = data;
+  }
+
+  // 获取性别
+	genderList: any = [];
+	getGenderList() {
+    this.mainService.getDictionary("list", "user_gender").subscribe((data) => {
+      this.genderList = data || [];
+    });
+	}
+
+  // 获取护理等级
+	careLevelList: any = [];
+	getCareLevelList() {
+    this.mainService.getDictionary("list", "levelOfCare").subscribe((data) => {
+      this.careLevelList = data || [];
+    });
+	}
+
+  // 获取病情级别
+	illnessStateList: any = [];
+	getIllnessStateList() {
+    this.mainService.getDictionary("list", "stateOfAnIllness").subscribe((data) => {
+      this.illnessStateList = data || [];
+    });
+	}
+
+  // 获取患者类别
+	patientTypeList: any = [];
+	getPatientTypeList() {
+    this.mainService.getDictionary("list", "patient_type").subscribe((data) => {
+      this.patientTypeList = data || [];
+    });
+	}
 }

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

@@ -127,9 +127,19 @@ export class SpecimenSearchComponent implements OnInit {
 	    this.startDate = this.endDate = null;
 	    return;
 	  }
-	  this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
-	  this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
-	  this.searchCriteria.dateRange = [this.startDate,this.endDate]
+	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+	  this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+    this.searchCriteria.dateRange = [this.startDate, this.endDate];
+	}
+	onCalendarChangeDate(dateArr){
+	  console.log(dateArr)
+	  if(dateArr.length == 2){
+	    let dateStart = new Date(dateArr[0]);
+	    let dateEnd = new Date(dateArr[1]);
+	    dateStart.setHours(0,0,0);
+	    dateEnd.setHours(23,59,59);
+	    this.searchCriteria.dateRange = [dateStart,dateEnd];
+	  }
 	}
   // 重置
   reset() {

src/app/views/web-repairs/web-repairs.component.html

@@ -172,7 +172,7 @@
 						</nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item>
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="floorId">楼层</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择楼层!">
@@ -183,7 +183,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item>
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="address">详细地址</nz-form-label>
 				  <nz-form-control>
@@ -192,7 +192,7 @@
 				    </nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
         <nz-form-item>
           <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="phone">联系电话</nz-form-label>
           <nz-form-control>
@@ -228,18 +228,18 @@
 					<div class="form-title"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
 					<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}岁</div>
 				</div>
-				
+
 				<div class="form-title-box">
 					<div class="form-title"><span class="font-weight-500">检验项目：</span>{{project||'无'}}</div>
 				</div>
-				
+
 				<div class="form-list">
 					<div class="form-title font-weight-500">诊断：</div>
 					<div class="indent">
 						{{detailsData.diagnose||'无'}}
 					</div>
 				</div>
-				
+
 				<div class="form-list">
 					<div class="form-title font-weight-500">病历摘要：</div>
 					<div class="indent">{{detailsData.medicalRecords||'无'}}</div>
@@ -254,13 +254,13 @@
 					<div class="form-title"><span class="font-weight-500">标本数量：</span>{{detailsData.specimenNum||'无'}}</div>
 					<div class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
 				</div>
-				
+
 				<div class="form-title-box">
 					<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
 					<div class="form-title"><span class="font-weight-500">离体时间：</span>{{detailsData.inVitroTime?(detailsData.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
 					<div class="form-title"><span class="font-weight-500">固定时间：</span>{{detailsData.fixationTime?(detailsData.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
 				</div>
-				
+
 				<div class="form-list">
 					<div class="form-title font-weight-500">标本：</div>
 					<div class="form-title specimen-list">
@@ -271,7 +271,7 @@
 				</div>
 
 			</div>
-			
+
 			<div class="content-item-right">
 				<div class="step-title">病理闭环</div>
 				<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
@@ -303,13 +303,13 @@
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
-	
+
 
 <div class="mask-style" *ngIf="isSpinning">
 	<nz-spin nzSimple class="spin-style"></nz-spin>
 </div>
 
-<router-outlet (deactivate)="getConnectList($event)"></router-outlet>
+<router-outlet (deactivate)="getConnectList()"></router-outlet>
 
 <!-- 快速报修 -->
 <div class="commonModal display_flex justify-content_flex-center align-items_center" *ngIf="bxModal" (click)="clickExtra($event)">
@@ -419,4 +419,4 @@
   [btnLoading]="btnLoading"
   (confirmDelEvent)="confirmDelBx()"
   content="您确认要撤销吗？"
-></app-dialog-delete>
+></app-dialog-delete>