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

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

@@ -39,7 +39,7 @@ public class HospitalServiceItemDO extends UuidIdentityEntityWithOperator implem
    private Integer status;//状态
    @Column(name = "expense")
    private Integer expense;//价格
    private Double expense;//价格
    @Transient
    private String title;//服务项目名称
@@ -111,11 +111,11 @@ public class HospitalServiceItemDO extends UuidIdentityEntityWithOperator implem
    }
    @Column(name = "expense")
    public Integer getExpense() {
    public Double getExpense() {
        return expense;
    }
    public void setExpense(Integer expense) {
    public void setExpense(Double expense) {
        this.expense = expense;
    }

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

@@ -37,7 +37,7 @@ public class RehabilitationDetailDO extends UuidIdentityEntityWithOperator imple
    @Column(name = "status")
    private Integer status;//状态（0未完成，1已完成，2已预约）
    @Column(name = "expense")
    private Integer expense;
    private Double expense;
    @Column(name = "service_qr_code")
    private String serviceQrCode;//服务码
@@ -132,11 +132,11 @@ public class RehabilitationDetailDO extends UuidIdentityEntityWithOperator imple
    }
    @Column(name = "expense")
    public Integer getExpense() {
    public Double getExpense() {
        return expense;
    }
    public void setExpense(Integer expense) {
    public void setExpense(Double expense) {
        this.expense = expense;
    }

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

@@ -6,7 +6,6 @@ import com.yihu.jw.entity.specialist.SpecialistServiceItemDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import sun.plugin.javascript.navig.LinkArray;
import java.util.List;

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

@@ -362,7 +362,7 @@ public class SpecialistHospitalServiceItemService extends EnvelopRestEndpoint {
                List<SpecialistServiceItemDO> specialistServiceItemDOS = specialistServiceItemDao.findByTitleAndContent(hospitalServiceItemDO.getTitle(),hospitalServiceItemDO.getContent());
                if (specialistServiceItemDOS != null && specialistServiceItemDOS.size()!=0){
                    List<HospitalServiceItemDO> hospitalServiceItemDOList = specialistHospitalServiceItemDao.findByHospitalAndServiceItemId(hospitalServiceItemDO.getHospital(),specialistServiceItemDOS.get(0).getId());
                    if (hospitalServiceItemDOList == null && hospitalServiceItemDOList.size() ==0){
                    if (hospitalServiceItemDOList != null && hospitalServiceItemDOList.size() !=0){
                        continue;
                    }else {
                        hospitalServiceItemDO.setStatus(1);