Projects >> openelisglobal-core >>c4f8e506752347888bb01b8f80f7b6b6c7d10fda

Chunk
Conflicting content 
*/
package us.mn.state.health.lims.common.services.historyservices;

<<<<<<< HEAD
import us.mn.state.health.lims.audittrail.action.workers.AuditTrailItem;
import us.mn.state.health.lims.audittrail.valueholder.History;
import us.mn.state.health.lims.common.services.TestService;
=======
import us.mn.state.health.lims.analysis.valueholder.Analysis;
import us.mn.state.health.lims.audittrail.action.workers.AuditTrailItem;
import us.mn.state.health.lims.audittrail.valueholder.History;
import us.mn.state.health.lims.common.services.AnalysisService;
import us.mn.state.health.lims.common.services.NoteService;
import us.mn.state.health.lims.common.services.QAService;
import us.mn.state.health.lims.common.services.SampleService;
>>>>>>> 495e94a1b6ebe311b90fc322398a3fd205b3813d
import us.mn.state.health.lims.common.util.StringUtil;
import us.mn.state.health.lims.note.dao.NoteDAO;
import us.mn.state.health.lims.note.daoimpl.NoteDAOImpl;
Solution content 
*/
package us.mn.state.health.lims.common.services.historyservices;

import us.mn.state.health.lims.analysis.valueholder.Analysis;
import us.mn.state.health.lims.audittrail.action.workers.AuditTrailItem;
import us.mn.state.health.lims.audittrail.valueholder.History;
import us.mn.state.health.lims.common.services.AnalysisService;
import us.mn.state.health.lims.common.services.NoteService;
import us.mn.state.health.lims.common.services.QAService;
import us.mn.state.health.lims.common.services.SampleService;
import us.mn.state.health.lims.common.util.StringUtil;
import us.mn.state.health.lims.note.dao.NoteDAO;
import us.mn.state.health.lims.note.daoimpl.NoteDAOImpl;
File
NoteHistoryService.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
		noteIdToIndicatorMap = new HashMap();

		historyList = new ArrayList();
<<<<<<< HEAD
		
		Note searchNote = new Note();
		searchNote.setReferenceTableId(RESULT_TABLE_ID);
		for( Result result : results){
			searchNote.setReferenceId(result.getId());

			List notes = noteDAO.getAllNotesByRefIdRefTable(searchNote);
			
			for(Note note : notes){
				searchHistory.setReferenceId(note.getId());
				noteIdToIndicatorMap.put(note.getId(), TestService.getLocalizedTestName( result.getAnalysis().getTest()) );
				historyList.addAll(auditTrailDAO.getHistoryByRefIdAndRefTableId(searchHistory));
			}	
		}
		
=======

        addAnalysisNotes( sample );
        addOrderNotes( sample );
        addQANotes( sample );
>>>>>>> 495e94a1b6ebe311b90fc322398a3fd205b3813d
		newValueMap = new HashMap();
	}
Solution content 
		noteIdToIndicatorMap = new HashMap();

		historyList = new ArrayList();

        addAnalysisNotes( sample );
        addOrderNotes( sample );
        addQANotes( sample );
		newValueMap = new HashMap();
	}
