|
@ -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)) {
|