modify

common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreementDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.agreement;
package com.yihu.jw.entity.wlyy.agreement;

common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreementKpiDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.agreement;
package com.yihu.jw.entity.wlyy.agreement;

common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreementKpiLogDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.agreement;
package com.yihu.jw.entity.wlyy.agreement;
import com.yihu.jw.entity.UuidIdentityEntity;

common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyySignFamilyDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.agreement;
package com.yihu.jw.entity.wlyy.agreement;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

common/common-entity/src/main/java/com/yihu/jw/wlyy/hospital/BaseOrgDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.hospital;// default package
package com.yihu.jw.entity.wlyy.hospital;// default package
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

common/common-entity/src/main/java/com/yihu/jw/wlyy/hospital/BaseOrgDeptDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.hospital;// default package
package com.yihu.jw.entity.wlyy.hospital;// default package
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

common/common-entity/src/main/java/com/yihu/jw/wlyy/hospital/BaseOrgHospitalDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.hospital;
package com.yihu.jw.entity.wlyy.hospital;

common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/BasePatientExtendDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.patient;// default package
package com.yihu.jw.entity.wlyy.patient;// default package
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/BasePatientWechatDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.patient;// default package
package com.yihu.jw.entity.wlyy.patient;// default package
import com.yihu.jw.entity.UuidIdentityEntity;

common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/WlyyAdvertisementDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.patient;
package com.yihu.jw.entity.wlyy.patient;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/endpoint/EnvelopRestEndpoint.java

