|
@@ -10,11 +10,13 @@ import com.diagbot.dto.RespDTO;
|
|
import com.diagbot.dto.data.AMedicalRecordDTO;
|
|
import com.diagbot.dto.data.AMedicalRecordDTO;
|
|
import com.diagbot.dto.data.AMrContentDTO;
|
|
import com.diagbot.dto.data.AMrContentDTO;
|
|
import com.diagbot.entity.*;
|
|
import com.diagbot.entity.*;
|
|
|
|
+import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.ModeIdEnum;
|
|
import com.diagbot.enums.ModeIdEnum;
|
|
import com.diagbot.enums.data.*;
|
|
import com.diagbot.enums.data.*;
|
|
-import com.diagbot.enums.IsDeleteEnum;
|
|
|
|
-import com.diagbot.facade.*;
|
|
|
|
-import com.diagbot.service.BehospitalInfoService;
|
|
|
|
|
|
+import com.diagbot.facade.BasHospitalInfoFacade;
|
|
|
|
+import com.diagbot.facade.BehospitalInfoFacade;
|
|
|
|
+import com.diagbot.facade.ModelHospitalFacade;
|
|
|
|
+import com.diagbot.facade.QcTypeFacade;
|
|
import com.diagbot.service.ModelHospitalService;
|
|
import com.diagbot.service.ModelHospitalService;
|
|
import com.diagbot.service.impl.MedicalRecordServiceImpl;
|
|
import com.diagbot.service.impl.MedicalRecordServiceImpl;
|
|
import com.diagbot.service.impl.QcAbnormalServiceImpl;
|
|
import com.diagbot.service.impl.QcAbnormalServiceImpl;
|
|
@@ -581,12 +583,12 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
.eq("behospital_code", s.getBehospitalCode())
|
|
.eq("behospital_code", s.getBehospitalCode())
|
|
.eq("hospital_id", s.getHospitalId())
|
|
.eq("hospital_id", s.getHospitalId())
|
|
.eq("is_deleted", IsDeleteEnum.N), false);
|
|
.eq("is_deleted", IsDeleteEnum.N), false);
|
|
- if (behospitalInfo != null) {
|
|
|
|
- //如果病人住院信息存在,更新对应的qc_type_id
|
|
|
|
- Long qcTypeId = initQcTypeId(s, behospitalInfo);
|
|
|
|
- behospitalInfo.setQcTypeId(qcTypeId);
|
|
|
|
|
|
+// if (behospitalInfo != null) {
|
|
|
|
+// //如果病人住院信息存在,更新对应的qc_type_id
|
|
|
|
+// Long qcTypeId = initQcTypeId(s, behospitalInfo);
|
|
|
|
+// behospitalInfo.setQcTypeId(qcTypeId);
|
|
behospitalInfoList.add(behospitalInfo);
|
|
behospitalInfoList.add(behospitalInfo);
|
|
- }
|
|
|
|
|
|
+// }
|
|
}
|
|
}
|
|
s.setModeId(modeId);
|
|
s.setModeId(modeId);
|
|
//新增或修改
|
|
//新增或修改
|