Merge branch 'dev-1.1.4' into 'dev-1.1.4'

优化排队取药信息

See merge request lihong/thmz_system!24

src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -546,10 +546,9 @@ public class MzPharmacyController {
             // 更新窗口发药排队人数
             mzPharmacyService.updateMzDrugWinPatientNum(mzChargeDetail, 1);
 
-            // 这两天没有门诊处方则删除当天排队人信息
-            if(mzPharmacyService.getIncludeWfyPrescription(mzChargeDetail.getPatientId()) == 0){
-                ypPdQueueService.deleteYpPdStatus(mzChargeDetail.getPatientId());
-            }
+            // 删除当天排队人信息
+            ypPdQueueService.deleteYpPdStatus(mzChargeDetail.getPatientId());
+
             return resultMap;
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -1134,12 +1134,12 @@ public interface MzPharmacyMapper {
     int updateMzChargeDetailDispensing(MzChargeDetail mzChargeDetail);
 
     /**
-     * 查询患者当天和前一天是否含有未发药处方
+     * 查询患者15天内是否含有未发药处方
      *
      * @param patientId
      * @return
      */
-    @Select("SELECT count(1) from mz_charge_detail where rtrim(patient_id) = #{patientId} and confirm_flag in ('0', '5') and charge_date>=CAST(DATEADD(day, -1, GETDATE()) AS date) and group_no=71")
+    @Select("SELECT count(1) from mz_charge_detail where rtrim(patient_id) = #{patientId} and confirm_flag in ('0', '5') and charge_date>=CAST(DATEADD(day, -15, GETDATE()) AS date) and group_no=71")
     int selectIncludeWfyPrescription(String patientId);