Skip to content

Commit e37d6ba

Browse files
Null Condition Added
1 parent 3602722 commit e37d6ba

1 file changed

Lines changed: 18 additions & 16 deletions

File tree

src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,24 +1894,26 @@ public BenMenstrualDetails getMenstrualHistory(Long beneficiaryRegID, Long visit
18941894
BenMenstrualDetails menstrualHistoryDetails = BenMenstrualDetails.getBenMenstrualDetails(menstrualHistory);
18951895

18961896
// CRs changes, 30-10-2018
1897-
String problemID = menstrualHistoryDetails.getMenstrualProblemID();
1898-
String problemName = menstrualHistoryDetails.getProblemName();
1899-
1900-
if (problemID != null && problemName != null) {
1901-
String[] problemIdArr = problemID.split(",");
1902-
String[] problemNameArr = problemName.split(",");
1903-
ArrayList<Map<String, Object>> menstrualProblemList = new ArrayList<>();
1904-
Map<String, Object> menstrualProblemMap = null;
1905-
1906-
if (problemIdArr.length == problemNameArr.length) {
1907-
for (int i = 0; i < problemIdArr.length; i++) {
1908-
menstrualProblemMap = new HashMap<String, Object>();
1909-
menstrualProblemMap.put("menstrualProblemID", problemIdArr[i]);
1910-
menstrualProblemMap.put("problemName", problemNameArr[i]);
1911-
menstrualProblemList.add(menstrualProblemMap);
1897+
if (null != menstrualHistoryDetails) {
1898+
String problemID = menstrualHistoryDetails.getMenstrualProblemID();
1899+
String problemName = menstrualHistoryDetails.getProblemName();
1900+
1901+
if (problemID != null && problemName != null) {
1902+
String[] problemIdArr = problemID.split(",");
1903+
String[] problemNameArr = problemName.split(",");
1904+
ArrayList<Map<String, Object>> menstrualProblemList = new ArrayList<>();
1905+
Map<String, Object> menstrualProblemMap = null;
1906+
1907+
if (problemIdArr.length == problemNameArr.length) {
1908+
for (int i = 0; i < problemIdArr.length; i++) {
1909+
menstrualProblemMap = new HashMap<String, Object>();
1910+
menstrualProblemMap.put("menstrualProblemID", problemIdArr[i]);
1911+
menstrualProblemMap.put("problemName", problemNameArr[i]);
1912+
menstrualProblemList.add(menstrualProblemMap);
1913+
}
19121914
}
1915+
menstrualHistoryDetails.setMenstrualProblemList(menstrualProblemList);
19131916
}
1914-
menstrualHistoryDetails.setMenstrualProblemList(menstrualProblemList);
19151917
}
19161918

19171919
return menstrualHistoryDetails;

0 commit comments

Comments
 (0)