Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-base/src/main/java/com/yihu/jw/base/dao/voluntary/VoluntaryRecruitmentPeopleDao.java

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/patient/PatientEndpoint.java

@@ -173,6 +173,19 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "findPatientLabelAndCar")
    @ApiOperation(value = "获取居民标签及能力评估结果信息")
    public Envelop findPatientLabelAndCar(@ApiParam(name = "patientId", value = "居民id")
                                    @RequestParam(value = "patientId", required = true)String patientId){
        try{
            return success("获取成功",patientService.findPatientLabelAndCar(patientId));
        }catch (Exception e){
            return failedException2(e);
        }
    }
    @PostMapping(value = "updPatientLabel")
    @ApiOperation(value = "修改居民标签信息")
    @ObserverRequired

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -101,6 +101,19 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        return PageEnvelop.getSuccessListWithPage("success",list,page,size,count);
    }
    public JSONObject findPatientLabelAndCar(String patientId) throws Exception{
        JSONObject res = new JSONObject();
        List<WlyyPatientLabelDO> list = patientLabelDao.findByPatient(patientId);
        res.put("label",list);
        CapacityAssessmentRecordDO recordDO = capacityAssessmentRecordService.findAssessmentByPatientId(patientId);
        if(recordDO==null){
            res.put("levelConclusionName","");
        }else{
            res.put("levelConclusionName",recordDO.getLevelConclusionName());
        }
        return res;
    }
    /**
     * 居民id
     * @param patientId

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/CapacityAssessmentRecordService.java

@@ -86,8 +86,10 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
    public CapacityAssessmentRecordDO findAssessmentByPatientId(String patient) throws Exception {
        Date assessmentTime =  DateUtil.dateTimeParse(DateUtil.getNowYear() + "-01-01 00:00:00");
        CapacityAssessmentRecordDO recordDO = capacityAssessmentRecordDao.findByPatient(patient,assessmentTime);
        recordDO.setLevelConclusionName(dictService.fingByNameAndCode(ConstantUtil.DICT_LEVEL_CONCLUSION,String.valueOf(recordDO.getLevelConclusion())));
        return recordDO;
        if(recordDO!=null){
            recordDO.setLevelConclusionName(dictService.fingByNameAndCode(ConstantUtil.DICT_LEVEL_CONCLUSION,String.valueOf(recordDO.getLevelConclusion())));
        }
         return recordDO;
    }
    /**