lihong 1 year ago
parent
commit
7813a7dbf4

+ 1 - 1
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzfzPatientOrderMapper.java

@@ -75,7 +75,7 @@ public interface MzfzPatientOrderMapper {
      * @return
      */
     @Select({"<script>",
-            "select top ${pageSize} rtrim(patient_id) patient_id,times,name,dept_code,room_code,doctor_code,gh_no,visit_date,slow_flag,serial_no,req_type,req_order,ampm,fz_no,status_flag,call_time,fz_flag FROM (SELECT ROW_NUMBER() OVER (ORDER BY mzfz_patient_order_page.fz_no,visit_date asc) AS RowNumber,",
+            "select top ${pageSize} rtrim(patient_id) patient_id,times,name,dept_code,room_code,doctor_code,gh_no,visit_date,slow_flag,serial_no,req_type,req_order,ampm,fz_no,status_flag,call_time,fz_flag FROM (SELECT ROW_NUMBER() OVER (ORDER BY mzfz_patient_order_page.req_type,mzfz_patient_order_page.fz_no,gh_no,visit_date asc) AS RowNumber,",
             "* from ${tableName} mzfz_patient_order_page WITH(NOLOCK) where 1=1 and DateDiff(hh,visit_date,getDate()) &lt;=24 ",
             "<when test='statusFlagList!=null'>",
             " and status_flag in ",

+ 3 - 1
src/main/resources/static/js/mz/add_mzzyreq.js

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

+ 3 - 1
src/main/resources/static/js/mz/clinic.js

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

+ 3 - 2
src/main/resources/templates/mz/unit_code.html

@@ -233,10 +233,11 @@
                                 </div>
                             </div>
                             <div class="item form-group">
-                                <label class="control-label col-md-3 col-sm-3 col-xs-12" for="inpatientFlagPlus">是否住院科室
+                                <label class="control-label col-md-3 col-sm-3 col-xs-12" for="inpatientFlagPlus">是否住院科室<span
+                                        class="required">*</span>
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <select class="form-control selectpicker show-tick" id="inpatientFlagPlus"
+                                    <select class="form-control selectpicker show-tick" id="inpatientFlagPlus" required="required"
                                             title="请选择"></select>
                                 </div>
                             </div>