优化门诊退药查询时间

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

@@ -105,10 +105,10 @@ public interface MzPharmacyMapper {
             " and warn_dept = #{warnDept}",
             "</when>",
             "<when test='beginDate!=null'>",
-            " and charge_date <![CDATA[>=]]> #{beginDate}",
+            " and confirm_time <![CDATA[>=]]> #{beginDate}",
             "</when>",
             "<when test='endDate!=null'>",
-            " and charge_date <![CDATA[<=]]> #{endDate}",
+            " and confirm_time <![CDATA[<=]]> #{endDate}",
             "</when> group by patient_id,times,receipt_no,order_no,name,charge_date,group_no,confirm_time,doctor_id,doctor_name,real_no,warn_dept,confirm_flag",
             ") as A WHERE RowNumber >#{pageSize}*#{pageIndex} order by RowNumber ASC",
             "</script>"})
@@ -144,10 +144,10 @@ public interface MzPharmacyMapper {
             " and warn_dept = #{warnDept}",
             "</when>",
             "<when test='beginDate!=null'>",
-            " and charge_date <![CDATA[>=]]> #{beginDate}",
+            " and confirm_time <![CDATA[>=]]> #{beginDate}",
             "</when>",
             "<when test='endDate!=null'>",
-            " and charge_date <![CDATA[<=]]> #{endDate}",
+            " and confirm_time <![CDATA[<=]]> #{endDate}",
             "</when>",
             ")A",
             "</script>"})

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -530,7 +530,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                             zyDetailChargeNew.setOriDetailSn(zyDetailChargeNew.getDetailSn());
                             int maxDetailSn = zyDetailChargeMapper.selectMaxDetailSn(yzYpZyOrder.getInpatientNo(), yzYpZyOrder.getAdmissTimes());
                             zyDetailChargeNew.setDetailSn(maxDetailSn + 1);
-                            zyDetailChargeNew.setOrderNo(0);
+//                            zyDetailChargeNew.setOrderNo(0);
                             zyDetailChargeNew.setChargeAmount(-zyDetailChargeNew.getChargeAmount());
                             zyDetailChargeNew.setChargeFee(zyDetailChargeNew.getChargeFee().negate());
                             zyDetailChargeNew.setChargeDate(now);