|
@@ -600,133 +600,133 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
*/
|
|
|
//会诊申请单
|
|
|
if (ListUtil.isNotEmpty(medConsultationApplyList)) {
|
|
|
- newAddData("会诊申请单", medConsultationApplyList, medrecVoList, Arrays.asList("recordDate", "behospitalDate",
|
|
|
+ addDataWithKeyConvert("会诊申请单", medConsultationApplyList, medrecVoList, dicMap.get("23"),Arrays.asList("recordDate", "behospitalDate",
|
|
|
"applyDate", "consultationDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//会诊结果单
|
|
|
if (ListUtil.isNotEmpty(medConsultationResultList)) {
|
|
|
- newAddData("会诊结果单", medConsultationResultList, medrecVoList, Arrays.asList("recordDate", "behospitalDate",
|
|
|
+ addDataWithKeyConvert("会诊结果单", medConsultationResultList, medrecVoList,dicMap.get("24"), Arrays.asList("recordDate", "behospitalDate",
|
|
|
"applyDate", "consultationArriveDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//会诊单(申请和结果)
|
|
|
if (ListUtil.isNotEmpty(medConsultationNoteList)) {
|
|
|
- newAddData("会诊单(申请和结果)", medConsultationNoteList, medrecVoList, Arrays.asList("recordDate", "behospitalDate",
|
|
|
+ addDataWithKeyConvert("会诊单(申请和结果)", medConsultationNoteList, medrecVoList,dicMap.get("25"), Arrays.asList("recordDate", "behospitalDate",
|
|
|
"applyDate", "consultationDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//入院记录
|
|
|
if (ListUtil.isNotEmpty(medAdmissionNoteList)) {
|
|
|
- newAddData("入院记录", medAdmissionNoteList, medrecVoList, Arrays.asList("recordDate", "birthday", "behospitalDate",
|
|
|
+ addDataWithKeyConvert("入院记录", medAdmissionNoteList, medrecVoList,dicMap.get("26"), Arrays.asList("recordDate", "birthday", "behospitalDate",
|
|
|
"recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//输血效果评价
|
|
|
if (ListUtil.isNotEmpty(medBloodResultList)) {
|
|
|
- newAddData("输血效果评价", medBloodResultList, medrecVoList, Arrays.asList("recordDate", "recDate", "auditDate",
|
|
|
+ addDataWithKeyConvert("输血效果评价", medBloodResultList, medrecVoList,dicMap.get("27"), Arrays.asList("recordDate", "recDate", "auditDate",
|
|
|
"gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//输血记录
|
|
|
if (ListUtil.isNotEmpty(medBloodTransfusionList)) {
|
|
|
- newAddData("输血记录", medBloodTransfusionList, medrecVoList, Arrays.asList("recordDate", "startTime",
|
|
|
+ addDataWithKeyConvert("输血记录", medBloodTransfusionList, medrecVoList,dicMap.get("28"), Arrays.asList("recordDate", "startTime",
|
|
|
"endTime", "recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//危急值记录
|
|
|
if (ListUtil.isNotEmpty(medCrisisNoteList)) {
|
|
|
- newAddData("危急值记录", medCrisisNoteList, medrecVoList, Arrays.asList("recordDate", "recieveDate",
|
|
|
+ addDataWithKeyConvert("危急值记录", medCrisisNoteList, medrecVoList,dicMap.get("29"), Arrays.asList("recordDate", "recieveDate",
|
|
|
"consultationDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//死亡病例讨论记录
|
|
|
if (ListUtil.isNotEmpty(medDeathDiscussionList)) {
|
|
|
- newAddData("死亡病例讨论记录", medDeathDiscussionList, medrecVoList, Arrays.asList("recordDate", "deathDate",
|
|
|
+ addDataWithKeyConvert("死亡病例讨论记录", medDeathDiscussionList, medrecVoList,dicMap.get("30"), Arrays.asList("recordDate", "deathDate",
|
|
|
"discussDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//死亡记录
|
|
|
if (ListUtil.isNotEmpty(medDeathNoteList)) {
|
|
|
- newAddData("死亡记录", medDeathNoteList, medrecVoList, Arrays.asList("recordDate", "behospitalDate",
|
|
|
+ addDataWithKeyConvert("死亡记录", medDeathNoteList, medrecVoList,dicMap.get("31"), Arrays.asList("recordDate", "behospitalDate",
|
|
|
"deathDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//疑难病例讨论记录
|
|
|
if (ListUtil.isNotEmpty(medDifficultCaseList)) {
|
|
|
- newAddData("疑难病例讨论记录", medDifficultCaseList, medrecVoList, Arrays.asList("recordDate", "discussDate",
|
|
|
+ addDataWithKeyConvert("疑难病例讨论记录", medDifficultCaseList, medrecVoList,dicMap.get("32"), Arrays.asList("recordDate", "discussDate",
|
|
|
"recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//首次病程录
|
|
|
if (ListUtil.isNotEmpty(medFirstRecordList)) {
|
|
|
- newAddData("首次病程录", medFirstRecordList, medrecVoList, Arrays.asList("recordDate", "behospitalDate",
|
|
|
+ addDataWithKeyConvert("首次病程录", medFirstRecordList, medrecVoList,dicMap.get("33"), Arrays.asList("recordDate", "behospitalDate",
|
|
|
"applyDate", "consultationDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//病危通知单
|
|
|
if (ListUtil.isNotEmpty(medIllCriticallyList)) {
|
|
|
- newAddData("病危通知单", medIllCriticallyList, medrecVoList, Arrays.asList("recordDate", "recDate",
|
|
|
+ addDataWithKeyConvert("病危通知单", medIllCriticallyList, medrecVoList, dicMap.get("34"),Arrays.asList("recordDate", "recDate",
|
|
|
"auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//病重通知单
|
|
|
if (ListUtil.isNotEmpty(medIllSeriouslList)) {
|
|
|
- newAddData("病重通知单", medIllSeriouslList, medrecVoList, Arrays.asList("recordDate", "patientSignDate",
|
|
|
+ addDataWithKeyConvert("病重通知单", medIllSeriouslList, medrecVoList, dicMap.get("35"),Arrays.asList("recordDate", "patientSignDate",
|
|
|
"doctorSignDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//出院小结
|
|
|
if (ListUtil.isNotEmpty(medLeaveHospitalList)) {
|
|
|
- newAddData("出院小结", medLeaveHospitalList, medrecVoList, Arrays.asList("recordDate", "behospitalDate",
|
|
|
+ addDataWithKeyConvert("出院小结", medLeaveHospitalList, medrecVoList, dicMap.get("36"),Arrays.asList("recordDate", "behospitalDate",
|
|
|
"leaveHospitalDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//术后首程
|
|
|
if (ListUtil.isNotEmpty(medOperativeFirstRecordList)) {
|
|
|
- newAddData("术后首程", medOperativeFirstRecordList, medrecVoList, Arrays.asList("recordDate", "operationDate",
|
|
|
+ addDataWithKeyConvert("术后首程", medOperativeFirstRecordList, medrecVoList,dicMap.get("37"), Arrays.asList("recordDate", "operationDate",
|
|
|
"startTime", "endTime", "recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//手术记录
|
|
|
if (ListUtil.isNotEmpty(medOperativeNoteList)) {
|
|
|
- newAddData("手术记录", medOperativeNoteList, medrecVoList, Arrays.asList("recordDate", "operationDate",
|
|
|
+ addDataWithKeyConvert("手术记录", medOperativeNoteList, medrecVoList, dicMap.get("38"),Arrays.asList("recordDate", "operationDate",
|
|
|
"startTime", "endTime", "recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//阶段小结
|
|
|
if (ListUtil.isNotEmpty(medPeriodConclusionList)) {
|
|
|
- newAddData("阶段小结", medPeriodConclusionList, medrecVoList, Arrays.asList("recordaDte", "recDate",
|
|
|
+ addDataWithKeyConvert("阶段小结", medPeriodConclusionList, medrecVoList,dicMap.get("39"), Arrays.asList("recordaDte", "recDate",
|
|
|
"auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//术前讨论小结
|
|
|
if (ListUtil.isNotEmpty(medPreoperativeDiscussionList)) {
|
|
|
- newAddData("术前讨论小结", medPreoperativeDiscussionList, medrecVoList, Arrays.asList("recordDate", "discussTime",
|
|
|
+ addDataWithKeyConvert("术前讨论小结", medPreoperativeDiscussionList, medrecVoList, dicMap.get("40"),Arrays.asList("recordDate", "discussTime",
|
|
|
"recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//抢救记录
|
|
|
if (ListUtil.isNotEmpty(medRescueNoteList)) {
|
|
|
- newAddData("抢救记录", medRescueNoteList, medrecVoList, Arrays.asList("recordDate", "startTime", "endTime",
|
|
|
+ addDataWithKeyConvert("抢救记录", medRescueNoteList, medrecVoList,dicMap.get("41"),Arrays.asList("recordDate", "startTime", "endTime",
|
|
|
"recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//转入记录
|
|
|
if (ListUtil.isNotEmpty(medTransferInNoteList)) {
|
|
|
- newAddData("转入记录", medTransferInNoteList, medrecVoList, Arrays.asList("recordDate", "transferInDate",
|
|
|
+ addDataWithKeyConvert("转入记录", medTransferInNoteList, medrecVoList,dicMap.get("42"), Arrays.asList("recordDate", "transferInDate",
|
|
|
"recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//转出记录
|
|
|
if (ListUtil.isNotEmpty(medTransferOutNoteList)) {
|
|
|
- newAddData("转出记录", medTransferOutNoteList, medrecVoList, Arrays.asList("recordDate", "transferInDate",
|
|
|
+ addDataWithKeyConvert("转出记录", medTransferOutNoteList, medrecVoList,dicMap.get("43"), Arrays.asList("recordDate", "transferInDate",
|
|
|
"recDate", "auditDate", "gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
|
//查房记录
|
|
|
if (ListUtil.isNotEmpty(medWardRecordList)) {
|
|
|
- newAddData("查房记录", medWardRecordList, medrecVoList, Arrays.asList("recordDate", "recDate", "auditDate",
|
|
|
+ addDataWithKeyConvert("查房记录", medWardRecordList, medrecVoList, dicMap.get("44"),Arrays.asList("recordDate", "recDate", "auditDate",
|
|
|
"gmtCreate", "gmtModified"));
|
|
|
}
|
|
|
|
|
@@ -1002,44 +1002,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 1.5.0拼接数据
|
|
|
- *
|
|
|
- * @param key
|
|
|
- * @param list
|
|
|
- * @param medrecVoList
|
|
|
- */
|
|
|
- public <T> void newAddData(String key, List<T> list, List<MedrecVo> medrecVoList, List<String> dateList) {
|
|
|
- MedrecVo medrecVo = new MedrecVo();
|
|
|
- medrecVo.setTitle(key);
|
|
|
- Map<String, Object> content = new HashMap<>();
|
|
|
- //装入jason数据
|
|
|
- List<String> contents = new ArrayList<>();
|
|
|
- for (T bean : list) {
|
|
|
- Map<String, Object> res = new HashMap<>();
|
|
|
- try {
|
|
|
- Map<String, Object> objectMap = MapUtil.objectToMap(bean);
|
|
|
- for (String objKey : objectMap.keySet()) {
|
|
|
- if (dateList.contains(objKey)) {
|
|
|
- Date date = (Date) objectMap.get(objKey);
|
|
|
- res.put(objKey, DateUtil.formatDateTime(date).replaceAll("null", ""));
|
|
|
- } else {
|
|
|
- res.put(objKey, (objectMap.get(objKey)));
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- String jsonStr = JSON.toJSONString(res, SerializerFeature.WRITE_MAP_NULL_FEATURES);
|
|
|
- contents.add(jsonStr);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- }
|
|
|
- content.put("content", contents);
|
|
|
- medrecVo.setContent(content);
|
|
|
- medrecVoList.add(medrecVo);
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 拼接数据(例如:手术)
|
|
|
*
|
|
@@ -1115,18 +1077,17 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
medrecVo.setTitle(key);
|
|
|
Map<String, Object> content = new HashMap<>();
|
|
|
List<String> contents = new ArrayList<>();
|
|
|
-//通过字典里面的分组,确定所需字段来过滤数据
|
|
|
- //通用封装格式,采用List<T> list
|
|
|
+ //1.5.0判断定制过滤数据
|
|
|
+ if("结构化数据".equals(map.get("wholeData"))){
|
|
|
+ map.remove("wholeData");
|
|
|
+ }
|
|
|
+
|
|
|
for (T bean : list) {
|
|
|
try {
|
|
|
Map<String, String> res = new HashMap<>();
|
|
|
-// 将对象转化为kv格式,方便处理字段
|
|
|
Map<String, Object> objectMap = MapUtil.objectToMap(bean);
|
|
|
- //遍历查出数据所有字段
|
|
|
for (String objKey : objectMap.keySet()) {
|
|
|
- //分组1 所需要展示的所有字段 过滤一部分数据
|
|
|
if (map.get(objKey) != null) {
|
|
|
-// 目标数据的时间格式转化 为字符串
|
|
|
if (dateList.contains(objKey)) {
|
|
|
Date date = (Date) objectMap.get(objKey);
|
|
|
res.put(map.get(objKey), DateUtil.formatDateTime(date).replaceAll("null", ""));
|