diff --git a/healthlink-his-server/core-system/pom.xml b/healthlink-his-server/core-system/pom.xml index f50af0b26..da99f15fb 100755 --- a/healthlink-his-server/core-system/pom.xml +++ b/healthlink-his-server/core-system/pom.xml @@ -1,4 +1,4 @@ - + @@ -58,12 +58,6 @@ - - com.alibaba - fastjson - 1.2.83 - - com.belerweb diff --git a/healthlink-his-server/healthlink-his-application/pom.xml b/healthlink-his-server/healthlink-his-application/pom.xml index c483bd924..a4372dcea 100755 --- a/healthlink-his-server/healthlink-his-application/pom.xml +++ b/healthlink-his-server/healthlink-his-application/pom.xml @@ -1,4 +1,4 @@ - + @@ -104,12 +104,6 @@ spring-boot-starter-test test - - com.alibaba - fastjson - 2.0.43 - compile - org.apache.httpcomponents.client5 httpclient5 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/impl/ConsultationAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/impl/ConsultationAppServiceImpl.java index c95ec15a7..735742447 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/impl/ConsultationAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/impl/ConsultationAppServiceImpl.java @@ -1,6 +1,6 @@ package com.healthlink.his.web.consultation.appservice.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.utils.SecurityUtils; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java index 03d155f6a..a8e362e28 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java @@ -1,6 +1,6 @@ package com.healthlink.his.web.departmentmanage.appservice.impl; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; import com.core.common.utils.DateUtils; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocRecordAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocRecordAppServiceImpl.java index 35ddec3ee..df7881565 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocRecordAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocRecordAppServiceImpl.java @@ -1,6 +1,6 @@ package com.healthlink.his.web.document.appservice.impl; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/ConvertToDocStatistics.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/ConvertToDocStatistics.java index f1d19e234..dc162575e 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/ConvertToDocStatistics.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/ConvertToDocStatistics.java @@ -1,8 +1,8 @@ package com.healthlink.his.web.document.util; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.core.common.utils.StringUtils; import com.healthlink.his.common.enums.TemperatureChartEnum; import com.healthlink.his.web.document.appservice.IDocStatisticsDefinitionAppService; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java index 21351b538..3746f8dc6 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java @@ -1,6 +1,6 @@ package com.healthlink.his.web.externalintegration.appservice.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.core.common.core.domain.R; import com.core.common.enums.TenantOptionDict; import com.core.web.util.TenantOptionUtil; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java index 1c980be91..92b701319 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java @@ -1,7 +1,7 @@ package com.healthlink.his.web.externalintegration.appservice.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.core.common.core.domain.R; import com.core.common.enums.TenantOptionDict; import com.core.common.utils.StringUtils; @@ -122,7 +122,7 @@ public class FoodborneAcquisitionAppServiceImpl implements IFoodborneAcquisition JSON.parseObject(EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8.toString())); log.info("【食源性判断接口】入参encounterId：{}返回值：{}", encounterId, object.toString()); // 判断返回的result字段 - String result = String.valueOf(object.getInnerMap().get("result")); + String result = String.valueOf(object.get("result")); if (!"true".equals(result)) { // 返回不是true时，返回空OK结果，跳过处理 return R.ok(); @@ -136,7 +136,7 @@ public class FoodborneAcquisitionAppServiceImpl implements IFoodborneAcquisition return R.fail("【食源性判断接口】跳转参数查询失败"); } // 返回的标识字段 fillGuid - String fillGuid = String.valueOf(object.getInnerMap().get("fillGuid")); + String fillGuid = String.valueOf(object.get("fillGuid")); // 拼装参数，作成跳转URL String jumpUrl = foodborneApiUrl + "/SimplediseaseAddNopw" + "?diseaseDate=" + simplediseaseAddNopwParam.getDiseaseDate() + "&diseaseTreattime=" diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java index 20a0800b9..a6f80a1f1 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java @@ -1,6 +1,6 @@ package com.healthlink.his.web.inpatientmanage.appservice.impl; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java index cc7caa389..f04c8d6e2 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java @@ -3,7 +3,7 @@ */ package com.healthlink.his.web.inventorymanage.appservice.impl; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java index 3376a07b4..fdf279207 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java @@ -1,6 +1,6 @@ package com.healthlink.his.web.materialmanage.appservice.impl; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; import com.core.common.exception.ServiceException; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java index 4a14f2715..a96c3cba8 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java @@ -3,7 +3,7 @@ */ package com.healthlink.his.web.paymentmanage.appservice.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java index 17a522a8e..b7ff2a493 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java @@ -3,7 +3,7 @@ */ package com.healthlink.his.web.paymentmanage.appservice.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java index 8e313469f..593b7ef3e 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java @@ -1,7 +1,7 @@ package com.healthlink.his.web.paymentmanage.appservice.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java index 2929507fe..6c1213f85 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java @@ -1,6 +1,6 @@ package com.healthlink.his.web.pharmacyDispensarymanage.appservice.impl; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; import com.core.common.utils.DateUtils; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java index 5d4e3ff9b..b38f32b8b 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java @@ -1,6 +1,6 @@ package com.healthlink.his.web.pharmacyWarehousemanage.appservice.impl; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; import com.core.common.exception.ServiceException; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java index 3f999c985..61066d95b 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java @@ -14,7 +14,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.tuple.Pair; import org.springframework.stereotype.Service; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java index b70e88584..228898886 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java @@ -1,6 +1,6 @@ package com.healthlink.his.web.pharmacymanage.appservice.impl; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java index 1e9460f6a..b2be64c4b 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java @@ -1,6 +1,6 @@ package com.healthlink.his.web.pharmacymanage.appservice.impl; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbServiceImpl.java index e7d2bb882..695090788 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbServiceImpl.java @@ -3,7 +3,7 @@ package com.healthlink.his.web.ybmanage.service.impl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/banner.txt b/healthlink-his-server/healthlink-his-application/src/main/resources/banner.txt index 6ed3f6d35..903679239 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/banner.txt +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/banner.txt @@ -13,6 +13,4 @@ ║ Spring Boot : 4.0.6 ║ ║ JDK : 25.0.3 ║ ║ Database : PostgreSQL ║ -╠═════════════════════════════════════════════════════════════════════════╣ -║ 模块化 HIS · 智慧医疗 · 数据安全 · 合规优先 ║ ╚═════════════════════════════════════════════════════════════════════════╝ diff --git a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/billing/BillingApiTest.java b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/billing/BillingApiTest.java index e3149390f..026fe6af0 100644 --- a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/billing/BillingApiTest.java +++ b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/billing/BillingApiTest.java @@ -1,7 +1,7 @@ package com.healthlink.his.billing; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/doctor/DoctorWorkstationTest.java b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/doctor/DoctorWorkstationTest.java index db99f79d0..fc25bc126 100644 --- a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/doctor/DoctorWorkstationTest.java +++ b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/doctor/DoctorWorkstationTest.java @@ -1,6 +1,6 @@ package com.healthlink.his.doctor; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/inpatient/InpatientApiTest.java b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/inpatient/InpatientApiTest.java index fefdac79a..9fe6019d1 100644 --- a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/inpatient/InpatientApiTest.java +++ b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/inpatient/InpatientApiTest.java @@ -1,8 +1,8 @@ package com.healthlink.his.inpatient; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSONArray; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/inspection/InspectionApiTest.java b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/inspection/InspectionApiTest.java index dc8d7badc..645068f66 100644 --- a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/inspection/InspectionApiTest.java +++ b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/inspection/InspectionApiTest.java @@ -1,7 +1,7 @@ package com.healthlink.his.inspection; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/nurse/NurseStationTest.java b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/nurse/NurseStationTest.java index b09c9cf29..3045383cf 100644 --- a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/nurse/NurseStationTest.java +++ b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/nurse/NurseStationTest.java @@ -1,6 +1,6 @@ package com.healthlink.his.nurse; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/pharmacy/PharmacyApiTest.java b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/pharmacy/PharmacyApiTest.java index 73af66b1d..1a80b345a 100644 --- a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/pharmacy/PharmacyApiTest.java +++ b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/pharmacy/PharmacyApiTest.java @@ -1,7 +1,7 @@ package com.healthlink.his.pharmacy; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/registration/RegistrationApiTest.java b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/registration/RegistrationApiTest.java index a10e680bd..e85be6e92 100644 --- a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/registration/RegistrationApiTest.java +++ b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/registration/RegistrationApiTest.java @@ -1,8 +1,8 @@ package com.healthlink.his.registration; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.JSONArray; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/report/ReportApiTest.java b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/report/ReportApiTest.java index 5048999f0..80e12fffd 100644 --- a/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/report/ReportApiTest.java +++ b/healthlink-his-server/healthlink-his-application/src/test/java/com/healthlink/his/report/ReportApiTest.java @@ -1,7 +1,7 @@ package com.healthlink.his.report; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/healthlink-his-server/healthlink-his-domain/pom.xml b/healthlink-his-server/healthlink-his-domain/pom.xml index b9c94e705..e5ce1bd70 100755 --- a/healthlink-his-server/healthlink-his-domain/pom.xml +++ b/healthlink-his-server/healthlink-his-domain/pom.xml @@ -1,4 +1,4 @@ - + @@ -37,13 +37,6 @@ - - - com.alibaba - fastjson - 2.0.43 - compile - org.apache.httpcomponents.client5 httpclient5 diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemServiceImpl.java index 06717611c..96bcbc110 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemServiceImpl.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemServiceImpl.java @@ -1,6 +1,6 @@ package com.healthlink.his.administration.service.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/utils/CrossSystemSendApplyUtil.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/utils/CrossSystemSendApplyUtil.java index 41b385340..d0202c37a 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/utils/CrossSystemSendApplyUtil.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/utils/CrossSystemSendApplyUtil.java @@ -1,7 +1,7 @@ package com.healthlink.his.crosssystem.utils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.core.common.enums.TenantOptionDict; import com.core.common.exception.ServiceException; import com.core.common.utils.DateUtils; @@ -141,7 +141,7 @@ public class CrossSystemSendApplyUtil { response = httpClient.execute(httpPost); JSONObject object = JSON.parseObject(EntityUtils.toString(response.getEntity(), "utf-8")); // 获取结果CODE - String code = String.valueOf(object.getInnerMap().get("code")); + String code = String.valueOf(object.get("code")); if (!"100000".equals(code)) { log.error("LIS失败申请报文：" + s); throw new ServiceException("LIS申请返回失败信息：" + object); @@ -256,7 +256,7 @@ public class CrossSystemSendApplyUtil { response = httpClient.execute(httpPost); JSONObject object = JSON.parseObject(EntityUtils.toString(response.getEntity(), "utf-8")); // 获取结果CODE - String code = String.valueOf(object.getInnerMap().get("code")); + String code = String.valueOf(object.get("code")); if (!"100000".equals(code)) { log.error("PACS失败申请报文：" + s); throw new ServiceException("PACS申请返回失败信息：" + object); diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentRecStaticServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentRecStaticServiceImpl.java index 6f7ad5494..be98ffdd6 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentRecStaticServiceImpl.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentRecStaticServiceImpl.java @@ -3,7 +3,7 @@ */ package com.healthlink.his.financial.service.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.healthlink.his.administration.dto.ChargeItemDefInfo; import com.healthlink.his.common.enums.PaymentStatisticalMethod; diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/TransactionResponse.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/TransactionResponse.java index 53d4d0736..d8b69c621 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/TransactionResponse.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/TransactionResponse.java @@ -3,7 +3,7 @@ */ package com.healthlink.his.nenu.domain; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3505Param.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3505Param.java index c8694ad73..b36b7af79 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3505Param.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3505Param.java @@ -3,7 +3,7 @@ */ package com.healthlink.his.yb.dto; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3506Param.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3506Param.java index 6f7b9ba6d..57e2d43d7 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3506Param.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3506Param.java @@ -3,7 +3,7 @@ */ package com.healthlink.his.yb.dto; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3502Param.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3502Param.java index 11e2447ba..bb52f4a04 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3502Param.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3502Param.java @@ -3,7 +3,7 @@ */ package com.healthlink.his.yb.dto; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3511Param.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3511Param.java index 0c1c9a44d..d8ae79da4 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3511Param.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3511Param.java @@ -3,7 +3,7 @@ */ package com.healthlink.his.yb.dto; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb5205OutputSpecialDisease.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb5205OutputSpecialDisease.java index 2d62b7d47..ea918c92a 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb5205OutputSpecialDisease.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb5205OutputSpecialDisease.java @@ -3,7 +3,7 @@ */ package com.healthlink.his.yb.dto; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import java.math.BigDecimal; diff --git a/healthlink-his-server/pom.xml b/healthlink-his-server/pom.xml index 3bb1b0036..109a78adc 100755 --- a/healthlink-his-server/pom.xml +++ b/healthlink-his-server/pom.xml @@ -128,14 +128,6 @@ fastjson2 ${fastjson2.version} - - - com.alibaba - fastjson - ${fastjson2.version} - - - com.googlecode.aviator