签约表字段

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/patient/SignFamilyRenewLog.java

@@ -31,11 +31,47 @@ public class SignFamilyRenewLog extends IdEntity {
    private String   oldProId ;
    private Date   createTime;
    private Date  updateTime;
    private Integer status;
    private Date applyDate;
    private String renewChangeReason;
    private String expensesStatus;
    public String getSignCode() {
        return signCode;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public Date getApplyDate() {
        return applyDate;
    }
    public void setApplyDate(Date applyDate) {
        this.applyDate = applyDate;
    }
    public String getRenewChangeReason() {
        return renewChangeReason;
    }
    public void setRenewChangeReason(String renewChangeReason) {
        this.renewChangeReason = renewChangeReason;
    }
    public String getExpensesStatus() {
        return expensesStatus;
    }
    public void setExpensesStatus(String expensesStatus) {
        this.expensesStatus = expensesStatus;
    }
    public void setSignCode(String signCode) {
        this.signCode = signCode;
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -2939,7 +2939,7 @@ public class FamilyContractService extends BaseService {
     * @return
     */
    @Transactional
    public int signRenew(String doctor,String healthDoctor, String patient) throws Exception {
    public int signRenew(String doctor,String healthDoctor, String patient, String reason) throws Exception {
        Patient p = patientDao.findByCode(patient);
        if (p == null) {
            return -1;
@@ -3087,6 +3087,11 @@ public class FamilyContractService extends BaseService {
        sf.setIsValid(0);
        sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear()+"-07-01 00:00:00","yyyy-MM-dd HH:mmm:ss"));
        sf.setEnd(DateUtil.stringToDate(DateUtil.getSignYear()+1+"-07-01 00:00:00","yyyy-MM-dd HH:mmm:ss"));
        //设置转签原因
        if(StringUtils.isNotBlank(reason)){
            sf.setRenewChangeReason(reason);
        }
        SignFamilyRenew temp = signFamilyRenewDao.save(sf);
        if (temp != null) {
@@ -3133,7 +3138,7 @@ public class FamilyContractService extends BaseService {
     * @return
     */
    @Transactional
    public int signRenewOverdue(String doctor,String healthDoctor, String patient) throws Exception {
    public int signRenewOverdue(String doctor,String healthDoctor, String patient, String reason) throws Exception {
        Patient p = patientDao.findByCode(patient);
        if (p == null) {
            return -1;
@@ -3273,6 +3278,9 @@ public class FamilyContractService extends BaseService {
        sf.setBegin(new Date());
        sf.setEnd(DateUtil.stringToDate(year+1+"-06-30 00:00:00","yyyy-MM-dd HH:mmm:ss"));
        if(StringUtils.isNotBlank(reason)){
            sf.setRenewChangeReason(reason);
        }
        SignFamily temp = signFamilyDao.save(sf);
        if (temp != null) {
@@ -3290,7 +3298,13 @@ public class FamilyContractService extends BaseService {
            message.setTitle("家庭续签申请");
            message.setType(1);//家庭签约信息
            message.setReadonly(1);//是否只读消息
            message.setSignStatus("1");//过期以后,变为1为签约
            if("1".equals(sf.getRenewFlag())){
                message.setSignStatus("8");//续签
            }else{
                message.setSignStatus("9");//改签
            }
            //message.setSignStatus("1");//过期以后,变为1为签约
            message.setSex(p.getSex());
            message.setOver("1");//未处理
            message.setData(sf.getCode());

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -1721,6 +1721,13 @@ public class SignWebService extends BaseService {
        log.setNeedUpload("1");
        log.setCreateTime(new Date());
        log.setUpdateTime(new Date());
        //1.3.4新增字段
        log.setStatus(renew.getStatus());
        if(StringUtils.isNotBlank(renew.getRenewChangeReason())){
            log.setRenewChangeReason(renew.getRenewChangeReason());
        }
        log.setApplyDate(renew.getApplyDate());
        log.setExpensesStatus(renew.getExpensesStatus());
        signFamilyRenewLogDao.save(log);
        return 1;

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/sign/FamilyContractController.java

@@ -494,7 +494,8 @@ public class FamilyContractController extends BaseController {
    @ResponseBody
    public String signRenew(@RequestParam(required = true) String doctor,
                            @RequestParam(required = false) String healthDoctor,
                            @RequestParam(required = false) String patient) {
                            @RequestParam(required = false) String patient,
                            @RequestParam(required = false) String reason) {
        try {
            if (StringUtils.isEmpty(doctor)) {
                return error(-1, "签约医生不能为空");
@@ -503,9 +504,9 @@ public class FamilyContractController extends BaseController {
            int month = cal.get(Calendar.MONTH)+1;
            int result = -1;
            if(month<7){
                result = familyContractService.signRenew(doctor,healthDoctor,patient);
                result = familyContractService.signRenew(doctor,healthDoctor,patient,reason);
            }else{
                result = familyContractService.signRenewOverdue(doctor,healthDoctor,patient);
                result = familyContractService.signRenewOverdue(doctor,healthDoctor,patient,reason);
            }