Skip to content

Commit

Permalink
Merge branch 'Issue#5752' of https://github.com/hmislk/hmis.git into …
Browse files Browse the repository at this point in the history
…Issue#6827

# Conflicts:
#	src/main/resources/META-INF/persistence.xml

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
  • Loading branch information
buddhika75 committed Aug 10, 2024
2 parents 2ef1caa + 7f3b451 commit bdc3b82
Show file tree
Hide file tree
Showing 8 changed files with 1,342 additions and 224 deletions.
4 changes: 4 additions & 0 deletions src/main/java/com/divudi/bean/common/BillBeanController.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.divudi.data.dataStructure.PaymentMethodData;
import com.divudi.data.inward.InwardChargeType;
import com.divudi.data.inward.SurgeryBillType;
import com.divudi.data.lab.PatientInvestigationStatus;
import com.divudi.ejb.ServiceSessionBean;
import com.divudi.entity.Bill;
import com.divudi.entity.BillComponent;
Expand Down Expand Up @@ -3386,6 +3387,9 @@ private void savePatientInvestigation(BillEntry e, BillComponent bc, WebUser wu)

ptIx.setCreatedAt(Calendar.getInstance().getTime());
ptIx.setCreater(wu);

ptIx.setStatus(PatientInvestigationStatus.ORDERED);


ptIx.setBillItem(e.getBillItem());
ptIx.setBillComponent(bc);
Expand Down
Loading

0 comments on commit bdc3b82

Please sign in to comment.