Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r30413 -r30416 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30413) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30416) @@ -198,51 +198,50 @@ queryCondition['sterilizationTransitionEnd'] = $Id('sterilizationTransitionEnd').value; //灭菌交接结束时间 //装配任务组 - queryCondition['taskGroup'] = ($Id('id_taskGroup').value == '')?encodeURI($Id('taskGroup').value):encodeURI($Id('id_taskGroup').value); + queryCondition['taskGroup'] = ($Id('id_taskGroup').value == '')?$Id('taskGroup').value:$Id('id_taskGroup').value; queryCondition['operationStart'] = $Id('operationStart').value; //装配开始时间 queryCondition['operationEnd'] = $Id('operationEnd').value; //装配结束时间 queryCondition['invoiceStart'] = $Id('invoiceStart').value; //发货开始时间 queryCondition['invoiceEnd'] = $Id('invoiceEnd').value; //发货结束时间 - queryCondition['department'] = encodeURI(Ext.getCmp('department').getValue()); //科室编号 + queryCondition['department'] = Ext.getCmp('department').getValue(); //科室编号 //器械包状态 - queryCondition['tousseStatus'] = ($Id('id_tousseStatus').value == '')?encodeURI($Id('tousseStatus').value):encodeURI($Id('id_tousseStatus').value); - queryCondition['tousseGroupName'] = encodeURI($Id('tousseGroupName').value); //器械包分组 + queryCondition['tousseStatus'] = ($Id('id_tousseStatus').value == '')?$Id('tousseStatus').value:$Id('id_tousseStatus').value; + queryCondition['tousseGroupName'] = $Id('tousseGroupName').value; //器械包分组 if(preciseQuery == Ext.getCmp('queryMode').getRawValue()){ //器械包名称(根据查询模式设置不同) - queryCondition['tousseName'] = encodeURI(Ext.getCmp('tousseName').getRawValue()); + queryCondition['tousseName'] = Ext.getCmp('tousseName').getRawValue(); queryCondition['tousseNameFuzzy'] = ''; }else{ - queryCondition['tousseNameFuzzy'] = encodeURI(Ext.getCmp('tousseName').getRawValue()); + queryCondition['tousseNameFuzzy'] = Ext.getCmp('tousseName').getRawValue(); queryCondition['tousseName'] = ''; } queryCondition['sterilizationStart'] = $Id('sterilizationStart').value; //灭菌开始时间 queryCondition['sterilizationEnd'] = $Id('sterilizationEnd').value; //灭菌结束时间 - queryCondition['sterilizerGroup'] = encodeURI($Id('sterilizerGroup').value); //灭菌炉分组 - queryCondition['sterilizerName'] = encodeURI($Id('sterilizerName').value); //灭菌炉 + queryCondition['sterilizerGroup'] = $Id('sterilizerGroup').value; //灭菌炉分组 + queryCondition['sterilizerName'] = $Id('sterilizerName').value; //灭菌炉 queryCondition['frequency'] = $Id('frequency').value; //炉次 - queryCondition['patientName'] = encodeURI(Ext.getCmp('patientName').getValue()); //病人姓名 + queryCondition['patientName'] = Ext.getCmp('patientName').getValue(); //病人姓名 queryCondition['hospitalNum'] = Ext.getCmp('hospitalNum').getValue(); //住院号 queryCondition['treatmentNum'] = Ext.getCmp('treatmentNum').getValue(); //诊疗号 - //位置 - queryCondition['locationForDisplay'] = encodeURI($Id('id_locationForDisplay').value); + queryCondition['locationForDisplay'] = $Id('id_locationForDisplay').value; //回收人 - queryCondition['recyclingUser'] = encodeURI($Id('id_recyclingUser').value); + queryCondition['recyclingUser'] = $Id('id_recyclingUser').value; //回收清点人 - queryCondition['recyclingOperator'] = encodeURI($Id('id_recyclingOperator').value); + queryCondition['recyclingOperator'] = $Id('id_recyclingOperator').value; //清洗人 - queryCondition['washOperator'] = encodeURI($Id('id_washOperator').value); + queryCondition['washOperator'] = $Id('id_washOperator').value; //装配人 - queryCondition['operator'] = encodeURI($Id('id_operator').value); + queryCondition['operator'] = $Id('id_operator').value; //审核人 - queryCondition['reviewer'] = encodeURI($Id('id_reviewer').value); + queryCondition['reviewer'] = $Id('id_reviewer').value; //包装类型 - queryCondition['packageType'] = encodeURI($Id('id_packageType').value); + queryCondition['packageType'] = $Id('id_packageType').value; //灭菌篮筐 - queryCondition['sterilizationBasket'] = encodeURI($Id('id_sterilizationBasket').value); + queryCondition['sterilizationBasket'] = $Id('id_sterilizationBasket').value; return queryCondition; }