← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #17390

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6900: local/in - add new reason for mternal death for linelisting dataentry

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 6900
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-05-10 17:10:01 +0530
message:
  local/in - add new reason for mternal death for linelisting dataentry
modified:
  local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/api/LLDataSets.java
  local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java
  local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llmdeathForm.vm
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingWebPortalReportAnalyserResultAction.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/api/LLDataSets.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/api/LLDataSets.java	2011-11-04 08:03:14 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/api/LLDataSets.java	2012-05-10 11:40:01 +0000
@@ -376,5 +376,6 @@
     public static final int LLMD_CAUSE_BACD = 548;
     public static final int LLMD_CAUSE_HFBD = 549;
     public static final int LLMD_CAUSE_HFAD = 550;
-    public static final int LLMD_CAUSE_NK = 551;    
+    public static final int LLMD_CAUSE_NK = 551;
+    public static final int LLMD_CAUSE_MDNK = 5725;// This dataelement should be created for state specific for linelisting maternal death Other Causes (including cause not known)
 }

=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java	2011-10-13 09:13:08 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java	2012-05-10 11:40:01 +0000
@@ -2217,7 +2217,7 @@
             LLDataSets.LLMD_BY_TRAINED, LLDataSets.LLMD_BY_ANM, LLDataSets.LLMD_BY_NURSE, LLDataSets.LLMD_BY_DOCTOR,
             LLDataSets.LLMD_CAUSE_ABORTION, LLDataSets.LLMD_CAUSE_OPL, LLDataSets.LLMD_CAUSE_FITS,
             LLDataSets.LLMD_CAUSE_SH, LLDataSets.LLMD_CAUSE_BBCD, LLDataSets.LLMD_CAUSE_BACD,
-            LLDataSets.LLMD_CAUSE_HFBD, LLDataSets.LLMD_CAUSE_HFAD, LLDataSets.LLMD_CAUSE_NK
+            LLDataSets.LLMD_CAUSE_HFBD, LLDataSets.LLMD_CAUSE_HFAD, LLDataSets.LLMD_CAUSE_NK, LLDataSets.LLMD_CAUSE_MDNK
 
         };
         String[] queries = new String[aggDeIds.length];
@@ -2313,7 +2313,10 @@
         // Metarnal Death Cause not known
         queries[28] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
             + " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + "  AND value = 'NK'";
