健康管理端

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

@@ -7074,10 +7074,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    "  t.doctor = d.id " +
                    " AND t.start_time <=:startTime" +
                    " AND t.end_time >=:endTime" +
                    " ) OR " +
                    " d.consult_status = '1') ";
                    " ) ) ";
            params.put("startTime", date);
            params.put("endTime", date);
        } else if (StringUtils.isNotBlank(iswork) && "2".equals(iswork)&&isNeedDoctorWord) {
            sql += " and d.consult_status = '1' ";
        }
        if (StringUtils.isNotBlank(orgCode)) {
            sql += " AND  h.org_code =:orgCode";
@@ -7160,7 +7161,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                            "\tD.id DESC,dw.workTotal DESC NULLS LAST";
                }
            }else {
                sql += " and d.del='1' order by d.consult_status DESC ,evaluate.score desc,a.total " + consutlSort+"";
                sql += " and d.del='1' order by dw.workTotal desc,d.consult_status DESC ,evaluate.score desc,a.total " + consutlSort+"";
            }
        }

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

@@ -138,7 +138,7 @@ public class WorkTimeService {
                                "  AND t.start_time <=:startTime " +
                                "  AND t.end_time >=:endTime" +
                                " ) " +
                                " OR d.consult_status = '1' " +
       /*                         " OR d.consult_status = '1' " +*/
                                ")";
                        Map<String,Object> params = new HashedMap();
                        params.put("doctor",doctor);
@@ -182,7 +182,7 @@ public class WorkTimeService {
                            "  AND t.start_time <=:startTime " +
                            "  AND t.end_time >=:endTime" +
                            " ) " +
                            " OR d.consult_status = '1' " +
                          /*  " OR d.consult_status = '1' " +*/
                            ")";
                    Map<String,Object> params = new HashedMap();
                    params.put("doctor",doctor);
@@ -217,7 +217,7 @@ public class WorkTimeService {
                    "  AND t.start_time <=:startTime " +
                    "  AND t.end_time >=:endTime" +
                    " ) " +
                    " OR d.consult_status = '1' " +
                  /*  " OR d.consult_status = '1' " +*/
                    ")";
            Map<String,Object> params = new HashedMap();
            params.put("doctor",doctor);

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -623,18 +623,17 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
            token = parameters.get("token");
        }
        String userAgent = request.getHeader("userAgent");
        if (StringUtils.isEmpty(userAgent)) {
        if (!StringUtils.isEmpty(userAgent)) {
            userAgent = request.getHeader("User-Agent");
            JSONObject json = JSON.parseObject(userAgent);
            String uuid = json.getString("uid");
            String loginType = parameters.get("login_type");
            //医生更新
            if (!StringUtils.isEmpty(loginType)&&"2".equals(loginType)){
                logger.info("医生登录修改在线状态为离线");
                userDetailsService.updateDoctorOnline("0",uuid);
            }
        }
        JSONObject json = JSON.parseObject(userAgent);
        String uuid = json.getString("uid");
        String loginType = parameters.get("login_type");
        //医生更新
        if (!StringUtils.isEmpty(loginType)&&"2".equals(loginType)){
            logger.info("医生登录修改在线状态为离线");
            userDetailsService.updateDoctorOnline("0",uuid);
        }
        OAuth2AccessToken oAuth2AccessToken = tokenStore.readAccessToken(token);
        if (oAuth2AccessToken != null) {
            tokenStore.removeAccessToken(oAuth2AccessToken.getValue());

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorService.java

@@ -557,7 +557,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
            try {
                for (Object object : role) {
                    baseDoctorRoleDO = objectMapper.readValue(object.toString(), BaseDoctorRoleDO.class);
                    BaseDoctorRoleDO baseDoctorRoleDO1 = baseDoctorRoleDao.findByDoctorCodeAndroleCode(baseDoctorDO.getId(),baseDoctorRoleDO.getRoleCode());
                    BaseDoctorRoleDO baseDoctorRoleDO1 = baseDoctorRoleDao.findByDoctorCodeAndRoleCode(baseDoctorDO.getId(),baseDoctorRoleDO.getRoleCode());
                    if (null==baseDoctorRoleDO1){
                        baseDoctorRoleDO.setDoctorCode(baseDoctorDO.getId());
                        baseDoctorRoleDao.save(baseDoctorRoleDO);