Merge branch 'dev-1.1.4' into 'dev-1.1.4'

优化下拉选科室

See merge request lihong/thmz_system!121

src/main/java/cn/hnthyy/thmz/mapper/his/zd/ZdUnitCodeMapper.java

@@ -368,7 +368,7 @@ public interface ZdUnitCodeMapper {
      * 查询所有的病区
      * @return
      */
-    @Select("select code,name,class_code,py_code,d_code wbCode,mz_flag,del_flag,n_code ynCode,yj_flag,mzrc_flag,parent_code,gh_charge_flag,office_pos,supply_flag,xnh_dept_code,xnh_dept_name,ghjz_flag,mz_class,sort_code,op_id,op_date,inpatient_flag,unit_num from zd_unit_code  WITH(NOLOCK)  where code like '8%'")
+    @Select("select code,name,class_code,py_code,d_code wbCode,mz_flag,del_flag,n_code ynCode,yj_flag,mzrc_flag,parent_code,gh_charge_flag,office_pos,supply_flag,xnh_dept_code,xnh_dept_name,ghjz_flag,mz_class,sort_code,op_id,op_date,inpatient_flag,unit_num from zd_unit_code  WITH(NOLOCK)  where code like '8%' and isnull(del_flag, '0') = '0' ")
     List<ZdUnitCode> selectAllInpatientWard();
 
     /**

src/main/resources/static/js/mz/clinic.js

@@ -4229,9 +4229,7 @@ function initListDeptSelect() {
             }
             var html = '';
             $.each(data.data, function (commentIndex, comment) {
-                if(comment.code !='8000020'){
-                    html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')</option>';
-                }
+                html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')</option>';
             });
             $('#inpatientWardBeHospitalized').empty();
             $('#inpatientWardBeHospitalized').html(html);