Index: ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.js
===================================================================
diff -u -r14346 -r15509
--- ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.js	(.../borrowRecordView.js)	(revision 14346)
+++ ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.js	(.../borrowRecordView.js)	(revision 15509)
@@ -357,13 +357,22 @@
 					layout : 'form',
 					labelWidth : 70,
 					items : [{
-						xtype : 'textfield',
+						xtype : 'datefieldWithMin',
 						fieldLabel : '出借时间',
 						id : 'lendingTime',
 						name : 'lendingTime',
-						anchor : '90%',
+						altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+						format : 'Y-m-d H:i',
 						readOnly : true,
-						cls : 'fieldReadOnlyNoRemove'
+						anchor : '90%'
+//						xtype : 'textfield',
+//						fieldLabel : '出借时间',
+//						id : 'lendingTime',
+//						name : 'lendingTime',
+//						format : 'Y-m-d H:i',
+//						anchor : '90%',
+//						readOnly : true,
+//						cls : 'fieldReadOnlyNoRemove'
 					}]
 				}, {
 					columnWidth : .5,
@@ -544,7 +553,8 @@
 			}
 		});
 	} else {// 添加
-		top.Ext.getCmp('lendingTime').setValue(Ext.util.Format.date(new Date(), "Y-m-d H:i"));
+//		top.Ext.getCmp('lendingTime').setValue(Ext.util.Format.date(new Date(), "Y-m-d H:i"));
+		setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'lendingTime');  //（设置出借时间，取服务器时间 cjr）
 		top.Ext.getCmp('lender').setValue($Id('userName').value);
 		top.Ext.getCmp('rentalDepartName').setValue($Id('depart').value);
 		top.Ext.getCmp('rentalDepartCode').setValue($Id('departCoding').value);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
===================================================================
diff -u -r15403 -r15509
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java	(.../SterilizerManagerImpl.java)	(revision 15403)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java	(.../SterilizerManagerImpl.java)	(revision 15509)
@@ -119,6 +119,7 @@
 			Date biologicalMonitoringEndDate) {
 
 
+		//有待优化，只针对外来器械包和外来器械小分包更加合理
 		String sql = 
 				"select t.id tousseId,t.tousseName tousseName,i.sendTime sendTime "
 				+ "from TousseInstance t,SterilizationRecord sr,Invoice i "
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r15504 -r15509
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15504)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15509)
@@ -1497,7 +1497,7 @@
 		JSONObject jsonObj = invoiceManager.isRoutine(barcode);  //判断是否常规发货（cjr）
 		String noBiologicalMonitoringForeignTousse = jsonObj.optString("noBiologicalMonitoringForeignTousses");
 		String unconventionalForeignTousse = jsonObj.optString("unconventionalForeignTousses");
-		if (StringTools.isBlank(noBiologicalMonitoringForeignTousse)) {  //此外来器械包做了生物监测
+		if (StringTools.isBlank(noBiologicalMonitoringForeignTousse)) {  //此外来器械包做了生物监测（或者不是外来器械包，不用做生物监测的）
 			vo.setNoBiologicalMonitoring(false);
 		}
 		if (!StringTools.isBlank(unconventionalForeignTousse)) {  //此外来器械包做了生物监测，但是没结束就要发货了
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
===================================================================
diff -u -r15403 -r15509
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java	(.../InvoiceGoodsVo.java)	(revision 15403)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java	(.../InvoiceGoodsVo.java)	(revision 15509)
@@ -57,7 +57,7 @@
 	public static final boolean VALIDATE_PASS_FALSE = false;
 	
 	private String isRoutine =TousseInstance.ROUTINE_YES;  //是否常规发货,默认是常规发货（这里的不常规指的是：正在做"生物监测"时就把这个器械包发货了）
-	private Boolean noBiologicalMonitoring = true;  //没有做生物监测，默认是没做（目前只针对外来器械吧）
+	private Boolean noBiologicalMonitoring = true;  //没有做生物监测，默认是没做（目前只针对外来器械包）
 	
 
 	public Long getId() {
Index: ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js
===================================================================
diff -u -r14837 -r15509
--- ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js	(.../recallRecordView.js)	(revision 14837)
+++ ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js	(.../recallRecordView.js)	(revision 15509)
@@ -203,7 +203,7 @@
 					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 					selectOnFocus :true,
 					format : 'Y-m-d',
-					value : new Date(),
+//					value : new Date(),
 					allowBlank : false,
 					anchor : '95%',
 					listeners:{"change": dateChange}
@@ -235,7 +235,7 @@
 					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 					selectOnFocus :true,
 					format : 'Y-m-d',
-					value : new Date(),
+//					value : new Date(),
 					allowBlank : false,
 					anchor : '95%',
 					listeners:{"change": dateChange}
@@ -346,6 +346,9 @@
 			},
 			failure : function(form, action) {}
 		});
