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

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

@@ -0,0 +1,45 @@
package com.yihu.jw.entity.specialist;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by hmf on 2020/2/28.
 */
@Entity
@Table(name = "wlyy_rehabilitation_service_item")
public class RehabilitationServiceItemDO extends IntegerIdentityEntity {
    private String code;
    private String name;
    private Date createTime;//操作时间
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

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

@@ -45,6 +45,10 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntityWithOperator
    private Date abortTime;//中止时间
    @Column(name = "patient_img")
    private String patientImg;//居民签名照/证件照
    @Column(name = "advice_code")
    private String adviceCode;//康复建议（wlyy_rehabilitation_advice 的code）
    @Column(name = "advice_content")
    private String adviceContent;//康复建议（wlyy_rehabilitation_advice 的content）
    @Column(name = "saas_id")
    public String getSaasId() {
@@ -172,4 +176,20 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntityWithOperator
    public void setPatientImg(String patientImg) {
        this.patientImg = patientImg;
    }
    public String getAdviceCode() {
        return adviceCode;
    }
    public void setAdviceCode(String adviceCode) {
        this.adviceCode = adviceCode;
    }
    public String getAdviceContent() {
        return adviceContent;
    }
    public void setAdviceContent(String adviceContent) {
        this.adviceContent = adviceContent;
    }
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/rehabilitation/RehabilitationPlanController.java

@@ -3,7 +3,7 @@ package com.yihu.jw.controller.rehabilitation;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.dao.rehabilitation.RehabilitationOperateRecordsDao;
import com.yihu.jw.entity.specialist.HospitalServiceItemDO;
import com.yihu.jw.entity.specialist.RehabilitationServiceItemDO;
import com.yihu.jw.entity.specialist.rehabilitation.*;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
@@ -91,7 +91,7 @@ public class RehabilitationPlanController extends EnvelopRestEndpoint {
    @GetMapping(value = SpecialistMapping.rehabilitation.findTemplateDetailByTemplateId)
    @ApiOperation(value = "获取康复服务套餐模板明细")
    public MixEnvelop<HospitalServiceItemDO, HospitalServiceItemDO> findTemplateDetailByTemplateId(@ApiParam(name = "templateId", value = "模板id")
    public MixEnvelop<RehabilitationServiceItemDO, RehabilitationServiceItemDO> findTemplateDetailByTemplateId(@ApiParam(name = "templateId", value = "模板id")
                                                                                      @RequestParam(value = "templateId", required = true)String templateId){
        try {
            return rehabilitationPlanService.findTemplateDetailByTemplateId(templateId);

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/rehabilitation/RehabilitationServiceItemDao.java

@@ -0,0 +1,10 @@
package com.yihu.jw.dao.rehabilitation;
import com.yihu.jw.entity.specialist.RehabilitationServiceItemDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface RehabilitationServiceItemDao extends PagingAndSortingRepository<RehabilitationServiceItemDO, Long>,JpaSpecificationExecutor<RehabilitationServiceItemDO> {
    RehabilitationServiceItemDO findByCode(String itemId);
}

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

@@ -6,6 +6,7 @@ import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.jw.dao.rehabilitation.*;
import com.yihu.jw.entity.rehabilitation.RehabilitationPlanningDO;
import com.yihu.jw.entity.specialist.HospitalServiceItemDO;
import com.yihu.jw.entity.specialist.RehabilitationServiceItemDO;
import com.yihu.jw.entity.specialist.rehabilitation.*;
import com.yihu.jw.restmodel.specialist.PatientSignInfoVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -74,6 +75,8 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
    private SpecialistService specialistService;
    @Autowired
    private HttpClientUtil httpClientUtil;
    @Autowired
    private RehabilitationServiceItemDao serviceItemDao;
    public ObjEnvelop createRehabilitationTemplate(RehabilitationPlanTemplateDO templateDO) {
        templateDO.setCreateTime(new Date());
@@ -131,12 +134,22 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
     * @param templateId
     * @return
     */
    public MixEnvelop<HospitalServiceItemDO, HospitalServiceItemDO> findTemplateDetailByTemplateId(String templateId) {
    public MixEnvelop<RehabilitationServiceItemDO, RehabilitationServiceItemDO> findTemplateDetailByTemplateId(String templateId) {
        MixEnvelop<RehabilitationServiceItemDO,RehabilitationServiceItemDO> envelop = new MixEnvelop<>();
        List<RehabilitationServiceItemDO> serviceItemDOS = new ArrayList<>();
        List<String> hospitalServiceItemIds = templateDetailDao.findHospitalServiceItemIdByTemplateId(templateId);
        if(hospitalServiceItemIds.size() > 0) {
            return hospitalServiceItemService.selectById(hospitalServiceItemIds);
        for(String itemId : hospitalServiceItemIds){
            RehabilitationServiceItemDO serviceItemDO = serviceItemDao.findByCode(itemId);
            if (serviceItemDO != null){
                serviceItemDOS.add(serviceItemDO);
            }
        }
        return MixEnvelop.getSuccess(SpecialistMapping.api_success);
        envelop.setDetailModelList(serviceItemDOS);
        return envelop;
//        if(hospitalServiceItemIds.size() > 0) {
//            return hospitalServiceItemService.selectById(hospitalServiceItemIds);
//        }
//        return MixEnvelop.getSuccess(SpecialistMapping.api_success);
    }
    public PatientRehabilitationPlanDO createPatientRehabilitationPlan(PatientRehabilitationPlanDO planDO) {