-
+        // Metarnal Death Other Causes (including cause not known)
+        queries[29] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+            + " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + "  AND value = 'MDNK'";
+        
         try
         {
             //Connection con = jdbcTemplate.getDataSource().getConnection();

=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llmdeathForm.vm'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llmdeathForm.vm	2010-08-31 07:51:06 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llmdeathForm.vm	2012-05-10 11:40:01 +0000
@@ -58,7 +58,7 @@
     	oCell.innerHTML = "<select name='entryfield' id='value[1037].value:value["+nextRecordNo+"].value' onchange='validateLLMDDeliveryByField(1037,"+nextRecordNo+")' onkeypress='return keyPress(event, this)' style='width:100% text-align:center'><option value='NONE' SELECTED>---</option><option value='UNTRAINED'>UNTRAINED</option><option value='TRAINED'>TRAINED</option><option value='ANM'>ANM</option><option value='NURSE'>NURSE</option><option value='DOCTOR'>DOCTOR</option><option value='OTHERS'>OTHERS</option></select>";    	    	
 
     	oCell = newRow.insertCell(7);
-    	oCell.innerHTML = "<select name='entryfield' id='value[1038].value:value["+nextRecordNo+"].value' onchange='validateLLMDCauseField(1038,"+nextRecordNo+")' onkeypress='return keyPress(event, this)' style='width:100% text-align:center'><option value='NONE' SELECTED>---</option><option value='ABORTION'>ABORTION</option><option value='OPL'>OBSTRUCTED/PROLONGED LABOUR</option><option value='FITS'>FITS</option><option value='SH'>SEVERE HYPERTENSION</option><option value='BBCD'>BLEEDING BEFORE CHILD DELIVERY</option><option value='BACD'>BLEEDING AFTER CHILD DELIVERY</option><option value='HFBD'>HIGH FEVER BEFORE DELIVERY</option><option value='HFAD'>HIGH FEVER AFTER DELIVERY</option><option value='OTHERS'>ANY OTHERS</option><option value='NK'>NOT KNOWN</option></select>";    	    	
+    	oCell.innerHTML = "<select name='entryfield' id='value[1038].value:value["+nextRecordNo+"].value' onchange='validateLLMDCauseField(1038,"+nextRecordNo+")' onkeypress='return keyPress(event, this)' style='width:100% text-align:center'><option value='NONE' SELECTED>---</option><option value='ABORTION'>ABORTION</option><option value='OPL'>OBSTRUCTED/PROLONGED LABOUR</option><option value='FITS'>FITS</option><option value='SH'>SEVERE HYPERTENSION</option><option value='BBCD'>BLEEDING BEFORE CHILD DELIVERY</option><option value='BACD'>BLEEDING AFTER CHILD DELIVERY</option><option value='HFBD'>HIGH FEVER BEFORE DELIVERY</option><option value='HFAD'>HIGH FEVER AFTER DELIVERY</option><option value='OTHERS'>ANY OTHERS</option><option value='NK'>NOT KNOWN</option><option value='MDNK'>Other Causes (including cause not known)</option></select>";    	    	
 
     	oCell = newRow.insertCell(8);
     	oCell.innerHTML = "<select name='entryfield' id='value[1039].value:value["+nextRecordNo+"].value' onchange='validateLLMDAuditedField(1039,"+nextRecordNo+")' onkeypress='return keyPress(event, this)' style='width:100% text-align:center'><option value='NONE' SELECTED>---</option><option value='Y'>YES</option><option value='N'>NO</option><option value='NK'>NOT KNOWN</option></select>";
@@ -155,7 +155,8 @@
 					<option value="HFBD" #if($llDataValue.getValue() && $llDataValue.getValue()=="HFBD") selected #end>HIGH FEVER BEFORE DELIVERY</option>
 					<option value="HFAD" #if($llDataValue.getValue() && $llDataValue.getValue()=="HFAD") selected #end>HIGH FEVER AFTER DELIVERY</option>
 					<option value="OTHERS" #if($llDataValue.getValue() && $llDataValue.getValue()=="OTHERS") selected #end>ANY OTHERS</option>
-					<option value="NK" #if($llDataValue.getValue() && $llDataValue.getValue()=="NK") selected #end>NOT KNOWN</option>										
+					<option value="NK" #if($llDataValue.getValue() && $llDataValue.getValue()=="NK") selected #end>NOT KNOWN</option>
+					<option value="MDNK" #if($llDataValue.getValue() && $llDataValue.getValue()=="MDNK") selected #end>Other Causes (including cause not known)</option>										
 				</select>
 			</td>
 		#elseif($count1 == 1)
@@ -220,7 +221,8 @@
 			<option value="HFBD">HIGH FEVER BEFORE DELIVERY</option>
 			<option value="HFAD">HIGH FEVER AFTER DELIVERY</option>
 			<option value="OTHERS">ANY OTHERS</option>
-			<option value="NK">NOT KNOWN</option>										
+			<option value="NK">NOT KNOWN</option>
+			<option value="MDNK">Other Causes (including cause not known)</option>										
 		</select>	
 	</td>
 	<td>

=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingWebPortalReportAnalyserResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingWebPortalReportAnalyserResultAction.java	2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingWebPortalReportAnalyserResultAction.java	2012-05-10 11:40:01 +0000
@@ -1256,13 +1256,22 @@
         resMap.put( "NURSE", "NURSE" );
         resMap.put( "DOCTOR", "DOCTOR" );
         resMap.put( "ABORTION", "M01-Abortion" );
-        resMap.put( "OPL", "OBSTRUCTED/PROLONGED LABOUR" );
-        resMap.put( "FITS", "FITS" );
+        resMap.put( "OPL", "M02-Obstructed/Prolonged labour" );
+        resMap.put( "FITS", "M03-Severe hypertension/fits" );
+        resMap.put( "SH", "M03-Severe hypertension/fits" );
+        resMap.put( "BBCD", "M04-Bleeding" );
+        resMap.put( "BACD", "M04-Bleeding" );
+        resMap.put( "HFBD", "M05-High fever" );
+        resMap.put( "HFAD", "M05-High fever" );
+        resMap.put( "MDNK", "M06-Other Causes (including cause not known)" );
+        /*resMap.put( "FITS", "FITS" );
         resMap.put( "SH", "SEVERE HYPERTENSION" );
         resMap.put( "BBCD", "BLEEDING BEFORE CHILD DELIVERY" );
         resMap.put( "BACD", "BLEEDING AFTER CHILD DELIVERY" );
         resMap.put( "HFBD", "HIGH FEVER BEFORE DELIVERY" );
         resMap.put( "HFAD", "HIGH FEVER AFTER DELIVERY" );
+        */
+        
     }
 
     public void initializeLLDeathResultMap()
  Thread Previous • Date Previous • • Thread Next