系统设置添加pda版本号

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

@@ -194,9 +194,11 @@ export class ConfigurationDeptUserComponent implements OnInit {
 			deptArr.push(i.id)
 		}
     this.validatePriorityForm.controls.department.setValue(deptArr);
-    this.validatePriorityForm.controls.handleGroup.setValue(data.handleGroupDTO.id);
+		if(data.handleGroupDTO){
+			this.validatePriorityForm.controls.handleGroup.setValue(data.handleGroupDTO.id);
+			this.getUser(data.handleGroupDTO.id)
+		}
 		this.validatePriorityForm.controls.binding.setValue(data.handleUserDTO?'1':'0')
-		this.getUser(data.handleGroupDTO.id)
 		if(data.handleUserDTO){
 			this.validatePriorityForm.controls.handleUser.setValue(data.handleUserDTO.id);
 		}

src/app/share/pathology-add/pathology-add.component.html

@@ -283,14 +283,13 @@
 		<div class="monad">
 			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && operation != 'addPrint'" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
-				 <div style="display: flex;">
-					 <img style="width: 50%;height: 70px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
-					 <div style="width: 50%;">
-						 
-						 <img style="width: 100%; border-radius: 5px;
-						 	position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
-					 	<!-- <img style="width: 100%; border-radius: 5px;
-					 		position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;">
+					 <div style="width: 60%;height: 70px;text-align: center;">
+						 <img style="max-width: 95%;height: 80%;" [src]="printData.applyBarCode" alt="">
+						 <div>{{printData.applyCode}}</div>
+					 </div>
+					 <div style="width: 40%;text-align: center;">
+						 <img style="max-width: 100%;height: 100%;" [src]="tool.logoUrl" alt="">
 					 </div>
 				 </div>
 				
@@ -328,14 +327,13 @@
 			
 			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>0 && operation == 'addPrint'" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
-				 <div style="display: flex;">
-					 <img style="width: 50%;height: 70px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
-					 <div style="width: 50%;">
-						 
-						 <img style="width: 100%; border-radius: 5px;
-						 	position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
-					 	<!-- <img style="width: 100%; border-radius: 5px;
-					 		position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;">
+					 <div style="width: 60%;height: 70px;text-align: center;">
+						 <img style="max-width: 95%;height: 80%;" [src]="printData.applyBarCode" alt="">
+						 <div>{{printData.applyCode}}</div>
+					 </div>
+					 <div style="width: 40%;text-align: center;">
+						 <img style="max-width: 100%;height: 100%;" [src]="tool.logoUrl" alt="">
 					 </div>
 				 </div>
 				
@@ -376,13 +374,13 @@
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 				 <div style="height: 50px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 				 <div style="border: 1px solid #AAAAAA;border-radius: 5px;">
-					 <div style="display: flex;">
-					 	<img style="width: 50%;height: 70px;border-radius: 5px;" [src]="data.barCode" alt="">
-						<div style="width: 50%;">
-							<img style="width: 100%; border-radius: 5px;
-								position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
-							<!-- <img style="width: 100%;border-radius: 5px;
-								position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+					 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;">
+						<div style="width: 60%;height: 70px;text-align: center;">
+							<img style="max-width: 95%;height: 80%;" [src]="data.barCode" alt="">
+						  <div>{{data.specimenCode}}</div>
+						</div>
+						<div style="width: 40%;text-align: center;">
+							<img style="max-width: 100%;height: 100%;" [src]="tool.logoUrl" alt="">
 						</div>
 					 </div>
 					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">

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

@@ -19,7 +19,7 @@
 					<nz-form-item class="form-title-box">
 						<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 class="form-title"><span class="font-weight-500">性别：</span>{{detailsData.patientDTO.gender.name||'-'}}</div>
+						<div class="form-title"><span class="font-weight-500">性别：</span>{{detailsData.patientDTO.gender ? detailsData.patientDTO.gender.name : '-'}}</div>
 						<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
 					</nz-form-item>
 					
@@ -115,13 +115,13 @@
 		<div class="monad">
 			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
