|
@@ -274,13 +274,20 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
List<MedrecVo> medrecVoList = new ArrayList<>(); // 设置内容
|
|
|
|
|
|
// 添加住院病历信息
|
|
|
- BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
|
|
|
+ List<BehospitalInfo> behospitalInfoList = this.list(new QueryWrapper<BehospitalInfo>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("hospital_id", hospitalId)
|
|
|
- .eq("behospital_code", analyzeVO.getBehospitalCode()), false
|
|
|
+ .eq("behospital_code", analyzeVO.getBehospitalCode())
|
|
|
);
|
|
|
- if (behospitalInfo != null) {
|
|
|
- queryVo.setBehospitalInfo(behospitalInfo);
|
|
|
+ if (ListUtil.isNotEmpty(behospitalInfoList)) {
|
|
|
+ MedrecVo medrecVo = new MedrecVo();
|
|
|
+ medrecVo.setTitle("住院病历信息");
|
|
|
+ Map<String, Object> content = new HashMap<>();
|
|
|
+ content.put("content", behospitalInfoList);
|
|
|
+ medrecVo.setContent(content);
|
|
|
+ medrecVoList.add(medrecVo);
|
|
|
+
|
|
|
+ queryVo.setBehospitalInfo(behospitalInfoList.get(0));
|
|
|
}
|
|
|
|
|
|
// 会诊记录
|