Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/area/service/BaseCityService.java

@@ -16,7 +16,7 @@ import java.util.List;
 *          litaohong    1.0  2018年08月31日 Created
 *
 *          </pre>
 * @since 1.
 * @since 1 .
 */
@Service
public class BaseCityService extends BaseJpaService<BaseCityDO, BaseCityDao> {

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -3391,18 +3391,19 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if(StringUtils.isNotBlank(iswork)&&"1".equals(iswork)){
            logger.info("iswork:"+iswork);
            String startDate = DateUtil.dateToStr(new Date(),"yyyy-MM-dd"+" 00:00:00");
            String endDate = DateUtil.dateToStr(new Date(),"yyyy-MM-dd")+" 23:59:59";
            sql+=" AND EXISTS ( " +
            String date = DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss");
            sql+=" AND (" +
                    " EXISTS ( " +
                    " SELECT " +
                    "  1 " +
                    " FROM " +
                    "  wlyy_doctor_work_time t " +
                    " WHERE " +
                    "  t.doctor = d.id " +
                    " AND t.start_time >='" +startDate+"'" +
                    " AND t.start_time <='"+endDate+"'"+
                    " )";
                    " AND t.start_time <='" +date+"'" +
                    " AND t.end_time >='"+date+"'"+
                    " ) OR " +
                    " d.consult_status = '1') ";
        }
        if(StringUtils.isNotBlank(orgCode)){
            sql += " AND  h.org_code = '"+orgCode+"'";

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/WorkTimeService.java

@@ -89,13 +89,24 @@ public class WorkTimeService {
     */
    public Boolean checkDoctorWork(String doctor){
        String sql = "SELECT " +
                " t.id " +
                " d.id " +
                " FROM " +
                " wlyy_doctor_work_time t " +
                " base_doctor d " +
                " WHERE " +
                " t.doctor =:doctor " +
                " AND t.start_time <=:startTime " +
                " ANd t.end_time >=:endTime";
                " d.id =:doctor " +
                " AND ( " +
                " EXISTS ( " +
                "  SELECT " +
                "   t.id " +
                "  FROM " +
                "   wlyy_doctor_work_time t " +
                "  WHERE " +
                "   t.doctor = d.id " +
                "  AND t.start_time <=:startTime " +
                "  AND t.end_time >=:endTime" +
                " ) " +
                " OR d.consult_status = '1' " +
                ")";
        Map<String,Object> params = new HashedMap();
        params.put("doctor",doctor);
        Date date = new Date();