三元接口

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServiceItemConfig.java

@@ -45,6 +45,29 @@ public class ServiceItemConfig extends UuidIdentityEntity implements java.io.Ser
    @Column(name = "template_code")
    private String templateCode;
    @Column(name = "pricing_units_code")
    private String pricingUnitsCode;//计价单位
    @Column(name = "pricing_units_name")
    private String pricingUnitsName;//计价单位名称
    public String getPricingUnitsCode() {
        return pricingUnitsCode;
    }
    public void setPricingUnitsCode(String pricingUnitsCode) {
        this.pricingUnitsCode = pricingUnitsCode;
    }
    public String getPricingUnitsName() {
        return pricingUnitsName;
    }
    public void setPricingUnitsName(String pricingUnitsName) {
        this.pricingUnitsName = pricingUnitsName;
    }
    public String getPackageId() {
        return packageId;
    }

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

@@ -62,6 +62,28 @@ public class RehabilitationTemplateDetailDO extends UuidIdentityEntityWithOperat
    @Column(name = "pricing_units_name")
    private String pricingUnitsName;//计价单位名称
    @Column(name = "template_type")
    private String templateType;
    @Column(name = "template_code")
    private String templateCode;
    public String getTemplateType() {
        return templateType;
    }
    public void setTemplateType(String templateType) {
        this.templateType = templateType;
    }
    public String getTemplateCode() {
        return templateCode;
    }
    public void setTemplateCode(String templateCode) {
        this.templateCode = templateCode;
    }
    //-----------------------------------------------------
    public String getPricingUnitsCode() {

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

@@ -119,6 +119,22 @@ public class ServicePackageEndpoint extends EnvelopRestEndpoint {
    }
    /**
     * 根据服务包查询所有服务项配置
     */
    @GetMapping(value = "/findItemConfig")
    @ApiOperation(value = "根据服务包查询所有服务项配置")
    public Envelop findItemConfig(
            @ApiParam(name = "jsonStr", value = "Json数据", required = false) @RequestParam String jsonStr
    ) throws Exception {
        jsonStr = URLDecoder.decode(jsonStr, "UTF-8");
        System.out.println("入参:" + JSON.toJSONString(jsonStr));
        ParamQvo qvo = JSON.parseObject(jsonStr, ParamQvo.class);
        List<Map<String, Object>> list = itemConfigService.findItemConfig(qvo);
        return success("配置服务项计划成功", list);
    }
    //--------------------------------------------------------------------------------------
    //
    //--------------------------------------------------------------------------------------

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/specialist/rehabilitation/RehabilitationPlanController.java

@@ -67,9 +67,11 @@ public class RehabilitationPlanController extends EnvelopRestEndpoint {
            rehabilitationTemplateDetail = URLDecoder.decode(rehabilitationTemplateDetail, "UTF-8");
            //映射成实体
            RehabilitationPlanTemplateDO templateDO = toEntity(rehabilitationTemplate, RehabilitationPlanTemplateDO.class);
            List<RehabilitationTemplateDetailDO> details =
                    new ObjectMapper().readValue(rehabilitationTemplateDetail, new TypeReference<List<RehabilitationTemplateDetailDO>>() {
                    });
//            List<RehabilitationTemplateDetailDO> details =
//                    new ObjectMapper().readValue(rehabilitationTemplateDetail, new TypeReference<List<RehabilitationTemplateDetailDO>>() {
//                    });
            List<RehabilitationTemplateDetailDO> details = JSON.parseArray(rehabilitationTemplateDetail, RehabilitationTemplateDetailDO.class);
            System.out.println(details);
            //数据保存
            return rehabilitationPlanService.saveRehabilitationPlanTemplateData(templateDO, details);
        } catch (Exception e) {

svr/svr-base/src/main/java/com/yihu/jw/base/service/followup/FollowupTemplateService.java

@@ -29,6 +29,9 @@ public class FollowupTemplateService extends BaseJpaService<FollowupTemplate, Fo
        String conditionSql = " FROM base_followup_template WHERE 1=1 ";
        String pageSql = "";
        if (StringUtils.isNotBlank(qvo.getId())) {
            conditionSql += " AND `id`='" + qvo.getId() + "'";
        }
        if (StringUtils.isNotBlank(qvo.getSearchKey())) {
            conditionSql += " AND `template_name`='" + qvo.getSearchKey() + "'";
        }

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

@@ -13,8 +13,8 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.net.URLDecoder;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -51,4 +51,16 @@ public class ServiceItemConfigService extends BaseJpaService<ServiceItemConfig,
        //保存
        itemConfigDao.saveAll(itemConfigList);
    }
    public List<Map<String, Object>> findItemConfig(ParamQvo qvo) {
        String sql = "SELECT\n" +
                "	b.name,a.* \n" +
                "FROM\n" +
                "	base_service_item_config a\n" +
                "	INNER JOIN base_service_package_item b ON a.package_id = b.service_package_id \n" +
                "	AND a.server_item_id = b.service_package_item_id\n" +
                "	WHERE 1=1 AND a.package_id='" + qvo.getId() + "'";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        return list;
    }
}

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

