门诊发药界面增加排序选择

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzPharmacyMapper.java

@@ -464,8 +464,13 @@ public interface MzPharmacyMapper {
             " and (isnull(mz_charge_detail.confirm_flag,'0') in('0','2','5') OR mz_charge_detail.print_flag_yj='1') ",
             "</when>",
             " and (isnull(mz_charge_detail.confirm_zs,'') <![CDATA[<>]]> '1' ",
-            " and (isnull(mz_charge_detail.confirm_zs,'') <![CDATA[<>]]> '4') ) group by confirm_flag,print_flag,mz_charge_detail.patient_id,mz_charge_detail.times,mz_charge_detail.receipt_no,mz_charge_detail.order_no,mz_charge_detail.real_no,mz_charge_detail.charge_date,mz_charge_detail.group_no,mz_charge_detail.name,mz_charge_detail.doctor_code,mz_charge_detail.warn_dept,mz_charge_detail.charge_date,doctor_flag,windows_no_yf)" +
-                    "as gg order by gg.charge_date desc",
+            " and (isnull(mz_charge_detail.confirm_zs,'') <![CDATA[<>]]> '4') ) group by confirm_flag,print_flag,mz_charge_detail.patient_id,mz_charge_detail.times,mz_charge_detail.receipt_no,mz_charge_detail.order_no,mz_charge_detail.real_no,mz_charge_detail.charge_date,mz_charge_detail.group_no,mz_charge_detail.name,mz_charge_detail.doctor_code,mz_charge_detail.warn_dept,mz_charge_detail.charge_date,doctor_flag,windows_no_yf) as gg " +
+            "<when test='sortType == 0'>",
+            " order by gg.charge_date desc",
+            "</when>",
+            "<when test='sortType == 1'>",
+            " order by gg.patient_id desc, gg.charge_date desc",
+            "</when>",
             "</script>"})
     List<ChargeDetailInfoVo> selectFyclWfyPrescription(ChargeFeeParamsVo chargeFeeParamsVo);
 

src/main/java/cn/hnthyy/thmz/vo/ChargeFeeParamsVo.java

@@ -66,4 +66,9 @@ public class ChargeFeeParamsVo extends PageBean {
      * 是否发配一体 0否 1是
      */
     private Integer isSendAndMatch;
+
+    /**
+     * 门诊未发药排序： 0：缴费时间；1：病人门诊号（一起）
+     */
+    private Integer sortType;
 }

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

@@ -1163,7 +1163,8 @@ function queryParams(params) {
         warnDept: warnDept,
         groupNoOut: groupNo,
         winNo: winNo,
-        isSendAndMatch: 1
+        isSendAndMatch: 1,
+        sortType: $("#sortType option:selected").val()
     };
     return temp;
 };

src/main/resources/templates/mz/west_pharmacy_send.html

@@ -41,7 +41,7 @@
                         </button>
                     </div>
                     <div class="form-group">
-                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="patientId_or_cardNo">病人ID/就诊卡号
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="patientId_or_cardNo">病人ID/就诊卡号
                         </label>
                         <div class="col-md-2 col-sm-2 col-xs-12">
                             <input id="patientId_or_cardNo" class="form-control col-md-7 col-xs-12" type="text"
@@ -79,7 +79,7 @@
                                 </label>
                             </div>
                         </div>
-                        <label class="control-label col-md-2 col-sm-2 col-xs-12"
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12"
                                for="confirmFlagSearch">状态</label>
                         <div class="col-md-2 col-sm-2 col-xs-12">
                             <select class="form-control selectpicker show-tick" required="required" title="请选择"
@@ -100,6 +100,16 @@
                                 <span>December 30, 2014 - January 28, 2015</span> <b class="caret"></b>
                             </div>
                         </div>
+                        <div class="col-md-2 col-sm-2 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="unitCode">排序
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" required="required" title="请选择" id="sortType">
+                                    <option value="0" selected>缴费时间</option>
+                                    <option value="1">门诊号</option>
+                                </select>
+                            </div>
+                        </div>
                         <button type="button" style="margin-left:3px" id="btn_query" class="btn btn-primary"
                                 title="查询"><i class="fa fa-search"></i>
                         </button>