Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorForm.js
===================================================================
diff -u -r21119 -r21123
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorForm.js	(.../comUsedDoctorForm.js)	(revision 21119)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorForm.js	(.../comUsedDoctorForm.js)	(revision 21123)
@@ -134,7 +134,7 @@
 
 function save() {
 	this.disable();
-	if (!formObj.form.isValid()) {
+	if (null==top.Ext.getCmp("doctorName").getValue() || ""==top.Ext.getCmp("doctorName").getValue()) {
 		showResult('请正确填写表单各值');
 		this.enable();
 		return false;
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/commonlyUsedDoctor/service/CommonlyUsedDoctorManagerImpl.java
===================================================================
diff -u -r21121 -r21123
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/commonlyUsedDoctor/service/CommonlyUsedDoctorManagerImpl.java	(.../CommonlyUsedDoctorManagerImpl.java)	(revision 21121)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/commonlyUsedDoctor/service/CommonlyUsedDoctorManagerImpl.java	(.../CommonlyUsedDoctorManagerImpl.java)	(revision 21123)
@@ -79,7 +79,7 @@
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<Map<String, Object>> getDoctorBykeyWord(String keyWord) {
-		String searchSql = " select * from CommonlyUsedDoctor c where c.pinYinCode like '%"+keyWord+"%' or c.doctorName like '%"+keyWord+"%'";
+		String searchSql = " select * from CommonlyUsedDoctor c where c.pinYinCode like '%"+keyWord+"%' or c.doctorName like '%"+keyWord+"%' order by grade desc";
 		ResultSet result = objectDao.executeSql(searchSql);
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 		try {