@@ -33,61 +33,61 @@ public abstract class EnvelopRestEndpoint {
    @Autowired
    protected ObjectMapper objectMapper;
    protected Envelop success(String desc) {
        return success(desc, 200);
    protected Envelop success(String message) {
        return success(message, 200);
    }
    protected Envelop success(String desc, int code) {
    protected Envelop success(String message, int status) {
        Envelop envelop = new Envelop();
        envelop.setMessage(desc);
        envelop.setStatus(code);
        envelop.setMessage(message);
        envelop.setStatus(status);
        return envelop;
    }
    protected <J> ObjEnvelop<J> success(J data){
        return success(data, "success");
        return success("success", data);
    }
    protected <J> ObjEnvelop<J> success(J data, String desc){
        return success(data, desc, 200);
    protected <J> ObjEnvelop<J> success(String message, J data){
        return success(message, 200, data);
    }
    protected <J> ObjEnvelop<J> success(J data, String desc, int code){
    protected <J> ObjEnvelop<J> success(String message, int status, J data){
        ObjEnvelop<J> objEnvelop = new ObjEnvelop<>();
        objEnvelop.setMessage(desc);
        objEnvelop.setStatus(code);
        objEnvelop.setMessage(message);
        objEnvelop.setStatus(status);
        objEnvelop.setObj(data);
        return objEnvelop;
    }
    protected <T> ListEnvelop<T> success(List<T> contents){
        return success(contents, "success");
        return success("success", contents);
    }
    protected <T> ListEnvelop<T> success(List<T> contents, String desc){
        return success(contents, desc, 200);
    protected <T> ListEnvelop<T> success(String message, List<T> contents){
        return success(message, 200, contents);
    }
    protected <T> ListEnvelop<T> success(List<T> contents, String desc, int code){
    protected <T> ListEnvelop<T> success(String message, int status, List<T> contents){
        ListEnvelop<T> listEnvelop = new ListEnvelop<>();
        listEnvelop.setMessage(desc);
        listEnvelop.setStatus(code);
        listEnvelop.setMessage(message);
        listEnvelop.setStatus(status);
        listEnvelop.setDetailModelList(contents);
        return listEnvelop;
    }
    protected <T> PageEnvelop<T> success(List<T> contents, int totalCount, int currPage, int pageSize) {
        return success(contents, "success", totalCount, currPage, pageSize);
        return success("success", contents, totalCount, currPage, pageSize);
    }
    protected <T> PageEnvelop<T> success(List<T> contents, String desc, int totalCount, int currPage, int pageSize) {
        return success(contents, desc, 200, totalCount, currPage, pageSize);
    protected <T> PageEnvelop<T> success(String message, List<T> contents, int totalCount, int currPage, int pageSize) {
        return success(message, 200, contents, totalCount, currPage, pageSize);
    }
    protected <T> PageEnvelop<T> success(List<T> contents, String desc, int code, int totalCount, int currPage, int pageSize) {
    protected <T> PageEnvelop<T> success(String message, int status,  List<T> contents, int totalCount, int currPage, int pageSize) {
        PageEnvelop<T> pageEnvelop = new PageEnvelop();
        pageEnvelop.setMessage(desc);
        pageEnvelop.setStatus(code);
        pageEnvelop.setMessage(message);
        pageEnvelop.setStatus(status);
        pageEnvelop.setCurrPage(currPage);
        pageEnvelop.setPageSize(pageSize);
        pageEnvelop.setTotalCount(totalCount);
@@ -96,21 +96,21 @@ public abstract class EnvelopRestEndpoint {
    }
    protected <T, J> MixEnvelop<T, J> success(List<T> contents, J obj) {
        return success(contents, obj, "success");
        return success("success", contents, obj);
    }
    protected <T, J> MixEnvelop<T, J> success(List<T> contents, J obj, String desc) {
        return success(contents, obj, desc, 200);
    protected <T, J> MixEnvelop<T, J> success(String message, List<T> contents, J obj) {
        return success(message, 200, contents, obj);
    }
    protected <T, J> MixEnvelop<T, J> success(List<T> contents, J data, String desc, int code) {
        return success(contents, data, desc, code, contents.size(), 1, contents.size());
    protected <T, J> MixEnvelop<T, J> success(String message, int status, List<T> contents, J data) {
        return success(message, status, contents, data, contents.size(), 1, contents.size());
    }
    protected <T, J> MixEnvelop<T, J> success(List<T> contents, J data, String desc, int code, int totalCount, int currPage, int pageSize) {
    protected <T, J> MixEnvelop<T, J> success(String message, int status, List<T> contents, J data, int totalCount, int currPage, int pageSize) {
        MixEnvelop<T, J> mixEnvelop = new MixEnvelop();
        mixEnvelop.setMessage(desc);
        mixEnvelop.setStatus(code);
        mixEnvelop.setMessage(message);
        mixEnvelop.setStatus(status);
        mixEnvelop.setCurrPage(currPage);
        mixEnvelop.setPageSize(pageSize);
        mixEnvelop.setTotalCount(totalCount);
@@ -119,14 +119,14 @@ public abstract class EnvelopRestEndpoint {
        return mixEnvelop;
    }
    protected Envelop failed(String desc) {
        return failed(desc, 500);
    protected Envelop failed(String message) {
        return failed(message, 500);
    }
    protected Envelop failed(String desc, int code) {
    protected Envelop failed(String message, int status) {
        Envelop envelop = new Envelop();
        envelop.setMessage(desc);
        envelop.setStatus(code);
        envelop.setMessage(message);
        envelop.setStatus(status);
        return envelop;
    }

svr/svr-wlyy/pom.xml

@@ -109,5 +109,11 @@
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-commons</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
        </dependency>
    </dependencies>
</project>

svr/svr-wlyy/src/main/java/com/yihu/jw/config/SwaggerConfig.java

@@ -1,50 +1,50 @@
package com.yihu.jw.config;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import static com.google.common.base.Predicates.or;
import static springfox.documentation.builders.PathSelectors.regex;
@Configuration
@EnableSwagger2
@ComponentScan("com.yihu.jw.**")
public class SwaggerConfig {
    public static final String Wlyy_API = "Wlyy";
    @Bean
    public Docket wlyyAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(Wlyy_API)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(false)
                .pathMapping("/")
                .select()
                .paths(or(
                        regex("/" + WlyyRequestMapping.api_wlyy_common + "/.*")
                ))
                .build()
                .apiInfo(wlyyApiInfo());
    }
    private ApiInfo wlyyApiInfo() {
        ApiInfo wlyyInfo = new ApiInfo("基卫2.0API",
                "基卫2.0API，提供基础卫生相关服务。",
                "1.0",
                "No terms of service",
                "wenfujian@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return wlyyInfo;
    }
}
//package com.yihu.jw.config;
//
//import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.ComponentScan;
//import org.springframework.context.annotation.Configuration;
//import springfox.documentation.service.ApiInfo;
//import springfox.documentation.spi.DocumentationType;
//import springfox.documentation.spring.web.plugins.Docket;
//import springfox.documentation.swagger2.annotations.EnableSwagger2;
//
//import static com.google.common.base.Predicates.or;
//import static springfox.documentation.builders.PathSelectors.regex;
//
//@Configuration
//@EnableSwagger2
//@ComponentScan("com.yihu.jw.**")
//public class SwaggerConfig {
//    public static final String Wlyy_API = "Wlyy";
//
//    @Bean
//    public Docket wlyyAPI() {
//        return new Docket(DocumentationType.SWAGGER_2)
//                .groupName(Wlyy_API)
//                .useDefaultResponseMessages(false)
//                .forCodeGeneration(false)
//                .pathMapping("/")
//                .select()
//                .paths(or(
//                        regex("/" + WlyyRequestMapping.api_wlyy_common + "/.*")
//                ))
//                .build()
//                .apiInfo(wlyyApiInfo());
//    }
//
//    private ApiInfo wlyyApiInfo() {
//        ApiInfo wlyyInfo = new ApiInfo("基卫2.0API",
//                "基卫2.0API，提供基础卫生相关服务。",
//                "1.0",
//                "No terms of service",
//                "wenfujian@jkzl.com",
//                "The Apache License, Version 2.0",
//                "http://www.apache.org/licenses/LICENSE-2.0.html"
//        );
//
//        return wlyyInfo;
//    }
//
//
//}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementController.java

@@ -2,9 +2,11 @@ package com.yihu.jw.wlyy.controller.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.EnvelopRestController;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.wlyy.service.agreement.WlyyAgreementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,13 +17,14 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "协议相关操作", description = "协议相关操作")
public class WlyyAgreementController extends EnvelopRestController {
public class WlyyAgreementController extends EnvelopRestEndpoint {
    @Autowired
    private WlyyAgreementService wlyyAgreementService;
@@ -30,10 +33,10 @@ public class WlyyAgreementController extends EnvelopRestController {
    @ApiOperation(value = "创建协议", notes = "创建协议")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAgreementDO wlyyAgreement = toEntity(jsonData, WlyyAgreementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Agreement.message_success_create, wlyyAgreementService.create(wlyyAgreement));
            return success(WlyyRequestMapping.Agreement.message_success_create, wlyyAgreementService.create(wlyyAgreement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -43,12 +46,12 @@ public class WlyyAgreementController extends EnvelopRestController {
    @ApiOperation(value = "修改协议", notes = "修改协议")
    public Envelop update(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAgreementDO wlyyAgreement = toEntity(jsonData, WlyyAgreementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Agreement.message_success_update, wlyyAgreementService.update(wlyyAgreement));
            return success(WlyyRequestMapping.Agreement.message_success_update, wlyyAgreementService.update(wlyyAgreement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
            return failed(e.getMessage(), e.getErrorCode());
        }
    }
@@ -70,10 +73,9 @@ public class WlyyAgreementController extends EnvelopRestController {
    @ApiOperation(value = "根据code查找协议", notes = "根据code查找协议")
    public Envelop findByCode(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id
    ) {
            @RequestParam(value = "id", required = true) String id) {
        try {
            return Envelop.getSuccess(WlyyRequestMapping.Agreement.message_success_find, wlyyAgreementService.findById(id));
            return success(WlyyRequestMapping.Agreement.message_success_find, wlyyAgreementService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -81,7 +83,7 @@ public class WlyyAgreementController extends EnvelopRestController {
    @RequestMapping(value = WlyyRequestMapping.Agreement.api_queryPage, method = RequestMethod.GET)
    @ApiOperation(value = "分页获取协议")
    public Envelop queryPage(
    public PageEnvelop<WlyyAgreementDO> queryPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,parentCode,saasId,name,price,posterPic,remark,type,status")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -103,13 +105,13 @@ public class WlyyAgreementController extends EnvelopRestController {
        //封装返回格式
        List<WlyyAgreementDO> wlyyAgreement = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementDO.class, fields);
        return Envelop.getSuccessListWithPage(WlyyRequestMapping.Agreement.message_success_find_functions,wlyyAgreement, page, size,count);
        return success(WlyyRequestMapping.Agreement.message_success_find_functions, wlyyAgreement, page, size, (int)count);
    }
    @GetMapping(value = WlyyRequestMapping.Agreement.api_getList)
    @ApiOperation(value = "获取协议列表(不分页)")
    public Envelop getList(
    public ListEnvelop<WlyyAgreementDO> getList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,parentCode,saasId,name,price,posterPic,remark,type,status")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -120,7 +122,7 @@ public class WlyyAgreementController extends EnvelopRestController {
        List<WlyyAgreementDO> list = wlyyAgreementService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyyAgreementDO> wlyyAgreement = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.Agreement.message_success_find_functions,wlyyAgreement);
        return success(WlyyRequestMapping.Agreement.message_success_find_functions,wlyyAgreement);
    }
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementKpiController.java

@@ -2,9 +2,11 @@ package com.yihu.jw.wlyy.controller.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.EnvelopRestController;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiDO;
import com.yihu.jw.wlyy.service.agreement.WlyyAgreementKpiService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,13 +17,14 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "套餐指标相关操作", description = "套餐指标相关操作")
public class WlyyAgreementKpiController extends EnvelopRestController {
public class WlyyAgreementKpiController extends EnvelopRestEndpoint {
    @Autowired
    private WlyyAgreementKpiService wlyyAgreementKpiService;
@@ -30,12 +33,12 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
    @ApiOperation(value = "创建套餐指标", notes = "创建套餐指标")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAgreementKpiDO wlyyAgreementKpi = toEntity(jsonData, WlyyAgreementKpiDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_create, wlyyAgreementKpiService.create(wlyyAgreementKpi));
            return success(WlyyRequestMapping.AgreementKpi.message_success_create, wlyyAgreementKpiService.create(wlyyAgreementKpi));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
            return failed(e.getMessage(), e.getErrorCode());
        }
    }
@@ -43,12 +46,12 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
    @ApiOperation(value = "修改套餐指标", notes = "修改套餐指标")
    public Envelop update(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAgreementKpiDO wlyyAgreementKpi = toEntity(jsonData, WlyyAgreementKpiDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_update, wlyyAgreementKpiService.update(wlyyAgreementKpi));
            return MixEnvelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_update, wlyyAgreementKpiService.update(wlyyAgreementKpi));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
@@ -68,14 +71,14 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
    @GetMapping(value = WlyyRequestMapping.AgreementKpi.api_getById)
    @ApiOperation(value = "根据id查找套餐指标", notes = "根据id查找套餐指标")
    public Envelop findByCode(
    public MixEnvelop findByCode(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_find, wlyyAgreementKpiService.findById(id));
            return MixEnvelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_find, wlyyAgreementKpiService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
@@ -97,19 +100,19 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
        //得到list数据
        List<WlyyAgreementKpiDO> list = wlyyAgreementKpiService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=wlyyAgreementKpiService.getCount(filters);
        long count= wlyyAgreementKpiService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<WlyyAgreementKpiDO> wlyyAgreementKpi = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiDO.class, fields);
        return Envelop.getSuccessListWithPage(WlyyRequestMapping.AgreementKpi.message_success_find_functions,wlyyAgreementKpi, page, size,count);
        return MixEnvelop.getSuccessListWithPage(WlyyRequestMapping.AgreementKpi.message_success_find_functions,wlyyAgreementKpi, page, size,count);
    }
    @GetMapping(value = WlyyRequestMapping.AgreementKpi.api_getList)
    @ApiOperation(value = "获取套餐指标列表(不分页)")
    public Envelop getList(
    public ListEnvelop<WlyyAgreementKpiDO> getList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,agreementCode,kpiName,type,kpiTimes,status,del,kpiContent,keyword")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -120,7 +123,7 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
        List<WlyyAgreementKpiDO> list = wlyyAgreementKpiService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyyAgreementKpiDO> wlyyAgreementKpi = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.AgreementKpi.message_success_find_functions,wlyyAgreementKpi);
        return success(WlyyRequestMapping.AgreementKpi.message_success_find_functions, wlyyAgreementKpi);
    }
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementKpiLogController.java

@@ -2,9 +2,10 @@ package com.yihu.jw.wlyy.controller.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.EnvelopRestController;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiLogDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiLogDO;
import com.yihu.jw.wlyy.service.agreement.WlyyAgreementKpiLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,13 +16,14 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "套餐指标执行日志相关操作", description = "套餐指标执行日志相关操作")
public class WlyyAgreementKpiLogController extends EnvelopRestController {
public class WlyyAgreementKpiLogController extends EnvelopRestEndpoint {
    @Autowired
    private WlyyAgreementKpiLogService wlyyAgreementKpiLogService;
@@ -30,10 +32,10 @@ public class WlyyAgreementKpiLogController extends EnvelopRestController {
    @ApiOperation(value = "创建套餐指标日志", notes = "创建套餐指标日志")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAgreementKpiLogDO wlyyAgreementKpiLog = toEntity(jsonData, WlyyAgreementKpiLogDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpiLog.message_success_create, wlyyAgreementKpiLogService.create(wlyyAgreementKpiLog));
            return success(WlyyRequestMapping.AgreementKpiLog.message_success_create, wlyyAgreementKpiLogService.create(wlyyAgreementKpiLog));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -46,7 +48,7 @@ public class WlyyAgreementKpiLogController extends EnvelopRestController {
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpiLog.message_success_find, wlyyAgreementKpiLogService.findById(id));
            return success(WlyyRequestMapping.AgreementKpiLog.message_success_find, wlyyAgreementKpiLogService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -76,7 +78,7 @@ public class WlyyAgreementKpiLogController extends EnvelopRestController {
        //封装返回格式
        List<WlyyAgreementKpiLogDO> wlyyAgreementKpiLog = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiLogDO.class, fields);
        return Envelop.getSuccessListWithPage(WlyyRequestMapping.AgreementKpiLog.message_success_find_functions,wlyyAgreementKpiLog, page, size,count);
        return PageEnvelop.getSuccessListWithPage(WlyyRequestMapping.AgreementKpiLog.message_success_find_functions,wlyyAgreementKpiLog, page, size,count);
    }
@@ -93,7 +95,7 @@ public class WlyyAgreementKpiLogController extends EnvelopRestController {
        List<WlyyAgreementKpiLogDO> list = wlyyAgreementKpiLogService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyyAgreementKpiLogDO> wlyyAgreementKpiLog = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiLogDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.AgreementKpiLog.message_success_find_functions,wlyyAgreementKpiLog);
        return success(WlyyRequestMapping.AgreementKpiLog.message_success_find_functions, wlyyAgreementKpiLog);
    }
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyySignFamilyController.java

@@ -2,9 +2,9 @@ package com.yihu.jw.wlyy.controller.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.EnvelopRestController;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.entity.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.wlyy.service.agreement.WlyySignFamilyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,14 +15,13 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "签约相关操作", description = "签约相关操作")
public class WlyySignFamilyController extends EnvelopRestController {
public class WlyySignFamilyController extends EnvelopRestEndpoint {
    @Autowired
    private WlyySignFamilyService wlyySignFamilyService;
@@ -31,10 +30,10 @@ public class WlyySignFamilyController extends EnvelopRestController {
    @ApiOperation(value = "创建签约", notes = "创建签约")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) throws ParseException {
            @RequestBody String jsonData) throws Exception {
        try {
            WlyySignFamilyDO wlyySignFamily = toEntity(jsonData, WlyySignFamilyDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.SignFamily.message_success_create, wlyySignFamilyService.create(wlyySignFamily));
            return success(WlyyRequestMapping.SignFamily.message_success_create, wlyySignFamilyService.create(wlyySignFamily));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -44,10 +43,10 @@ public class WlyySignFamilyController extends EnvelopRestController {
    @ApiOperation(value = "修改签约", notes = "修改签约")
    public Envelop update(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) throws ParseException {
            @RequestBody String jsonData) throws Exception {
        try {
            WlyySignFamilyDO wlyySignFamily = toEntity(jsonData, WlyySignFamilyDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.SignFamily.message_success_update, wlyySignFamilyService.update(wlyySignFamily));
            return success(WlyyRequestMapping.SignFamily.message_success_update, wlyySignFamilyService.update(wlyySignFamily));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -60,7 +59,7 @@ public class WlyySignFamilyController extends EnvelopRestController {
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(WlyyRequestMapping.SignFamily.message_success_find, wlyySignFamilyService.findById(id));
            return success(WlyyRequestMapping.SignFamily.message_success_find, wlyySignFamilyService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -90,7 +89,7 @@ public class WlyySignFamilyController extends EnvelopRestController {
        //封装返回格式
        List<WlyySignFamilyDO> wlyySignFamily = convertToModels(list, new ArrayList<>(list.size()), WlyySignFamilyDO.class, fields);
        return Envelop.getSuccessListWithPage(WlyyRequestMapping.SignFamily.message_success_find_functions,wlyySignFamily, page, size,count);
        return success(WlyyRequestMapping.SignFamily.message_success_find_functions,wlyySignFamily, page, size, (int)count);
    }
@@ -107,7 +106,7 @@ public class WlyySignFamilyController extends EnvelopRestController {
        List<WlyySignFamilyDO> list = wlyySignFamilyService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyySignFamilyDO> wlyySignFamily = convertToModels(list, new ArrayList<>(list.size()), WlyySignFamilyDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.SignFamily.message_success_find_functions,wlyySignFamily);
        return success(WlyyRequestMapping.SignFamily.message_success_find_functions, wlyySignFamily);
    }
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/patient/AdvertisementControlelr.java

@@ -2,9 +2,9 @@ package com.yihu.jw.wlyy.controller.patient;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.EnvelopRestController;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.patient.WlyyAdvertisementDO;
import com.yihu.jw.entity.wlyy.patient.WlyyAdvertisementDO;
import com.yihu.jw.wlyy.service.patient.AdvertisementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -25,7 +26,7 @@ import java.util.List;
@RestController
@RequestMapping(value = WlyyRequestMapping.api_wlyy_common)
@Api(value = "广告相关操作", description = "广告相关操作")
public class AdvertisementControlelr extends EnvelopRestController {
public class AdvertisementControlelr extends EnvelopRestEndpoint {
    @Autowired
    private AdvertisementService advertisementService;
@@ -34,10 +35,10 @@ public class AdvertisementControlelr extends EnvelopRestController {
    @ApiOperation(value = "创建广告", notes = "创建广告")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAdvertisementDO advertisement = toEntity(jsonData, WlyyAdvertisementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_create, advertisementService.create(advertisement));
            return success(WlyyRequestMapping.Advertisement.message_success_create, advertisementService.create(advertisement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -47,10 +48,10 @@ public class AdvertisementControlelr extends EnvelopRestController {
    @ApiOperation(value = "修改广告", notes = "修改广告")
    public Envelop update(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAdvertisementDO advertisement = toEntity(jsonData, WlyyAdvertisementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_update, advertisementService.update(advertisement));
            return success(WlyyRequestMapping.Advertisement.message_success_update, advertisementService.update(advertisement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -76,7 +77,7 @@ public class AdvertisementControlelr extends EnvelopRestController {
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_find, advertisementService.findById(id));
            return success(WlyyRequestMapping.Advertisement.message_success_find, advertisementService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -106,7 +107,7 @@ public class AdvertisementControlelr extends EnvelopRestController {
        //封装返回格式
        List<WlyyAdvertisementDO> advertisement = convertToModels(list, new ArrayList<>(list.size()), WlyyAdvertisementDO.class, fields);
        return Envelop.getSuccessListWithPage(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisement, page, size, count);
        return success(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisement, page, size, (int)count);
    }
@@ -123,7 +124,7 @@ public class AdvertisementControlelr extends EnvelopRestController {
        List<WlyyAdvertisementDO> list = advertisementService.search(fields, filters, sorts);
        //封装返回格式
        List<WlyyAdvertisementDO> advertisement = convertToModels(list, new ArrayList<>(list.size()), WlyyAdvertisementDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisement);
        return success(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisement);
    }
    @GetMapping(value = WlyyRequestMapping.Advertisement.api_getListByPatientId)
@@ -134,14 +135,14 @@ public class AdvertisementControlelr extends EnvelopRestController {
            HttpServletRequest request
    ) {
        List<WlyyAdvertisementDO> advertisements = advertisementService.getListByPatientId(patientId, request);
        return Envelop.getSuccessList(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
        return success(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
    }
    @GetMapping(value = WlyyRequestMapping.Advertisement.api_getListByHttp)
    @ApiOperation(value = "根据患者code地区(通过http判断)获取广告")
    public Envelop getListByHttp(HttpServletRequest request) {
        List<WlyyAdvertisementDO> advertisements = advertisementService.getByHttp(request);
        return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
        return success(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
    }
    /**
@@ -154,7 +155,7 @@ public class AdvertisementControlelr extends EnvelopRestController {
    @ApiOperation(value = "根据患者ip地址(供网关调用)")
    public Envelop getListByIp(@RequestParam(value = "ipAddress") String ipAddress) {
        List<WlyyAdvertisementDO> advertisements = advertisementService.getListByIp(ipAddress);
        return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
        return success(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
    }
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/BaseSaasDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyyAgreementDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.agreement;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyyAgreementKpiDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.agreement;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyyAgreementKpiLogDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.agreement;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiLogDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyySignFamilyDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.agreement;
import com.yihu.jw.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.entity.wlyy.agreement.WlyySignFamilyDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/doctor/HospitalDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.doctor;
import com.yihu.jw.wlyy.hospital.BaseOrgHospitalDO;
import com.yihu.jw.entity.wlyy.hospital.BaseOrgHospitalDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/patient/AdvertisementDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.patient;
import com.yihu.jw.wlyy.patient.WlyyAdvertisementDO;
import com.yihu.jw.entity.wlyy.patient.WlyyAdvertisementDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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

@@ -1,8 +1,8 @@
package com.yihu.jw.wlyy.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.wlyy.dao.BaseSaasDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementKpiLogService.java

@@ -2,10 +2,10 @@ package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiLogDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiLogDO;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementKpiLogDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementKpiService.java

@@ -2,11 +2,11 @@ package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiDO;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementKpiDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementService.java

@@ -2,10 +2,10 @@ package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyySignFamilyService.java

@@ -2,12 +2,12 @@ package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.util.IDCard;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.entity.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.wlyy.dao.agreement.WlyySignFamilyDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/doctor/HospitalService.java

@@ -1,8 +1,8 @@
package com.yihu.jw.wlyy.service.doctor;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.doctor.HospitalDao;
import com.yihu.jw.wlyy.hospital.BaseOrgHospitalDO;
import com.yihu.jw.entity.wlyy.hospital.BaseOrgHospitalDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/patient/AdvertisementService.java

@@ -1,18 +1,17 @@
package com.yihu.jw.wlyy.service.patient;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.util.AddressUtils;
import com.yihu.jw.util.CusAccessObjectUtil;
import com.yihu.jw.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.entity.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.wlyy.dao.patient.AdvertisementDao;
import com.yihu.jw.wlyy.patient.WlyyAdvertisementDO;
import com.yihu.jw.entity.wlyy.patient.WlyyAdvertisementDO;
import com.yihu.jw.wlyy.service.BaseSaasService;
import com.yihu.jw.wlyy.service.agreement.WlyySignFamilyService;
import com.yihu.mysql.query.BaseJpaService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;