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

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationPlanTemplateDO.java

@@ -44,8 +44,20 @@ public class RehabilitationPlanTemplateDO extends UuidIdentityEntityWithOperator
    @Column(name = "status")
    private String status;
    @Column(name = "type")
    private String type;
    //---------------------------------
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getStatus() {
        return status;
    }

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/PostFilter.java

@@ -67,6 +67,12 @@ public class PostFilter extends ZuulFilter {
                url.contains("/open/noLogin/pushArticleCountExcel")||
                url.contains("/prescription/searchRecordWrite")||
                url.contains("/Funds/reconciliationExcel")||
                url.contains("/servicePackageSubItem/exportSubItemExcel")|| //导出
                url.contains("/Funds/deviceInfoExcel")){
            return true;
        }
@@ -149,6 +155,9 @@ public class PostFilter extends ZuulFilter {
                url.contains("/excelControl")||
                url.contains("/prescription/searchRecordWrite")||
                url.contains("/Funds/reconciliationExcel")||
                url.contains("/servicePackageSubItem/exportSubItemExcel")|| //导出
                url.contains("/Funds/deviceInfoExcel"))){
            RequestContext.getCurrentContext().setResponseBody(object.toJSONString());
        }else {

svr/svr-base/src/main/java/com/yihu/jw/base/service/servicePackage/ServicePackageSubItemService.java

@@ -81,10 +81,10 @@ public class ServicePackageSubItemService extends BaseJpaService<ServicePackageS
                " c.`name`'itemName',a.`name` 'subItemName' ,a.*\n" +
                "FROM\n" +
                " base_service_package_sub_item a\n" +
                " INNER JOIN base_service_package_item_relational b ON a.id = b.sub_item_id \n" +
                " INNER JOIN base_service_package_item c ON b.item_id=c.id\n" +
                " LEFT JOIN base_service_package_item_relational b ON a.id = b.sub_item_id \n" +
                " LEFT JOIN base_service_package_item c ON b.item_id=c.id\n" +
                "WHERE\n" +
                " 1 = 1;";
                " 1 = 1 ";
        if (StringUtils.isNotBlank(qvo.getId())) {
            detailSql += "AND a.id = '" + qvo.getId() + "'";
        }