Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
===================================================================
diff -u -r41412 -r41444
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 41412)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 41444)
@@ -852,6 +852,10 @@
 			id: 'biologicalMonitoringDisplay'
 		}, {
 			xtype: 'hidden',
+			name: 'luminalChemistryPcdDefault',
+			id: 'luminalChemistryPcdDefault'
+		}, {
+			xtype: 'hidden',
 			name: 'monitorTousseDisplay',
 			id: 'monitorTousseDisplay'
 		}, {
@@ -1530,12 +1534,12 @@
 				layout: 'column',
 				xtype: 'fieldset',
 				title: '生物监测的结果默认值',
-				height: 38,
 				autoHeight: true,
 				items: [{
 					layout: 'form',
 					columnWidth: .5,
-					labelWidth: 170,
+					labelWidth: 210,
+					height:25,
 					items: [{
 						id: 'qualified',
 						name: 'qualified',
@@ -1562,8 +1566,9 @@
 					}]
 				}, {
 					layout: 'form',
-					labelWidth: 170,
+					labelWidth: 210,
 					columnWidth: .5,
+					height:25,
 					items: [{
 						id: 'firstQualified',
 						name: 'firstQualified',
@@ -1575,7 +1580,8 @@
 				}, {
 					layout: 'form',
 					columnWidth: .5,
-					labelWidth: 170,
+					labelWidth: 210,
+					height:25,
 					items: [{
 						id: 'implantQualified',
 						name: 'implantQualified',
@@ -1597,7 +1603,8 @@
 				}, {
 					layout: 'form',
 					columnWidth: .5,
-					labelWidth: 170,
+					labelWidth: 210,
+					height:25,
 					items: [{
 						id: 'foreignTousseQualified',
 						name: 'foreignTousseQualified',
@@ -1618,24 +1625,98 @@
 					}]
 				}]
 			}, {
+				columnWidth: 0.49,
+				layout: 'column',
+				hidden: sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation,
+				height: 80
+			}, {
 				columnWidth: 0.02,
 				layout: 'column',
+				hidden: !sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation,
 				height: 38
 			}, {
 				columnWidth: 0.49,
 				layout: 'column',
 				xtype: 'fieldset',
-				title: '监测包扫描提示默认值,之前的，目前不用了，这里占位',
-				height: 38,
+				title: '管腔化学PCD监测结果默认值',
 				autoHeight: true,
-				bodyStyle: 'margin:10px 0 !important',
-				hidden: true,
+				hidden: !sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation,
+				items: [{
+					layout: 'form',
+					columnWidth: .5,
+					labelWidth: 210,
+					height:25,
+					items: [{
+						id: 'PCDQualified',
+						name: 'PCDQualified',
+						fieldLabel: BIOLOGICALMONITORINGDISPLAY_QUALIFIED,
+						cls: 'sterilizerCheckbox',
+						xtype: 'checkbox',
+						inputValue: BIOLOGICALMONITORINGDISPLAY_QUALIFIED,
+						listeners: {
+							check: function (thiz, checked) {
+								if (checked) {
+									top.Ext.getCmp('PCDFirstQualified').setValue(false);
+									top.Ext.getCmp('PCDFirstQualified').disable();
+								} else {
+									top.Ext.getCmp('PCDFirstQualified').enable();
+								}
+							}
+						}
+					}]
+				}, {
+					layout: 'form',
+					labelWidth: 210,
+					columnWidth: .5,
+					height:25,
+					items: [{
+						id: 'PCDFirstQualified',
+						name: 'PCDFirstQualified',
+						cls: 'sterilizerCheckbox',
+						fieldLabel: BIOLOGICALMONITORINGDISPLAY_FIRSTQUALIFIED,
+						xtype: 'checkbox',
+						inputValue: BIOLOGICALMONITORINGDISPLAY_FIRSTQUALIFIED,
+						listeners: {
+							check: function (thiz, checked) {
+								if (checked) {
+									top.Ext.getCmp('PCDQualified').setValue(false);
+									top.Ext.getCmp('PCDQualified').disable();
+								} else {
+									top.Ext.getCmp('PCDQualified').enable();
+								}
+							}
+						}
+					}]
+				}, {
+					layout: 'form',
+					labelWidth: 210,
+					columnWidth: .5,
+					height:25,
+					items: [{
+						xtype: 'textfield',
+						readOnly: true,
+						labelSeparator:'',
+						cls: 'fieldReadOnlyNoRemove',
+						anchor: '95%'
+					}]
+				}, {
+					layout: 'form',
+					labelWidth: 210,
+					columnWidth: .5,
+					height:25,
+					items: [{
+						xtype: 'textfield',
+						readOnly: true,
+						labelSeparator:'',
+						cls: 'fieldReadOnlyNoRemove',
+						anchor: '95%'
+					}]
+				}]
 			}, {
 				columnWidth: 0.49,
 				layout: 'column',
 				xtype: 'fieldset',
 				title: '灭菌器运行前安全检查',
-				height: 38,
 				autoHeight: true,
 				hidden: !sstsConfig.enableSterilizerSafetyCheckBeforeRunAndSterilizerRunLogSheetRegistrationFunction,
 				items: [{
@@ -1646,6 +1727,7 @@
 					layout: 'form',
 					columnWidth: 1,
 					labelWidth: 84,
+					height:25,
 					items: [{
 						xtype: 'combo',
 						id: 'safetyCheckFormDefinitionName',
@@ -1673,6 +1755,7 @@
 					layout: 'form',
 					labelWidth: 96,
 					columnWidth: .5,
+					height:25,
 					items: [{
 						xtype: 'hidden',
 						id: 'safetyCheckFirstStoveValue',
@@ -1689,6 +1772,7 @@
 					layout: 'form',
 					columnWidth: .5,
 					labelWidth: 130,
+					height:25,
 					items: [{
 						xtype: 'hidden',
 						id: 'safetyCheckEachStoveValue',
@@ -1705,19 +1789,20 @@
 			}, {
 				columnWidth: 0.02,
 				layout: 'column',
+				hidden: !sstsConfig.enableSterilizerSafetyCheckBeforeRunAndSterilizerRunLogSheetRegistrationFunction,
 				height: 38
 			}, {
 				columnWidth: 0.49,
 				layout: 'column',
 				xtype: 'fieldset',
 				title: '灭菌器运行记录表',
-				height: 38,
 				autoHeight: true,
 				hidden: !sstsConfig.enableSterilizerSafetyCheckBeforeRunAndSterilizerRunLogSheetRegistrationFunction,
 				items: [{
 					layout: 'form',
 					columnWidth: 1,
 					labelWidth: 84,
+					height:25,
 					items: [{
 						xtype: 'hidden',
 						id: 'runTableRecordFormDefinitionId',
@@ -1749,6 +1834,7 @@
 					layout: 'form',
 					labelWidth: 96,
 					columnWidth: .5,
+					height:25,
 					items: [{
 						xtype: 'hidden',
 						id: 'runTableRecordFirstStoveValue',
@@ -1932,6 +2018,26 @@
 						top.Ext.getCmp('qualified').disable();
 					}
 				}
+
+				//CDSLQYQYYY-149：管腔化学PCD监测结果默认值
+				if(sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation){
+					var luminalChemistryPcdDefault = sterilizer.luminalChemistryPcdDefault || '';
+					if(luminalChemistryPcdDefault !== ''){
+						var luminalChemistryPcdDefaultArray = luminalChemistryPcdDefault.split(';');
+						for (var i = 0; i < luminalChemistryPcdDefaultArray.length; i++) {
+							if (luminalChemistryPcdDefaultArray[i] == BIOLOGICALMONITORINGDISPLAY_QUALIFIED) {
+								top.Ext.getCmp('PCDQualified').setValue(true);
+								top.Ext.getCmp('PCDFirstQualified').setValue(false);
+								top.Ext.getCmp('PCDFirstQualified').disable();
+							} else if (luminalChemistryPcdDefaultArray[i] == BIOLOGICALMONITORINGDISPLAY_FIRSTQUALIFIED) {
+								top.Ext.getCmp('PCDFirstQualified').setValue(true);
+								top.Ext.getCmp('PCDQualified').setValue(false);
+								top.Ext.getCmp('PCDQualified').disable();
+							}
+						}
+					}
+				}
+
 				for (var i = 0; i < monitoringPackageRules.length; i++) {
 					var data = monitoringPackageRules[i];
 					var p = new MonitoringPackageGridRecord({
@@ -2120,6 +2226,21 @@
 
 	top.Ext.getCmp('biologicalMonitoringDisplay').setValue(biologicalMonitoringDisplay);
 }
+
+//CDSLQYQYYY-149：设置管腔化学PCD监测结果默认值
+function setLuminalChemistryPcdDefault(){
+	var qualified = top.Ext.getCmp('PCDQualified').getValue();
+	var firstQualified = top.Ext.getCmp('PCDFirstQualified').getValue();
+	var luminalChemistryPcdDefault = '';
+	luminalChemistryPcdDefault += (qualified ? top.Ext.getCmp('PCDQualified').inputValue + ';' : '');
+	luminalChemistryPcdDefault += (firstQualified ? top.Ext.getCmp('PCDFirstQualified').inputValue + ';' : '');
+	if (luminalChemistryPcdDefault !== '') {
+		luminalChemistryPcdDefault = luminalChemistryPcdDefault.substring(0, luminalChemistryPcdDefault.length - 1);
+	}
+
+	top.Ext.getCmp('luminalChemistryPcdDefault').setValue(luminalChemistryPcdDefault);
+}
+
 function arrContainsMonitoringPackageRule(rules,  rule) {
 	for (var i = 0; i < rules.length; i++) {
 		if (rules[i].trigger === rule.trigger) {
@@ -2192,6 +2313,10 @@
 		return false;
 	}
 	setBiologicalMonitoringDisplay();
+	//CDSLQYQYYY-149：设置管腔化学PCD监测结果默认值
+	if(sstsConfig.displayPCDMonitoringResultsInTheSterilizationRecordInformation){
+		setLuminalChemistryPcdDefault();
+	}
 	if(!setMonitortousseDisplay()){
 		// 没有地方调用disable().随波逐流，先加上吧
 		top.Ext.getCmp('saveBtn').enable();