完善医疗接口
diff --git a/backend/src/main/kotlin/com/supwisdom/dlpay/medical/bean/PayedBean.kt b/backend/src/main/kotlin/com/supwisdom/dlpay/medical/bean/PayedBean.kt
index b4943df..c376899 100644
--- a/backend/src/main/kotlin/com/supwisdom/dlpay/medical/bean/PayedBean.kt
+++ b/backend/src/main/kotlin/com/supwisdom/dlpay/medical/bean/PayedBean.kt
@@ -58,4 +58,5 @@
var transdate: String? = ""
var transtime: String? = ""
var refundflag: String? = ""
+ var hospitalName: String? = ""
}
\ No newline at end of file
diff --git a/backend/src/main/kotlin/com/supwisdom/dlpay/medical/service/impl/MedicalServiceImpl.kt b/backend/src/main/kotlin/com/supwisdom/dlpay/medical/service/impl/MedicalServiceImpl.kt
index f09ba45..499ca0d 100644
--- a/backend/src/main/kotlin/com/supwisdom/dlpay/medical/service/impl/MedicalServiceImpl.kt
+++ b/backend/src/main/kotlin/com/supwisdom/dlpay/medical/service/impl/MedicalServiceImpl.kt
@@ -352,6 +352,8 @@
}
override fun getPayedList(uid: String, organizationId: String, pageno: Int, pagesize: Int): ArrayList<PayedDtlDTO> {
+ val hospital = hospitalDao.findByHospitalcodeAndStatus(organizationId, TradeDict.STATUS_NORMAL)
+ ?: throw MedicineException("未找到该医院")
val medicalDtlList = medicalDtlDao.findByUidAndOrganizationidAndPaystatusOrderByTransdateDescTranstimeDesc(
uid, organizationId, MedicalConstant.DTL_STATUS_SUCCESS, PageRequest.of(pageno - 1, pagesize))
val payedDtlDTOList = ArrayList<PayedDtlDTO>()
@@ -365,6 +367,7 @@
this.transdate = it.transdate
this.transtime = it.transtime
this.refundflag = it.reverseflag
+ this.hospitalName = hospital.name
if (!StringUtil.isEmpty(it.resultid)) {
this.notifyStatus = true
}
@@ -459,6 +462,7 @@
throw MedicineException("该流水状态异常，请查询后再试")
}
// 查询是否已初始化
+ // TODO: 不同医院是否共用一个shopaccno
val shopaccno = systemUtilService.getBusinessValue(PortalConstant.SYSPARA_MEDICAL_SHOPACCNO)
val queryResult = transactionProxy.queryDtlResult(QueryDtlResultParam().apply {
this.billno = medicalDtl.billno
@@ -473,8 +477,7 @@
this.billno = medicalDtl.billno
this.cardNo = medicalDtl.citizencardno
this.amount = MoneyUtil.YuanToFen(medicalDtl.mergingsubtotal)
- //TODO: 修改成医疗的dtltype
- this.dtltype = "water"
+ this.dtltype = MedicalConstant.DTLTYPE_MEDICAL
this.transdate = medicalDtl.transdate
this.transtime = medicalDtl.transtime
this.shopaccno = shopaccno
diff --git a/backend/src/main/kotlin/com/supwisdom/dlpay/medical/task/NotifyHISAsyncTask.kt b/backend/src/main/kotlin/com/supwisdom/dlpay/medical/task/NotifyHISAsyncTask.kt
index ca4e2c0..29948ce 100644
--- a/backend/src/main/kotlin/com/supwisdom/dlpay/medical/task/NotifyHISAsyncTask.kt
+++ b/backend/src/main/kotlin/com/supwisdom/dlpay/medical/task/NotifyHISAsyncTask.kt
@@ -81,7 +81,7 @@
}
} else {
logger.error("调用医疗结算确认接口异常，billno=[${medicalDtl.billno}]，code:" + result.code + ";message:" + result.message)
- //如果确认接口重复调用会报g错，此处可以查询已支付列表中是否有该订单来确认是否已通知HIS成功
+ //如果确认接口重复调用会报错，此处可以查询已支付列表中是否有该订单来确认是否已通知HIS成功
//查询近三天的流水，医疗系统时间格式为 yyyy-MM-dd HH:mm:ss
val sdf = SimpleDateFormat("yyyy-MM-dd")
val currentDate = SimpleDateFormat("yyyyMMdd").parse(systemUtilService.sysdatetime.hostdate)
@@ -91,7 +91,7 @@
val payedRequest = PayedRequest()
payedRequest.organizationId = medicalDtl.organizationid
payedRequest.queryType = MedicalConstant.ORDER_QUERYTYPE_PATIENTID
- payedRequest.patientIdList.add(PatientId().apply { medicalDtl.patientid })
+ payedRequest.patientIdList.add(PatientId().apply { this.patientId = medicalDtl.patientid })
payedRequest.executeFlag = MedicalConstant.PAYED_EXECUTEFLAG_INVALID
payedRequest.outpatientType = MedicalConstant.PAYED_OUTPATIENTTYPE_NORMAL
payedRequest.beginTime = "$beginTime 00:00:00"