Merge branch 'dev' of liuwenbin/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/synergy/ManageSynergyWorkorderDO.java

@@ -41,6 +41,7 @@ public class ManageSynergyWorkorderDO extends IdEntity {
    private String hospital;//创建人所属机构code；
    private String hospitalName;//创建人所属机构名称
    private Date receiverTime;//工单（客服管理员）接收时间
    private Date completeTime;//工单完成时间
    @Column(name = "code")
    public String getCode() {
@@ -276,4 +277,13 @@ public class ManageSynergyWorkorderDO extends IdEntity {
    public void setCreateUserRole(Integer createUserRole) {
        this.createUserRole = createUserRole;
    }
    @Column(name = "complete_time")
    public Date getCompleteTime() {
        return completeTime;
    }
    public void setCompleteTime(Date completeTime) {
        this.completeTime = completeTime;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -1171,6 +1171,7 @@ public class SynergyManageService extends BaseJpaService {
        ManageSynergyWorkorderDO manageSynergyWorkorderDO = workOrderDao.findByCode(workorderCode);
        manageSynergyWorkorderDO.setDealResultRemark(dealResultRemark);
        manageSynergyWorkorderDO.setStatus(3);
        manageSynergyWorkorderDO.setCompleteTime(new Date());
        workOrderDao.save(manageSynergyWorkorderDO);
    }

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyWorkorderServicerLogService.java

@@ -60,6 +60,7 @@ public class SynergyWorkorderServicerLogService extends BaseJpaService {
        if (workorderServicerDOS == null || workorderServicerDOS.size() == 0){
            ManageSynergyWorkorderDO workorderDO = manageSynergyWorkOrderDao.findByCode(workorderServicerLogDO.getWorkorderCode());
            workorderDO.setStatus(3);
            workorderDO.setCompleteTime(new Date());
            manageSynergyWorkOrderDao.save(workorderDO);
        }
    }