wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java
View File

@@ -36,6 +36,7 @@ import com.openhis.common.enums.ybenums.*;
import com.openhis.financial.domain.Contract;
import com.openhis.financial.domain.PaymentRecDetail;
import com.openhis.financial.domain.PaymentReconciliation;
import com.openhis.financial.model.PaymentedItemModel;
import com.openhis.financial.service.IContractService;
import com.openhis.financial.service.IPaymentRecDetailService;
import com.openhis.financial.service.IPaymentReconciliationService;
@@ -354,17 +355,17 @@ public class YbParamBuilderUtil {
* @return
*/
public List<Clinic2204FeeDetailParam> getClinicFeedetailList(Integer tenantId, ClinicReg2201Output reg,
String chrgBchno, List<Long> chargeItemIds) {
String chrgBchno, List<PaymentedItemModel> paymentedItemList) {
List<Clinic2204FeeDetailParam> clincFeedetailList = new ArrayList<Clinic2204FeeDetailParam>();
// 查询收费项
List<ChargeItem> ChargeItemList = iChargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
.in(ChargeItem::getId, chargeItemIds).eq(ChargeItem::getTenantId, tenantId));
// List<ChargeItem> ChargeItemList = iChargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
// .in(ChargeItem::getId, chargeItemIds).eq(ChargeItem::getTenantId, tenantId));
// 是否是电子处方
Whether eFlag = Whether.getByValue(0);
for (ChargeItem chargeItem : ChargeItemList) {
for (PaymentedItemModel chargeItem : paymentedItemList) {
Clinic2204FeeDetailParam clinicFeedetail = new Clinic2204FeeDetailParam();
// 查询项目信息
String productTable = chargeItem.getProductTable();
@@ -423,7 +424,7 @@ public class YbParamBuilderUtil {
* @param tenantId 租户id
* @return
*/
public Clinic2204OrderParam getClinicOrder2204Param(Integer tenantId, List<Long> chargeItemIds,
public Clinic2204OrderParam getClinicOrder2204Param(Integer tenantId, List<PaymentedItemModel> paymentedItemList,
ClinicReg2201Output reg2201Output) {
Clinic2204OrderParam clinicOrderPage = new Clinic2204OrderParam();
@@ -433,7 +434,7 @@ public class YbParamBuilderUtil {
clinicOrderPage.setChrgBchno(clinicOrderPage.getChrgBchno());
List<Clinic2204FeeDetailParam> clincFeedetailList =
getClinicFeedetailList(tenantId, reg2201Output, clinicOrderPage.getChrgBchno(), chargeItemIds);
getClinicFeedetailList(tenantId, reg2201Output, clinicOrderPage.getChrgBchno(), paymentedItemList);
clinicOrderPage.setFeedetail(clincFeedetailList).setInsuplcAdmdvs(reg2201Output.getInsuplcAdmdvs());
return clinicOrderPage;
@@ -1338,8 +1339,8 @@ public class YbParamBuilderUtil {
throw new ServiceException("无效的目录类别");
}
return new MedicalDirectory3302Param().setFixmedinsHilistId(busNo)
.setFixmedinsCode(TenantOptionUtil.getOptionContent(TenantOptionDict.FIXMEDINS_CODE)).setListType(listType)
.setMedListCodg(ybNo);
.setFixmedinsCode(TenantOptionUtil.getOptionContent(TenantOptionDict.YB_FIXMEDINS_CODE))
.setListType(listType).setMedListCodg(ybNo);
}
/**