Merge branch 'master' of http://highdatas.com:9000/r/promotion/promotion_html

tom

2024-08-04 c754242fa7e366862dc8b2b147a9c4b922c82980

 module/md/page/terminal/page/popup/popup_position_hospital.html

@@ -502,14 +502,14 @@
                     var data_ = {};
                     var filter_ = "";
                     if (this.formData.company_id) {
                        filter_ = "company_id='" + this.formData.company_id + "'"
                        filter_ = "md_target_hospital.company_id='" + this.formData.company_id + "'"
                     }
                     if (this.formData.bu_id) {
                        if (filter_) {
                           filter_ += " and bu_id='" + this.formData.bu_id + "'"
                           filter_ += " and md_target_hospital.bu_id='" + this.formData.bu_id + "'"
                        }
                        else {
                           filter_ = "bu_id='" + this.formData.bu_id + "'"
                           filter_ = "md_target_hospital.bu_id='" + this.formData.bu_id + "'"
                        }
                     }