Changeset 2594

Timestamp:

02/05/10 15:10:05 (2 years ago)

Author:

wouter

Message:

Last part of migration from exist to sql for healthdocuments.

Files:

• his-extensions/plugins/trunk/opinio/his-plugin/src/main/java/org/joiningtracks/his/plugin/integration/opinio/provider/QuestionnaireProvider.java (modified) (2 diffs)
• his-extensions/plugins/trunk/opinio/his-plugin/src/main/java/org/joiningtracks/his/plugin/integration/opinio/rest/server/ResponsesResource.java (modified) (6 diffs)
• his-extensions/plugins/trunk/opinio/his-plugin/src/main/resources/META-INF/spring/bundle-config.xml (modified) (1 diff)
• his-extensions/plugins/trunk/samples/pathway-plugin/src/main/java/org/joiningtracks/his/pathway/sample/TherapyPossibleDecision.java (modified) (3 diffs)
• his-extensions/plugins/trunk/samples/pathway-plugin/src/main/java/org/joiningtracks/his/pathway/sample/intakeform/IntakeFormPanel.java (modified) (3 diffs)
• his-extensions/plugins/trunk/samples/pathway-plugin/src/main/resources/META-INF/spring/bundle-config.xml (modified) (1 diff)
• his-extensions/plugins/trunk/samples/pathway-plugin/src/test/java/org/joiningtracks/his/pathway/sample/JpdlSamplePathwayTest.java (modified) (2 diffs)
• his-extensions/plugins/trunk/treatment/importer/src/main/resources/META-INF/spring/bundle-config.xml (modified) (1 diff)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/PatientAppointmentSignOffPanel.java (modified) (8 diffs)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/PatientSignOffPanel.java (modified) (4 diffs)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/form/TreatmentFormDetailsPanel.java (modified) (9 diffs)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/form/TreatmentFormPanel.java (modified) (4 diffs)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/questionnaire/DisplayQuestionnairePanel.java (modified) (5 diffs)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/questionnaire/QuestionnairePanel.java (modified) (3 diffs)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/bloodvalues/BloodValueFormPanel.java (modified) (4 diffs)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/data/model/AppointmentDocument.java (modified) (1 diff)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/data/model/FormDocument.java (modified) (2 diffs)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/frontend/TreatmentGroupOverviewPanel.java (modified) (2 diffs)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/surgical/OperatiePlanningFormPanel.java (modified) (8 diffs)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/surgical/post/OperatieVerwerkingFormTaskPanel.java (modified) (7 diffs)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/tasks/SelectPatientGroupPanel.java (modified) (1 diff)
• his-extensions/plugins/trunk/treatment/treatment-base/src/main/resources/META-INF/spring/bundle-config.xml (modified) (1 diff)
• his-extensions/plugins/trunk/treatment/treatment-base/src/test/java/org/joiningtracks/his/pathway/nok/treatment/surgical/post/OperatieVerwerkingFormTest.java (modified) (2 diffs)
• his/trunk/README.txt (modified) (2 diffs)
• his/trunk/data/etc/create_db.sql (modified) (2 diffs)
• his/trunk/data/etc/upgrade_1.9.7-to-1.9.8.sql (added)
• his/trunk/data/src/main/java/org/joiningtracks/his/data/dao/HealthDocumentDao.java (modified) (3 diffs)
• his/trunk/data/src/main/java/org/joiningtracks/his/data/dao/jpa/JpaHealthDocumentDao.java (modified) (2 diffs)
• his/trunk/data/src/main/java/org/joiningtracks/his/data/model/HisHealthDocument.java (modified) (6 diffs)
• his/trunk/frontend/internal/src/main/java/org/joiningtracks/his/frontend/employee/patient/dossier/form/FormsTabPanel.java (modified) (1 diff)
• his/trunk/service/src/main/java/org/joiningtracks/his/service/healthdocument/HealthDocumentService.java (modified) (3 diffs)
• his/trunk/service/src/main/java/org/joiningtracks/his/service/healthdocument/impl/DefaultHealthDocumentService.java (modified) (4 diffs)
• his/trunk/service/src/main/java/org/joiningtracks/his/service/pathway/impl/DefaultPathwayParticipationService.java (modified) (5 diffs)
• his/trunk/service/src/main/java/org/joiningtracks/his/service/patient/impl/DefaultPatientService.java (modified) (4 diffs)
• his/trunk/service/src/main/resources/context/services.xml (modified) (2 diffs)
• his/trunk/service/src/test/java/org/joiningtracks/his/service/pathway/impl/DefaultPathwayParticipationServiceTest.java (modified) (4 diffs)
• his/trunk/service/src/test/java/org/joiningtracks/his/service/patient/impl/DefaultPatientServiceTest.java (modified) (5 diffs)

his-extensions/plugins/trunk/opinio/his-plugin/src/main/java/org/joiningtracks/his/plugin/integration/opinio/provider/QuestionnaireProvider.java

