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

后端最新版本同步

Browse Source
This commit is contained in:
Zhang.WH
2025-09-25 10:43:25 +08:00
parent 1276dc4adb
commit c8014404f1
355 changed files with 10070 additions and 5578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java
View File

@@ -709,6 +709,20 @@ public class YbDao {
return ybUtil.getMedicalDirectory3301Param(tableName, id);
}
/**
* 【3301】医保目录对照参数作成（药品）
*
* @param categoryCode 药品分类
* @param busNo 药品编号
* @param name 药品编号
* @param ybNo 医保编码
* @return 医保目录对照参数
*/
public MedicalDirectory3301Param getMedicalDirectory3301ParamMedication(String categoryCode, String busNo,
String name, String ybNo) {
return ybUtil.getMedicalDirectory3301ParamMedication(categoryCode, busNo, name, ybNo);
}
/**
* 【3302】目录对照撤销
*
@@ -720,6 +734,19 @@ public class YbDao {
return ybUtil.getMedicalDirectory3302Param(tableName, id);
}
/**
* 【3302】医保目录对照撤销参数作成（药品）
*
* @param categoryCode 药品分类
* @param busNo 药品编号
* @param ybNo 医保编码
* @return 医保目录对照撤销参数
*/
public MedicalDirectory3302Param getMedicalDirectory3302ParamMedication(String categoryCode, String busNo,
String ybNo) {
return ybUtil.getMedicalDirectory3302ParamMedication(categoryCode, busNo, ybNo);
}
/**
* 【3201】医药机构费用结算对总账
*
@@ -1404,6 +1431,11 @@ public class YbDao {
// 基金支付
settlement3201Dto.setFundPaySumAmt(
paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getFundPaySumAmt()));
// 合计医疗费用
settlement3201Dto
.setMedFeeSumAmt(new BigDecimal(paymentDecDetailUniAccountDto.getMedfeeSumamt() == null
? "0.0" : paymentDecDetailUniAccountDto.getMedfeeSumamt())
.add(settlement3201Dto.getMedFeeSumAmt()));
count++;
}
if (YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())) {
@@ -1417,13 +1449,13 @@ public class YbDao {
settlement3201Dto.setAcctGjPay(
paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getAcctGjPay()));
}
if (YbPayment.SELF_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())
|| YbPayment.OTHER_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())
|| YbPayment.YB_FUND_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())) {
// 合计医疗费用
settlement3201Dto.setMedFeeSumAmt(
paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getMedFeeSumAmt()));
}
// if (YbPayment.SELF_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())
// || YbPayment.OTHER_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())
// || YbPayment.YB_FUND_PAY.getValue().equals(paymentDecDetailUniAccountDto.getPayEnum())) {
// // 合计医疗费用
// settlement3201Dto.setMedFeeSumAmt(
// paymentDecDetailUniAccountDto.getAmount().add(settlement3201Dto.getMedFeeSumAmt()));
// }
}
// 结算笔数
settlement3201Dto.setFixMedInsSetlCnt(count);
@@ -1985,9 +2017,9 @@ public class YbDao {
.setFeeOcurTime(chargeItemBaseInfoDto.getEnteredDate()).setMedListCodg(chargeItemBaseInfoDto.getYbNo())
.setMedinsListCodg(chargeItemBaseInfoDto.getBaseBusNo())
.setDetItemFeeSumamt(chargeItemBaseInfoDto.getTotalPrice())
.setCnt(new BigDecimal(chargeItemBaseInfoDto.getQuantityValue()))
.setPric(chargeItemBaseInfoDto.getUnitPrice()).setBilgDeptName(chargeItemBaseInfoDto.getDeptName())
.setBilgDrName(chargeItemBaseInfoDto.getDoctName()).setBilgDeptCodg(chargeItemBaseInfoDto.getDeptYbNo())
.setCnt(chargeItemBaseInfoDto.getQuantityValue()).setPric(chargeItemBaseInfoDto.getUnitPrice())
.setBilgDeptName(chargeItemBaseInfoDto.getDeptName()).setBilgDrName(chargeItemBaseInfoDto.getDoctName())
.setBilgDeptCodg(chargeItemBaseInfoDto.getDeptYbNo())
.setBilgDrCodg(chargeItemBaseInfoDto.getDoctYbNo());
yb2301InputFeeDetailList.add(yb2301InputFeeDetail);
@@ -2232,7 +2264,7 @@ public class YbDao {
}
List<EncounterLocation> encounterLocationList = iEncounterLocationService.getEncounterLocationList(encounterId,
LocationForm.BED, EncounterLocationStatus.ACTIVE);
LocationForm.BED, EncounterActivityStatus.ACTIVE);
if (encounterLocationList.isEmpty()) {
throw new ServiceException("未查询到床位信息");
}
@@ -2364,7 +2396,7 @@ public class YbDao {
}
List<EncounterLocation> encounterLocationList = iEncounterLocationService.getEncounterLocationList(encounterId,
LocationForm.BED, EncounterLocationStatus.ACTIVE);
LocationForm.BED, EncounterActivityStatus.ACTIVE);
if (encounterLocationList.isEmpty()) {
throw new ServiceException("未查询到床位信息");
}
@@ -2558,7 +2590,7 @@ public class YbDao {
}
List<EncounterLocation> encounterLocationList = iEncounterLocationService.getEncounterLocationList(encounterId,
LocationForm.BED, EncounterLocationStatus.ACTIVE);
LocationForm.BED, EncounterActivityStatus.ACTIVE);
if (encounterLocationList.isEmpty()) {
throw new ServiceException("未查询到床位信息");
}
@@ -2719,4 +2751,28 @@ public class YbDao {
return yb2405InputInpatient;
}
/**
* 【5205】结果
*
* @param patientId 患者id
* @param begntime 开始时间
* @param endtime 结束时间
* @return 5205结果
*/
public Yb5205InputSpecialDisease yb5205SpecialDiseaseDrugRecordSearch(Long patientId, Date begntime, Date endtime) {
Patient patient = iPatientService.getById(patientId);
if (patient == null) {
throw new ServiceException("未查询到患者信息");
}
InfoPerson perInfoByIdCard = iPerinfoService.getPerInfoByIdCard(patient.getIdCard(), patient.getTenantId());
if (perInfoByIdCard == null) {
throw new ServiceException("未查询到患者医保读卡信息");
}
Yb5205InputSpecialDisease yb5205InputSpecialDisease = new Yb5205InputSpecialDisease();
yb5205InputSpecialDisease.setBegntime(begntime).setEndtime(endtime).setPsnNo(perInfoByIdCard.getPsnNo());
return yb5205InputSpecialDisease;
}
}

