| @@ -90,7 +90,7 @@ public class HL7Receiver2<T extends AbstractMessage> implements ReceivingApplica | |||||
| logInHL7MessageToDatabase(message, msh, metadata); | logInHL7MessageToDatabase(message, msh, metadata); | ||||
| updateUI(new HL7Message(null, -1, LocalDateTime.now(), "Patient nicht gefunden.", true)); | updateUI(new HL7Message(null, -1, LocalDateTime.now(), "Patient nicht gefunden.", true)); | ||||
| return generateACKWithAR(message, "Patient nicht gefunden."); | return generateACKWithAR(message, "Patient nicht gefunden."); | ||||
| } | |||||
| } // TODO: Patienten und Fall neu anlegen??? Nicht verlangt! | |||||
| List<BAR_P05_VISIT> visits = bar_p05.getVISITAll(); | List<BAR_P05_VISIT> visits = bar_p05.getVISITAll(); | ||||
| @@ -121,11 +121,11 @@ public class HL7Receiver2<T extends AbstractMessage> implements ReceivingApplica | |||||
| List<Untersuchung> untersuchungen = new ArrayList<>(); | List<Untersuchung> untersuchungen = new ArrayList<>(); | ||||
| // Station(PV1-3-1), Fachabteilung(PV1-3-4), Aufnahmedatum(PV1-44), Entlassungsdatum(PV1-45), Fallnummer(PV1-19) | // Station(PV1-3-1), Fachabteilung(PV1-3-4), Aufnahmedatum(PV1-44), Entlassungsdatum(PV1-45), Fallnummer(PV1-19) | ||||
| Station station = new Station(); | |||||
| Station station = new Station(); // TODO: Station holen! | |||||
| station.setStation(pv1.getAssignedPatientLocation().getPointOfCare().encode()); | station.setStation(pv1.getAssignedPatientLocation().getPointOfCare().encode()); | ||||
| station.setAbteilung(pv1.getAssignedPatientLocation().getFacility().encode()); | station.setAbteilung(pv1.getAssignedPatientLocation().getFacility().encode()); | ||||
| StationsHistorie hist = new StationsHistorie(); | |||||
| StationsHistorie hist = new StationsHistorie(); // TODO: StationsHist schreiben/schon vorhanden! | |||||
| hist.setStationKey(station.getStation()); | hist.setStationKey(station.getStation()); | ||||
| hist.setAufnahmeDatum(HL7Util2.parseLocalDateTime(pv1.getAdmitDateTime().getTime())); | hist.setAufnahmeDatum(HL7Util2.parseLocalDateTime(pv1.getAdmitDateTime().getTime())); | ||||
| hist.setEntlassungsDatum(HL7Util2.parseLocalDateTime(pv1.getDischargeDateTime()[0].getTime())); // TODO: null? | hist.setEntlassungsDatum(HL7Util2.parseLocalDateTime(pv1.getDischargeDateTime()[0].getTime())); // TODO: null? | ||||
| @@ -177,6 +177,7 @@ public class HL7Receiver2<T extends AbstractMessage> implements ReceivingApplica | |||||
| default: | default: | ||||
| diagnose.setDiagArt(DiagArt.VERDACHT); | diagnose.setDiagArt(DiagArt.VERDACHT); | ||||
| } | } | ||||
| diagnose.setFreiText(dg1.getDiagnosisDescription().encode()); | |||||
| diagnosen.add(diagnose); | diagnosen.add(diagnose); | ||||
| } | } | ||||