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

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/UpIdCollectionDao.java

@@ -413,8 +413,8 @@ public interface UpIdCollectionDao extends BaseMapper<SetlinfoUpld> {
     List<BatjBa4> shouShuXinXi(@Param("patNo") String patNo, @Param("times") Integer times, @Param("tableName") String tableName);
 
 
-    @Select("select rtrim(inpatient_no) inpatient_no,admiss_times,rtrim(name) name,admiss_date,dis_date,responce_type,operation, " + "       responce_type_name = (select rtrim(name) from zy_zd_responce_type where code = responce_type),sex,rtrim(refer_physician) refer_physician " +
-            "from zy_inactpatient where inpatient_no = #{patNo} and admiss_times = #{times}")
+    @Select("select rtrim(inpatient_no) inpatient_no,admiss_times,rtrim(name) name,admiss_date,dis_date,responce_type,operation,rtrim(small_dept) small_dept, " + "       responce_type_name = (select rtrim(name) from zy_zd_responce_type where code = responce_type),sex,rtrim(refer_physician) refer_physician " +
+            " from zy_inactpatient where inpatient_no = #{patNo} and admiss_times = #{times}")
     ZyInactpatient huanZheXinXi(@Param("patNo") String patNo, @Param("times") Integer times);
 
     @Select("select top(1) * from t_yb_set_modify_time")