|
@ -199,8 +199,8 @@ public class FamilyContractService extends BaseService {
|
|
|
* @param level 医生类型:1专科医生,2全科医生,3健康管理师
|
|
|
* @return
|
|
|
*/
|
|
|
public Page<Doctor> findDoctors(String hospital, int level, long id, int pagesize) {
|
|
|
if (pagesize <= 0) {
|
|
|
public Page<Doctor> findDoctors(String hospital, Integer level, Long id, Integer pagesize) {
|
|
|
if (pagesize == null || pagesize <= 0) {
|
|
|
pagesize = 10;
|
|
|
}
|
|
|
// 排序
|
|
@ -212,11 +212,11 @@ public class FamilyContractService extends BaseService {
|
|
|
if (StringUtils.isNoneEmpty(hospital)) {
|
|
|
filters.put("hospital", new SearchFilter("hospital", Operator.EQ, hospital));
|
|
|
}
|
|
|
if (id > 0) {
|
|
|
if (id != null && id > 0) {
|
|
|
filters.put("id", new SearchFilter("id", Operator.GT, id));
|
|
|
}
|
|
|
// 医生类型过滤
|
|
|
if (level > 0) {
|
|
|
if (level != null && level > 0) {
|
|
|
filters.put("level", new SearchFilter("level", Operator.EQ, level));
|
|
|
}
|
|
|
// 未作废
|
|
@ -2430,9 +2430,9 @@ public class FamilyContractService extends BaseService {
|
|
|
}
|
|
|
|
|
|
if (result.has("jtTeam") || result.has("ssTeam")) {
|
|
|
result.put("hasSign",1);
|
|
|
result.put("hasSign", 1);
|
|
|
} else {
|
|
|
result.put("hasSign",0);
|
|
|
result.put("hasSign", 0);
|
|
|
}
|
|
|
|
|
|
return result;
|