拉取代码

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

@@ -89,20 +89,28 @@
                 <span class="label">患者姓名</span>
                 <span>{{orderInfo.patient.patientName}}</span>
               </p>
-              <p>
+              <p *ngIf="orderInfo.patient.residenceNo">
                 <span class="label">床位</span>
                 <span>{{orderInfo.patient.bedNum}}</span>
               </p>
+							<p *ngIf="!orderInfo.patient.residenceNo">
+							  <span class="label">就诊卡号</span>
+							  <span>{{orderInfo.patient.cardNo}}</span>
+							</p>
               <p *ngIf="orderInfo.patient.careLevel">
                 <span class="label">{{orderInfo.patient.careLevel.desc}}</span>
                 <span>{{orderInfo.patient.careLevel.name}}</span>
               </p>
             </div>
             <div class="right" nz-col nzSpan="12">
-              <p>
+              <p *ngIf="orderInfo.patient.residenceNo">
                 <span class="label">住院号</span>
                 <span>{{orderInfo.patient.residenceNo}}</span>
               </p>
+							<p *ngIf="!orderInfo.patient.residenceNo">
+							  <span class="label">身份证号</span>
+							  <span>{{orderInfo.patient.identityCardNo}}</span>
+							</p>
               <p>
                 <span class="label">携带物品</span>
                 <span>{{orderInfo.goods||'暂无'}}</span>

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

@@ -761,20 +761,32 @@
                     orderInfo.patient ? orderInfo.patient.patientName : "-"
                   }}</span>
                 </p>
-                <p>
+                <p *ngIf="orderInfo.patient.residenceNo">
                   <span class="label">床位</span>
                   <span>{{
                     orderInfo.patient ? orderInfo.patient.bedNum : "-"
                   }}</span>
                 </p>
+								<p *ngIf="!orderInfo.patient.residenceNo">
+								  <span class="label">就诊卡号</span>
+								  <span>{{
+								    orderInfo.patient ? orderInfo.patient.cardNo : "-"
+								  }}</span>
+								</p>
               </div>
               <div class="right" nz-col nzSpan="12">
-                <p>
+                <p *ngIf="orderInfo.patient.residenceNo">
                   <span class="label">住院号</span>
                   <span>{{
                     orderInfo.patient ? orderInfo.patient.residenceNo : "-"
                   }}</span>
                 </p>
+								<p *ngIf="!orderInfo.patient.residenceNo">
+								  <span class="label">身份证号</span>
+								  <span>{{
+								    orderInfo.patient ? orderInfo.patient.identityCardNo : "-"
+								  }}</span>
+								</p>
                 <p>
                   <span class="label">携带物品</span>
                   <span>{{ orderInfo.goods || "暂无" }}</span>

src/app/views/pathology/pathology.component.ts

@@ -481,18 +481,20 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	
 	// 获取院区
 	getHospitalData(){
-		let data = {
-		  idx: 0,
-		  sum: 9999,
-			hospital:{
-				selectType:'level1'
-			}
-		};
-		this.mainService
-		  .getFetchDataList("data", "hospital", data)
-		  .subscribe((res) => {
-		    this.hospital = res.list;
-		  });
+		let arr = this.tool.getHospitalList().filter(i=>i.parent==undefined)
+		this.hospital = arr
+		// let data = {
+		//   idx: 0,
+		//   sum: 9999,
+		// 	hospital:{
+		// 		selectType:'level1'
+		// 	}
+		// };
+		// this.mainService
+		//   .getFetchDataList("data", "hospital", data)
+		//   .subscribe((res) => {
+		//     this.hospital = res.list;
+		//   });
 	}
 	
 	// 选择院区
@@ -762,15 +764,24 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			this.mustReceived = res.data.mustReceived;
 			this.currReceived = res.data.currReceived;
 			this.btnConnectLoading = false
-			this.validateConnectForm = this.fb.group({
-				receptionNumber: [null, [Validators.required]],
-				dispatchingNumber: [this.codeData[0].deliveryUserDTO.account, [Validators.required]]
-			});
-			this.dispatchingName = this.codeData[0].deliveryUserDTO.name;
-			this.dispatchingUserId = this.codeData[0].deliveryUserDTO.id
+			if(this.codeData[0].deliveryUserDTO){
+				this.validateConnectForm = this.fb.group({
+					receptionNumber: [null, [Validators.required]],
+					dispatchingNumber: [this.codeData[0].deliveryUserDTO.account, [Validators.required]]
+				});
+				this.dispatchingName = this.codeData[0].deliveryUserDTO.name;
+				this.dispatchingUserId = this.codeData[0].deliveryUserDTO.id
+			}else{
+				this.validateConnectForm = this.fb.group({
+					receptionNumber: [null, [Validators.required]],
+					dispatchingNumber: [null, [Validators.required]]
+				});
+				this.dispatchingName = null;
+				this.dispatchingUserId = null
+			}
 			
 			this.receptionName = null;
-			this.connectUserId =null
+			this.connectUserId = null
 			this.connectModal = true
 		});
 	}

src/app/views/pathologyScan/pathologyScan.component.ts

@@ -517,13 +517,21 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			this.mustReceived = res.data.mustReceived;
 			this.currReceived = res.data.currReceived;
 			this.btnConnectLoading = false
-			this.validateConnectForm = this.fb.group({
-				receptionNumber: [this.userInfo.account, [Validators.required]],
-				dispatchingNumber: [this.codeData[0].deliveryUserDTO.account, [Validators.required]]
-			});
-			this.dispatchingName = this.codeData[0].deliveryUserDTO.name;
-			this.dispatchingUserId = this.codeData[0].deliveryUserDTO.id
-			
+			if(this.codeData[0].deliveryUserDTO){
+				this.validateConnectForm = this.fb.group({
+					receptionNumber: [this.userInfo.account, [Validators.required]],
+					dispatchingNumber: [this.codeData[0].deliveryUserDTO.account, [Validators.required]]
+				});
+				this.dispatchingName = this.codeData[0].deliveryUserDTO.name;
+				this.dispatchingUserId = this.codeData[0].deliveryUserDTO.id
+			}else{
+				this.validateConnectForm = this.fb.group({
+					receptionNumber: [null, [Validators.required]],
+					dispatchingNumber: [null, [Validators.required]]
+				});
+				this.dispatchingName = null;
+				this.dispatchingUserId = null
+			}
 			this.receptionName = this.userInfo.name;
 			this.connectUserId = this.userInfo.id;
 			this.connectModal = true