|
@@ -222,14 +222,14 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
|
|
|
BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
|
|
BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
|
|
.eq("behospital_code", s.getBehospitalCode())
|
|
.eq("behospital_code", s.getBehospitalCode())
|
|
- .eq("hospital_id", s.getHospitalId()));
|
|
|
|
|
|
+ .eq("hospital_id", s.getHospitalId()), false);
|
|
if(behospitalInfo!=null){
|
|
if(behospitalInfo!=null){
|
|
//如果病人住院信息存在,更新对应的qc_type_id
|
|
//如果病人住院信息存在,更新对应的qc_type_id
|
|
Long qcTypeId=Long.valueOf("0");
|
|
Long qcTypeId=Long.valueOf("0");
|
|
QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
|
|
QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
|
|
.eq("name",s.getRecTitle())
|
|
.eq("name",s.getRecTitle())
|
|
.eq("hospital_id", s.getHospitalId())
|
|
.eq("hospital_id", s.getHospitalId())
|
|
- .eq("is_deleted",IsDeleteEnum.N));
|
|
|
|
|
|
+ .eq("is_deleted",IsDeleteEnum.N), false);
|
|
if(qcType!=null){
|
|
if(qcType!=null){
|
|
behospitalInfo.setQcTypeId(qcType.getId());
|
|
behospitalInfo.setQcTypeId(qcType.getId());
|
|
}else{
|
|
}else{
|
|
@@ -259,7 +259,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
MedicalRecord mRecord = this.getOne(new QueryWrapper<MedicalRecord>()
|
|
MedicalRecord mRecord = this.getOne(new QueryWrapper<MedicalRecord>()
|
|
.eq("rec_id", s.getRecId())
|
|
.eq("rec_id", s.getRecId())
|
|
.eq("hospital_id", s.getHospitalId())
|
|
.eq("hospital_id", s.getHospitalId())
|
|
- .eq("behospital_code", s.getBehospitalCode()));
|
|
|
|
|
|
+ .eq("behospital_code", s.getBehospitalCode()), false);
|
|
if (mRecord != null) {
|
|
if (mRecord != null) {
|
|
s.setGmtModified(new Date());
|
|
s.setGmtModified(new Date());
|
|
updateE.add(s);
|
|
updateE.add(s);
|
|
@@ -294,7 +294,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
QueryWrapper<ModelHospital> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<ModelHospital> wrapper = new QueryWrapper<>();
|
|
wrapper.eq("hospital_id",medicalRecord.getHospitalId());
|
|
wrapper.eq("hospital_id",medicalRecord.getHospitalId());
|
|
wrapper.eq("hospital_model_name",medicalRecord.getRecTitle());
|
|
wrapper.eq("hospital_model_name",medicalRecord.getRecTitle());
|
|
- ModelHospital mode=modelHospitalFacade.getOne(wrapper);
|
|
|
|
|
|
+ ModelHospital mode=modelHospitalFacade.getOne(wrapper, false);
|
|
if(mode!=null){
|
|
if(mode!=null){
|
|
modeId=mode.getStandModelId();
|
|
modeId=mode.getStandModelId();
|
|
}else{
|
|
}else{
|