Merge branch 'dev-1.1.1' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.1

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

@@ -409,7 +409,7 @@ public interface MzPharmacyMapper {
      * @return
      */
     @Select({"<script>",
-            "SELECT rtrim(mz_charge_detail.patient_id)patient_id,",
+            "select gg.* from (SELECT rtrim(mz_charge_detail.patient_id)patient_id,",
             "         mz_charge_detail.times,",
             "         mz_charge_detail.receipt_no,",
             "         mz_charge_detail.order_no,",
@@ -457,7 +457,8 @@ 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,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",
+            " and (isnull(mz_charge_detail.confirm_zs,'') <![CDATA[<>]]> '4') ) group by confirm_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",
             "</script>"})
     List<ChargeDetailInfoVo> selectFyclWfyPrescription(ChargeFeeParamsVo chargeFeeParamsVo);