@@ -54,19 +54,19 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            packageVo = servicePackageDao.save(packageVo);
        } else {
            //修改
            ServicePackageDO oldDO = servicePackageDao.findById(packageVo.getId()).orElse(null);
            oldDO.setName(packageVo.getName());
            oldDO.setDel(packageVo.getDel());
            oldDO.setType(packageVo.getType());
            oldDO.setIntroduce(packageVo.getIntroduce());
            oldDO.setOrgCode(packageVo.getOrgCode());
            oldDO.setOrgName(packageVo.getOrgName());
            oldDO.setLeasedCode(packageVo.getLeasedCode());
            oldDO.setLeasedName(packageVo.getLeasedName());
//            ServicePackageDO oldDO = servicePackageDao.findById(packageVo.getId()).orElse(null);
//            oldDO.setName(packageVo.getName());
//            oldDO.setDel(packageVo.getDel());
//            oldDO.setType(packageVo.getType());
//            oldDO.setIntroduce(packageVo.getIntroduce());
//            oldDO.setOrgCode(packageVo.getOrgCode());
//            oldDO.setOrgName(packageVo.getOrgName());
//            oldDO.setLeasedCode(packageVo.getLeasedCode());
//            oldDO.setLeasedName(packageVo.getLeasedName());
            //更新服务包
            packageVo = servicePackageDao.save(oldDO);
            packageVo = servicePackageDao.save(packageVo);
            //删除服务项-根据server_page_id
            servicePackageItemDao.deleteByServicePackageId(oldDO.getId());
            servicePackageItemDao.deleteByServicePackageId(packageVo.getId());
        }
        //保存服务项
        List<ServicePackageItemDO> saveItemList = new ArrayList<>();

svr/svr-base/src/main/java/com/yihu/jw/base/service/specialist/rehabilitation/RehabilitationPlanService.java

@@ -207,6 +207,9 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
            for (RehabilitationServiceItemDO item : itemDOList) {
                if (code.equals(item.getCode())) {
                    detailVo.setName(item.getName());
                    for (RehabilitationTemplateDetailDO detailDO : detailVo.getList()) {
                        detailDO.setName(item.getName());
                    }
                    break;
                }
            }
@@ -575,7 +578,7 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
    public RehabilitationPlanTemplateDO changeState(ParamQvo qvo) {
        RehabilitationPlanTemplateDO entity = templateDao.findById(qvo.getId()).orElse(null);
        if (entity != null) {
            entity.setDel(Integer.parseInt(qvo.getStatus()));
            entity.setStatus(qvo.getStatus());
            templateDao.save(entity);
            return entity;
        }