|
@@ -159,6 +159,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
StrWardRecordFacade strWardRecordFacade;
|
|
StrWardRecordFacade strWardRecordFacade;
|
|
@Autowired
|
|
@Autowired
|
|
MedTransferRecordFacade medTransferRecordFacade;
|
|
MedTransferRecordFacade medTransferRecordFacade;
|
|
|
|
+ @Autowired
|
|
|
|
+ MedNurseFacade medNurseFacade;
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -537,6 +539,13 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
.orderByAsc("rec_date")
|
|
.orderByAsc("rec_date")
|
|
);
|
|
);
|
|
// -------------------------------------文书数据改造结束----------------------------------
|
|
// -------------------------------------文书数据改造结束----------------------------------
|
|
|
|
+ // 获取护理
|
|
|
|
+ List<MedNurse> medNurseList = medNurseFacade.list(new QueryWrapper<MedNurse>()
|
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
|
+ .eq("hospital_id", hospitalId)
|
|
|
|
+ .eq("behospital_code", analyzeVO.getBehospitalCode())
|
|
|
|
+ .orderByAsc("gmt_create")
|
|
|
|
+ );
|
|
|
|
|
|
// 获取医嘱
|
|
// 获取医嘱
|
|
List<DoctorAdvice> doctorAdviceList = doctorAdviceFacade.list(new QueryWrapper<DoctorAdvice>()
|
|
List<DoctorAdvice> doctorAdviceList = doctorAdviceFacade.list(new QueryWrapper<DoctorAdvice>()
|
|
@@ -874,7 +883,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
addDataWithInnerKey("谈话告知书", recMap, medrecVoList);
|
|
addDataWithInnerKey("谈话告知书", recMap, medrecVoList);
|
|
|
|
|
|
//==============文书====================
|
|
//==============文书====================
|
|
-
|
|
|
|
|
|
+ //护理
|
|
|
|
+ if (ListUtil.isNotEmpty(medNurseList)) {
|
|
|
|
+ addDataWithKeyConvert("护理", medNurseList, medrecVoList,
|
|
|
|
+ dicMap.get("23"), Arrays.asList("measureTime"));
|
|
|
|
+ }
|
|
// 医嘱
|
|
// 医嘱
|
|
if (ListUtil.isNotEmpty(doctorAdviceList)) {
|
|
if (ListUtil.isNotEmpty(doctorAdviceList)) {
|
|
addDataWithKeyConvert("医嘱信息", doctorAdviceList, medrecVoList,
|
|
addDataWithKeyConvert("医嘱信息", doctorAdviceList, medrecVoList,
|