LAPTOP-KB9HII50\70708 1 год назад
Родитель
Сommit
f3bd3e2bfa

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

@ -6143,6 +6143,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        } else if (4==type){
            //专家咨询
            sql += " AND room.reservation_type=3 AND room.consult_type =1";
        } else if (5==type){
            //康复咨询
            sql += " AND room.reservation_type=4 AND room.consult_type =1";
        } else if (1==type) {
            //在线复诊
            sql += " AND room.reservation_type=1 AND room.consult_type =1";

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

@ -4248,7 +4248,9 @@ public class ImService {
                sql += " AND op.type =2 and op.outpatient_type = 3";
            } else if (type.equalsIgnoreCase("12")) {
                sql += " AND op.outpatient_type = 2";
            } else {
            } else if (type.equalsIgnoreCase("28")) {
                sql += " AND op.outpatient_type = 4";
            }else {
                sql += " AND op.type in (1,2,3) ";
            }
        }
@ -4299,6 +4301,9 @@ public class ImService {
                if ("2".equalsIgnoreCase(map.get("outpatientType").toString())) {
                    map.put("type", 12);
                }
                if ("4".equalsIgnoreCase(map.get("outpatientType").toString())) {
                    map.put("type", 28);
                }
            }
            if (map.get("id") != null) {
                if ("1".equals(type) || "15".equals(type) || type.contains(",") || "17".equals(type)) {