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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistService.java

@@ -41,10 +41,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * Created by Trick on 2018/5/31.
@@ -862,5 +859,24 @@ public class SpecialistService extends BaseService {
        }
        throw new Exception("请求获取居民信息失败！");
    }
    public List<Map<String,Object>> findPatientSignFamily(String patient) throws Exception {
        SignFamily signFamily = signFamilyDao.findSignFamilyByPatient(patient);
        List<Map<String,Object>> resultList = new ArrayList<>();
        if(signFamily!=null){
            Map<String,Object> map = new HashMap<>();
            map.put("doctorName",signFamily.getDoctorHealthName());
            map.put("doctorCode",signFamily.getDoctorHealth());
            map.put("doctorType","健管师");
            resultList.add(map);
            map = new HashMap<>();
            map.put("doctorName",signFamily.getDoctorName());
            map.put("doctorCode",signFamily.getDoctor());
            map.put("doctorType","全科医生");
            resultList.add(map);
        }
        return resultList;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/specialist/SpecialistController.java

@@ -392,4 +392,15 @@ public class SpecialistController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "/findPatientSignFamily", method = RequestMethod.GET)
    @ApiOperation(value = "获取居民所有专科医生签约信息")
    public String findPatientSignFamily(@ApiParam(name = "patient", value = "居民code") @RequestParam(required = true)String patient) throws Exception {
        try {
            return write(200, "获取成功", "data", specialistService.findPatientSignFamily(patient));
        } catch (Exception e) {
            error(e);
            return error(-1, "请求失败");
        }
    }
}