Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/dao/his/ybkf/OutpatientCoordinationDao.java

@@ -66,7 +66,7 @@ public interface OutpatientCoordinationDao {
             "(select rtrim(a.name) from a_employee_mi a WHERE a.code = t3.doctor_code) as doctor, \n" +
             "t3.visit_dept_code as deptId, \n" +
             "(select d.name from zd_unit_code d WHERE d.code = t3.visit_dept_code ) as dept, \n" +
-            "(select rtrim(a.name) from a_employee_mi a WHERE a.code = t2.op_id) as czr, \n" +
+            "(select rtrim(a.name) from a_employee_mi a WHERE a.code = t1.staff_id) as czr, \n" +
             "(select d.code from a_employee_mi a, zd_unit_code d WHERE a.code = t1.staff_id and d.code = a.dept_code ) as deptCode, \n" +
             "(select d.name from a_employee_mi a, zd_unit_code d WHERE a.code = t1.staff_id and d.code = a.dept_code ) as deptName, \n" +
             "t1.pat_no as patNo, \n" +

src/main/java/thyyxxk/webserver/utils/ExcelUtil.java

@@ -294,7 +294,7 @@ public class ExcelUtil {
             HSSFRow row = sheet.createRow(index2);
 
             for (int i = 0; i < keyList.size(); i++) {
-                createHeaderInfo(row,cellStyle,i,(map.get(keyList.get(i))==null?"":map.get(keyList.get(i)).toString())+"");
+                createHeaderInfo(row,cellStyle,i,(map.get(keyList.get(i))==null?"": (String) map.get(keyList.get(i))));
 
             }
             index2++;