-				 <div style="display: flex;">
-					 <img style="width: 50%;height: 70px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
-					 <div style="width: 50%;">
-						 <img style="width: 100%; border-radius: 5px;
-						 	position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
-<!-- 					 	<img style="width: 100%; border-radius: 5px;
-					 		position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;">
+					 <div style="width: 60%;height: 70px;text-align: center;">
+						 <img style="max-width: 95%;height: 80%;" [src]="printData.applyBarCode" alt="">
+						 <div>{{printData.applyCode}}</div>
+					 </div>
+					 <div style="width: 40%;text-align: center;">
+						 <img style="max-width: 100%;height: 100%;" [src]="tool.logoUrl" alt="">
 					 </div>
 				 </div>
 				
@@ -162,13 +162,13 @@
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 				 <div style="height: 50px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 				 <div style="border: 1px solid #AAAAAA;border-radius: 5px;">
-					 <div style="display: flex;">
-					 	<img style="width: 50%;height: 70px;border-radius: 5px;" [src]="data.barCode" alt="">
-						<div style="width: 50%;">
-							<img style="width: 100%; border-radius: 5px;
-								position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
-							<!-- <img style="width: 100%;border-radius: 5px;
-								position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+					 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;">
+						<div style="width: 60%;height: 70px;text-align: center;">
+							<img style="max-width: 95%;height: 80%;" [src]="data.barCode" alt="">
+							<div>{{data.specimenCode}}</div>
+						</div>
+						<div style="width: 40%;text-align: center;">
+							<img style="max-width: 100%;height: 100%;" [src]="tool.logoUrl" alt="">
 						</div>
 					 </div>
 					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">

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

@@ -208,6 +208,12 @@
 						</nz-radio-group>
 				  </nz-form-control>
 				</nz-form-item>
+				<nz-form-item class="formItem">
+				  <nz-form-label [nzSpan]="24" nzFor="supportAppVersion" class="label">支助APP版本号</nz-form-label>
+				  <nz-form-control [nzSpan]="24" nzErrorTip="请输入支助APP版本号!">
+				    <input nz-input formControlName="supportAppVersion" id="supportAppVersion" placeholder="请输入支助APP版本号">
+				  </nz-form-control>
+				</nz-form-item>
       </div>
     </form>
   </overlay-scrollbars>

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

@@ -74,6 +74,7 @@ export class SysConfigComponent implements OnInit {
       busiViewDeptId: [null, [Validators.required]],
 			repairs: [null, [Validators.required]],
 			cmdbRepair: [null, [Validators.required]],
+			supportAppVersion: [null, [Validators.required]],
     });
     this.getDeptType();
     this.coopBtns = this.tool.initCoopBtns(this.route);
@@ -152,7 +153,8 @@ export class SysConfigComponent implements OnInit {
         item.keyconfig === "busiViewDeptId" ||
 				item.keyconfig === "deptRepair" ||
 				item.keyconfig === "publicRepair" ||
-				item.keyconfig === "cmdbRepair" 
+				item.keyconfig === "cmdbRepair" ||
+				item.keyconfig === "supportAppVersion"
     );
 		console.log(7777,this.validateForm.controls.repairs.value)
     filterData.forEach((item) => {
@@ -206,6 +208,8 @@ export class SysConfigComponent implements OnInit {
 			  item.valueconfig = value;
 			}else if (item.keyconfig === "cmdbRepair") {
         item.valueconfig = this.validateForm.controls.cmdbRepair.value;
+      }else if (item.keyconfig === "supportAppVersion") {
+        item.valueconfig = this.validateForm.controls.supportAppVersion.value;
       }
     });
     const postData = filterData;
@@ -334,6 +338,9 @@ export class SysConfigComponent implements OnInit {
 								case "cmdbRepair":
 								  this.validateForm.controls.cmdbRepair.setValue(c[1] + "");
 								  break;
+								case "supportAppVersion":
+								  this.validateForm.controls.supportAppVersion.setValue(c[1]);
+								  break;
               }
             });
           } else {