优先显示转科科室

src/main/java/thyyxxk/webserver/dao/his/yibao/PatientDao.java

@@ -43,13 +43,12 @@ public interface PatientDao {
             "refer_physician_name=rtrim((select name FROM a_employee_mi WHERE code = b.refer_physician)), " +
             "admiss_diag_str=rtrim(isnull(b.admiss_diag_str,'')), " +
             "clinic_diag_str=rtrim(isnull(b.clinic_diag_str,'')), " +
-            "admiss_ward=rtrim(b.admiss_ward), " +
-            "admiss_ward_name=rtrim((select name from zd_unit_code where code=admiss_ward)), " +
+            "admiss_ward=rtrim(isnull(b.ward,b.admiss_ward)), " +
+            "admiss_ward_name=(select rtrim(name) from zd_unit_code where code=b.ward), " +
             "admiss_dept=rtrim(b.admiss_dept), " +
             "small_dept=rtrim(b.small_dept), " +
             "small_dept_name=rtrim((select name from zd_unit_code where code=small_dept)), " +
-            "admiss_date, " +
-            "yb_register_date=isnull(yb_register_date, admiss_date), " +
+            "admiss_date,yb_register_date=isnull(yb_register_date, admiss_date), " +
             "responce_type=rtrim(isnull(isnull(a.responce_type, b.responce_type), '')), " +
             "xnh_hasreferral=rtrim(isnull(b.xnh_hasreferral, 0)), " +
             "xnh_referralno=rtrim(b.xnh_referralno), " +