Merge branch 'dev' of zengmengkang/wlyy2.0 into dev

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

@@ -115,7 +115,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
     * @param doctorId
     * @return
     */
    public List<Map<String, Object>> queryById(String doctorId) {
    public Object queryById(String doctorId) {
        Map<String,Object> params = new HashedMap();
        String sql ="SELECT " +
                " a.NAME AS \"name\", " +
@@ -145,7 +145,23 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        params.put("typeCode",6);
        List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql, params);
        return  list;
        StringBuilder disease = new StringBuilder();
        StringBuilder code = new StringBuilder();
        if (null != list && list.size() > 0){
            for (int i=0;i<list.size();i++){
                if (i == 0 ){
                    disease.append(list.get(i).get("diseaseName"));
                    code.append(list.get(i).get("diseaseCode"));
                }else {
                    disease.append(","+list.get(i).get("diseaseName"));
                    code.append(","+list.get(i).get("diseaseCode"));
                }
            }
            list.get(0).put("diseaseName",disease);
            list.get(0).put("diseaseCode",code);
        }
        return  list.get(0);
    }

business/base-service/src/main/java/com/yihu/jw/evaluate/score/service/BaseEvaluateScoreService.java

@@ -116,7 +116,7 @@ public class BaseEvaluateScoreService extends BaseJpaService<BaseEvaluateScoreDO
        if (nowScore > oldScore){
            if (oldScore == 0){
                object.put("trend",1);
                object.put("percentage","100%");
                object.put("percentage",nowScore.toString());
            }else {
                Double difScore = nowScore - oldScore;
                String percentage = getPercentage((float) (difScore.intValue()), (float) oldScore.intValue());
@@ -124,10 +124,15 @@ public class BaseEvaluateScoreService extends BaseJpaService<BaseEvaluateScoreDO
                object.put("percentage",percentage);
            }
        }else if (nowScore < oldScore){
            Double difScore = oldScore - nowScore;
            String percentage = getPercentage((float) (difScore.intValue()), (float) oldScore.intValue());
            object.put("trend",-1);
            object.put("percentage",percentage);
            if (nowScore == 0){
                object.put("trend",-1);
                object.put("percentage",oldScore.toString());
            }else {
                Double difScore = oldScore - nowScore;
                String percentage = getPercentage((float) (difScore.intValue()), (float) oldScore.intValue());
                object.put("trend",-1);
                object.put("percentage",percentage);
            }
        }else {
            String percentage = "0%";
            object.put("trend",0);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/config/DoctorServiceEndPoint.java

@@ -55,9 +55,9 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
    public Envelop queryById(
            @ApiParam(name = "doctorId", value = "医生id")
            @RequestParam(value = "doctorId", required = true) String doctorId)throws Exception{
        List<Map<String, Object>> list = baseDoctorService.queryById(doctorId);
        if (list != null && list.size() > 0){
            return success("查询成功",list);
        Object object = baseDoctorService.queryById(doctorId);
        if (null != object){
            return success("查询成功",object);
        }
        return failed("查询失败");
    }