解决合并冲突

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java

@@ -33,6 +33,7 @@ import com.openhis.web.inhospitalcharge.dto.*;
 import com.openhis.web.inhospitalcharge.mapper.InHospitalRegisterAppMapper;
 import com.openhis.web.patientmanage.appservice.IPatientInformationService;
 import com.openhis.web.patientmanage.dto.PatientInformationDto;
+import com.openhis.yb.service.YbManager;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -79,6 +80,9 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS
     @Resource
     IPatientService iPatientService;
 
+    @Resource
+    private YbManager ybManager;
+
     /**
      * 门诊医生开住院申请
      *
@@ -96,7 +100,7 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS
         // 获取执行科室
         LambdaQueryWrapper<Encounter> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Encounter::getAmbEncounterId, ambEncounterId);
-        if (iEncounterService.list(queryWrapper).size() > 0) {
+        if (!iEncounterService.list(queryWrapper).isEmpty()) {
             return R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
         }
 
@@ -447,7 +451,8 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS
             zYEncounterDiagnosis.setIptDiseTypeCode(YbIptDiseTypeCode.ADMISSION_DIAGNOSIS.getValue()); // 住院患者疾病诊断类型代码
             iEncounterDiagnosisService.save(zYEncounterDiagnosis);
         }
-
+        // 调用医保入院办理
+        ybManager.hospitalAdmission();
     }
 
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java

@@ -25,7 +25,7 @@ public interface AdvancePaymentManageAppMapper {
      * @param wardEnum 病区
      * @param houseEnum 病房
      * @param bedEnum 床位
-     * @param encounterLocationStatus 使用状态
+     * @param encounterActivityStatus 使用状态
      * @param status1 待结算
      * @param status2 已收费
      * @param status3 已退费
@@ -35,7 +35,7 @@ public interface AdvancePaymentManageAppMapper {
      */
     IPage<AdvancePaymentInfoDto> getAdvancePaymentInfo(@Param("page") Page<AdvancePaymentInfoDto> page,
         @Param("kindEnum") Integer kindEnum, @Param("wardEnum") Integer wardEnum, @Param("houseEnum") Integer houseEnum,
-        @Param("bedEnum") Integer bedEnum, @Param("encounterLocationStatus") Integer encounterLocationStatus,
+        @Param("bedEnum") Integer bedEnum, @Param("encounterActivityStatus") Integer encounterActivityStatus,
         @Param("status1") Integer status1, @Param("status2") Integer status2, @Param("status3") Integer status3,
         @Param("classEnum") Integer classEnum, @Param("accountTypeCode") String accountTypeCode,
         @Param(Constants.WRAPPER) QueryWrapper<AdvancePaymentInfoDto> queryWrapper);