|
@@ -189,22 +189,22 @@ public class THR03077 extends QCCatalogue {
|
|
|
, CatalogueUtil.structureMapJoin(x.getStructureMap(), Lists.newArrayList("会诊意见"))));
|
|
|
}*/
|
|
|
/*********************************************出院小结********************************************************/
|
|
|
- if (leaveHospitalDoc != null) {
|
|
|
- LeaveHospitalLabel leaveHospitalLabel = leaveHospitalDoc.getLeaveHospitalLabel();
|
|
|
- if (inputInfo.getMedicalRecordInfoDoc() != null) {
|
|
|
- Map<String, String> medicalRecordInfoStructureMap = inputInfo.getMedicalRecordInfoDoc().getStructureMap();
|
|
|
- dateStr = medicalRecordInfoStructureMap.get("leaveHospitalDate");
|
|
|
- //如果存在出院小结,出院日期为空,存储系统当前时间
|
|
|
- if (StringUtil.isBlank(dateStr)) {
|
|
|
- dateStr = DateUtil.formatDateTime(new Date());
|
|
|
- }
|
|
|
- }
|
|
|
- if (leaveHospitalLabel != null && StringUtil.isNotBlank(dateStr)) {
|
|
|
- List<Drug> drugs = leaveHospitalLabel.getDrugs();
|
|
|
- getCourseDrugInfo(antibioticDateCourse, dateStr, drugs
|
|
|
- , CatalogueUtil.structureMapJoin(leaveHospitalDoc.getStructureMap(), Lists.newArrayList("诊治经过")));
|
|
|
- }
|
|
|
- }
|
|
|
+// if (leaveHospitalDoc != null) {
|
|
|
+// LeaveHospitalLabel leaveHospitalLabel = leaveHospitalDoc.getLeaveHospitalLabel();
|
|
|
+// if (inputInfo.getMedicalRecordInfoDoc() != null) {
|
|
|
+// Map<String, String> medicalRecordInfoStructureMap = inputInfo.getMedicalRecordInfoDoc().getStructureMap();
|
|
|
+// dateStr = medicalRecordInfoStructureMap.get("leaveHospitalDate");
|
|
|
+// //如果存在出院小结,出院日期为空,存储系统当前时间
|
|
|
+// if (StringUtil.isBlank(dateStr)) {
|
|
|
+// dateStr = DateUtil.formatDateTime(new Date());
|
|
|
+// }
|
|
|
+// }
|
|
|
+// if (leaveHospitalLabel != null && StringUtil.isNotBlank(dateStr)) {
|
|
|
+// List<Drug> drugs = leaveHospitalLabel.getDrugs();
|
|
|
+// getCourseDrugInfo(antibioticDateCourse, dateStr, drugs
|
|
|
+// , CatalogueUtil.structureMapJoin(leaveHospitalDoc.getStructureMap(), Lists.newArrayList("诊治经过")));
|
|
|
+// }
|
|
|
+// }
|
|
|
//将病程日期排序
|
|
|
antibioticDateCourse.forEach((x, y) -> y.sort(Comparator.naturalOrder()));
|
|
|
|