File
NoteHistoryService.java
Developer's decision
Version 2
Kind of conflict
For statement
Method invocation
Variable
Chunk
Conflicting content 
import us.mn.state.health.lims.analysis.daoimpl.AnalysisDAOImpl;
import us.mn.state.health.lims.analysis.valueholder.Analysis;
import us.mn.state.health.lims.common.action.BaseActionForm;
<<<<<<< HEAD
import us.mn.state.health.lims.common.services.*;
=======
import us.mn.state.health.lims.common.services.AnalysisService;
import us.mn.state.health.lims.common.services.NoteService;
import us.mn.state.health.lims.common.services.PatientService;
import us.mn.state.health.lims.common.services.ResultService;
import us.mn.state.health.lims.common.services.StatusService;
>>>>>>> 495e94a1b6ebe311b90fc322398a3fd205b3813d
import us.mn.state.health.lims.common.services.StatusService.AnalysisStatus;
import us.mn.state.health.lims.common.util.DateUtil;
import us.mn.state.health.lims.common.util.StringUtil;
Solution content 
import us.mn.state.health.lims.analysis.daoimpl.AnalysisDAOImpl;
import us.mn.state.health.lims.analysis.valueholder.Analysis;
import us.mn.state.health.lims.common.action.BaseActionForm;
import us.mn.state.health.lims.common.services.AnalysisService;
import us.mn.state.health.lims.common.services.NoteService;
import us.mn.state.health.lims.common.services.PatientService;
import us.mn.state.health.lims.common.services.ResultService;
import us.mn.state.health.lims.common.services.StatusService;
import us.mn.state.health.lims.common.services.StatusService.AnalysisStatus;
import us.mn.state.health.lims.common.util.DateUtil;
import us.mn.state.health.lims.common.util.StringUtil;
File
HaitiLNSPExportReport.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import us.mn.state.health.lims.common.services.ResultService;
import us.mn.state.health.lims.common.services.StatusService;
import us.mn.state.health.lims.common.services.StatusService.AnalysisStatus;
<<<<<<< HEAD
import us.mn.state.health.lims.common.services.TestService;
=======
import us.mn.state.health.lims.common.util.DateUtil;
>>>>>>> 495e94a1b6ebe311b90fc322398a3fd205b3813d
import us.mn.state.health.lims.common.util.StringUtil;
import us.mn.state.health.lims.referral.valueholder.Referral;
import us.mn.state.health.lims.referral.valueholder.ReferralResult;
Solution content 
import us.mn.state.health.lims.common.util.DateUtil;
import us.mn.state.health.lims.common.services.ResultService;
import us.mn.state.health.lims.common.services.StatusService;
import us.mn.state.health.lims.common.services.StatusService.AnalysisStatus;
import us.mn.state.health.lims.common.services.TestService;
import us.mn.state.health.lims.common.util.StringUtil;
import us.mn.state.health.lims.referral.valueholder.Referral;
import us.mn.state.health.lims.referral.valueholder.ReferralResult;
File
PatientHaitiClinical.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
			// case if there was a confirmation sample with no test specified
			if(analysis.getTest() != null && !analysis.getStatusId().equals(StatusService.getInstance().getStatusID(AnalysisStatus.ReferredIn))){
				reportAnalysis = analysis;
<<<<<<< HEAD
				ClinicalPatientData resultsData = reportAnalysisResults(  hasParentResult);
=======
				ClinicalPatientData resultsData = reportAnalysisResults( hasParentResult);
>>>>>>> 495e94a1b6ebe311b90fc322398a3fd205b3813d

				if(reportAnalysis.isReferredOut()){
					Referral referral = referralDao.getReferralByAnalysisId(reportAnalysis.getId());
Solution content 
			// case if there was a confirmation sample with no test specified
			if(analysis.getTest() != null && !analysis.getStatusId().equals(StatusService.getInstance().getStatusID(AnalysisStatus.ReferredIn))){
				reportAnalysis = analysis;
				ClinicalPatientData resultsData = reportAnalysisResults( hasParentResult);

				if(reportAnalysis.isReferredOut()){
					Referral referral = referralDao.getReferralByAnalysisId(reportAnalysis.getId());
File
PatientHaitiClinical.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        reportParameters.put( "SUBREPORT_DIR", reportPath );
        reportParameters.put( "startDate", dateRange.getLowDateStr() );
        reportParameters.put( "endDate", dateRange.getHighDateStr() );
<<<<<<< HEAD
        reportParameters.put( "splitNameAndTest", getSplitNameAndTest() );
        reportParameters.put( "isTestReport", isTestReport());
=======
        reportParameters.put( "isReportByTest", isReportByTest() );
    }
>>>>>>> 495e94a1b6ebe311b90fc322398a3fd205b3813d

    protected boolean isReportByTest(){
        return Boolean.FALSE;
Solution content 
        reportParameters.put( "SUBREPORT_DIR", reportPath );
        reportParameters.put( "startDate", dateRange.getLowDateStr() );
        reportParameters.put( "endDate", dateRange.getHighDateStr() );
        reportParameters.put( "isReportByTest", isReportByTest() );
    }

    protected boolean isReportByTest(){
        return Boolean.FALSE;
File
RejectionReport.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        } );
    }

<<<<<<< HEAD
    @Override
    protected boolean isTestReport(){
        return true;
    }


=======
>>>>>>> 495e94a1b6ebe311b90fc322398a3fd205b3813d
    @Override
    protected boolean isReportByTest(){
        return Boolean.TRUE;
Solution content 
        } );
    }

    @Override
    protected boolean isReportByTest(){
        return Boolean.TRUE;
File
RejectionReportByTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration