Flow/inspect-backend
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Euni4U 2025-04-19 18:33:47 +08:00
commit 3ead66e969
4 changed files with 115 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java
View File

@ -734,6 +734,7 @@ public class InspectPatientController {
}
return success(true);
}
@GetMapping("/PushJYPatientInfo")
@Operation(summary = "回传体检相关信息")
public CommonResult<Boolean> PushJYPatientInfo(@RequestParam("medicalSn") String medicalSn) throws JsonProcessingException {
@ -754,17 +755,14 @@ public class InspectPatientController {
//先添加基本信息
patientJYInfoVO.setPatientname(patientDO.getPName());
patientJYInfoVO.setIdcard(patientDO.getCardId());
if(patientDO.getMedicalDateTime()!=null)
{
if (patientDO.getMedicalDateTime() != null) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
patientJYInfoVO.setExamindate(patientDO.getMedicalDateTime().format(formatter));
}
//心电图信息
InspectPacsDataDO ecg = pacsDataService.getPacsDataByCode(medicalSn, "ecg");
if(ecg!=null)
{
if(ecg.getData()!=null)
{
if (ecg != null) {
if (ecg.getData() != null) {
patientJYInfoVO.setElectrokardiagramtypeid(1);
patientJYInfoVO.setElectrocardiogramimg(ecg.getData());
}
@ -812,25 +810,34 @@ public class InspectPatientController {
}
break;
case "PRO"://尿常规尿蛋白
if (result.getItemValue() != null)
{
if (result.getItemValue() != null) {
patientJYInfoVO.setUrineprotein(result.getItemValue());
}
break;
case "GLU"://尿常规尿糖
if (result.getItemValue() != null)
if(barCode.equals(patientDO.getShqx()))
{
if (result.getItemValue() != null) {
if (NumberUtils.isNumeric(result.getItemValue())) {
double value = Double.parseDouble(result.getItemValue());
patientJYInfoVO.setFastplasmaglucoseml(value);
}
}
}
else
{
if (result.getItemValue() != null) {
patientJYInfoVO.setUrinesugar(result.getItemValue());
}
}
break;
case "KET"://尿常规尿酮体
if (result.getItemValue() != null)
{
if (result.getItemValue() != null) {
patientJYInfoVO.setUnrineketone(result.getItemValue());
}
break;
case "BLD"://尿常规潜血
if (result.getItemValue() != null)
{
if (result.getItemValue() != null) {
patientJYInfoVO.setUnrineoccultblood(result.getItemValue());
}
break;
@ -874,6 +881,53 @@ public class InspectPatientController {
}
}
break;
case "AST"://谷丙转氨酶
if (result.getItemValue() != null) {
if (NumberUtils.isNumeric(result.getItemValue())) {
double value = Double.parseDouble(result.getItemValue());
patientJYInfoVO.setSgpt(value);
}
}
break;
case "UREA"://尿素
if (result.getItemValue() != null) {
if (NumberUtils.isNumeric(result.getItemValue())) {
double value = Double.parseDouble(result.getItemValue());
patientJYInfoVO.setBun(value);
}
}
break;
case "ALT"://谷草转氨酶
if (result.getItemValue() != null) {
if (NumberUtils.isNumeric(result.getItemValue())) {
double value = Double.parseDouble(result.getItemValue());
patientJYInfoVO.setSgot(value);
}
}
break;
case "TBLL":
if(barCode.equals(patientDO.getShqx()))
{
if (result.getItemValue() != null) {
if (NumberUtils.isNumeric(result.getItemValue())) {
double value = Double.parseDouble(result.getItemValue());
patientJYInfoVO.setTotalbilirubin(value);
}
}
}
break;
case "CREA":
if(barCode.equals(patientDO.getShqx()))
{
if (result.getItemValue() != null) {
if (NumberUtils.isNumeric(result.getItemValue())) {
double value = Double.parseDouble(result.getItemValue());
patientJYInfoVO.setSerumcreatinine(value);
}
}
}
break;
}
}
@ -890,7 +944,11 @@ public class InspectPatientController {
}
}
}
//添加超声数据
String usitemresult = patientitemsService.GetItemResult(medicalSn, "US001");
if (usitemresult != null&&usitemresult!="") {
patientJYInfoVO.setBultrasound(usitemresult);
}
//获取配置项地址
ConfigDO configDO = configService.getConfigByKey("url.tjhc");
// 发送 POST 请求
@ -915,9 +973,10 @@ public class InspectPatientController {
responseLogVO1.setIdcard(patientDO.getCardId());
responseLogVO1.setJson(response);
applylogService.createApplylog(responseLogVO1);
} else {
return success(true, "未查询到患者样本码");
}
}
return success(true);
}
@ -1465,6 +1524,7 @@ public class InspectPatientController {
}
return success(inspectApiInfoVO);
}
@GetMapping("/updatePatientSupplement")
@Operation(summary = "更新公卫患者扩展信息")
public CommonResult<Boolean> updatePatientSupplement(@RequestParam("medicalSn") String medicalSn, @RequestParam("idCard") String idCard) throws JsonProcessingException {
@ -1511,6 +1571,7 @@ public class InspectPatientController {
return success(true);
}
@PutMapping("/syncPatientZyInfo")
@Operation(summary = "同步中医体质结果项")
public CommonResult<Boolean> syncPatientZyInfo(@RequestParam("medicalSn") String medicalSn, @RequestParam("cardId") String cardId) throws JsonProcessingException {
@ -1829,6 +1890,7 @@ public class InspectPatientController {
return success(barcodeInfoVO);
}
@GetMapping("/getworkload")
@Operation(summary = "根据日期获取卫生院体检统计")
public CommonResult<List<WorkloadStatisticsVO>> getWorkload(@RequestParam("dates") @DateTimeFormat(pattern = "yyyy-MM-dd") List<LocalDate> dates) {

4
yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsService.java
View File

@ -70,6 +70,10 @@ public interface InspectPatientitemsService {
* 根据体检编号和项目编号查询指定项目
* */
String Getanalyse(String medicalSn, String itemCode);
/*
* 根据体检编号和项目编号查询所得
* */
String GetItemResult(String medicalSn, String itemCode);
/*
* 根据体检编号和项目编号更新结论和所见

15
yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsServiceImpl.java
View File

@ -135,6 +135,21 @@ public class InspectPatientitemsServiceImpl implements InspectPatientitemsServic
}
return msg;
}
@Override
public String GetItemResult(String medicalSn, String itemCode)
{
String msg="";
QueryWrapper<InspectPatientitemsDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("medicalSn", medicalSn);
queryWrapper.eq("itemCode", itemCode);
InspectPatientitemsDO patientitemsDO= patientitemsMapper.selectOne(queryWrapper);
if(patientitemsDO!=null)
{
msg = patientitemsDO.getItemResult();
}
return msg;
}
private void validatePatientitemsExists(Integer id) {
if (patientitemsMapper.selectById(id) == null) {

8
yudao-server/src/main/resources/application.yaml
View File

@ -3,7 +3,7 @@ spring:
name: yudao-server
profiles:
active: local
active: 222
main:
allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
@ -375,6 +375,6 @@ yudao:
debug: false
#别名 需要的配置 项目名称：/admin
#server:
# servlet:
# context-path: /adminInspect
server:
servlet:
context-path: /adminInspect