号表排序优化

src/main/java/cn/hnthyy/thmz/mapper/his/MzChargeDetailMapper.java

@@ -572,7 +572,7 @@ public interface MzChargeDetailMapper {
             "<when test='serialNo!=null'>",
             " and mz_receipt_serial.serial_no like #{serialNo}",
             "</when>",
-            " and  real_no=receipt_sn order by serial_no_order desc" +
+            " and  real_no=receipt_sn and a.name is not null and a.responce_type is not null order by serial_no_order desc" +
                     "</script>"})
     List<Map<String, Object>> selectChargeListByPatient(@Param("patientId") String patientId, @Param("name") String name, @Param("serialNo") String serialNo, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
 
@@ -683,7 +683,7 @@ public interface MzChargeDetailMapper {
             "<when test='serialNo!=null'>",
             " and mz_receipt_serial_b.serial_no =#{serialNo}",
             "</when>",
-            " and  real_no=receipt_sn order by serial_no_order desc" +
+            " and  real_no=receipt_sn and a.name is not null and a.responce_type is not null order by serial_no_order desc" +
                     "</script>"})
     List<Map<String, Object>> selectHisChargeListByPatient(@Param("patientId") String patientId, @Param("name") String name, @Param("serialNo") String serialNo, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
 

src/main/java/cn/hnthyy/thmz/mapper/his/MzyRequestMapper.java

@@ -172,7 +172,7 @@ public interface MzyRequestMapper {
             "    FROM mzy_request_new " +
             " where " +
             "         request_day >= #{beginDate,jdbcType=TIMESTAMP} and " +
-            "         request_day <= #{endDate,jdbcType=TIMESTAMP} order by request_day,unit_code ")
+            "         request_day <= #{endDate,jdbcType=TIMESTAMP} order by request_day,unit_code,doctor_code,ampm ")
     List<MzyRequest> selectByTimes(@Param("beginDate") Date beginDate, @Param("endDate") Date endDate);