save claim with new fields

Author: vaneck237

claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java

@@ -71,7 +71,7 @@ public static Intent newIntent(@NonNull Context context, @NonNull String claimUU
     AutoCompleteTextView etDiagnosis, etDiagnosis1, etDiagnosis2, etDiagnosis3, etDiagnosis4, etReferalHF;
     TextView tvItemTotal, tvServiceTotal;
     Button btnPost, btnNew;
-    RadioGroup rgVisitType, etPatientCondition;
+    RadioGroup rgVisitType, rgPatientCondition;
     RadioButton rbEmergency, rbReferral, rbOther, rbHealed, rbDiseased, rbEscaped, rbReferal;
     ImageButton btnScan;
     CheckBox etPreAuthorization;
@@ -112,7 +112,7 @@ protected void onCreate(Bundle savedInstanceState) {
         rbReferral = findViewById(R.id.rbReferral);
         rbOther = findViewById(R.id.rbOther);
         etReferalHF = findViewById(R.id.etReferalHF);
-        etPatientCondition = findViewById(R.id.rgPatientCondition);
+        rgPatientCondition = findViewById(R.id.rgPatientCondition);
         rbDiseased = findViewById(R.id.rbDeceased);
         rbEscaped = findViewById(R.id.rbEscaped);
         rbHealed = findViewById(R.id.rbHealed);
@@ -389,7 +389,10 @@ private void ClearForm() {
         etDiagnosis2.setText("");
         etDiagnosis3.setText("");
         etDiagnosis4.setText("");
+        etPreAuthorization.setChecked(false);
+        etReferalHF.setText("");
         rgVisitType.clearCheck();
+        rgPatientCondition.clearCheck();
         etClaimCode.requestFocus();
     }
 
@@ -489,6 +492,7 @@ private void fillClaimFromRestore(Claim claim) {
     private void fillClaimFromDatabase(String claimUUID) {
         new Thread(() -> {
             JSONObject claimObject = sqlHandler.getClaim(claimUUID);
+            Log.e("claim", claimObject.toString());
             if (claimObject == null) {
                 showDialog(getResources().getString(R.string.ClaimNotFound), (dialog, which) -> finish());
             } else {
@@ -515,6 +519,13 @@ private void fillClaimFromDatabase(String claimUUID) {
                         etDiagnosis2.setText(claimDetails.getString("ICDCode2"));
                         etDiagnosis3.setText(claimDetails.getString("ICDCode3"));
                         etDiagnosis4.setText(claimDetails.getString("ICDCode4"));
+                        etReferalHF.setText(claimDetails.getString("ReferalHF"));
+
+                        if(claimDetails.getInt("PreAuthorization") == 1){
+                            etPreAuthorization.setChecked(true);
+                        }else{
+                            etPreAuthorization.setChecked(false);
+                        }
 
                         switch (claimDetails.getString("VisitType")) {
                             case "E":
@@ -530,6 +541,23 @@ private void fillClaimFromDatabase(String claimUUID) {
                                 rgVisitType.clearCheck();
                         }
 
+                        switch (claimDetails.getString("PatientCondition")) {
+                            case "H":
+                                rgPatientCondition.check(R.id.rbHealed);
+                                break;
+                            case "D":
+                                rgPatientCondition.check(R.id.rbDeceased);
+                                break;
+                            case "E":
+                                rgPatientCondition.check(R.id.rbEscaped);
+                                break;
+                            case "R":
+                                rgPatientCondition.check(R.id.rbReferal);
+                                break;
+                            default:
+                                rgPatientCondition.clearCheck();
+                        }
+
                         lvItemList.clear();
                         if (claimObject.has("items")) {
                             JSONArray items = claimObject.getJSONArray("items");
@@ -709,6 +737,12 @@ private boolean saveClaim() {
         selectedTypeButton = findViewById(SelectedId);
         String visitType = selectedTypeButton.getTag().toString();
 
+        int PatientConditionId;
+        PatientConditionId = rgPatientCondition.getCheckedRadioButtonId();
+        RadioButton selectedPatientCondition;
+        selectedPatientCondition = findViewById(PatientConditionId);
+        String patientCondition = selectedPatientCondition.getTag().toString();
+
         ContentValues claimCV = new ContentValues();
 
         claimCV.put("ClaimUUID", claimUUID);
@@ -728,6 +762,14 @@ private boolean saveClaim() {
         claimCV.put("ICDCode3", etDiagnosis3.getText().toString());
         claimCV.put("ICDCode4", etDiagnosis4.getText().toString());
         claimCV.put("VisitType", visitType);
+        claimCV.put("ReferalHF", etReferalHF.getText().toString());
+        claimCV.put("PatientCondition", patientCondition);
+
+        if(etPreAuthorization.isChecked()){
+            claimCV.put("PreAuthorization", 1);
+        }else{
+            claimCV.put("PreAuthorization", 0);
+        }
 
         ArrayList<ContentValues> claimItemCVs = new ArrayList<>(lvItemList.size());
         for (int i = 0; i < lvItemList.size(); i++) {

claimManagement/src/main/java/org/openimis/imisclaims/SQLHandler.java

@@ -40,7 +40,7 @@ public class SQLHandler extends SQLiteOpenHelper {
     private static final String CreateTableControls = "CREATE TABLE IF NOT EXISTS tblControls(FieldName TEXT, Adjustability TEXT);";
     private static final String CreateTableClaimAdmins = "CREATE TABLE IF NOT EXISTS tblClaimAdmins(Code TEXT, HFCode TEXT ,Name TEXT);";
     private static final String CreateTableReferences = "CREATE TABLE IF NOT EXISTS tblReferences(Code TEXT, Name TEXT, Type TEXT, Price TEXT);";
-    private static final String createTableClaimDetails = "CREATE TABLE IF NOT EXISTS tblClaimDetails(ClaimUUID TEXT, ClaimDate TEXT, HFCode TEXT, ClaimAdmin TEXT, ClaimCode TEXT, GuaranteeNumber TEXT, InsureeNumber TEXT, StartDate TEXT, EndDate TEXT, ICDCode TEXT, Comment TEXT, Total TEXT, ICDCode1 TEXT, ICDCode2 TEXT, ICDCode3 TEXT, ICDCode4 TEXT, VisitType TEXT);";
+    private static final String createTableClaimDetails = "CREATE TABLE IF NOT EXISTS tblClaimDetails(ClaimUUID TEXT, ClaimDate TEXT, HFCode TEXT, ClaimAdmin TEXT, ClaimCode TEXT, GuaranteeNumber TEXT, InsureeNumber TEXT, StartDate TEXT, EndDate TEXT, ICDCode TEXT, Comment TEXT, Total TEXT, ICDCode1 TEXT, ICDCode2 TEXT, ICDCode3 TEXT, ICDCode4 TEXT, VisitType TEXT, ReferalHF TEXT, PatientCondition TEXT,PreAuthorization Int );";
     private static final String createTableClaimItems = "CREATE TABLE IF NOT EXISTS tblClaimItems(ClaimUUID TEXT, ItemCode TEXT, ItemPrice TEXT, ItemQuantity TEXT);";
     private static final String createTableClaimServices = "CREATE TABLE IF NOT EXISTS tblClaimServices(ClaimUUID TEXT, ServiceCode TEXT, ServicePrice TEXT, ServiceQuantity TEXT, ServicePackageType TEXT, SubServicesItems TEXT);";
     private static final String createTableClaimUploadStatus = "CREATE TABLE IF NOT EXISTS tblClaimUploadStatus(ClaimUUID TEXT, UploadDate TEXT, UploadStatus TEXT, UploadMessage TEXT);";
@@ -431,7 +431,7 @@ public void deleteClaim(String claimUUID) {
 
     public JSONObject getClaim(String claimUUID) {
         JSONArray claimDetails = getQueryResultAsJsonArray("tblClaimDetails",
-                new String[]{"ClaimUUID", "ClaimDate", "HFCode", "ClaimAdmin", "ClaimCode", "GuaranteeNumber", "InsureeNumber", "StartDate", "EndDate", "ICDCode", "Comment", "Total", "ICDCode1", "ICDCode2", "ICDCode3", "ICDCode4", "VisitType"},
+                new String[]{"ClaimUUID", "ClaimDate", "HFCode", "ClaimAdmin", "ClaimCode", "GuaranteeNumber", "InsureeNumber", "StartDate", "EndDate", "ICDCode", "Comment", "Total", "ICDCode1", "ICDCode2", "ICDCode3", "ICDCode4", "VisitType", "ReferalHF", "PatientCondition", "PreAuthorization"},
                 "LOWER(ClaimUUID) = ?",
                 new String[]{claimUUID.toLowerCase(Locale.ROOT)});