+	} else {
+		setStartDate(top.Ext, 'yyyy/MM/dd', 'startDate');  //（开始时间，取服务器时间 cjr）
+		setStartDate(top.Ext, 'yyyy/MM/dd', 'endDate');  //（截止时间，取服务器时间 cjr）
 	}
 
 	recallRecordWin = new top.Ext.Window( {
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r15464 -r15509
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15464)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15509)
@@ -522,7 +522,7 @@
 					continue;
 				}
 				
-				if (goods.noBiologicalMonitoring && (goods.tousseType == '外来器械包' || goods.tousseType == '外来器械拆分小包')) {  //此外来器械包没做生物监测（cjr）
+				if (goods.noBiologicalMonitoring) {  //此外来器械包没做生物监测（cjr）&& (goods.tousseType == '外来器械包' || goods.tousseType == '外来器械拆分小包')
 					if (!confirm('[' + goods.name + ']没做生物监测，确定要发货吗？')){
 						continue;
 					}
@@ -1087,8 +1087,14 @@
 						allowBlank : false,
 						altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 						format:'Y-m-d H:i',
-						value:new Date(),
-						anchor : '99%'
+//						value:new Date(),
+						anchor : '99%',
+						listeners : {
+							render : function() {
+								setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'sendTime');  //（设置发货时间，取服务器时间 cjr）
+							}
+						}
+							
 					}]
 				},{
 					columnWidth : .5,
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r15416 -r15509
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 15416)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 15509)
@@ -1237,15 +1237,25 @@
                 layout : 'form',
                 columnWidth : 0.66,
                 items : [{
-                    xtype : 'textfield',
-                    fieldLabel : '录入时间',
-                    maxLength : '41',
-                    id : 'enteringTime',
-                    name : 'enteringTime',
-                    readOnly : true,
-                    allowBlank : false,
-                    anchor : '96%',
-                    cls : 'fieldReadOnlyNoRemove'
+                	xtype : 'datefieldWithMin',
+					fieldLabel : '录入时间',
+					id : 'enteringTime',
+					name : 'enteringTime',
+					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+					format : 'Y-m-d H:i',
+					readOnly : true,
+					width : 150
+                	
+                	
+//                	xtype : 'textfield',
+//                    fieldLabel : '录入时间',
+//                    maxLength : '41',
+//                    id : 'enteringTime',
+//                    name : 'enteringTime',
+//                    readOnly : true,
+//                    allowBlank : false,
+//                    anchor : '96%',
+//                    cls : 'fieldReadOnlyNoRemove'
                 }]
             },{
                 layout : 'form',
@@ -1438,7 +1448,8 @@
 	} else {// 添加
 		top.Ext.getCmp('operator').setValue($Id('userName').value);
 		top.Ext.getCmp('depart').setValue($Id('currentOrgUnitName').value);
-		top.Ext.getCmp('enteringTime').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i'));
+//		top.Ext.getCmp('enteringTime').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i'));
+		setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'enteringTime');  //（录入时间，取服务器时间 cjr）
 	}
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js
===================================================================
diff -u -r15043 -r15509
--- ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js	(.../recyclingDamageRecordForm.js)	(revision 15043)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js	(.../recyclingDamageRecordForm.js)	(revision 15509)
@@ -758,7 +758,8 @@
 		}else{
 			initFormData(linkType, $Id('userName').value, $Id('departCoding').value, $Id('departName').value);
 		}
-		top.Ext.getCmp('time').setValue(new Date());
+//		top.Ext.getCmp('time').setValue(new Date());
+		setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'time');  //（设置出借时间，取服务器时间 cjr）
 	}
 	if(linkType){
 		top.Ext.getCmp('linkType').setDisabled(true);
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
===================================================================
diff -u -r15361 -r15509
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 15361)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 15509)
@@ -834,7 +834,8 @@
 		top.Ext.getCmp('departCoding').setValue(departCoding);
 		top.Ext.getCmp('settleAccountsDepart').setValue(depart);
 		top.Ext.getCmp('settleAccountsDepartCoding').setValue(departCoding);
-		top.Ext.getCmp('applicationTimeStr').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i'));
+//		top.Ext.getCmp('applicationTimeStr').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i'));
+		setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'applicationTimeStr');  //（设置申请时间，取服务器时间 cjr）
 		
 		foreignProxyHandleDepartStore.proxy.extraParams.applyDepartCode = $Id('departCoding').value;
 		foreignProxyHandleDepartStore.proxy.extraParams.tousseType = invoicePlanForTousseType_Tousse;