代码修改

common/common-entity/src/main/java/com/yihu/jw/entity/base/processGuidance/BaseProcessGuidancePresetDO.java

@@ -17,7 +17,7 @@ public class BaseProcessGuidancePresetDO extends UuidIdentityEntityWithCreateTim
    private String processGuidanceId;//流程指引id
    private String processCode;//步骤code =节点id（nodeId）
    private String processName;//步骤名称
//    private Integer sortNo;//步骤排序
    private Integer sortNo;//步骤排序
    private Integer isOptional;//是否可选项（1必要项，2可选项 ）
    @Column(name = "process_guidance_id")
@@ -47,14 +47,14 @@ public class BaseProcessGuidancePresetDO extends UuidIdentityEntityWithCreateTim
        this.processName = processName;
    }
//    @Column(name = "sort_no")
//    public Integer getSortNo() {
//        return sortNo;
//    }
//
//    public void setSortNo(Integer sortNo) {
//        this.sortNo = sortNo;
//    }
    @Column(name = "sort_no")
    public Integer getSortNo() {
        return sortNo;
    }
    public void setSortNo(Integer sortNo) {
        this.sortNo = sortNo;
    }
    @Column(name = "is_optional")
    public Integer getIsOptional() {

common/common-entity/src/main/java/com/yihu/jw/entity/base/processGuidance/BaseProcessGuidancePushLogDO.java

@@ -22,6 +22,7 @@ public class BaseProcessGuidancePushLogDO extends UuidIdentityEntityWithCreateTi
    private Date sendTime;//发送时间
    private Integer sendType;//发送类型1wx模板，2短信
    private Integer userType;//用户类型1居民 2医生
    private Integer status;//状态1成功 2失败
    private String userId;//对象id
    private String userName;//送对象姓名
    private String mobile;//手机号
@@ -30,6 +31,7 @@ public class BaseProcessGuidancePushLogDO extends UuidIdentityEntityWithCreateTi
    private String sendTypeName;//发送类型
    private String userTypeName;//用户类型
    private String statusName;//状态
    @Column(name = "node_id")
    public String getNodeId() {
@@ -147,4 +149,22 @@ public class BaseProcessGuidancePushLogDO extends UuidIdentityEntityWithCreateTi
    public void setUserTypeName(String userTypeName) {
        this.userTypeName = userTypeName;
    }
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Transient
    public String getStatusName() {
        return statusName;
    }
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/patient/BasePatientEndpoint.java

@@ -16,7 +16,6 @@ import com.yihu.jw.entity.base.servicePackage.ServicePackageRecordDO;
import com.yihu.jw.entity.base.servicePackage.ServicePackageSignRecordDO;
import com.yihu.jw.entity.base.team.BaseTeamDO;
import com.yihu.jw.entity.care.archive.ArchiveDO;
import com.yihu.jw.entity.care.device.DeviceDetail;
import com.yihu.jw.entity.care.label.WlyyPatientLabelDO;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.service.BasePatientService;
@@ -24,22 +23,15 @@ import com.yihu.jw.restmodel.base.patient.BasePatientVO;
import com.yihu.jw.restmodel.web.*;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.encrypt.MD5;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jxl.Sheet;
import jxl.Workbook;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -156,10 +148,11 @@ public class BasePatientEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            @RequestParam(value = "size") int size) {
        try {
            return basePatientService.pageByCondition(name, archiveType , archiveStatus, page, size);
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError(e.getMessage(),-1);
        }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/processGuidance/BaseProcessGuidanceEndpoint.java

@@ -139,6 +139,11 @@ public class BaseProcessGuidanceEndpoint extends EnvelopRestEndpoint {
            }else {
                one.setUserTypeName("医生");
            }
            if(one.getStatus()==1){
                one.setStatusName("成功");
            }else {
                one.setStatusName("失败");
            }
        });
        int count = (int) processGuidancePushLogService.getCount(filters);
        return success(processGuidancePushLogDOS, count, page, size, BaseProcessGuidancePushLogDO.class);