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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/base/org/BaseOrgDO.java

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/sign/SignEndpoint.java

@@ -51,9 +51,11 @@ public class SignEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "查找签约机构")
    public ListEnvelop findSignOrg (
            @ApiParam(name = "patient", value = "医生code", required = true)
            @RequestParam(value = "patient",required = true) String patient) throws Exception {
            @RequestParam(value = "patient",required = true) String patient,
            @ApiParam(name = "type", value = "类型 3 养老 4 教育，1 医疗", required = false)
            @RequestParam(value = "type",required = false) String type) throws Exception {
        try{
            return ListEnvelop.getSuccess("查询成功",servicePackageService.findSignOrg(patient));
            return ListEnvelop.getSuccess("查询成功",servicePackageService.findSignOrg(patient,type));
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("查询失败");

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

@@ -75,9 +75,10 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    /**
     * 查找签约机构
     * @param patient
     *  type 3 养老 4 教育，1 医疗
     * @return
     */
    public List<BaseOrgDO> findSignOrg(String patient){
    public List<BaseOrgDO> findSignOrg(String patient,String type){
        String sql = "SELECT " +
                " DISTINCT o.* " +
                "FROM " +
@@ -91,6 +92,13 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
                "AND i.del = 1 " +
                "and i.org_code = o.code " +
                "AND sr.`status` = 1 ";
        if("1".equals(type)){
            sql += " and (o.type =1 or o.type = 2) ";
        }else if("3".equals(type)){
            sql += " and o.type =3 ";
        }
        //type =4 新生儿
        List<BaseOrgDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper(BaseOrgDO.class));
        return list;
    }