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

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/specialist/SurveyScreenResultVo.java

@@ -32,6 +32,8 @@ public class SurveyScreenResultVo{
    //
    @ApiModelProperty("全科医生code")
    private String doctor;
    @ApiModelProperty("家医电话号码")
    private String doctorMobile;
    //
    @ApiModelProperty("居民code")
    private String patientCode;
@@ -160,6 +162,14 @@ public class SurveyScreenResultVo{
        this.doctor = doctor;
    }
    public String getDoctorMobile() {
        return doctorMobile;
    }
    public void setDoctorMobile(String doctorMobile) {
        this.doctorMobile = doctorMobile;
    }
    public String getPatientCode() {
        return patientCode;
    }

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/SpecialistScreenResultController.java

@@ -61,7 +61,7 @@ public class SpecialistScreenResultController extends EnvelopRestController {
    }
    @GetMapping(value = SpecialistMapping.screen.getScreenResultDetail)
    @ApiOperation(value = "查看筛查结果记录详情")
    @ApiOperation(value = "查看筛查结果记录详情.")
    public Envelop<Map<String,Object>> getScreenResultDetail(@ApiParam(value = "筛查结果唯一code")@RequestParam(value = "code") String code) {
        try {
            return specialistScreenResultService.getScreenResultDetail(code);

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistScreenResultService.java

@@ -89,6 +89,7 @@ public class SpecialistScreenResultService {
        if (doctorList!=null && doctorList.size()>0){
            surveyScreenResultVo.setLevel(Integer.valueOf(String.valueOf(doctorList.get(0).get("level"))));
            surveyScreenResultVo.setDoctorName(String.valueOf(doctorList.get(0).get("name")));
            surveyScreenResultVo.setDoctorMobile(String.valueOf(doctorList.get(0).get("mobile")));
        }
        map.put("info",surveyScreenResultVo);
        //json.put("info",surveyScreenResultVo);