36
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java
View File

@@ -71,7 +71,7 @@ public class YbHttpUtils {
Logger logger = LoggerFactory.getLogger(YbHttpUtils.class);
public Info1101Output getPerInfo(Info1101ReadcardParam readcard) {
// 省名参数
// 声明参数
Result result = null;
Info1101Output perinfo = null;
// 发送请求
@@ -1014,4 +1014,38 @@ public class YbHttpUtils {
}
return null;
}
/**
* 【5205】人员慢特病用药记录查询
*
* @param yb5205InputSpecialDisease
* @return
*/
public List<Yb5205OutputSpecialDisease>
yb5205SpecialDiseaseDrugRecordSearch(Yb5205InputSpecialDisease yb5205InputSpecialDisease) {
String resultString =
httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/spe-disease-record-search",
yb5205InputSpecialDisease, null);
if (StringUtils.isEmpty(resultString)) {
throw new ServiceException("未接收到医保返回参数");
}
System.out.println("【5205】返回参数:" + JSON.toJSONString(resultString));
logger.info("【5205】返回参数:" + resultString);
ObjectMapper mapper = new ObjectMapper();
Result result = null;
try {
result = mapper.readValue(resultString, Result.class);
if (result == null) {
throw new ServiceException("未接收到医保返回参数");
} else if (result.getCode() == 200) {
System.out.println(result.getResult().toString());
return JSON.parseArray(result.getResult().toString(), Yb5205OutputSpecialDisease.class);
} else {
throw new ServiceException(result.getMessage());
}
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
return null;
}
}

34
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java
View File

@@ -510,6 +510,34 @@ public class YbManager {
throw new ServiceException("药品对照失败");
}
/**
* 【3301】目录对照（药品）
*
* @param categoryCode 药品分类
* @param busNo 药品编号
* @param name 药品编号
* @param ybNo 医保编码
*/
public R<?> directoryCheckMedication(String categoryCode, String busNo, String name, String ybNo) {
MedicalDirectory3302Param medicalDirectory3302Param =
ybBaseService.getMedicalDirectory3302ParamMedication(categoryCode, busNo, ybNo);
Result result3302Info = ybHttpService.directoryUnCheck(medicalDirectory3302Param);
if (!result3302Info.getCode().equals(CommonConstant.SC_OK_200)) {
return R.fail("目录对照前，撤销对照失败");
}
MedicalDirectory3301Param medicalDirectory3301Param =
ybBaseService.getMedicalDirectory3301ParamMedication(categoryCode, busNo, name, ybNo);
ArrayList<MedicalDirectory3301Param> list = new ArrayList<>();
list.add(medicalDirectory3301Param);
MedicalDirectory3301ListParam medicalDirectory3301ListParam = new MedicalDirectory3301ListParam();
medicalDirectory3301ListParam.setData(list);
Result resultInfo = ybHttpService.directoryCheck(medicalDirectory3301ListParam);
if (!resultInfo.getCode().equals(CommonConstant.SC_OK_200)) {
return R.fail("药品对照失败");
}
return R.ok();
}
/**
* 【3302】目录对照撤销
*
@@ -915,9 +943,9 @@ public class YbManager {
.setFeeOcurTime(chargeItemBaseInfoDto.getEnteredDate()).setMedListCodg(chargeItemBaseInfoDto.getYbNo())
.setMedinsListCodg(chargeItemBaseInfoDto.getBaseBusNo())
.setDetItemFeeSumamt(chargeItemBaseInfoDto.getTotalPrice())
.setCnt(new BigDecimal(chargeItemBaseInfoDto.getQuantityValue()))
.setPric(chargeItemBaseInfoDto.getUnitPrice()).setBilgDeptName(chargeItemBaseInfoDto.getDeptName())
.setBilgDrName(chargeItemBaseInfoDto.getDoctName()).setBilgDeptCodg(chargeItemBaseInfoDto.getDeptYbNo())
.setCnt(chargeItemBaseInfoDto.getQuantityValue()).setPric(chargeItemBaseInfoDto.getUnitPrice())
.setBilgDeptName(chargeItemBaseInfoDto.getDeptName()).setBilgDrName(chargeItemBaseInfoDto.getDoctName())
.setBilgDeptCodg(chargeItemBaseInfoDto.getDeptYbNo())
.setBilgDrCodg(chargeItemBaseInfoDto.getDoctYbNo());
yb2301InputFeeDetailList.add(yb2301InputFeeDetail);