增加患者标识

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

@@ -43,14 +43,14 @@ 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}
 	];
-	
+
   // 工单模式
   spePackageModelList:any[] = [
     { label: '一单一包', value: 1 },
@@ -151,7 +151,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	speStartCollectShowConfig:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-	
+
 	// 速冻标本数量控制
 	pathologyFrozenSpecimenNum:any = '0';
 

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

@@ -75,22 +75,24 @@
           <tr class="thead">
             <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="10%">院区</th>
-            <th nzWidth="10%">当前科室</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>{{ data.patientType?.name }}</td>
             <td>{{ data.patientName }}</td>
+            <td>{{ data.patientCode }}</td>
             <td>{{ data.residenceNo }}</td>
             <td>{{ data.barCode }}</td>
             <td>{{ data.bedNum }}</td>
@@ -149,6 +151,14 @@
           </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>

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

@@ -209,6 +209,7 @@ export class PatientSearchComponent implements OnInit {
       patientName: ['', [Validators.required]],
 			gender: [null],
 			age: [undefined],
+			patientCode: ['', [Validators.required]],
 			residenceNo: ['', [Validators.required]],
 			barCode: ['', [Validators.required]],
 			bedNum: [''],
@@ -238,6 +239,7 @@ export class PatientSearchComponent implements OnInit {
             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,
@@ -265,6 +267,7 @@ export class PatientSearchComponent implements OnInit {
             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,
@@ -326,6 +329,7 @@ export class PatientSearchComponent implements OnInit {
       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);