Merge pull request #2 from AvantiPatil/dev

Dev

Code/Components/DanpheEMR.DalLayer/BillingDbContext.cs

@@ -92,6 +92,8 @@ public BillingDbContext(string conn) : base(conn)
             this.AuditDisabled = true;
 
         }
+        public DbSet<IntegrationModel> IntegrationName { get; set; }
+
         protected override void OnModelCreating(DbModelBuilder modelBuilder)
         {
 
@@ -171,6 +173,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
             modelBuilder.Entity<PrinterSettingsModel>().ToTable("CFG_PrinterSettings");
 
             modelBuilder.Entity<LabVendorsModel>().ToTable("Lab_MST_LabVendors");
+            modelBuilder.Entity<IntegrationModel>().ToTable("ServiceDepartment_MST_IntegrationName");
         }
 
         //Sud: 14sept'18 -- 

Code/Components/DanpheEMR.ServerModel/ClinicalModels/VitalsModel.cs

@@ -14,7 +14,7 @@ public class VitalsModel
         public int PatientVisitId { get; set; }
 
         //assign default value to this property, don't set it from anywhere else.. 
-   
+
         public double? Height { get; set; }
         public string HeightUnit { get; set; }
         public double? Weight { get; set; }
@@ -41,5 +41,23 @@ public class VitalsModel
         public DateTime VitalsTakenOn { get; set; }
         public DateTime? ModifiedOn { get; set; }
         //public virtual PatientModel Patient { get; set; }
+
+        public int? Nadi { get; set; }
+        public string Mala { get; set; }
+        public string Mutra { get; set; }
+        public string Jivha { get; set; }
+        public string Shabda { get; set; }
+        public string Sparsha { get; set; }
+        public string Drik { get; set; }
+        public string Akriti { get; set; }
+        public string LungField { get; set; }
+        public string HeartSounds { get; set; }
+        public string PA_Tenderness { get; set; }
+        public string Organomegaly { get; set; }
+        public string CNS_Consiousness { get; set; }
+        public string Power { get; set; }
+        public string Reflexes { get; set; }
+        public string Tone { get; set; }
+        public string Others { get; set; }
     }
-}
+    }

Code/Websites/DanpheEMR/Controllers/Billing/BillingController.cs

@@ -3661,7 +3661,8 @@ public string Post()
                                 srvDepartment = (from billItem in billingDbContext.BillItemPrice
                                                  join srvDept in billingDbContext.ServiceDepartment on billItem.ServiceDepartmentId equals srvDept.ServiceDepartmentId
                                                  join dept in billingDbContext.Departments on srvDept.DepartmentId equals dept.DepartmentId
-                                                 where (dept.DepartmentName.ToLower() == req.DepartmentName.ToLower()
+                                                 join sd in billingDbContext.IntegrationName on srvDept.IntegrationName.ToLower() equals sd.IntegrationName.ToLower()
+                                                 where (sd.IntegrationName.ToLower() == req.DepartmentName.ToLower()
                                                  && billItem.ItemName.ToLower() == req.ItemName.ToLower())
                                                  select srvDept).FirstOrDefault();
                             }