Merge branch 'dev' of huangwenjie/wlyy2.0 into dev

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

@@ -3401,19 +3401,20 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     */
    public Long getWaitVideoCount(String doctor,String type,String outpatient_type) {
        String sql ="SELECT " +
                "count(room.outpatient_id) AS total " +
                "count(outpatient.id) AS total " +
                "FROM " +
                "wlyy_outpatient outpatient," +
                "base_patient patient " +
                "WHERE " +
                "room.patient_id=patient.id " +
                "AND room.outpatient_id=outpatient.id " +
                "outpatient.patient=patient.id " +
                "AND outpatient.status in (0,1) " +
                "AND outpatient.doctor='"+doctor+"' " +
                "AND outpatient.register_date is not null AND  room.register_date >= '"+DateUtil.dateToStrShort(new Date())+" 00:00:00' " +
                "AND outpatient.outpatient_type= '"+outpatient_type+"' ";
        if("1".equals(outpatient_type)){
        if("1".equals(outpatient_type)){//复诊
            sql =  sql + " AND outpatient.type= '"+type+"' ";
            if("2".equals(type)){//视频复诊才需要判断时间，
                sql =  sql + " AND outpatient.register_date is not null AND  outpatient.register_date >= '"+DateUtil.dateToStrShort(new Date())+" 00:00:00' ";
            }
        }
    
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(sql);

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -2281,11 +2281,13 @@ public class ImService {
			}else if("16".equals(type)){
				//视频复诊
				sql =sql +"AND op.type=2 AND op.outpatient_type=1 ";
				sql =sql + " AND  op.register_date >= '"+DateUtil.dateToStrShort(new Date())+" 00:00:00' ";
			}else if("12".equals(type)){
				//视频复诊
				sql =sql +"A ND op.outpatient_type=2";
				sql =sql +"AND op.outpatient_type=2";
				sql =sql + " AND  op.register_date >= '"+DateUtil.dateToStrShort(new Date())+" 00:00:00' ";
			}else{}
			sql =sql + " AND  op.register_date >= '"+DateUtil.dateToStrShort(new Date())+" 00:00:00' ";
			sql =sql +" ORDER BY op.create_time DESC";
		}