代码修改

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

@@ -1,7 +1,6 @@
package com.yihu.jw.entity.specialist.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
@@ -21,6 +20,8 @@ public class PatientMedicalRecordsDO extends UuidIdentityEntity {
    private String patientName;//居民姓名
    private String hospital;//诊疗医院code
    private String hospitalName;//诊疗医院名称
    private String dept;//科室code
    private String deptName;//科室名称
    private String dischargeDiagnosis;//出院诊断code，多个用逗号隔开
    private String dischargeDiagnosisName;//出院诊断名称，多个用逗号隔开
    private String admittingDiagnosis;//入院诊断code，多个用逗号隔开
@@ -33,7 +34,7 @@ public class PatientMedicalRecordsDO extends UuidIdentityEntity {
    private String createUser;//创建者
    private String createUserName;//创建者
    private String event;//健康档案病历eventID
    private String dataFrom;//病历来源：1基位，2app，3中山医院，4智业六家医院
    private String dataFrom;//病历来源：1三院，2app
    private String jwpatient;//基位居民code 获取病历详情用
    private String diseaseCode;//专病code
    private String diseaseName;//专病名称
@@ -230,4 +231,22 @@ public class PatientMedicalRecordsDO extends UuidIdentityEntity {
    public void setDoctorReadStatus(int doctorReadStatus) {
        this.doctorReadStatus = doctorReadStatus;
    }
    @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;
    }
}

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

@@ -62,7 +62,8 @@ public class RehabilitationPatientInfoDO extends IdEntity {
    private Date receiveTime;//接收时间
    private String dept;//科室
    private String deptName;//科室名称
    private Long ijkId;//推送i健康后返回的id
    private Long ijkId;//推送i健康后返回的id(有值为社区管理，没值且状态=1为本院管理)
    private Integer fromSource;//来源 1手动添加 2自动下转 3扫码添加
    private Integer archiveStatus;//档案状态
    private String archiveStatusName;//档案状态
@@ -423,4 +424,12 @@ public class RehabilitationPatientInfoDO extends IdEntity {
    public void setIjkId(Long ijkId) {
        this.ijkId = ijkId;
    }
    public Integer getFromSource() {
        return fromSource;
    }
    public void setFromSource(Integer fromSource) {
        this.fromSource = fromSource;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/specialist/rehabilitation/RehabilitationPlanService.java

@@ -132,7 +132,13 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
    }
    public ObjEnvelop createRehabilitationTemplateDetail(List<RehabilitationTemplateDetailDO> details, String templateId) {
        List<RehabilitationTemplateDetailDO> detailDOList = templateDetailDao.findTemplateDetailByTemplateId(templateId);
        List<RehabilitationTemplateDetailDO> delList = new ArrayList<>();
        Map<String,String> map = new HashMap<>();
        for (RehabilitationTemplateDetailDO detail : details) {
            if(StringUtils.isNotBlank(detail.getId())){
                map.put(detail.getId(),"");
            }
            detail.setTemplateId(templateId);
            detail.setCreateTime(new Date());
            detail.setUpdateTime(new Date());
@@ -142,6 +148,14 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
                e.printStackTrace();
            }
        }
        for (RehabilitationTemplateDetailDO detailDO:detailDOList){
            if(!map.containsKey(detailDO.getId())){
                delList.add(detailDO);
            }
        }
        if(delList.size()>0){
            templateDetailDao.deleteAll(delList);
        }
        return ObjEnvelop.getSuccess(SpecialistMapping.api_success, true);
    }

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

@@ -208,7 +208,8 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            PatientMedicalRecordsDO patientMedicalRecordsDO = objectMapper.readValue(jsonData, PatientMedicalRecordsDO.class);
            return write(200, "添加成功", "data", rehabilitationInfoService.createMedicalRecords(doctorCode, patient, patientName, patientMedicalRecordsDO, id));
        } catch (Exception e) {
            return error(-1, e.getMessage());
            e.printStackTrace();
            return error(-1, "添加失败");
        }
    }

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

@@ -55,7 +55,7 @@ public class RehabilitationManageController extends EnvelopRestEndpoint {
            return Envelop.getError(se.getMessage());
        }catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
            return Envelop.getError("分配失败");
        }
    }

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

@@ -207,23 +207,6 @@ public class SynchronizePatientService  {
            saveModifyList(modifyList);
            return "同步患者病历：" + re.getIdcard() + "----无住院病历信息";
        }
