代码修改

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

@@ -33,6 +33,10 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
    private String doctor;//计划完成者标识
    @Column(name = "doctor_name")
    private String doctorName;//计划完成者标识
    @Column(name = "dept")
    private String dept;//计划完成者科室标识
    @Column(name = "dept_name")
    private String deptName;//计划完成者科室标识
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "execute_time", nullable = true, length = 0,updatable = false)
    private Date executeTime;//服务项目执行时间
@@ -153,7 +157,6 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
    }
    @Column(name = "doctor_name")
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }
@@ -162,6 +165,24 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
        this.doctorName = doctorName;
    }
    @Column(name = "dept")
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
    @Column(name = "dept_name")
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    @Column(name = "expense")
    public Integer getExpense() {
        return expense;

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/controller/RehabilitationManageController.java

@@ -59,7 +59,6 @@ public class RehabilitationManageController extends EnvelopRestEndpoint {
        }
    }
    @PostMapping(value = "synchronizePationSingle")
    @ApiOperation("手动重新下转")
    public MixEnvelop synchronizePationSingle(

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationManageService.java

@@ -101,11 +101,14 @@ public class RehabilitationManageService {
    //计划负责人分配执行人
    public void assignExecutor(PatientRehabilitationPlanDO planDO,String uid){
        PatientRehabilitationPlanDO planDO1 = patientRehabilitationPlanDao.findById(planDO.getId()).orElse(null);
        if(planDO1==null){
            throw new ServiceException("康复计划不存在");
        }
        if(planDO1.getStatus()!=3){
            throw new ServiceException("已分配，请勿重复分配");
        }
        if(StringUtils.isNotBlank(uid)){
            PatientRehabilitationPlanDO planDO1 = patientRehabilitationPlanDao.findById(planDO.getId()).orElse(null);
            if(planDO1==null){
                throw new ServiceException("康复计划不存在");
            }
            if(!uid.equals(planDO1.getPlanDoctor())){
                throw new ServiceException("您不是该康复计划负责人，不允许操作");
            }
@@ -120,10 +123,13 @@ public class RehabilitationManageService {
                RehabilitationDetailDO newDetail = map.get(serviceItemId);
                detailDO.setDoctor(newDetail.getDoctor());
                detailDO.setDoctorName(newDetail.getDoctorName());
                detailDO.setDept(newDetail.getDept());
                detailDO.setDeptName(newDetail.getDeptName());
            }
        }
        rehabilitationDetailDao.saveAll(detailDOS);
        planDO1.setStatus(1);
        patientRehabilitationPlanDao.save(planDO1);
        addPlanLog(planDO.getId(),uid,null);
    }