Merge branch 'lmm' into lmm1

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

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

@@ -189,6 +189,25 @@
             <nz-input-number class="w100" formControlName="refreshNurseWorkOrderTime" [nzMin]="15" [nzStep]="1" [nzPrecision]="0" [nzFormatter]="formatterSecond" [nzParser]="parserSecond"></nz-input-number>
           </nz-form-control>
         </nz-form-item>
+				<nz-form-item class="formItem">
+				  <nz-form-label [nzSpan]="10" nzFor="repairs" nzRequired class="label">报修方式支持
+				  </nz-form-label>
+				  <nz-form-control [nzSpan]="14" nzErrorTip="报修方式支持是必填项!">
+						<nz-checkbox-group formControlName="repairs" [(ngModel)]="checkOptionsOne" ></nz-checkbox-group>
+						<!-- <label nz-checkbox formControlName="deptRepair" [(ngModel)]="deptRepair">科内报修</label> -->
+						<!-- <label nz-checkbox formControlName="publicRepair" [(ngModel)]="publicRepair">公共报修</label> -->
+					</nz-form-control>
+				</nz-form-item>
+				<nz-form-item class="formItem">
+				  <nz-form-label [nzSpan]="10" nzFor="cmdbRepair" nzRequired class="label">是否支持资产报修
+				  </nz-form-label>
+				  <nz-form-control [nzSpan]="14" nzErrorTip="是否支持资产报修是必填项!">
+						<nz-radio-group formControlName="cmdbRepair">
+						  <label nz-radio nzValue="1">是</label>
+						  <label nz-radio nzValue="0">否</label>
+						</nz-radio-group>
+				  </nz-form-control>
+				</nz-form-item>
       </div>
     </form>
   </overlay-scrollbars>

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

@@ -26,6 +26,10 @@ export class SysConfigComponent implements OnInit {
   promptInfo: string; //操作结果提示信息
   promptModalShow: boolean; //操作提示框是否展示
   coopBtns = {};
+	checkOptionsOne = [
+		{ label: '科内报修', value: 'deptRepair', checked:false},
+		{ label: '公共报修', value: 'publicRepair', checked:false },
+	];
   formatterSecond = (value: number) => `${value} 秒`;
   parserSecond = (value: string) => value.replace(' 秒', '');
   menu = JSON.parse(localStorage.getItem("menu")) || []; //菜单
@@ -68,6 +72,8 @@ export class SysConfigComponent implements OnInit {
       cachePath: [{ value: null, disabled: true }, [Validators.required]],
       cachePort: [{ value: null, disabled: true }, [Validators.required]],
       busiViewDeptId: [null, [Validators.required]],
+			repairs: [null, [Validators.required]],
+			cmdbRepair: [null, [Validators.required]],
     });
     this.getDeptType();
     this.coopBtns = this.tool.initCoopBtns(this.route);
@@ -143,8 +149,12 @@ export class SysConfigComponent implements OnInit {
         item.keyconfig === "systemName" ||
         item.keyconfig === "largeScreenName" ||
         item.keyconfig === "defaultRoleOfNurse" ||
-        item.keyconfig === "busiViewDeptId"
+        item.keyconfig === "busiViewDeptId" ||
+				item.keyconfig === "deptRepair" ||
+				item.keyconfig === "publicRepair" ||
+				item.keyconfig === "cmdbRepair" 
     );
+		console.log(7777,this.validateForm.controls.repairs.value)
     filterData.forEach((item) => {
       if (item.keyconfig === "pwd") {
         item.valueconfig = this.validateForm.controls.defaultPwd.value;
@@ -178,6 +188,24 @@ export class SysConfigComponent implements OnInit {
         item.valueconfig = this.validateForm.controls.defaultRoleOfNurse.value;
       } else if (item.keyconfig === "busiViewDeptId") {
         item.valueconfig = this.validateForm.controls.busiViewDeptId.value;
+      } else if (item.keyconfig === "deptRepair") {
+				let value = null
+				if(this.validateForm.controls.repairs.value[0].checked){
+					value = '1'
+				}else{
+					value = '0'
+				}
+        item.valueconfig = value;
+      } else if (item.keyconfig === "publicRepair") {
+			  let value = null
+			  if(this.validateForm.controls.repairs.value[1].checked){
+			  	value = '1'
+			  }else{
+			  	value = '0'
+			  }
+			  item.valueconfig = value;
+			}else if (item.keyconfig === "cmdbRepair") {
+        item.valueconfig = this.validateForm.controls.cmdbRepair.value;
       }
     });
     const postData = filterData;
@@ -287,6 +315,25 @@ export class SysConfigComponent implements OnInit {
                 case "busiViewDeptId":
                   this.validateForm.controls.busiViewDeptId.setValue(c[1] + "");
                   break;
+								case "deptRepair":
+									if(c[1]=='1'){
+										this.checkOptionsOne[0].checked = true
+									}else{
+										this.checkOptionsOne[0].checked = false
+									}
+								  this.validateForm.controls.repairs.setValue(this.checkOptionsOne + "");
+								  break;
+								case "publicRepair":
+									if(c[1]=='1'){
+										this.checkOptionsOne[1].checked = true
+									}else{
+										this.checkOptionsOne[1].checked = false
+									}
+								  this.validateForm.controls.repairs.setValue(this.checkOptionsOne + "");
+								  break;	
+								case "cmdbRepair":
+								  this.validateForm.controls.cmdbRepair.setValue(c[1] + "");
+								  break;
               }
             });
           } else {