Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/PatientDeviceJob.java

@@ -95,7 +95,6 @@ public class PatientDeviceJob implements Job {
                    "  wlyy_sign_family sf " +
                    " WHERE " +
                    "  pd.user_idcard = sf.idcard " +
                    " AND sf.expenses_status = 1 " +
                    " AND sf.type = 2 " +
                    " AND sf. STATUS IN (1, 2) " +
                    " AND pd.czrq <' "+yesterday+ Constant.quota_date_last+"' ";

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/WechatCountJob.java

@@ -94,7 +94,6 @@ public class WechatCountJob implements Job {
                    "  wlyy_sign_family sf " +
                    " WHERE " +
                    "   p.idcard = sf.idcard " +
                    " AND sf.expenses_status = 1 " +
                    " AND sf.type = 2 " +
                    " AND sf. STATUS IN (1, 2) " +
                    " AND p.openid is not null  " +

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -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));
        }
        // 未作废
@@ -2441,9 +2441,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;

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -144,8 +144,8 @@ public class DoctorController extends BaseController {
    public String getDoctorsByhospital(
            @RequestParam(required = false) String hospital,
            @RequestParam(required = false) Integer type,
            long id,
            int pagesize) {
            @RequestParam(required = true)  Long id,
            @RequestParam(required = true) Integer pagesize) {
        try {
            JSONArray array = new JSONArray();
            Page<Doctor> list = familyContractService.findDoctors(hospital, type, id, pagesize);