|
@@ -3,9 +3,12 @@ package com.diagbot.facade.data;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.diagbot.dto.AnalyzeRunDTO;
|
|
import com.diagbot.dto.AnalyzeRunDTO;
|
|
import com.diagbot.dto.RespDTO;
|
|
import com.diagbot.dto.RespDTO;
|
|
import com.diagbot.dto.data.AHomePageDTO;
|
|
import com.diagbot.dto.data.AHomePageDTO;
|
|
|
|
+import com.diagbot.entity.BasDoctorInfo;
|
|
|
|
+import com.diagbot.entity.BehospitalInfo;
|
|
import com.diagbot.entity.HomePage;
|
|
import com.diagbot.entity.HomePage;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.facade.BehospitalInfoFacade;
|
|
import com.diagbot.facade.BehospitalInfoFacade;
|
|
@@ -14,6 +17,7 @@ import com.diagbot.util.*;
|
|
import com.diagbot.vo.AnalyzeRunVO;
|
|
import com.diagbot.vo.AnalyzeRunVO;
|
|
import com.diagbot.vo.data.*;
|
|
import com.diagbot.vo.data.*;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -45,6 +49,8 @@ public class AHomePageFacade extends HomePageServiceImpl{
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
|
|
private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ABasDoctorInfoFacade aBasDoctorInfoFacade;
|
|
|
|
|
|
@Value("${log_switch.enable}")
|
|
@Value("${log_switch.enable}")
|
|
private boolean logSwitch;
|
|
private boolean logSwitch;
|
|
@@ -264,7 +270,27 @@ public class AHomePageFacade extends HomePageServiceImpl{
|
|
s.setGmtCreate(new Date());
|
|
s.setGmtCreate(new Date());
|
|
addE.add(s);
|
|
addE.add(s);
|
|
}
|
|
}
|
|
|
|
+ //从病案首页同步入院登记表中的住院医生behospitalDoctor,主治医生attendingDoctor和主任医生directorDoctor和ID
|
|
|
|
+ String behospitalDoctor= StringUtils.isEmpty(s.getBehospitalDoctor()) ? "" : s.getBehospitalDoctor();//获取住院医师姓名
|
|
|
|
+ String attendingDoctor= StringUtils.isEmpty(s.getAttendingDoctor()) ? "" : s.getAttendingDoctor();//获取主治医师姓名
|
|
|
|
+ String directorDoctor= StringUtils.isEmpty(s.getDirectorDoctor()) ? "" : s.getDirectorDoctor();//获取主任医师姓名
|
|
|
|
+ String behospitalDoctorID=this.getDoctorId(behospitalDoctor);//获取住院医师id
|
|
|
|
+ String attendingDoctorID=this.getDoctorId(attendingDoctor);//获取主治医师id
|
|
|
|
+ String directorDoctorID=this.getDoctorId(directorDoctor);//获取主任医师id
|
|
|
|
+
|
|
|
|
+ UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
|
|
|
|
+ updateWrapper.eq("behospital_code",s.getBehospitalCode())
|
|
|
|
+ .eq("hospital_id", homePage.getHospitalId())
|
|
|
|
+ .eq("is_deleted",IsDeleteEnum.N)
|
|
|
|
+ .set("beh_doctor_name",behospitalDoctor)
|
|
|
|
+ .set("doctor_name",attendingDoctor)
|
|
|
|
+ .set("director_doctor_name",directorDoctor)
|
|
|
|
+ .set("beh_doctor_id",behospitalDoctorID)
|
|
|
|
+ .set("doctor_id",attendingDoctorID)
|
|
|
|
+ .set("director_doctor_id",directorDoctorID);
|
|
|
|
+ behospitalInfoFacade.update(updateWrapper);
|
|
});
|
|
});
|
|
|
|
+
|
|
}
|
|
}
|
|
if(addE.size()>0){
|
|
if(addE.size()>0){
|
|
homePageService.saveBatch(addE);
|
|
homePageService.saveBatch(addE);
|
|
@@ -278,6 +304,22 @@ public class AHomePageFacade extends HomePageServiceImpl{
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 根据docktorName获取docktorID
|
|
|
|
+ * @param doctorName
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ public String getDoctorId(String doctorName){
|
|
|
|
+ QueryWrapper<BasDoctorInfo> queryWrapper = Wrappers.query();
|
|
|
|
+ queryWrapper.eq("name",doctorName);
|
|
|
|
+ BasDoctorInfo doctorInfo =aBasDoctorInfoFacade.getOne(queryWrapper);
|
|
|
|
+ if (doctorInfo !=null && StringUtils.isNotEmpty(doctorInfo.getDoctorId())){
|
|
|
|
+ return doctorInfo.getDoctorId();
|
|
|
|
+ }else {
|
|
|
|
+ return "-";
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
|
|
public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
|
|
try {
|
|
try {
|
|
//验证数据是否存在
|
|
//验证数据是否存在
|