@@ -1 +1 @@
-package org.joiningtracks.his.plugin.integration.opinio.provider;
-
-import org.joiningtracks.his.data.model.HealthDocument;
-import org.joiningtracks.his.data.model.HealthDocumentMetaData;
+import org.joiningtracks.his.data.model.HisHealthDocument;
-import org.joiningtracks.his.plugin.integration.opinio.data.model.Questionnaire;
-import org.joiningtracks.his.plugin.integration.opinio.data.model.Respondent;
@@ -29 +29 @@
-     * @return the transformed questionnaire response
-     */
-ealthDocument processQuestionnaireResponse(Respondent respondent, 
+isHealthDocument processQuestionnaireResponse(Respondent respondent, His
-
-    HealthDocumentMetaData getHealthDocumentMetaData();

his-extensions/plugins/trunk/opinio/his-plugin/src/main/java/org/joiningtracks/his/plugin/integration/opinio/rest/server/ResponsesResource.java

@@ -3 +3 @@
-import org.apache.wicket.injection.web.InjectorHolder;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.joiningtracks.his.data.model.HealthDocument;
-import org.joiningtracks.his.data.model.HealthDocumentMetaData;
+import org.joiningtracks.his.data.model.HisHealthDocument;
-import org.joiningtracks.his.data.model.PathwayParticipation;
-import org.joiningtracks.his.plugin.integration.opinio.data.model.Respondent;
-import org.joiningtracks.his.plugin.integration.opinio.provider.QuestionnaireProvider;
-import org.joiningtracks.his.plugin.integration.opinio.service.QuestionnaireIntegrationService;
-record.HealthRecord
+document.HealthDocument
-import org.joiningtracks.his.service.pathway.PathwayParticipationService;
-import org.joiningtracks.his.support.util.xml.XmlUtils;
@@ -17 +17 @@
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-Node
+Document
-
-/**
@@ -26 +26 @@
-
-    @SpringBean
-RecordService healthRecord
+DocumentService healthDocument
-
-    @SpringBean
@@ -111 +111 @@
-        }
-
-ealthDocument healthDocument = createHealthDocument(healthDocumentData, metaData
+isHealthDocument healthDocument = createHealthDocument(healthDocumentData, metaData, pathwayParticipation
-        if(healthDocument == null) {
-            respondent.setStatus(Respondent.Status.results_store_failed);
@@ -129 +129 @@
-
-        try {
-String healthDocumentId = addHealthDocument(healthDocument, pathwayParticipation
-healthDocumentId
+HisHealthDocument savedHealthDocument = healthDocumentService.create(healthDocument
+Long.toString(savedHealthDocument.getId())
-        } catch (Exception e){
-            respondent.setStatus(Respondent.Status.results_store_failed);
@@ -157 +157 @@
-    }
-
-String addHealthDocument(HealthDocument healthDocument
-String id = healthRecordService.add(healthDocument, pathwayParticipation
-return id
-}
+HisHealthDocument createHealthDocument(String healthDocumentData, HealthDocumentMetaData metaData
+Document data = XmlUtils.loadDocument(healthDocumentData
+HisHealthDocument newHd = new HisHealthDocument(metaData.getVersion(), metaData.getType(), pathwayParticipation, data)
+    newHd.setFormId(metaData.getFormId());
-
-
-
-
+
-    }
-}

his-extensions/plugins/trunk/opinio/his-plugin/src/main/resources/META-INF/spring/bundle-config.xml

@@ -48 +48 @@
-
-    <osgi:reference id="pathwayParticipationService" interface="org.joiningtracks.his.service.pathway.PathwayParticipationService"/>
-RecordService" interface="org.joiningtracks.his.service.healthrecord.HealthRecord
+DocumentService" interface="org.joiningtracks.his.service.healthdocument.HealthDocument
-
-    <osgi:reference id="eventChannel" interface="org.springframework.integration.core.MessageChannel"/>

his-extensions/plugins/trunk/samples/pathway-plugin/src/main/java/org/joiningtracks/his/pathway/sample/TherapyPossibleDecision.java

@@ -18 +18 @@
-import org.jbpm.graph.exe.ExecutionContext;
-import org.jbpm.graph.node.DecisionHandler;
-
+isH
-import org.joiningtracks.his.support.util.xml.XPathUtils;
-import org.slf4j.Logger;
@@ -46 +46 @@
-     */
-    public String decide(ExecutionContext executionContext) throws Exception {
-ealthDocument document = (
+isHealthDocument document = (His
-        // Be sure that the decision is not taken when there is no proper information as the process continues
-        // without the right base for it's decision, this puts unwanted risk in the real life process. 
@@ -52 +52 @@
-            throw new Exception("there is no healthDocument found in the executionContext");
-        }
-MetaData().ge
-Data
+Documen
+HealthDocument
-            String decision = XPathUtils.resolveString("/intakeform/therapyrequired/text()", contentNode);
-            logger.debug("healthdocument intakeform contains a " + decision + " for grouptherapy");

his-extensions/plugins/trunk/samples/pathway-plugin/src/main/java/org/joiningtracks/his/pathway/sample/intakeform/IntakeFormPanel.java

@@ -9 +9 @@
-import org.jbpm.taskmgmt.exe.PooledActor;
-import org.jbpm.taskmgmt.exe.TaskInstance;
-
-
-
-
+
-import org.joiningtracks.his.frontend.common.wicket.form.FormWithAssociatedMarkup;
-import org.joiningtracks.his.frontend.common.wicket.form.dom.DocumentSubmissionHandler;
-import org.joiningtracks.his.frontend.common.wicket.taskpanel.AbstractTaskPanel;
-record.HealthRecord
+document.HealthDocument
-import org.joiningtracks.his.service.pathway.PathwayParticipationService;
-import org.joiningtracks.his.service.process.TaskService;
@@ -28 +25 @@
-    private PathwayParticipationService pathwayParticipationService;
-    @SpringBean
-RecordService healthRecord
+DocumentService healthDocument
-    @SpringBean
-    private TaskService taskService;
@@ -56 +53 @@
-        intakeForm = intakeFormFactory.createForm("intake_form", new DocumentSubmissionHandler() {
-            public void handle(FormWithAssociatedMarkup form, Document document) {
-                HealthDocumentMetaData metaData = new HealthDocumentMetaData(IntakeFormFactory.FORM_NAME, IntakeFormFactory.FORM_VERSION);
-                final HealthDocument healthDocument = new HealthDocument(document, metaData);
-                final PathwayParticipation pp = pathwayParticipationService.findPathwayParticipationByProcessInstance(taskInstance.getProcessInstance().getId());
+                final HisHealthDocument healthDocument = new HisHealthDocument(IntakeFormFactory.FORM_VERSION,
+                        IntakeFormFactory.FORM_NAME, pp, document);
-
-                transactionTemplate.runInTransaction(new TransactionCallback<Object>() {
-                    public Object execute() {
-                        taskService.setVariable(taskInstance, "healthDocument", healthDocument);
-RecordService.add(healthDocument, pp
+DocumentService.create(healthDocument
-                        taskService.markTaskAsCompleted(taskInstance);
-                        return null;

his-extensions/plugins/trunk/samples/pathway-plugin/src/main/resources/META-INF/spring/bundle-config.xml

@@ -49 +49 @@
-                    interface="org.joiningtracks.his.service.pathway.PathwayParticipationService"/>
-
-Record
-record.HealthRecord
+Document
+document.HealthDocument
-
-    <osgi:reference id="transactionTemplate" interface="org.joiningtracks.his.service.transaction.TransactionTemplate"/>

his-extensions/plugins/trunk/samples/pathway-plugin/src/test/java/org/joiningtracks/his/pathway/sample/JpdlSamplePathwayTest.java

@@ -22 +22 @@
-import org.jbpm.taskmgmt.exe.TaskInstance;
-import org.joda.time.DateTime;
-import org.joiningtracks.his.data.model.HealthDocument;
-import org.joiningtracks.his.data.model.HealthDocumentMetaData;
-Pati
+HisHealthDocum
-import org.joiningtracks.his.data.util.jbpm.JbpmTemplate;
-import org.joiningtracks.his.support.util.event.EventListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@@ -115 +113 @@
-        }
-        HealthDocumentMetaData metaData = new HealthDocumentMetaData("intakeform", "1.0", "formId");
-
+
+
+
+
+
+
-
-        processInstance.getContextInstance().setVariable("healthDocument", newDoc);

his-extensions/plugins/trunk/treatment/importer/src/main/resources/META-INF/spring/bundle-config.xml

@@ -57 +57 @@
-    <osgi:reference id="pathwayPluginService" interface="org.joiningtracks.his.plugin.bridge.pathway.PathwayPluginService"/>
-    
-Record
-record.HealthRecord
+Document
+document.HealthDocument
-
-    <osgi:reference id="clinicalPathwayService"

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/PatientAppointmentSignOffPanel.java

@@ -37 +37 @@
-import org.joiningtracks.his.pathway.nok.treatment.data.model.PatientGroupDocument;
-import org.joiningtracks.his.service.appointment.AppointmentService;
-record.HealthRecord
+document.HealthDocument
-import org.joiningtracks.his.service.pathway.PathwayParticipationService;
-import org.joiningtracks.his.service.patientgroup.PatientGroupService;
@@ -53 +53 @@
-    private AppointmentService appointmentService;
-    @SpringBean
-RecordService healthRecord
+DocumentService healthDocument
-    @SpringBean
-    private PathwayParticipationService pathwayParticipationService;
@@ -84 +84 @@
-        if (!patientGroups.isEmpty()) {
-            patientGroup = patientGroups.iterator().next();
-        }
-
-        // for existing groups if the repository is not present create one
-        // we cannot create the repository in the his-core module as this requirement is only
-        // for treatment group. In that case, core would need the knowledge of all the supported groups
-        if (patientGroup.getUniqueIdentifier() == null) {
-            healthRecordService.createRepository(patientGroup);
-            patientGroup = patientGroupService.update(patientGroup);
-        }
-
@@ -271 +263 @@
-     */
-    private void derivePatientGroupDocument() {
-ealthDocumentInfo> groupHealthDocuments = healthRecordService.getAllHealthRecordInfo
+isHealthDocument> groupHealthDocuments = healthDocumentService.findByPatientGroup
-        if (groupHealthDocuments.size() == 0) {
-            patientGroupDocument = new PatientGroupDocument();
-        } else {
-            // Retrieve from XML
-
-
-
+
+
-            }
-        }
@@ -295 +286 @@
-            Patient patient = (Patient) attendeeReference.getAttendee();
-            PatientDetail patientDetail = new PatientDetail(patient, patientGroup);
-ealthDocumentInfo> healthdocuments = healthRecord
+isHealthDocument> healthdocuments = healthDocument
-
-            if (healthdocuments.size() == 0) {
@@ -302 +293 @@
-            } else {
-                // Retrieve from XML
-
-
-
+
+
-                }
-            }
@@ -394 +384 @@
-    private void saveOrUpdatePatientGroupDocument() {
-        Document document = XmlUtils.loadDocument(patientGroupDocument.toXML());
-
-
-
+
+
-        if (healthdocuments.size() == 0) {
-            // Create new
-
-
+
+
+
+
-
-        } else {
-            // Update existing
-
-
+
-                if (healthDocument != null) {
-Data(document.getDocumentElement()
-RecordService.update(healthDocument, patientGroup
+HealthDocument(document
+DocumentService.update(healthDocument
-                }
-            }
@@ -462 +452 @@
-    private void updatePatientDocument(PatientDocument patientDocument, PathwayParticipation pathwayParticipation) {
-        Document document = XmlUtils.loadDocument(patientDocument.toXML());
-
-
-List<HealthDocumentInfo> healthdocuments = healthRecordService.getAllHealthRecordInfo(pathwayParticipation, metaData.getFormId()
+
+
+        PatientHealthDocumentFormFactory.FORM_NAME + "_" + PatientHealthDocumentFormFactory.FORM_VERSION
-        if (healthdocuments.size() == 0) {
-            // Create new
-
-
+
+
+
-        } else {
-            // Update existing
-
-
+
-                if (healthDocument != null) {
-Data(document.getDocumentElement()
-RecordService.update(healthDocument, pathwayParticipation
+HealthDocument(document
+DocumentService.update(healthDocument
-                }
-            }

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/PatientSignOffPanel.java

@@ -24 +24 @@
-import org.joiningtracks.his.pathway.nok.treatment.data.model.PatientDocument;
-import org.joiningtracks.his.service.appointment.AppointmentService;
-record.HealthRecord
+document.HealthDocument
-import org.joiningtracks.his.service.ldap.LdapEmployeeService;
-import org.joiningtracks.his.support.util.xml.XmlUtils;
@@ -45 +45 @@
-    protected LdapEmployeeService ldapEmployeeService;
-    @SpringBean
-RecordService healthRecord
+DocumentService healthDocument
-    @SpringBean
-    protected AppointmentService appointmentService;
@@ -74 +74 @@
-        PatientDocument patientDocument = patientDetail.getPatientDocument();
-        Document document = XmlUtils.loadDocument(patientDocument.toXML());
-HealthDocumentMetaData metaData = new HealthDocumentMetaData(PatientHealthDocumentFormFactory.FORM_NAME, PatientHealthDocumentFormFactory.FORM_VERSION);
-List<HealthDocumentInfo> healthdocuments = healthRecordService.getAllHealthRecordInfo(patientDetail.getPathwayParticipation(), metaData.getFormId()
+List<HisHealthDocument> healthdocuments = healthDocumentService.getAllHealthRecordInfo(patientDetail.getPathwayParticipation(),
+        PatientHealthDocumentFormFactory.FORM_NAME + "_" + PatientHealthDocumentFormFactory.FORM_VERSION
-        if (healthdocuments.size() == 0) {
-            // Create new
-
-
+
+
+
-        } else {
-            // Update existing
-
-
+
-                if (healthDocument != null) {
-Data(document.getDocumentElement()
-RecordService.update(healthDocument, patientDetail.getPathwayParticipation()
+HealthDocument(document
+DocumentService.update(healthDocument
-                }
-            }
@@ -97 +97 @@
-     */
-    protected PatientDetail getUpdatedPatientDocument(PatientDetail patientDetail) {
-HealthDocumentMetaData metaData = new HealthDocumentMetaData(PatientHealthDocumentFormFactory.FORM_NAME, PatientHealthDocumentFormFactory.FORM_VERSION);
-List<HealthDocumentInfo> healthdocuments = healthRecordService.getAllHealthRecordInfo(patientDetail.getPathwayParticipation(), metaData.getFormId()
+List<HisHealthDocument> healthdocuments = healthDocumentService.getAllHealthRecordInfo(patientDetail.getPathwayParticipation(),
+        PatientHealthDocumentFormFactory.FORM_NAME + "_" + PatientHealthDocumentFormFactory.FORM_VERSION
-        // Get updated document
-
-
+
-            if (healthDocument != null) {
-Data
+HealthDocument
-                patientDetail.setPatientDocument(existingDocument);
-            }

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/form/TreatmentFormDetailsPanel.java

@@ -21 +21 @@
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-
-
+
-import org.joiningtracks.his.data.model.PathwayParticipation;
-import org.joiningtracks.his.frontend.common.wicket.form.FormWithAssociatedMarkup;
@@ -30 +29 @@
-import org.joiningtracks.his.plugin.form.FormFactory;
-import org.joiningtracks.his.plugin.form.FormManager;
-record.HealthRecord
+document.HealthDocument
-import org.joiningtracks.his.service.transaction.TransactionCallback;
-import org.joiningtracks.his.service.transaction.TransactionTemplate;
@@ -51 +50 @@
-    private PathwayPluginService pathwayPluginService;
-    @SpringBean
-RecordService healthRecord
+DocumentService healthDocument
-    @SpringBean
-    private TransactionTemplate transactionTemplate;
@@ -57 +56 @@
-    private FormManager formManager;
-
-
-Stri
+isH
+Lo
-
-    /**
@@ -68 +67 @@
-     * @param documentId             document id
-     */
-Stri
+Lo
-        super(id);
-        setOutputMarkupId(true);
@@ -85 +84 @@
-        // get the healthDocument (if it already exists)
-        if (documentId != null) {
-RecordService.get(documentId, pathwayParticipation
+DocumentService.getById(documentId
-        }
-        addForm(formConfig, pathwayParticipation);
@@ -93 +92 @@
-        final FormFactory factory = pathwayPluginService.getFormFactoryForProvidedForm(formConfig.getType(), formConfig.getVersion());
-        Form foundForm;
-Data
-Data
+HealthDocument
+HealthDocument
-                public void handle(FormWithAssociatedMarkup form, Document document) {
-Data(document.getDocumentElement()
+HealthDocument(document
-
-                    transactionTemplate.runInTransaction(new TransactionCallback<Object>() {
-                        public Object execute() {
-RecordService.update(healthDocument, pathwayParticipation
+DocumentService.update(healthDocument
-                            return null;
-                        }
@@ -110 +109 @@
-            foundForm = factory.createForm("theProvidedForm", new DocumentSubmissionHandler() {
-                public void handle(FormWithAssociatedMarkup form, Document document) {
-
-
+
+
+
-                    transactionTemplate.runInTransaction(new TransactionCallback<Object>() {
-                        public Object execute() {
-RecordService.add(healthDocument, pathwayParticipation
+DocumentService.create(healthDocument).getId(
-                            return null;
-                        }
@@ -144 +144 @@
-
-
-Stri
+Lo
-
-    abstract void handleCancel(AjaxRequestTarget target);

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/form/TreatmentFormPanel.java

@@ -127 +127 @@
-                            theFormConfig, patientDetail.getPathwayParticipation(), formDocument.getDocumentId()) {
-
-Stri
+Lo
-                            saveForm(healthRecordId, theFormConfig);
-
@@ -162 +162 @@
-        }
-
-Stri
+Lo
-            getUpdatedPatientDocument(patientDetail);
-            formDocument = patientDetail.getPatientDocument().getAppointmentByIdentifier(appointment.getAppointmentNumber())
@@ -171 +171 @@
-        }
-
-document
+form
-            AppointmentDocument appointmentDocument = patientDetail.getPatientDocument().getAppointmentByIdentifier(appointment.getAppointmentNumber());
-            if (appointmentDocument == null) {
@@ -177 +177 @@
-                patientDetail.getPatientDocument().addAppointment(appointmentDocument);
-            }
-document
+form
-            if (formDocument == null) {
-document
+form
-                appointmentDocument.addForm(formDocument);
-                updatePatientDocument(patientDetail);

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/questionnaire/DisplayQuestionnairePanel.java

@@ -24 +24 @@
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-
-
+
-import org.joiningtracks.his.data.model.PathwayParticipation;
-import org.joiningtracks.his.frontend.employee.patient.dossier.form.FormPanel;
-import org.joiningtracks.his.frontend.employee.patient.dossier.form.StaticXmlFormPanel;
-import org.joiningtracks.his.plugin.form.FormDescriptor;
-import org.joiningtracks.his.plugin.form.FormManager;
-import org.joiningtracks.his.service.healthdocument.HealthDocumentService;
-import org.joiningtracks.his.service.healthrecord.HealthRecordService;
-import org.w3c.dom.Document;
-
-/**
@@ -45 +40 @@
-    FormManager formManager;
-
-
+isH
-        super(id);
-        initUI(healthDocument, pathwayParticipation);
@@ -51 +46 @@
-    }
-
-
+isH
-
-        addFormPanel(healthDocument, pathwayParticipation);
@@ -64 +59 @@
-    }
-
-
+isH
-
-Data
+HealthDocument
-        add(formPanel);
-
-.getMetaData()
+
-        // we couldn't find the appropriate form that can edit the document, so we just show the xml document.
-        if (formDescriptor == null) {
@@ -76 +71 @@
-            formPanel.setVisible(false);
-
-(Document) healthDocument.getData
+healthDocument.getHealthDocument
-            add(form);
-            disableFormElements(form);

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/appointment/signoff/questionnaire/QuestionnairePanel.java

@@ -31 +31 @@
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.joiningtracks.his.data.model.Appointment;
-
+isH
-import org.joiningtracks.his.pathway.nok.treatment.appointment.signoff.PatientSignOffPanel;
-import org.joiningtracks.his.pathway.nok.treatment.config.AppointmentConfig;
@@ -96 +96 @@
-        private QuestionnaireIntegrationService questionnaireIntegrationService;
-
-
+isH
-        private QuestionnaireDocument questionnaireDocument;
-        private FeedbackPanel feedbackPanel;
@@ -156 +156 @@
-                String healthDocumentId = respondent.getHealthDocumentId();
-                if (healthDocumentId != null) {
-RecordService.get(healthDocumentId, patientDetail.getPathwayParticipation(
+DocumentService.getById(new Long(healthDocumentId
-                    if (healthDocument != null) {
-                        isAnsweredField.setModel(new Model<Boolean>(true));

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/bloodvalues/BloodValueFormPanel.java

@@ -5 +5 @@
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.jbpm.taskmgmt.exe.TaskInstance;
-
-
-
-
+
-import org.joiningtracks.his.frontend.common.wicket.form.FormWithAssociatedMarkup;
-import org.joiningtracks.his.frontend.common.wicket.form.dom.DocumentSubmissionHandler;
-import org.joiningtracks.his.frontend.common.wicket.taskpanel.AbstractTaskPanel;
-record.HealthRecord
+document.HealthDocument
-import org.joiningtracks.his.service.pathway.PathwayParticipationService;
-import org.joiningtracks.his.service.process.TaskService;
@@ -24 +21 @@
-    private PathwayParticipationService pathwayParticipationService;
-    @SpringBean
-RecordService healthRecord
+DocumentService healthDocument
-    @SpringBean
-    private TaskService taskService;
@@ -33 +30 @@
-
-    private final BloodValueForm bloodValueForm;
-
+isH
-
-    /**
@@ -81 +78 @@
-        bloodValueForm = (BloodValueForm) bloodValueFormFactory.createForm("blood_value_form", new DocumentSubmissionHandler() {
-            public void handle(FormWithAssociatedMarkup form, Document document) {
-HealthDocumentMetaData metaData = new HealthDocumentMetaData(BloodValueFormFactory.FORM_NAME, BloodValueFormFactory.FORM_VERSION);
-final HealthDocument healthDocument = new HealthDocument(document, metaData
+final HisHealthDocument healthDocument = new HisHealthDocument(BloodValueFormFactory.FORM_VERSION,
+        BloodValueFormFactory.FORM_NAME, pathwayParticipation, document
-
-                transactionTemplate.runInTransaction(new TransactionCallback<Object>() {
-                    public Object execute() {
-String recordId = healthRecordService.add(healthDocument, pathwayParticipation
-recordId
+HisHealthDocument savedDocument = healthDocumentService.create(healthDocument
+savedDocument.getId()
-
-                        return null;

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/data/model/AppointmentDocument.java

@@ -87 +87 @@
-        FormDocument formDocument = null;
-        for (FormDocument form : forms) {
-Document
+Form
-                formDocument = form;
-                break;

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/data/model/FormDocument.java

@@ -25 +25 @@
-public class FormDocument implements Serializable {
-
-
+
+
-    private boolean filled;
-
-Stri
+Lo
-        this.documentId = documentId;
-        this.filled = filled;
@@ -36 +37 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
-        this.documentId = documentId;
-    }
-
-Document
-document
+Form
+form
-    }
-
-DocumentId(String document
-documentId = document
+FormId(String form
+formId = form
-    }
-

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/frontend/TreatmentGroupOverviewPanel.java

@@ -38 +38 @@
-import org.joiningtracks.his.pathway.nok.treatment.data.model.TreatmentTrajectData;
-import org.joiningtracks.his.service.appointment.AppointmentService;
-import org.joiningtracks.his.service.healthrecord.HealthRecordService;
-import org.joiningtracks.his.service.pathway.ClinicalPathwayService;
-import org.joiningtracks.his.service.patientgroup.PatientGroupService;
@@ -57 +56 @@
-    @SpringBean
-    private AppointmentService appointmentService;
-
-    @SpringBean
-    private HealthRecordService healthRecordService;
-
-
-    private ProcessDefinition pathway;

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/surgical/OperatiePlanningFormPanel.java

@@ -20 +20 @@
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.jbpm.taskmgmt.exe.TaskInstance;
-
-
+
-import org.joiningtracks.his.data.model.PathwayParticipation;
-import org.joiningtracks.his.data.model.Patient;
@@ -27 +26 @@
-import org.joiningtracks.his.frontend.common.wicket.form.dom.DocumentSubmissionHandler;
-import org.joiningtracks.his.frontend.common.wicket.taskpanel.AbstractTaskPanel;
-record.HealthRecord
+document.HealthDocument
-import org.joiningtracks.his.service.pathway.PathwayParticipationService;
-import org.joiningtracks.his.service.process.TaskService;
@@ -35 +34 @@
-import org.w3c.dom.Document;
-
+import java.util.List;
-import java.util.Map;
-
@@ -47 +47 @@
-    private PathwayParticipationService pathwayParticipationService;
-    @SpringBean
-RecordService healthRecord
+DocumentService healthDocument
-    @SpringBean
-    private TaskService taskService;
@@ -56 +56 @@
-
-    private final OperatiePlanningForm operatiePlanningForm;
-
+isH
-
-    /**
@@ -102 +102 @@
-        Patient patient = pathwayParticipation.getPatient();
-
-String operatiePlanningRecordId = (Stri
+Long operatiePlanningRecordId = (Lo
-        // get the healthDocument (if it already exists)  "operatie planning_1.0.0"
-        if (operatiePlanningRecordId != null) {
-RecordService.get(operatiePlanningRecordId, pathwayParticipation
+DocumentService.getById(operatiePlanningRecordId
-        }
-        //if the healthDocument could not be collected the via the variable, scan for the healthDocument. There should only be one per participation.
-        if (healthDocument == null) {
-Map<String, HealthDocument> allDocs = healthRecordService.getAllDocuments
-Map.Entry<String, HealthDocument> entry : allDocs.entrySet()
-entry.getValue().getMetaData()
-entry.getValue()
+List<HisHealthDocument> allDocs = healthDocumentService.findByPathwayParticipation
+HisHealthDocument hd : allDocs
+hd
+hd
-                    break;
-                }
@@ -118 +118 @@
-        }
-
-Data
-Data
+HealthDocument
+HealthDocument
-                public void handle(FormWithAssociatedMarkup form, Document document) {
-Data(document.getDocumentElement()
+HealthDocument(document
-
-                    transactionTemplate.runInTransaction(new TransactionCallback<Object>() {
-                        public Object execute() {
-RecordService.update(healthDocument, pathwayParticipation
+DocumentService.update(healthDocument
-                            if (operatiePlanningForm.isCompleted()) {
-                                taskService.markTaskAsCompleted(taskInstance);
@@ -137 +137 @@
-            operatiePlanningForm = (OperatiePlanningForm) operatiePlanningFormFactory.createForm("operatie_planning_form", new DocumentSubmissionHandler() {
-                public void handle(FormWithAssociatedMarkup form, Document document) {
-HealthDocumentMetaData metaData = new HealthDocumentMetaData(OperatiePlanningFormFactory.FORM_NAME, OperatiePlanningFormFactory.FORM_VERSION);
-final HealthDocument healthDocument = new HealthDocument(document, metaData
+final HisHealthDocument healthDocument = new HisHealthDocument(OperatiePlanningFormFactory.FORM_VERSION,
+        OperatiePlanningFormFactory.FORM_NAME, pathwayParticipation, document
-
-                    transactionTemplate.runInTransaction(new TransactionCallback<Object>() {
-                        public Object execute() {
-String recordId = healthRecordService.add(healthDocument, pathwayParticipation
-recordId
+HisHealthDocument savedDoc = healthDocumentService.create(healthDocument
+savedDoc.getId()
-                            if (operatiePlanningForm.isCompleted()) {
-                                taskService.markTaskAsCompleted(taskInstance);

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/surgical/post/OperatieVerwerkingFormTaskPanel.java

@@ -20 +20 @@
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.jbpm.taskmgmt.exe.TaskInstance;
-
-
-
-
+
-import org.joiningtracks.his.frontend.common.wicket.form.FormWithAssociatedMarkup;
-import org.joiningtracks.his.frontend.common.wicket.form.dom.DocumentSubmissionHandler;
-import org.joiningtracks.his.frontend.common.wicket.taskpanel.AbstractTaskPanel;
-record.HealthRecord
+document.HealthDocument
-import org.joiningtracks.his.service.pathway.PathwayParticipationService;
-import org.joiningtracks.his.service.process.TaskService;
@@ -35 +32 @@
-import org.w3c.dom.Document;
-
+import java.util.List;
-import java.util.Map;
-
@@ -47 +45 @@
-    private PathwayParticipationService pathwayParticipationService;
-    @SpringBean
-RecordService healthRecord
+DocumentService healthDocument
-    @SpringBean
-    private TaskService taskService;
@@ -56 +54 @@
-
-    private final OperatieVerwerkingForm operatieVerwerkingForm;
-
+isH
-
-    /**
@@ -107 +105 @@
-        Patient patient = pathwayParticipation.getPatient();
-
-String operatieVerwerkingRecordId = (Stri
+Long operatieVerwerkingRecordId = (Lo
-        // get the healthDocument (if it already exists)  "operatie verwerking_1.0.0"
-        if (operatieVerwerkingRecordId != null) {
-RecordService.get(operatieVerwerkingRecordId, pathwayParticipation
+DocumentService.getById(operatieVerwerkingRecordId
-        }
-        //if the healthDocument could not be collected the via the variable, scan for the healthDocument. There should only be one per participation.
-        if (healthDocument == null) {
-Map<String, HealthDocument> allDocs = healthRecordService.getAllDocuments
-Map.Entry<String, HealthDocument> entry : allDocs.entrySet()
-entry.getValue().getMetaData()
-entry.getValue()
+List<HisHealthDocument> allDocs = healthDocumentService.findByPathwayParticipation
+HisHealthDocument thd : allDocs
+thd
+thd
-                    break;
-                }
@@ -123 +121 @@
-        }
-
-
-
+
+
+
-                public void handle(FormWithAssociatedMarkup form, Document document) {
-Data(document.getDocumentElement()
+HealthDocument(document
-
-                    transactionTemplate.runInTransaction(new TransactionCallback<Object>() {
-                        public Object execute() {
-RecordService.update(healthDocument, pathwayParticipation
+DocumentService.update(healthDocument
-                            if (operatieVerwerkingForm.isCompleted()) {
-                                taskService.markTaskAsCompleted(taskInstance);
@@ -142 +141 @@
-            operatieVerwerkingForm = (OperatieVerwerkingForm) operatieVerwerkingFormFactory.createForm("operatie_verwerking_form", new DocumentSubmissionHandler() {
-                public void handle(FormWithAssociatedMarkup form, Document document) {
-HealthDocumentMetaData metaData = new HealthDocumentMetaData(OperatieVerwerkingFormFactory.FORM_NAME, OperatieVerwerkingFormFactory.FORM_VERSION);
-final HealthDocument healthDocument = new HealthDocument(document, metaData
+final HisHealthDocument healthDocument = new HisHealthDocument(OperatieVerwerkingFormFactory.FORM_VERSION,
+        OperatieVerwerkingFormFactory.FORM_NAME, pathwayParticipation, document
-
-                    transactionTemplate.runInTransaction(new TransactionCallback<Object>() {
-                        public Object execute() {
-String recordId = healthRecordService.add(healthDocument, pathwayParticipation
-recordId
+HisHealthDocument savedDoc = healthDocumentService.create(healthDocument
+savedDoc.getId()
-                            if (operatieVerwerkingForm.isCompleted()) {
-                                taskService.markTaskAsCompleted(taskInstance);

his-extensions/plugins/trunk/treatment/treatment-base/src/main/java/org/joiningtracks/his/pathway/nok/treatment/tasks/SelectPatientGroupPanel.java

@@ -97 +97 @@
-            @Override
-            protected void populateItem(ListItem item) {
-
+
+
-
-                item.add(new Radio("radio", item.getDefaultModel()));

his-extensions/plugins/trunk/treatment/treatment-base/src/main/resources/META-INF/spring/bundle-config.xml

@@ -99 +99 @@
-    <osgi:reference id="pathwayPluginService" interface="org.joiningtracks.his.plugin.bridge.pathway.PathwayPluginService"/>
-    
-Record
-record.HealthRecord
+Document
+document.HealthDocument
-
-    <osgi:reference id="appointmentService" interface="org.joiningtracks.his.service.appointment.AppointmentService"/>

his-extensions/plugins/trunk/treatment/treatment-base/src/test/java/org/joiningtracks/his/pathway/nok/treatment/surgical/post/OperatieVerwerkingFormTest.java

@@ -18 +18 @@
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
-import org.apache.wicket.spring.test.ApplicationContextMock;
@@ -26 +25 @@
-import org.joiningtracks.his.data.model.PathwayParticipation;
-import org.joiningtracks.his.data.model.Patient;
-import org.joiningtracks.his.data.model.HealthDocument;
-import org.joiningtracks.his.frontend.common.wicket.form.dom.DocumentSubmissionHandler;
-import org.joiningtracks.his.frontend.common.wicket.form.FormWithAssociatedMarkup;

his/trunk/README.txt

@@ -58 +58 @@
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-   So to fully test the system, you will have to setup an LDAP directory
@@ -96 +73 @@
-        ldap.password=password
-
-4
+3
-
-    We use one of the Vecozo webservices to verify and support the creation of new patients in the system.

his/trunk/data/etc/create_db.sql

@@ -598 +598 @@
-    id                          BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-    version                     BIGINT(20) NOT NULL default 0,
- NOT NULL
+
-    pathway_participation_id    BIGINT(20) UNSIGNED,
+    patientgroup_id             BIGINT(20) UNSIGNED,
-    document_version            varchar(10) NOT NULL,
-    document_type               varchar(255) NOT NULL,
@@ -614 +615 @@
-    CONSTRAINT fk_healthdocument_pathway_participation_id FOREIGN KEY (pathway_participation_id)
-        REFERENCES pathway_participation(id)
+        ON DELETE RESTRICT ON UPDATE RESTRICT,
+
+    CONSTRAINT fk_healthdocument_patientgroup_id FOREIGN KEY (patientgroup_id)
+        REFERENCES patientgroup(id)
-        ON DELETE RESTRICT ON UPDATE RESTRICT
-

his/trunk/data/src/main/java/org/joiningtracks/his/data/dao/HealthDocumentDao.java

@@ -19 +19 @@
-import org.joiningtracks.his.data.model.PathwayParticipation;
-import org.joiningtracks.his.data.model.Patient;
+import org.joiningtracks.his.data.model.PatientGroup;
-import org.joiningtracks.his.support.data.dao.Dao;
-
@@ -27 +28 @@
- *
- * @author Daan van Etten
+ * @author Wouter Ketting
- */
-public interface HealthDocumentDao extends Dao<HisHealthDocument>{
@@ -37 +39 @@
-
-    List<HisHealthDocument> findByPatient(Patient patient);
+
+    List<HisHealthDocument> findByPatientGroup(PatientGroup patientGroup);
-}

his/trunk/data/src/main/java/org/joiningtracks/his/data/dao/jpa/JpaHealthDocumentDao.java

@@ -20 +20 @@
-import org.joiningtracks.his.data.model.PathwayParticipation;
-import org.joiningtracks.his.data.model.Patient;
+import org.joiningtracks.his.data.model.PatientGroup;
-import org.joiningtracks.his.support.data.dao.jpa.AbstractJpaDao;
-
@@ -119 +120 @@
-        return resultList;
-    }
+
+    public List<HisHealthDocument> findByPatientGroup(PatientGroup patientGroup) {
+        Map<String, Object> parameters = new HashMap<String, Object>();
+        parameters.put("patientGroup", patientGroup);
+
+        StringBuilder jql = new StringBuilder();
+        jql.append("select h from HisHealthDocument h WHERE h.patientGroup = :patientGroup ");
+
+        Query query = getEntityManager().createQuery(jql.toString());
+        for (Map.Entry<String, Object> entry : parameters.entrySet()) {
+            query.setParameter(entry.getKey(), entry.getValue());
+        }
+
+        List<HisHealthDocument> resultList = query.getResultList();
+
+        return resultList;
+    }
-}
-

his/trunk/data/src/main/java/org/joiningtracks/his/data/model/HisHealthDocument.java

@@ -54 +54 @@
-    private PathwayParticipation pathwayParticipation;
-
-fals
-
+tru
+, nullable = true
-    private Patient patient;
+
+    @OneToOne(optional = true, cascade = CascadeType.MERGE)
+    @JoinColumn(name = "patientgroup_id", nullable = true)
+    private PatientGroup patientGroup;
-
-    @Column(name = "document")
@@ -87 +91 @@
-    }
-
+    public HisHealthDocument(PatientGroup patientGroup){
+        this.patientGroup = patientGroup;
+        this.created = new DateTime();
+    }
+
-    public HisHealthDocument(String documentVersion, String documentType, String formId, Document xmlDocument) {
-        this.documentVersion = documentVersion;
@@ -93 +102 @@
-        this.created = new DateTime();
-        setHealthDocument(xmlDocument);
+    }
+
+    public HisHealthDocument(String documentVersion, String documentType, PatientGroup patientGroup, Document healthDocument) {
+        this.documentVersion = documentVersion;
+        this.documentType = documentType;
+        this.formId = documentType + "_" + documentVersion;
+        this.patientGroup = patientGroup;
+        this.created = new DateTime();
+        setHealthDocument(healthDocument);
-    }
-
@@ -124 +142 @@
-                .append(pathwayParticipation, other.pathwayParticipation)
-                .append(patient, other.patient)
+                .append(patientGroup, other.patientGroup)
-                .append(document, other.document)
-                .isEquals();
@@ -137 +156 @@
-             append(pathwayParticipation).
-             append(patient).
+             append(patientGroup).
-             append(document).
-             toHashCode();
@@ -187 +207 @@
-    public void setPatient(Patient patient) {
-        this.patient = patient;
+    }
+
+    public PatientGroup getPatientGroup() {
+        return patientGroup;
+    }
+
+    public void setPatientGroup(PatientGroup patientGroup) {
+        this.patientGroup = patientGroup;
-    }
-

his/trunk/frontend/internal/src/main/java/org/joiningtracks/his/frontend/employee/patient/dossier/form/FormsTabPanel.java

@@ -64 +64 @@
-        add(new Panel(getContentId()));
-
-//        HealthRecordVerificationResult result = healthRecordService.verifyAvailability(patient);
-//        switch (result) {
-//            case REGISTERED_NOT_AVAILABLE: {
-//                error(getString("formsTabPanel.error.healthRecord.notAvailable"));
-//                break;
-//            }
-//
-//            case NOT_REGISTERED: {
-//                healthRecordService.createRepository(patient);
-//                info("formsTabPanel.info.healthRecord.created");
-//                break;
-//            }
-//
-//            case AVAILABLE: {
-//                 do nothing
-//                break;
-//            }
-//        }
-        showDashboard();
-    }

his/trunk/service/src/main/java/org/joiningtracks/his/service/healthdocument/HealthDocumentService.java

@@ -19 +19 @@
-import org.joiningtracks.his.data.model.PathwayParticipation;
-import org.joiningtracks.his.data.model.Patient;
+import org.joiningtracks.his.data.model.PatientGroup;
-
-import java.util.List;
@@ -26 +27 @@
- *
- * @author Daan van Etten
+ * @author Wouter Ketting
- */
-public interface HealthDocumentService {
@@ -62 +64 @@
-    List<HisHealthDocument> findByPatient(Patient patient);
-
+    List<HisHealthDocument> findByPatientGroup(PatientGroup patientGroup);
+
-    HisHealthDocument removeById(long id);
-}

his/trunk/service/src/main/java/org/joiningtracks/his/service/healthdocument/impl/DefaultHealthDocumentService.java

@@ -20 +20 @@
-import org.joiningtracks.his.data.model.PathwayParticipation;
-import org.joiningtracks.his.data.model.Patient;
+import org.joiningtracks.his.data.model.PatientGroup;
-import org.joiningtracks.his.service.healthdocument.HealthDocumentService;
-import org.springframework.beans.factory.annotation.Required;
+import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
@@ -29 +31 @@
- *
- * @author Daan van Etten
+ * @author Wouter Ketting
- */
+@Transactional
-public class DefaultHealthDocumentService implements HealthDocumentService {
-    
-    private HealthDocumentDao healthDocumentDao;
-
-final 
+
-        return healthDocumentDao.getById(id);
-    }
-
-final HisHealthDocument create(HisHealthDocument healthDocumentReference
-Reference
+HisHealthDocument create(HisHealthDocument healthDocument
+
-        return healthDocumentDao.getById(id);
-    }
-
-final HisHealthDocument update(HisHealthDocument healthDocumentReference
-Reference
+HisHealthDocument update(HisHealthDocument healthDocument
+
-    }
-
@@ -63 +67 @@
-    }
-
+    public List<HisHealthDocument> findByPatientGroup(PatientGroup patientGroup) {
+        return healthDocumentDao.findByPatientGroup(patientGroup);
+    }
+
-    public HisHealthDocument removeById(long id) {
-        return healthDocumentDao.removeById(id);
@@ -68 +76 @@
-
-    @Required
-final 
+
-        this.healthDocumentDao = healthDocumentDao;
-    }

his/trunk/service/src/main/java/org/joiningtracks/his/service/pathway/impl/DefaultPathwayParticipationService.java

@@ -27 +27 @@
-import org.joiningtracks.his.data.util.jbpm.JbpmTemplate;
-import org.joiningtracks.his.events.RaisesEvent;
-import org.joiningtracks.his.service.healthrecord.HealthRecordService;
-import org.joiningtracks.his.service.pathway.PathwayParticipationService;
-import org.joiningtracks.his.service.pathway.PathwayParticipationAlreadyCancelledException;
@@ -54 +53 @@
-    private PathwayParticipationCancellationDao pathwayParticipationCancellationDao;
-    private JbpmTemplate jbpmTemplate;
-    private HealthRecordService healthRecordService;
-
-    public PathwayParticipation getById(long id) {
@@ -72 +70 @@
-        pathwayParticipation.setPatient(patient);
-        pathwayParticipationDao.save(pathwayParticipation);
-
-        healthRecordService.createRepository(pathwayParticipation);
-
-        try {
@@ -102 +98 @@
-        pathwayParticipation.setPayingParties(payingParties);
-        pathwayParticipationDao.save(pathwayParticipation);
-
-        healthRecordService.createRepository(pathwayParticipation);
-
-        try {
@@ -308 +302 @@
-        this.jbpmTemplate = jbpmTemplate;
-    }
-
-    @Required
-    public void setHealthRecordService(HealthRecordService healthRecordService) {
-        this.healthRecordService = healthRecordService;
-    }
-    
-}

his/trunk/service/src/main/java/org/joiningtracks/his/service/patient/impl/DefaultPatientService.java

@@ -25 +25 @@
-import org.joiningtracks.his.data.model.Patient;
-import org.joiningtracks.his.events.RaisesEvent;
-import org.joiningtracks.his.service.healthrecord.HealthRecordService;
-import org.joiningtracks.his.service.mail.MailService;
-import org.joiningtracks.his.service.patient.PatientService;
@@ -50 +49 @@
-
-    private PatientDao patientDao;
-    private HealthRecordService healthRecordService;
-    private MailService mailService;
-
@@ -69 +67 @@
-        Patient updatedPatient;
-        try {
-
-
-
+
+
-        } catch (RuntimeException ex) {
-            // Catch any exception thrown to allow reporting this exception by sending an mail.
@@ -152 +149 @@
-
-    @Required
-    public void setHealthRecordService(HealthRecordService healthRecordService) {
-        this.healthRecordService = healthRecordService;
-    }
-
-    @Required
-    public void setMailService(MailService mailService) {
-        this.mailService = mailService;

his/trunk/service/src/main/resources/context/services.xml

@@ -25 +25 @@
-    <bean id="patientService" class="org.joiningtracks.his.service.patient.impl.DefaultPatientService">
-        <property name="patientDao" ref="patientDao"/>
-        <property name="healthRecordService" ref="healthRecordService"/>
-        <property name="mailService" ref="mailService"/>
-    </bean>
@@ -115 +114 @@
-        <property name="pathwayParticipationDao" ref="pathwayParticipationDao"/>
-        <property name="jbpmTemplate" ref="jbpmTemplate"/>
-        <property name="healthRecordService" ref="healthRecordService"/>
-        <property name="pathwayParticipationCancellationDao" ref="pathwayParticipationCancellationDao"/>
-    </bean>

his/trunk/service/src/test/java/org/joiningtracks/his/service/pathway/impl/DefaultPathwayParticipationServiceTest.java

@@ -28 +28 @@
-import org.joiningtracks.his.data.model.Patient;
-import org.joiningtracks.his.data.util.jbpm.JbpmTemplate;
-import org.joiningtracks.his.service.healthrecord.HealthRecordService;
-import org.joiningtracks.his.service.location.LocationService;
-import org.junit.Assert;
-import org.junit.Before;
@@ -73 +71 @@
-        }, LogicalOperator.EQUAL))).andReturn(1L);
-
-        HealthRecordService mockHealthRecordService = createMock(HealthRecordService.class);
-        mockHealthRecordService.createRepository(EasyMock.isA(PathwayParticipation.class));
-        expectLastCall().once();
-
-        replay(mockHealthRecordService);
-
-        defaultPathwayParticipationService.setPathwayParticipationDao(mockParticipationDao);
-        defaultPathwayParticipationService.setJbpmTemplate(jbpmTemplate);
-        defaultPathwayParticipationService.setHealthRecordService(mockHealthRecordService);
-
-        ProcessDefinition pathway = new ProcessDefinition("pathway 1");
@@ -95 +86 @@
-        Assert.assertSame(mockProcessInstance, result.getProcessInstance());
-
-, mockHealthRecordService
+
-    }
-
@@ -101 +92 @@
-    public void testFindAllPatientsWithNoPayingParties() {
-        PathwayParticipationDao mockParticipationDao = createMock(PathwayParticipationDao.class);
-        LocationService mockLocationService = createMock(LocationService.class);
-
-        defaultPathwayParticipationService.setPathwayParticipationDao(mockParticipationDao);

his/trunk/service/src/test/java/org/joiningtracks/his/service/patient/impl/DefaultPatientServiceTest.java

@@ -21 +21 @@
-import org.joiningtracks.his.data.dao.query.QueryParams;
-import org.joiningtracks.his.data.model.Patient;
-import org.joiningtracks.his.service.healthrecord.HealthRecordService;
-import org.joiningtracks.his.service.mail.MailService;
-import org.junit.Assert;
@@ -43 +42 @@
-    private DefaultPatientService patientService;
-    private PatientDao patientDao;
-    private HealthRecordService healthRecordService;
-    private MailService mailService;
-
@@ -51 +49 @@
-
-        patientDao = createMock(PatientDao.class);
-        healthRecordService = createMock(HealthRecordService.class);
-        mailService = createMock(MailService.class);
-    }
@@ -58 +55 @@
-    public void testCreate() {
-        patientService.setPatientDao(patientDao);
-        patientService.setHealthRecordService(healthRecordService);
-        final long expectedId = 1L;
-        Patient expectedPatient = new Patient(expectedId);
-        expect(patientDao.save(expectedPatient)).andReturn(expectedId);
-
-
-
-
+
+
-
-        Patient patient = patientService.create(expectedPatient);
-
-, healthRecordService
+
-        Assert.assertSame(expectedPatient, patient);
-    }
@@ -90 +84 @@
-        } catch (RuntimeException expected) {
-            verify(patientDao, mailService);
-        }
-    }
-
-    @Test
-    public void testCreate_PropagatesExceptionsFromHealthRecordService() throws Exception {
-        patientService.setPatientDao(patientDao);
-        patientService.setHealthRecordService(healthRecordService);
-        patientService.setMailService(mailService);
-        final long expectedId = 1L;
-        Patient patient = new Patient(expectedId);
-        RuntimeException ex = new RuntimeException("Supposed failure creating repository for patient");
-
-        expect(patientDao.save(patient)).andReturn(expectedId);
-        expectLastCall();
-        healthRecordService.createRepository(patient);
-        expectLastCall().andThrow(ex);
-        mailService.sendPatientCreateFailureNotificationEmail(patient, ex);
-        expectLastCall();
-
-        replay(patientDao, healthRecordService, mailService);
-
-        try {
-            patientService.create(patient);
-            Assert.fail("Exception expected");
-        } catch (RuntimeException expected) {
-            verify(patientDao, healthRecordService, mailService);
-        }
-    }