//        int count = patientDischargeDao.isPatientExist(patient.getIdcard(), doctor.getId());//判断康复计划表是否已存该居名
//        if (count > 0) {//该患者已存在该团队中 修改分配状态
//            infoUpdate(tmpList,6,modifyList,null);
//        } else {//添加下转居名
//            PatientDischargeDO patientDischargeDO = new PatientDischargeDO();
//            patientDischargeDO.setCode(UUID.randomUUID().toString().replaceAll("-", ""));
//            patientDischargeDO.setType(2);//下转列表type==2
//            patientDischargeDO.setPatient(patient.getId());
//            patientDischargeDO.setName(patient.getName());
//            patientDischargeDO.setIdcard(patient.getIdcard());
//            patientDischargeDO.setSsc(patient.getSsc());
//            patientDischargeDO.setAddress(patient.getAddress());
//            patientDischargeDO.setCreateUser(doctor.getId());
//            patientDischargeDO.setCreateUserName(doctor.getName());
//            patientDischargeDO.setCreateTime(new Date());
//        }
        com.alibaba.fastjson.JSONObject tem = temlist.getJSONObject(0);
@@ -482,25 +465,7 @@ public class SynchronizePatientService  {
//                }
                continue;
            }
//            int count = patientDischargeDao.isPatientExist(patient.getIdcard(), doctor.getId());//判断康复计划表是否已存该居名
//            if (count > 0) {//该患者已存在该团队中 修改分配状态
//                isPatientExist = true;//不推送下转消息
//                results.append(re.getIdcard() + "--患者已存于医生:"+doctor.getName()+"康复下转列表中,修改分配状态\n");
//                logger.info("康复计划自动下转————" + re.getIdcard() + "--患者已存于医生:"+doctor.getName()+"康复下转列表中,修改分配状态");
//                infoUpdate(tmpList,6,modifyList,null);
//            } else {//添加下转居名
//                PatientDischargeDO patientDischargeDO = new PatientDischargeDO();
//                patientDischargeDO.setCode(UUID.randomUUID().toString().replaceAll("-", ""));
//                patientDischargeDO.setType(2);//下转列表type==2
//                patientDischargeDO.setPatient(patient.getId());
//                patientDischargeDO.setName(patient.getName());
//                patientDischargeDO.setIdcard(patient.getIdcard());
//                patientDischargeDO.setSsc(patient.getSsc());
//                patientDischargeDO.setAddress(patient.getAddress());
//                patientDischargeDO.setCreateUser(doctor.getId());
//                patientDischargeDO.setCreateUserName(doctor.getName());
//                patientDischargeDO.setCreateTime(new Date());
//            }
//            if (!needCreateRehabilitationPlan(hos.getCode())) {//仅厦心进行自动下转至已下转 //厦心不推送消息
//                if(!isPatientExist){//患者不存在与医生原有的康复列表中，添加推送消息
//                    successSync = addSyncPatientInfo(successSync, doctor.getId(), doctor.getName(), teamId, adminTeam.getName(), hos.getCode(), hos.getName(), patient.getId(),0);
@@ -781,25 +746,7 @@ public class SynchronizePatientService  {
//                }
                continue;
            }
//            int count = patientDischargeDao.isPatientExist(patient.getIdcard(), doctor.getId());//判断康复计划表是否已存该居名
//            if (count > 0) {//该患者已存在该团队中 修改分配状态
//                isPatientExist = true;//不推送下转消息
//                results.append(re.getIdcard() + "--患者已存于医生:"+doctor.getName()+"康复下转列表中,修改分配状态\n");
//                logger.info("康复计划自动下转————" + re.getIdcard() + "--患者已存于医生:"+doctor.getName()+"康复下转列表中,修改分配状态");
//                infoUpdate(tmpList,6,modifyList,null);
//            } else {//添加下转居名
//                PatientDischargeDO patientDischargeDO = new PatientDischargeDO();
//                patientDischargeDO.setCode(UUID.randomUUID().toString().replaceAll("-", ""));
//                patientDischargeDO.setType(2);//下转列表type==2
//                patientDischargeDO.setPatient(patient.getId());
//                patientDischargeDO.setName(patient.getName());
//                patientDischargeDO.setIdcard(patient.getIdcard());
//                patientDischargeDO.setSsc(patient.getSsc());
//                patientDischargeDO.setAddress(patient.getAddress());
//                patientDischargeDO.setCreateUser(doctor.getId());
//                patientDischargeDO.setCreateUserName(doctor.getName());
//                patientDischargeDO.setCreateTime(new Date());
//            }
//            if (!needCreateRehabilitationPlan(hos.getCode())) {//仅厦心进行自动下转至已下转 //厦心不推送消息
//                if(!isPatientExist){//患者不存在与医生原有的康复列表中，添加推送消息
//                    successSync = addSyncPatientInfo(successSync, doctor.getId(), doctor.getName(), teamId, adminTeam.getName(), hos.getCode(), hos.getName(), patient.getId(),0);