Merge branch 'dev' of humingfen/wlyy2.0 into dev

common/common-request-mapping/src/main/java/com/yihu/jw/rm/rehabilitation/RehabilitationRequestMapping.java

@@ -11,23 +11,65 @@ public class RehabilitationRequestMapping {
     * 公共模块
     */
    public static class Common {
        public static final String information = api_rehabilitation_common + "/information";
        public static final String message_success_update = "update success";
        public static final String message_success_delete = "delete success";
        public static final String message_success_find = "find success";
        public static final String message_success_create = "create success";
        public static final String message_success_find_functions = "message_success_find_functions";
    }
    public static class Information {
        public static final String api_create = "information";
        public static final String api_delete = "information";
        public static final String information = api_rehabilitation_common + "/information";
        public static final String api_create = "createInformation";
        public static final String api_delete = "delInformation";
        public static final String api_getById = "getInformationById";
        public static final String api_update = "information";
        public static final String api_update = "updateInformation";
        public static final String findInformationById = "findInformationById";
        public static final String findInformationByPatientId = "findInformationByPatientId";
        public static final String findInformationPage = "findInformationPage";
        public static final String message_success_update = "information update success";
        public static final String message_success_delete = "information delete success";
        public static final String message_success_find = "information find success";
        public static final String message_success_create = "information create success";
    }
        public static final String message_success_find_functions = "message_success_find_functions";
    public static class TreatmentProgram {
        public static final String treatmentProgram = api_rehabilitation_common + "/treatmentProgram";
        public static final String findTreatmentProgramPage = "findTreatmentProgramPage";
        public static final String api_create = "createTreatmentProgram";
        public static final String api_delete = "delTreatmentProgram";
        public static final String api_getById = "getTreatmentProgramById";
        public static final String api_update = "updateTreatmentProgram";
        public static final String findTreatmentProgramById = "findTreatmentProgramById";
    }
    public static class Planning {
        public static final String planning = api_rehabilitation_common + "/planning";
        public static final String findPlanningPage = "findPlanningPage";
        public static final String findTreatmentByProgramId = "findTreatmentByProgramId";
        public static final String api_create = "createPlanning";
        public static final String api_delete = "delPlanning";
        public static final String api_getById = "getPlanningById";
        public static final String api_update = "updatePlanning";
        public static final String findPlanningById = "findPlanningById";
    }
    public static class Performance {
        public static final String performance = api_rehabilitation_common + "/performance";
        public static final String findPerformancePage = "findPerformancePage";
        public static final String api_create = "createPerformance";
        public static final String api_delete = "delPerformance";
        public static final String api_getById = "getPerformanceById";
        public static final String api_update = "updatePerformance";
        public static final String findPerformanceById = "findPerformanceById";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/rehabilitation/RehabilitationPerformanceVO.java

@@ -0,0 +1,71 @@
package com.yihu.jw.restmodel.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.yihu.jw.restmodel.iot.common.BaseVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.sql.Date;
/**
 * 康复计划执行情况表
 * @author humingfen on 2018/5/2.
 */
@JsonInclude(JsonInclude.Include.ALWAYS)
@ApiModel(value = "康复计划执行情况表", description = "康复计划执行情况表")
public class RehabilitationPerformanceVO extends BaseVO implements Serializable {
    @ApiModelProperty("治疗方案id")
    private String programId;
    @ApiModelProperty("开始执行时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
    private Date startTime;
    @ApiModelProperty("结束执行时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
    private Date endTime;
    @ApiModelProperty("执行状态")
    private Integer status;
    @ApiModelProperty("身体健康状态说明")
    private String description;
    public String getProgramId() {
        return programId;
    }
    public void setProgramId(String programId) {
        this.programId = programId;
    }
    public Date getStartTime() {
        return startTime;
    }
    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    }
    public Date getEndTime() {
        return endTime;
    }
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/rehabilitation/RehabilitationPlanningVO.java

@@ -0,0 +1,63 @@
package com.yihu.jw.restmodel.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.yihu.jw.restmodel.iot.common.BaseVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
/**
 * 康复计划表
 * @author humingfen on 2018/5/2.
 */
@JsonInclude(JsonInclude.Include.ALWAYS)
@ApiModel(value = "康复计划表", description = "康复计划表")
public class RehabilitationPlanningVO extends BaseVO implements Serializable {
    @ApiModelProperty("居民id")
    private String patientId;
    @ApiModelProperty("治疗方案id")
    private String programId;
    @ApiModelProperty("复检时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
    private Date recheckTime;
    @ApiModelProperty("附加说明")
    private String description;
    public String getPatientId() {
        return patientId;
    }
    public void setPatientId(String patientId) {
        this.patientId = patientId;
    }
    public String getProgramId() {
        return programId;
    }
    public void setProgramId(String programId) {
        this.programId = programId;
    }
    public Date getRecheckTime() {
        return recheckTime;
    }
    public void setRecheckTime(Date recheckTime) {
        this.recheckTime = recheckTime;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/rehabilitation/RehabilitationTreatmentProgramVO.java

@@ -0,0 +1,57 @@
package com.yihu.jw.restmodel.rehabilitation;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.yihu.jw.restmodel.iot.common.BaseVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
/**
 * 治疗方案表
 * @author humingfen on 2018/4/27.
 */
@JsonInclude(JsonInclude.Include.ALWAYS)
@ApiModel(value = "治疗方案表", description = "治疗方案表")
public class RehabilitationTreatmentProgramVO extends BaseVO implements Serializable {
    @ApiModelProperty("方案名称")
    private String name;
    @ApiModelProperty("训练次数/时间")
    private String frequency;
    @ApiModelProperty("每日次数")
    private Integer timesDaily;
    @ApiModelProperty("附加说明")
    private String description;
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getFrequency() {
        return frequency;
    }
    public void setFrequency(String frequency) {
        this.frequency = frequency;
    }
    public Integer getTimesDaily() {
        return timesDaily;
    }
    public void setTimesDaily(Integer timesDaily) {
        this.timesDaily = timesDaily;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/config/SwaggerConfig.java

@@ -1,6 +1,6 @@
package com.yihu.rehabilitation.config;
import com.yihu.jw.rm.archives.PatientArchivesMapping;
import com.yihu.jw.rm.rehabilitation.RehabilitationRequestMapping;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@@ -14,27 +14,27 @@ import static springfox.documentation.builders.PathSelectors.regex;
@Configuration
@EnableSwagger2
@ComponentScan("com.yihu.jw.**")
@ComponentScan("com.yihu.rehabilitation.**")
public class SwaggerConfig {
    public static final String archives_API = "archives";
    public static final String rehabilitation_API = "rehabilitation";
    @Bean
    public Docket wlyyAPI() {
    public Docket rehabilitationAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(archives_API)
                .groupName(rehabilitation_API)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(false)
                .pathMapping("/")
                .select()
                .paths(or(
                        regex("/" + PatientArchivesMapping.api_archives_common + "/.*")
                        regex("/" + RehabilitationRequestMapping.api_rehabilitation_common + "/.*")
                ))
                .build()
                .apiInfo(wlyyApiInfo());
                .apiInfo(rehabilitationApiInfo());
    }
    private ApiInfo wlyyApiInfo() {
        ApiInfo wlyyInfo = new ApiInfo("基卫2.0API",
    private ApiInfo rehabilitationApiInfo() {
        ApiInfo rehabilitationInfo = new ApiInfo("基卫2.0API",
                "基卫2.0API，提供基础卫生相关服务。",
                "1.0",
                "No terms of service",
@@ -43,8 +43,7 @@ public class SwaggerConfig {
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return wlyyInfo;
        return rehabilitationInfo;
    }
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/config/jpa/WlyySpecialistJpa.java

@@ -18,27 +18,27 @@ import javax.sql.DataSource;
import java.util.Properties;
/**
 * Created by chenweida on 2017/4/6.
 * Created by humingfen on 2018/4/27.
 */
@Configuration
@EnableTransactionManagement
@EnableJpaRepositories(
        entityManagerFactoryRef = "wlyySpecialistEntityManagerFactory",
        transactionManagerRef = "wlyySpecialistTransactionManager",
        basePackages = {"com.yihu.jw.dao"})   //设置Repository所在位置
public class WlyySpecialistJpa {
        entityManagerFactoryRef = "rehabilitationEntityManagerFactory",
        transactionManagerRef = "rehabilitationTransactionManager",
        basePackages = {"com.yihu.rehabilitation.dao"})   //设置Repository所在位置
public class RehabilitationJpa {
    @Autowired
    private HibernateProperties hibernateProperties;
    @Bean(name = "wlyySpecialistEntityManagerFactory")
    @Bean(name = "rehabilitationEntityManagerFactory")
    @Primary
    public LocalContainerEntityManagerFactoryBean entityManagerFactoryPrimary(DataSource dataSource) {
        LocalContainerEntityManagerFactoryBean emfb = new LocalContainerEntityManagerFactoryBean();
        emfb.setDataSource(dataSource);
        emfb.setPackagesToScan("com.yihu.jw.entity");
        emfb.setPersistenceUnitName("specialist");
        emfb.setPackagesToScan("com.yihu.jw.rehabilitation");
        emfb.setPersistenceUnitName("rehabilitation");
        JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
        emfb.setJpaVendorAdapter(vendorAdapter);
        Properties properties = hibernateProperties.hibProperties();
@@ -49,10 +49,10 @@ public class WlyySpecialistJpa {
    }
    @Bean(name = "wlyySpecialistTransactionManager")
    @Bean(name = "rehabilitationTransactionManager")
    @Primary
    JpaTransactionManager transactionManagerSecondary(
            @Qualifier("wlyySpecialistEntityManagerFactory") EntityManagerFactory builder) {
            @Qualifier("rehabilitationEntityManagerFactory") EntityManagerFactory builder) {
        return new JpaTransactionManager(builder);
    }
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/controller/RehabilitationInformationController.java

@@ -1,16 +1,13 @@
package com.yihu.rehabilitation.controller;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.rehabilitation.RehabilitationInformationDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.rehabilitation.RehabilitationInformationVO;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.rehabilitation.service.RehabilitationInformationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +17,7 @@ import com.yihu.jw.rm.rehabilitation.RehabilitationRequestMapping;
 * @author humingfen on 2018/4/25.
 */
@RestController
@RequestMapping(value = RehabilitationRequestMapping.Common.information)
@RequestMapping(value = RehabilitationRequestMapping.Information.information)
@Api(tags = "就诊信息相关操作", description = "就诊信息相关操作")
public class RehabilitationInformationController extends EnvelopRestController {
@@ -29,7 +26,7 @@ public class RehabilitationInformationController extends EnvelopRestController {
    @GetMapping(value = RehabilitationRequestMapping.Information.findInformationPage)
    @ApiOperation(value = "分页查找就诊信息", notes = "分页查找就诊信息")
    public Envelop<RehabilitationInformationVO> findCompanyPage(@ApiParam(name = "hospital", value = "就诊医院名称", defaultValue = "")
    public Envelop<RehabilitationInformationVO> findInformationPage(@ApiParam(name = "hospital", value = "就诊医院名称", defaultValue = "")
                                                 @RequestParam(value = "hospital", required = false) String hospital,
                                                 @ApiParam(name = "patientId", value = "居民id", defaultValue = "")
                                                 @RequestParam(value = "patientId", required = false) String patientId,
@@ -57,9 +54,8 @@ public class RehabilitationInformationController extends EnvelopRestController {
    public Envelop<RehabilitationInformationVO> create(@ApiParam(name = "jsonData", value = "json", defaultValue = "")
                                                           @RequestParam(value = "jsonData", required = true)String jsonData) {
        try {
            RehabilitationInformationVO informationVO = toEntity(jsonData, RehabilitationInformationVO.class);
            RehabilitationInformationDO informationDO = rehabilitationInformationService.convertToModel(informationVO, RehabilitationInformationDO.class);
            return Envelop.getSuccess(RehabilitationRequestMapping.Information.message_success_create, rehabilitationInformationService.create(informationDO));
            RehabilitationInformationDO informationDO = toEntity(jsonData, RehabilitationInformationDO.class);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_create, rehabilitationInformationService.create(informationDO));
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
@@ -68,26 +64,24 @@ public class RehabilitationInformationController extends EnvelopRestController {
    @GetMapping(value = RehabilitationRequestMapping.Information.findInformationById)
    @ApiOperation(value = "根据id查找就诊信息", notes = "根据id查找就诊信息")
    public Envelop<RehabilitationInformationVO> findByCode(@ApiParam(name = "id", value = "id")
    public Envelop<RehabilitationInformationDO> findById(@ApiParam(name = "id", value = "id")
                                            @RequestParam(value = "id", required = true) String id) {
        try {
            RehabilitationInformationDO informationDO = rehabilitationInformationService.findById(id);
            RehabilitationInformationVO informationVO = rehabilitationInformationService.convertToModel(informationDO, RehabilitationInformationVO.class);
            return Envelop.getSuccess(RehabilitationRequestMapping.Information.message_success_find, informationVO);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_find, informationDO);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = RehabilitationRequestMapping.Information.findInformationById)
    @GetMapping(value = RehabilitationRequestMapping.Information.findInformationByPatientId)
    @ApiOperation(value = "根据patientId查找就诊信息", notes = "根据patientId查找就诊信息")
    public Envelop<RehabilitationInformationVO> findByPatientId(@ApiParam(name = "patientId", value = "patientId")
    public Envelop<RehabilitationInformationDO> findByPatientId(@ApiParam(name = "patientId", value = "patientId")
                                                           @RequestParam(value = "patientId", required = true) String patientId) {
        try {
            RehabilitationInformationDO informationDO = rehabilitationInformationService.findByPatientId(patientId);
            RehabilitationInformationVO informationVO = rehabilitationInformationService.convertToModel(informationDO, RehabilitationInformationVO.class);
            return Envelop.getSuccess(RehabilitationRequestMapping.Information.message_success_find, informationVO);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_find, informationDO);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
@@ -95,14 +89,13 @@ public class RehabilitationInformationController extends EnvelopRestController {
    }
    @PostMapping(value = RehabilitationRequestMapping.Information.api_update)
    @ApiOperation(value = "修改就诊信息", notes = "修改就诊信息")
    public Envelop<RehabilitationInformationVO> updCompany(@ApiParam(name = "jsonData", value = "json", defaultValue = "")
    @ApiOperation(value = "修改就诊信息", notes = "修改就诊信息(记得传入修改id)")
    public Envelop<RehabilitationInformationVO> updateInformation(@ApiParam(name = "jsonData", value = "json", defaultValue = "")
                                            @RequestParam(value = "jsonData", required = true)String jsonData) {
        try {
            RehabilitationInformationVO informationVO = toEntity(jsonData, RehabilitationInformationVO.class);
            RehabilitationInformationDO informationDO = rehabilitationInformationService.convertToModel(informationVO, RehabilitationInformationDO.class);
            RehabilitationInformationDO informationDO = toEntity(jsonData, RehabilitationInformationDO.class);
            rehabilitationInformationService.update(informationDO);
            return Envelop.getSuccess(RehabilitationRequestMapping.Information.message_success_find);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_update);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
@@ -110,12 +103,12 @@ public class RehabilitationInformationController extends EnvelopRestController {
    }
    @PostMapping(value = RehabilitationRequestMapping.Information.api_delete)
    @ApiOperation(value = "删除企业", notes = "删除企业")
    public Envelop<RehabilitationInformationVO> delCompany(@ApiParam(name = "id", value = "id")
    @ApiOperation(value = "删除就诊信息", notes = "删除就诊信息")
    public Envelop<RehabilitationInformationVO> delInformation(@ApiParam(name = "id", value = "id")
                                            @RequestParam(value = "id", required = true) String id) {
        try {
            rehabilitationInformationService.delete(id);
            return Envelop.getSuccess(RehabilitationRequestMapping.Information.message_success_find);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/controller/RehabilitationPerformanceController.java

@@ -0,0 +1,99 @@
package com.yihu.rehabilitation.controller;
import com.yihu.jw.rehabilitation.RehabilitationPerformanceDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.rehabilitation.RehabilitationPerformanceVO;
import com.yihu.jw.rm.rehabilitation.RehabilitationRequestMapping;
import com.yihu.rehabilitation.service.RehabilitationPerformanceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
 * @author humingfen on 2018/5/2.
 */
@RestController
@RequestMapping(value = RehabilitationRequestMapping.Performance.performance)
@Api(tags = "康复计划执行情况相关操作", description = "康复计划执行情况相关操作")
public class RehabilitationPerformanceController extends EnvelopRestController {
    @Autowired
    private RehabilitationPerformanceService performanceService;
    @GetMapping(value = RehabilitationRequestMapping.Performance.findPerformancePage)
    @ApiOperation(value = "分页查找康复计划执行情况", notes = "分页查找康复计划执行情况")
    public Envelop<RehabilitationPerformanceVO> findPerformancePage(@ApiParam(name = "patientId", value = "居民id", defaultValue = "")
                                                              @RequestParam(value = "patientId", required = false) String patientId,
                                                              @ApiParam(name = "page", value = "第几页", defaultValue = "")
                                                              @RequestParam(value = "page", required = false) Integer page,
                                                              @ApiParam(name = "size", value = "每页记录数", defaultValue = "")
                                                              @RequestParam(value = "size", required = false) Integer size){
        try {
            if(page == null|| page < 0){
                page = 1;
            }
            if(size == null){
                size = 10;
            }
            return performanceService.queryPerformancePage(page, size, patientId);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = RehabilitationRequestMapping.Performance.api_create)
    @ApiOperation(value = "创建康复计划执行情况", notes = "创建康复计划执行情况")
    public Envelop<RehabilitationPerformanceDO> createPerformance(@ApiParam(name = "jsonData", value = "基本信息Json", defaultValue = "")
                                                            @RequestParam(value = "jsonData", required = false) String jsonData) {
        try {
            RehabilitationPerformanceDO performanceDO = toEntity(jsonData, RehabilitationPerformanceDO.class);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_create, performanceService.create(performanceDO));
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = RehabilitationRequestMapping.Performance.findPerformanceById)
    @ApiOperation(value = "根据id查找康复计划执行情况", notes = "根据id查找康复计划执行情况")
    public Envelop<RehabilitationPerformanceDO> findById(@ApiParam(name = "id", value = "id")
                                                      @RequestParam(value = "id", required = true) String id) {
        try {
            RehabilitationPerformanceDO performanceDO = performanceService.findById(id);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_find, performanceDO);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = RehabilitationRequestMapping.Performance.api_update)
    @ApiOperation(value = "修改康复计划执行情况", notes = "修改康复计划执行情况(记得传入修改id)")
    public Envelop updatePerformance(@ApiParam(name = "jsonData", value = "json", defaultValue = "")
                                  @RequestParam(value = "jsonData", required = true)String jsonData) {
        try {
            RehabilitationPerformanceDO PerformanceDO = toEntity(jsonData, RehabilitationPerformanceDO.class);
            performanceService.update(PerformanceDO);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_update);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = RehabilitationRequestMapping.Performance.api_delete)
    @ApiOperation(value = "删除康复计划执行情况", notes = "删除康复计划执行情况")
    public Envelop delPerformance(@ApiParam(name = "id", value = "id")
                               @RequestParam(value = "id", required = true) String id) {
        try {
            performanceService.delete(id);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/controller/RehabilitationPlanningController.java

@@ -0,0 +1,119 @@
package com.yihu.rehabilitation.controller;
import com.yihu.jw.rehabilitation.RehabilitationPlanningDO;
import com.yihu.jw.rehabilitation.RehabilitationTreatmentProgramDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.rehabilitation.RehabilitationPlanningVO;
import com.yihu.jw.rm.rehabilitation.RehabilitationRequestMapping;
import com.yihu.rehabilitation.service.RehabilitationPlanningService;
import com.yihu.rehabilitation.service.RehabilitationTreatmentProgramService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
 * @author humingfen on 2018/5/2.
 */
@RestController
@RequestMapping(value = RehabilitationRequestMapping.Planning.planning)
@Api(tags = "康复计划相关操作", description = "康复计划相关操作")
public class RehabilitationPlanningController extends EnvelopRestController {
    @Autowired
    private RehabilitationPlanningService planningService;
    @Autowired
    private RehabilitationTreatmentProgramService TreatmentProgramService;
    @GetMapping(value = RehabilitationRequestMapping.Planning.findPlanningPage)
    @ApiOperation(value = "分页查找康复计划", notes = "分页查找康复计划")
    public Envelop<RehabilitationPlanningVO> findPlanningPage(@ApiParam(name = "patientId", value = "居民id", defaultValue = "")
                                                                              @RequestParam(value = "patientId", required = false) String patientId,
                                                              @ApiParam(name = "programId", value = "康复计划id", defaultValue = "")
                                                                              @RequestParam(value = "programId", required = false) String programId,
                                                              @ApiParam(name = "page", value = "第几页", defaultValue = "")
                                                                              @RequestParam(value = "page", required = false) Integer page,
                                                              @ApiParam(name = "size", value = "每页记录数", defaultValue = "")
                                                                              @RequestParam(value = "size", required = false) Integer size){
        try {
            if(page == null|| page < 0){
                page = 1;
            }
            if(size == null){
                size = 10;
            }
            return planningService.queryPlanningPage(page, size, patientId, programId);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = RehabilitationRequestMapping.Planning.api_create)
    @ApiOperation(value = "创建康复计划", notes = "创建康复计划")
    public Envelop<RehabilitationPlanningDO> createPlanning(@ApiParam(name = "jsonData", value = "基本信息Json", defaultValue = "")
                                                                            @RequestParam(value = "jsonData", required = false) String jsonData) {
        try {
            RehabilitationPlanningDO planningDO = toEntity(jsonData, RehabilitationPlanningDO.class);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_create, planningService.create(planningDO));
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = RehabilitationRequestMapping.Planning.findPlanningById)
    @ApiOperation(value = "根据id查找治疗方案", notes = "根据id查找治疗方案")
    public Envelop<RehabilitationPlanningDO> findById(@ApiParam(name = "id", value = "id")
                                                              @RequestParam(value = "id", required = true) String id) {
        try {
            RehabilitationPlanningDO planningDO = planningService.findById(id);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_find, planningDO);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = RehabilitationRequestMapping.Planning.findTreatmentByProgramId)
    @ApiOperation(value = "根据programId查找治疗方案", notes = "根据programId查找治疗方案")
    public Envelop<RehabilitationPlanningDO> findTreatmentByProgramId(@ApiParam(name = "programId", value = "programId")
                                                      @RequestParam(value = "programId", required = true) String programId) {
        try {
            RehabilitationTreatmentProgramDO treatmentProgramDO = TreatmentProgramService.findById(programId);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_find, treatmentProgramDO);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = RehabilitationRequestMapping.Planning.api_update)
    @ApiOperation(value = "修改治疗方案", notes = "修改治疗方案(记得传入修改id)")
    public Envelop updatePlanning(@ApiParam(name = "jsonData", value = "json", defaultValue = "")
                                          @RequestParam(value = "jsonData", required = true)String jsonData) {
        try {
            RehabilitationPlanningDO planningDO = toEntity(jsonData, RehabilitationPlanningDO.class);
            planningService.update(planningDO);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_update);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = RehabilitationRequestMapping.Planning.api_delete)
    @ApiOperation(value = "删除治疗方案", notes = "删除治疗方案")
    public Envelop delPlanning(@ApiParam(name = "id", value = "id")
                                       @RequestParam(value = "id", required = true) String id) {
        try {
            planningService.delete(id);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/controller/RehabilitationTreatmentProgramController.java

@@ -0,0 +1,103 @@
package com.yihu.rehabilitation.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.rehabilitation.RehabilitationTreatmentProgramDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.rehabilitation.RehabilitationTreatmentProgramVO;
import com.yihu.jw.rm.rehabilitation.RehabilitationRequestMapping;
import com.yihu.rehabilitation.service.RehabilitationTreatmentProgramService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
 * @author humingfen on 2018/4/27.
 */
@RestController
@RequestMapping(value = RehabilitationRequestMapping.TreatmentProgram.treatmentProgram)
@Api(tags = "治疗方案相关操作", description = "治疗方案相关操作")
public class RehabilitationTreatmentProgramController extends EnvelopRestController {
    @Autowired
    private RehabilitationTreatmentProgramService treatmentProgramService;
    @GetMapping(value = RehabilitationRequestMapping.TreatmentProgram.findTreatmentProgramPage)
    @ApiOperation(value = "分页查找治疗方案", notes = "分页查找治疗方案")
    public Envelop<RehabilitationTreatmentProgramVO> findTreatmentProgramPage(@ApiParam(name = "name", value = "方案名称", defaultValue = "")
                                                                    @RequestParam(value = "name", required = false) String name,
                                                                         @ApiParam(name = "page", value = "第几页", defaultValue = "")
                                                                    @RequestParam(value = "page", required = false) Integer page,
                                                                         @ApiParam(name = "size", value = "每页记录数", defaultValue = "")
                                                                    @RequestParam(value = "size", required = false) Integer size){
        try {
            if(page == null|| page < 0){
                page = 1;
            }
            if(size == null){
                size = 10;
            }
            return treatmentProgramService.queryTreatmentPage(page, size, name);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = RehabilitationRequestMapping.TreatmentProgram.api_create)
    @ApiOperation(value = "创建治疗方案", notes = "创建治疗方案")
    public Envelop<RehabilitationTreatmentProgramDO> createTreatmentProgram(@ApiParam(name = "jsonData", value = "方案基本信息Json", defaultValue = "")
                                                                         @RequestParam(value = "jsonData", required = false) String jsonData) {
        try {
            RehabilitationTreatmentProgramDO infos = new ObjectMapper().readValue(jsonData, new TypeReference<RehabilitationTreatmentProgramDO>(){});
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_create, treatmentProgramService.create(infos));
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = RehabilitationRequestMapping.TreatmentProgram.findTreatmentProgramById)
    @ApiOperation(value = "根据id查找治疗方案", notes = "根据id查找治疗方案")
    public Envelop<RehabilitationTreatmentProgramDO> findById(@ApiParam(name = "id", value = "id")
                                                         @RequestParam(value = "id", required = true) String id) {
        try {
            RehabilitationTreatmentProgramDO treatmentProgramDO = treatmentProgramService.findById(id);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_find, treatmentProgramDO);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = RehabilitationRequestMapping.TreatmentProgram.api_update)
    @ApiOperation(value = "修改治疗方案", notes = "修改治疗方案(记得传入修改id)")
    public Envelop updateTreatmentProgram(@ApiParam(name = "jsonData", value = "json", defaultValue = "")
                                                                  @RequestParam(value = "jsonData", required = true)String jsonData) {
        try {
            RehabilitationTreatmentProgramDO treatmentProgramDO = toEntity(jsonData, RehabilitationTreatmentProgramDO.class);
            treatmentProgramService.update(treatmentProgramDO);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_update);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = RehabilitationRequestMapping.TreatmentProgram.api_delete)
    @ApiOperation(value = "删除治疗方案", notes = "删除治疗方案")
    public Envelop delTreatmentProgram(@ApiParam(name = "id", value = "id")
                                                               @RequestParam(value = "id", required = true) String id) {
        try {
            treatmentProgramService.delete(id);
            return Envelop.getSuccess(RehabilitationRequestMapping.Common.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/dao/RehabilitationPerformanceDao.java

@@ -0,0 +1,13 @@
package com.yihu.rehabilitation.dao;
import com.yihu.jw.rehabilitation.RehabilitationPerformanceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface RehabilitationPerformanceDao extends PagingAndSortingRepository<RehabilitationPerformanceDO, String>,
        JpaSpecificationExecutor<RehabilitationPerformanceDO> {
    @Query("from RehabilitationPerformanceDO w where w.id = ?1")
    RehabilitationPerformanceDO findById(String id);
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/dao/RehabilitationPlanningDao.java

@@ -0,0 +1,13 @@
package com.yihu.rehabilitation.dao;
import com.yihu.jw.rehabilitation.RehabilitationPlanningDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface RehabilitationPlanningDao extends PagingAndSortingRepository<RehabilitationPlanningDO, String>,
        JpaSpecificationExecutor<RehabilitationPlanningDO> {
    @Query("from RehabilitationPlanningDO w where w.id = ?1")
    RehabilitationPlanningDO findById(String id);
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/dao/RehabilitationTreatmentProgramDao.java

@@ -0,0 +1,13 @@
package com.yihu.rehabilitation.dao;
import com.yihu.jw.rehabilitation.RehabilitationTreatmentProgramDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface RehabilitationTreatmentProgramDao extends PagingAndSortingRepository<RehabilitationTreatmentProgramDO, String>,
        JpaSpecificationExecutor<RehabilitationTreatmentProgramDO> {
    @Query("from RehabilitationTreatmentProgramDO w where w.id = ?1")
    RehabilitationTreatmentProgramDO findById(String id);
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/service/RehabilitationInformationService.java

@@ -1,11 +1,9 @@
package com.yihu.rehabilitation.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.iot.company.IotCompanyDO;
import com.yihu.jw.rehabilitation.RehabilitationInformationDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.rehabilitation.RehabilitationInformationVO;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.rm.rehabilitation.RehabilitationRequestMapping;
import com.yihu.rehabilitation.dao.RehabilitationInformationDao;
import org.apache.commons.lang.StringUtils;
@@ -40,20 +38,20 @@ public class RehabilitationInformationService extends BaseJpaService<Rehabilitat
     * @return
     */
    public Envelop<RehabilitationInformationVO> queryPage(Integer page, Integer size, String patientId, String hospital){
        StringBuffer sql = new StringBuffer("SELECT DISTINCT w.* from rehabilitation_information w ");
        StringBuffer sqlCount = new StringBuffer("SELECT COUNT(DISTINCT w.id) count from rehabilitation_information w ");
        StringBuffer sql = new StringBuffer("SELECT DISTINCT w.* from rehabilitation_information w where 1 = 1 ");
        StringBuffer sqlCount = new StringBuffer("SELECT COUNT(DISTINCT w.id) count from rehabilitation_information w where 1 = 1 ");
        List<Object> args = new ArrayList<>();
        if(StringUtils.isNotBlank(patientId)){
            sql.append(" and w.patientId = ? ");
            sqlCount.append(" and w.patientId = '").append(patientId).append("' ");
            args.add(patientId);
            sqlCount.append(" and w.patientId = '%").append(patientId).append("%' ");
            args.add('%'+ patientId + '%');
        }
        if(StringUtils.isNotBlank(hospital)){
            sql.append(" and w.hospital like ? ");
            sqlCount.append(" and w.hospital like '").append(hospital).append("' ");
            args.add(hospital);
            sqlCount.append(" and w.hospital like '%").append(hospital).append("%' ");
            args.add('%'+ hospital + '%');
        }
        sql.append("order by c.update_time desc limit ").append((page-1)*size).append(",").append(size);
        sql.append("order by w.update_time desc limit ").append((page-1)*size).append(",").append(size);
        List<RehabilitationInformationDO> list = jdbcTempalte.query(sql.toString(),args.toArray(),new BeanPropertyRowMapper(RehabilitationInformationDO.class));
        List<Map<String,Object>> countList = jdbcTempalte.queryForList(sqlCount.toString());
@@ -62,7 +60,7 @@ public class RehabilitationInformationService extends BaseJpaService<Rehabilitat
        //DO转VO
        List<RehabilitationInformationVO> informationVOList = convertToModels(list,new ArrayList<>(list.size()), RehabilitationInformationVO.class);
        return Envelop.getSuccessListWithPage(RehabilitationRequestMapping.Information.message_success_find_functions,informationVOList, page, size,count);
        return Envelop.getSuccessListWithPage(RehabilitationRequestMapping.Common.message_success_find_functions,informationVOList, page, size,count);
    }
    /**

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/service/RehabilitationPerformanceService.java

@@ -0,0 +1,77 @@
package com.yihu.rehabilitation.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rehabilitation.RehabilitationPerformanceDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.rehabilitation.RehabilitationPerformanceVO;
import com.yihu.jw.rm.rehabilitation.RehabilitationRequestMapping;
import com.yihu.rehabilitation.dao.RehabilitationPerformanceDao;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
/**
 * @author humingfen on 2018/5/2.
 */
@Service
@Transactional(rollbackFor = Exception.class)
public class RehabilitationPerformanceService extends BaseJpaService<RehabilitationPerformanceDO, RehabilitationPerformanceDao>  {
    @Autowired
    private RehabilitationPerformanceDao performanceDao;
    /**
     * 分页查找康复计划执行情况
     * @param page
     * @param size
     * @param patientId
     * @return
     * @throws ParseException
     */
    public Envelop<RehabilitationPerformanceVO> queryPerformancePage(Integer page, Integer size, String patientId) throws ParseException {
        String filters = "";
        String semicolon = "";
        if(StringUtils.isNotBlank(patientId)){
            filters = "createUser="+patientId+"";
            semicolon = ";";
        }
        String sorts = "-updateTime";
        //得到list数据
        List<RehabilitationPerformanceDO> list = search(null, filters, sorts, page, size);
        //获取总数
        long count = getCount(filters);
        //DO转VO
        List<RehabilitationPerformanceVO> PerformanceVOs = convertToModels(list,new ArrayList<>(list.size()), RehabilitationPerformanceVO.class);
        return Envelop.getSuccessListWithPage(RehabilitationRequestMapping.Common.message_success_find_functions,PerformanceVOs, page, size,count);
    }
    public RehabilitationPerformanceDO create(RehabilitationPerformanceDO performanceDO) {
        performanceDO.setSaasId(getCode());
        performanceDO.setStatus(0);
        performanceDO = performanceDao.save(performanceDO);
        return performanceDO;
    }
    public RehabilitationPerformanceDO findById(String id) {
        RehabilitationPerformanceDO performanceDO = performanceDao.findById(id);
        return performanceDO;
    }
    /**
     * 修改
     * @param performanceDO
     */
    public void update(RehabilitationPerformanceDO performanceDO){
        RehabilitationPerformanceDO oldPerformanceDO = performanceDao.findById(performanceDO.getId());
        oldPerformanceDO.setProgramId(performanceDO.getProgramId());
        oldPerformanceDO.setStartTime(performanceDO.getStartTime());
        oldPerformanceDO.setEndTime(performanceDO.getEndTime());
        oldPerformanceDO.setDescription(performanceDO.getDescription());
        performanceDao.save(oldPerformanceDO);
    }
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/service/RehabilitationPlanningService.java

@@ -0,0 +1,78 @@
package com.yihu.rehabilitation.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rehabilitation.RehabilitationPlanningDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.rehabilitation.RehabilitationPlanningVO;
import com.yihu.jw.rm.rehabilitation.RehabilitationRequestMapping;
import com.yihu.rehabilitation.dao.RehabilitationPlanningDao;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
public class RehabilitationPlanningService extends BaseJpaService<RehabilitationPlanningDO, RehabilitationPlanningDao> {
    @Autowired
    private RehabilitationPlanningDao planningDao;
    /**
     * 分页查找康复计划
     * @param page
     * @param size
     * @param patientId
     * @return
     * @throws ParseException
     */
    public Envelop<RehabilitationPlanningVO> queryPlanningPage(Integer page, Integer size, String patientId, String programId) throws ParseException {
        String filters = "";
        String semicolon = "";
        if(StringUtils.isNotBlank(patientId)){
            filters = "patientId="+patientId+"";
            semicolon = ";";
        }
        if(StringUtils.isNotBlank(programId)){
            filters += semicolon + "programId="+programId+"";
            semicolon = ";";
        }
        String sorts = "-updateTime";
        //得到list数据
        List<RehabilitationPlanningDO> list = search(null, filters, sorts, page, size);
        //获取总数
        long count = getCount(filters);
        //DO转VO
        List<RehabilitationPlanningVO> planningVOs = convertToModels(list,new ArrayList<>(list.size()), RehabilitationPlanningVO.class);
        return Envelop.getSuccessListWithPage(RehabilitationRequestMapping.Common.message_success_find_functions,planningVOs, page, size,count);
    }
    public RehabilitationPlanningDO create(RehabilitationPlanningDO PlanningDO) {
        PlanningDO.setSaasId(getCode());
        PlanningDO = planningDao.save(PlanningDO);
        return PlanningDO;
    }
    public RehabilitationPlanningDO findById(String id) {
        RehabilitationPlanningDO planningDO = planningDao.findById(id);
        return planningDO;
    }
    /**
     * 修改
     * @param planningDO
     */
    public void update(RehabilitationPlanningDO planningDO){
        RehabilitationPlanningDO oldPlanningDO = planningDao.findById(planningDO.getId());
        oldPlanningDO.setPatientId(planningDO.getPatientId());
        oldPlanningDO.setProgramId(planningDO.getProgramId());
        oldPlanningDO.setRecheckTime(planningDO.getRecheckTime());
        oldPlanningDO.setDescription(planningDO.getDescription());
        planningDao.save(oldPlanningDO);
    }
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/service/RehabilitationTreatmentProgramService.java

@@ -0,0 +1,77 @@
package com.yihu.rehabilitation.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rehabilitation.RehabilitationTreatmentProgramDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.rehabilitation.RehabilitationTreatmentProgramVO;
import com.yihu.jw.rm.rehabilitation.RehabilitationRequestMapping;
import com.yihu.rehabilitation.dao.RehabilitationTreatmentProgramDao;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
/**
 * @author humingfen on 2018/4/27.
 */
@Service
@Transactional(rollbackFor = Exception.class)
public class RehabilitationTreatmentProgramService extends BaseJpaService<RehabilitationTreatmentProgramDO, RehabilitationTreatmentProgramDao> {
    @Autowired
    private RehabilitationTreatmentProgramDao treatmentProgramDao;
    /**
     * 分页查找健康档案
     * @param page
     * @param size
     * @param name
     * @return
     * @throws ParseException
     */
    public Envelop<RehabilitationTreatmentProgramVO> queryTreatmentPage(Integer page, Integer size, String name) throws ParseException {
        String filters = "";
        String semicolon = "";
        if(StringUtils.isNotBlank(name)){
            filters = "name?"+name+"";
            semicolon = ";";
        }
        String sorts = "-updateTime";
        //得到list数据
        List<RehabilitationTreatmentProgramDO> list = search(null, filters, sorts, page, size);
        //获取总数
        long count = getCount(filters);
        //DO转VO
        List<RehabilitationTreatmentProgramVO> treatmentProgramVOs = convertToModels(list,new ArrayList<>(list.size()), RehabilitationTreatmentProgramVO.class);
        return Envelop.getSuccessListWithPage(RehabilitationRequestMapping.Common.message_success_find_functions,treatmentProgramVOs, page, size,count);
    }
    public RehabilitationTreatmentProgramDO create(RehabilitationTreatmentProgramDO treatmentProgramDO) {
        treatmentProgramDO.setSaasId(getCode());
        treatmentProgramDO = treatmentProgramDao.save(treatmentProgramDO);
        return treatmentProgramDO;
    }
    public RehabilitationTreatmentProgramDO findById(String id) {
        RehabilitationTreatmentProgramDO treatmentProgramDO = treatmentProgramDao.findById(id);
        return treatmentProgramDO;
    }
    /**
     * 修改
     * @param treatmentProgramDO
     */
    public void update(RehabilitationTreatmentProgramDO treatmentProgramDO){
        RehabilitationTreatmentProgramDO oldTreatmentProgramDO = treatmentProgramDao.findById(treatmentProgramDO.getId());
        oldTreatmentProgramDO.setName(treatmentProgramDO.getName());
        oldTreatmentProgramDO.setFrequency(treatmentProgramDO.getFrequency());
        oldTreatmentProgramDO.setTimesDaily(treatmentProgramDO.getTimesDaily());
        oldTreatmentProgramDO.setDescription(treatmentProgramDO.getDescription());
        treatmentProgramDao.save(oldTreatmentProgramDO);
    }
}

svr/svr-rehabilitation/src/main/resources/application.yml

@@ -1,6 +1,6 @@
##如果有配置服务的话，远程服务器和本地服务器配置不一致的情况下，优先远程的为主  git上 svr-base ->  git application ->本地 appliction ->本地 bootstarp
server:
  port: 10051
  port: 10055
spring:
  application:

svr/svr-rehabilitation/src/main/resources/banner.txt

@@ -0,0 +1,6 @@
                                               .__          ___.   .__.__  .__  __          __  .__
  _________  _________          _______   ____ |  |__ _____ \_ |__ |__|  | |__|/  |______ _/  |_|__| ____   ____
 /  ___/\  \/ /\_  __ \  ______ \_  __ \_/ __ \|  |  \\__  \ | __ \|  |  | |  \   __\__  \\   __\  |/  _ \ /    \
 \___ \  \   /  |  | \/ /_____/  |  | \/\  ___/|   Y  \/ __ \| \_\ \  |  |_|  ||  |  / __ \|  | |  (  <_> )   |  \
/____  >  \_/   |__|             |__|    \___  >___|  (____  /___  /__|____/__||__| (____  /__| |__|\____/|___|  /
     \/                                      \/     \/     \/    \/                      \/                    \/