新增获取样本码信息接口
This commit is contained in:
parent
c1d49642f1
commit
261cdbdacb
@ -207,7 +207,7 @@ public class InspectPatientController {
|
|||||||
String datePart = currentDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
|
String datePart = currentDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
|
||||||
// 生成一个6位的序列号
|
// 生成一个6位的序列号
|
||||||
int sequenceNumber = counter.incrementAndGet() % 1000000; // 确保序列号是6位数
|
int sequenceNumber = counter.incrementAndGet() % 1000000; // 确保序列号是6位数
|
||||||
String MedicalSn = datePart+String.format("%06d", sequenceNumber);
|
String MedicalSn = datePart + String.format("%06d", sequenceNumber);
|
||||||
//患者信息
|
//患者信息
|
||||||
InspectPatientSaveReqVO rowData = new InspectPatientSaveReqVO();
|
InspectPatientSaveReqVO rowData = new InspectPatientSaveReqVO();
|
||||||
|
|
||||||
@ -323,14 +323,13 @@ public class InspectPatientController {
|
|||||||
patientitemsService.createPatientListitems(batch);
|
patientitemsService.createPatientListitems(batch);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/insertPatinetInfo")
|
@PostMapping("/insertPatinetInfo")
|
||||||
@Operation(summary = "根据表单创建患者信息和项目信息")
|
@Operation(summary = "根据表单创建患者信息和项目信息")
|
||||||
public CommonResult<Boolean> insertPatinetInfo(@Valid @RequestBody InspectPatientSaveReqVO inspectPatientSaveReqVO)
|
public CommonResult<Boolean> insertPatinetInfo(@Valid @RequestBody InspectPatientSaveReqVO inspectPatientSaveReqVO) {
|
||||||
{
|
|
||||||
//验证身份证
|
//验证身份证
|
||||||
if( patientService.validateIdCardExists(inspectPatientSaveReqVO.getCardId()))
|
if (patientService.validateIdCardExists(inspectPatientSaveReqVO.getCardId())) {
|
||||||
{
|
return success(false, "身份证号已存在");
|
||||||
return success(false,"身份证号已存在");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//检查项目
|
//检查项目
|
||||||
@ -342,7 +341,7 @@ public class InspectPatientController {
|
|||||||
String datePart = currentDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
|
String datePart = currentDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
|
||||||
// 生成一个6位的序列号
|
// 生成一个6位的序列号
|
||||||
int sequenceNumber = counter.incrementAndGet() % 1000000; // 确保序列号是6位数
|
int sequenceNumber = counter.incrementAndGet() % 1000000; // 确保序列号是6位数
|
||||||
String sequencePart = datePart+String.format("%06d", sequenceNumber);
|
String sequencePart = datePart + String.format("%06d", sequenceNumber);
|
||||||
//患者信息
|
//患者信息
|
||||||
InspectPatientSaveReqVO rowData = new InspectPatientSaveReqVO();
|
InspectPatientSaveReqVO rowData = new InspectPatientSaveReqVO();
|
||||||
rowData.setMedicalSn(sequencePart);
|
rowData.setMedicalSn(sequencePart);
|
||||||
@ -378,14 +377,13 @@ public class InspectPatientController {
|
|||||||
// batchInsertPatientItems(dataList2);
|
// batchInsertPatientItems(dataList2);
|
||||||
return success(true);
|
return success(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/createPatientitem")
|
@GetMapping("/createPatientitem")
|
||||||
@Operation(summary = "通过体检编号绑定检查项目信息")
|
@Operation(summary = "通过体检编号绑定检查项目信息")
|
||||||
public CommonResult<Boolean> createPatientitem(@RequestParam("medicalSn") String medicalSn)
|
public CommonResult<Boolean> createPatientitem(@RequestParam("medicalSn") String medicalSn) {
|
||||||
{
|
|
||||||
//如果这个患者存在患者项目数据则不进行插入
|
//如果这个患者存在患者项目数据则不进行插入
|
||||||
boolean exists = patientitemsService.existsByMedicalSn(medicalSn);
|
boolean exists = patientitemsService.existsByMedicalSn(medicalSn);
|
||||||
if(exists)
|
if (exists) {
|
||||||
{
|
|
||||||
return success(true);
|
return success(true);
|
||||||
}
|
}
|
||||||
//检查项目
|
//检查项目
|
||||||
@ -414,14 +412,14 @@ public class InspectPatientController {
|
|||||||
rowData2.setMealfrontorafter(inspectitemsDO.getMealfrontorafter());
|
rowData2.setMealfrontorafter(inspectitemsDO.getMealfrontorafter());
|
||||||
dataList2.add(rowData2);
|
dataList2.add(rowData2);
|
||||||
}
|
}
|
||||||
if(dataList2.size()>0)
|
if (dataList2.size() > 0) {
|
||||||
{
|
|
||||||
// 分批插入患者项目信息
|
// 分批插入患者项目信息
|
||||||
batchInsertPatientItems(dataList2);
|
batchInsertPatientItems(dataList2);
|
||||||
}
|
}
|
||||||
|
|
||||||
return success(true);
|
return success(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/syncinspectApplyTj")
|
@GetMapping("/syncinspectApplyTj")
|
||||||
@Operation(summary = "发送检验申请单")
|
@Operation(summary = "发送检验申请单")
|
||||||
public CommonResult<Boolean> syncinspectApplyTj(@RequestParam("medicalSn") String medicalSn) throws JsonProcessingException {
|
public CommonResult<Boolean> syncinspectApplyTj(@RequestParam("medicalSn") String medicalSn) throws JsonProcessingException {
|
||||||
@ -540,22 +538,19 @@ public class InspectPatientController {
|
|||||||
switch (type) {
|
switch (type) {
|
||||||
case "XCG":
|
case "XCG":
|
||||||
model = "cbc";
|
model = "cbc";
|
||||||
if(patientDO.getXcgcode()!=null)
|
if (patientDO.getXcgcode() != null) {
|
||||||
{
|
|
||||||
barCode = patientDO.getXcgcode();
|
barCode = patientDO.getXcgcode();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "NCG":
|
case "NCG":
|
||||||
model = "rt";
|
model = "rt";
|
||||||
if(patientDO.getNcgcode()!=null)
|
if (patientDO.getNcgcode() != null) {
|
||||||
{
|
|
||||||
barCode = patientDO.getNcgcode();
|
barCode = patientDO.getNcgcode();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "SHQX":
|
case "SHQX":
|
||||||
model = "bt";
|
model = "bt";
|
||||||
if(patientDO.getShqx()!=null)
|
if (patientDO.getShqx() != null) {
|
||||||
{
|
|
||||||
barCode = patientDO.getShqx();
|
barCode = patientDO.getShqx();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -563,31 +558,25 @@ public class InspectPatientController {
|
|||||||
ConfigDO config = configService.getConfigByKey("url.reporttj");
|
ConfigDO config = configService.getConfigByKey("url.reporttj");
|
||||||
String url = config.getValue();
|
String url = config.getValue();
|
||||||
//查询是否已经存在记录 存在则不进行同步操作
|
//查询是否已经存在记录 存在则不进行同步操作
|
||||||
if(pacsDataService.IspacsDataExist(medicalSn, model))
|
if (pacsDataService.IspacsDataExist(medicalSn, model)) {
|
||||||
{
|
if (!pacsDataService.IspacsDataitemExist(medicalSn, model)) {
|
||||||
if(!pacsDataService.IspacsDataitemExist(medicalSn, model))
|
|
||||||
{
|
|
||||||
//没有对应的item值 更新
|
//没有对应的item值 更新
|
||||||
String response = HttpUtils.get(url + "?" + "barCode=" + barCode + "&" + "hospitalCode=" + patientDO.getHospitalNo());
|
String response = HttpUtils.get(url + "?" + "barCode=" + barCode + "&" + "hospitalCode=" + patientDO.getHospitalNo());
|
||||||
if (response != null)
|
if (response != null) {
|
||||||
{
|
|
||||||
// 解析 JSON 响应
|
// 解析 JSON 响应
|
||||||
ObjectMapper objectMapper = new ObjectMapper();
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
try {
|
try {
|
||||||
ReportResponse reportResponse = objectMapper.readValue(response, ReportResponse.class);
|
ReportResponse reportResponse = objectMapper.readValue(response, ReportResponse.class);
|
||||||
if ("操作成功".equals(reportResponse.getMsg()) && reportResponse.getCode() == 200)
|
if ("操作成功".equals(reportResponse.getMsg()) && reportResponse.getCode() == 200) {
|
||||||
{
|
|
||||||
ReportData reportData = reportResponse.getData();
|
ReportData reportData = reportResponse.getData();
|
||||||
// 获取 reportPath
|
// 获取 reportPath
|
||||||
String reportPath = reportData.getReportPath();
|
String reportPath = reportData.getReportPath();
|
||||||
if(!reportPath.contains("报告暂未出"))
|
if (!reportPath.contains("报告暂未出")) {
|
||||||
{
|
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
InspectPacsDataSaveReqVO inspectPacs = new InspectPacsDataSaveReqVO();
|
InspectPacsDataSaveReqVO inspectPacs = new InspectPacsDataSaveReqVO();
|
||||||
inspectPacs.setCode(patientDO.getMedicalSn());
|
inspectPacs.setCode(patientDO.getMedicalSn());
|
||||||
inspectPacs.setType(model);
|
inspectPacs.setType(model);
|
||||||
if(reportData.getResults()!=null&&reportData.getResults().size()>0)
|
if (reportData.getResults() != null && reportData.getResults().size() > 0) {
|
||||||
{
|
|
||||||
// 获取 results 数组并遍历
|
// 获取 results 数组并遍历
|
||||||
List<ResultItem> results = reportData.getResults();
|
List<ResultItem> results = reportData.getResults();
|
||||||
for (ResultItem result : results) {
|
for (ResultItem result : results) {
|
||||||
@ -600,7 +589,7 @@ public class InspectPatientController {
|
|||||||
tipsDescription = "偏高";
|
tipsDescription = "偏高";
|
||||||
}
|
}
|
||||||
|
|
||||||
sb.append("【"+result.getItemName() +":"+tipsDescription+" ,结果:" + result.getItemValue() + result.getItemUnit() +","+"参考值("+result.getReferenceRange()+ ")】"+"\n");
|
sb.append("【" + result.getItemName() + ":" + tipsDescription + " ,结果:" + result.getItemValue() + result.getItemUnit() + "," + "参考值(" + result.getReferenceRange() + ")】" + "\n");
|
||||||
}
|
}
|
||||||
inspectPacs.setItem(sb.toString());
|
inspectPacs.setItem(sb.toString());
|
||||||
}
|
}
|
||||||
@ -623,21 +612,18 @@ public class InspectPatientController {
|
|||||||
ObjectMapper objectMapper = new ObjectMapper();
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
try {
|
try {
|
||||||
ReportResponse reportResponse = objectMapper.readValue(response, ReportResponse.class);
|
ReportResponse reportResponse = objectMapper.readValue(response, ReportResponse.class);
|
||||||
if ("操作成功".equals(reportResponse.getMsg()) && reportResponse.getCode() == 200)
|
if ("操作成功".equals(reportResponse.getMsg()) && reportResponse.getCode() == 200) {
|
||||||
{
|
|
||||||
ReportData reportData = reportResponse.getData();
|
ReportData reportData = reportResponse.getData();
|
||||||
// 获取 reportPath
|
// 获取 reportPath
|
||||||
String reportPath = reportData.getReportPath();
|
String reportPath = reportData.getReportPath();
|
||||||
if(!reportPath.contains("报告暂未出"))
|
if (!reportPath.contains("报告暂未出")) {
|
||||||
{
|
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
InspectPacsDataSaveReqVO inspectPacs = new InspectPacsDataSaveReqVO();
|
InspectPacsDataSaveReqVO inspectPacs = new InspectPacsDataSaveReqVO();
|
||||||
inspectPacs.setCode(patientDO.getMedicalSn());
|
inspectPacs.setCode(patientDO.getMedicalSn());
|
||||||
inspectPacs.setData(reportPath);
|
inspectPacs.setData(reportPath);
|
||||||
inspectPacs.setType(model);
|
inspectPacs.setType(model);
|
||||||
inspectPacs.setPersonName(patientDO.getPName());
|
inspectPacs.setPersonName(patientDO.getPName());
|
||||||
if(reportData.getResults()!=null&&reportData.getResults().size()>0)
|
if (reportData.getResults() != null && reportData.getResults().size() > 0) {
|
||||||
{
|
|
||||||
// 获取 results 数组并遍历
|
// 获取 results 数组并遍历
|
||||||
List<ResultItem> results = reportData.getResults();
|
List<ResultItem> results = reportData.getResults();
|
||||||
for (ResultItem result : results) {
|
for (ResultItem result : results) {
|
||||||
@ -650,7 +636,7 @@ public class InspectPatientController {
|
|||||||
tipsDescription = "偏高";
|
tipsDescription = "偏高";
|
||||||
}
|
}
|
||||||
|
|
||||||
sb.append("【"+result.getItemName() +":"+tipsDescription+" ,结果:" + result.getItemValue() + result.getItemUnit() +","+"参考值("+result.getReferenceRange()+ ")】"+"\n");
|
sb.append("【" + result.getItemName() + ":" + tipsDescription + " ,结果:" + result.getItemValue() + result.getItemUnit() + "," + "参考值(" + result.getReferenceRange() + ")】" + "\n");
|
||||||
}
|
}
|
||||||
inspectPacs.setItem(sb.toString());
|
inspectPacs.setItem(sb.toString());
|
||||||
}
|
}
|
||||||
@ -718,6 +704,7 @@ public class InspectPatientController {
|
|||||||
patientService.medicalSnupdate(updateReqVO);
|
patientService.medicalSnupdate(updateReqVO);
|
||||||
return success(true);
|
return success(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@PutMapping("/updatedoctorid")
|
@PutMapping("/updatedoctorid")
|
||||||
@Operation(summary = "更新患者总检医生ID")
|
@Operation(summary = "更新患者总检医生ID")
|
||||||
public CommonResult<Boolean> updatedoctorid(@Valid @RequestBody InspectPatientSaveReqVO updateReqVO) {
|
public CommonResult<Boolean> updatedoctorid(@Valid @RequestBody InspectPatientSaveReqVO updateReqVO) {
|
||||||
@ -738,11 +725,9 @@ public class InspectPatientController {
|
|||||||
// 设置基本信息
|
// 设置基本信息
|
||||||
BeanUtils.copyProperties(patientDO, inspectPatientReportVO);
|
BeanUtils.copyProperties(patientDO, inspectPatientReportVO);
|
||||||
// 先拿到ID 在查询签名
|
// 先拿到ID 在查询签名
|
||||||
if(patientDO.getChiefinspectorid()!=null)
|
if (patientDO.getChiefinspectorid() != null) {
|
||||||
{
|
InspectDoctorDO doctorDO = doctorService.getDoctorid(patientDO.getChiefinspectorid());
|
||||||
InspectDoctorDO doctorDO= doctorService.getDoctorid( patientDO.getChiefinspectorid());
|
if (doctorDO != null && doctorDO.getDoctorsign() != null) {
|
||||||
if(doctorDO!=null&&doctorDO.getDoctorsign()!=null)
|
|
||||||
{
|
|
||||||
inspectPatientReportVO.setSign(doctorDO.getDoctorsign());
|
inspectPatientReportVO.setSign(doctorDO.getDoctorsign());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -906,7 +891,8 @@ public class InspectPatientController {
|
|||||||
// 添加新的匹配逻辑
|
// 添加新的匹配逻辑
|
||||||
if (pacsType.equals("CBC") && upperItemName.contains("血常规")) return true;
|
if (pacsType.equals("CBC") && upperItemName.contains("血常规")) return true;
|
||||||
if (pacsType.equals("RT") && upperItemName.contains("尿常规")) return true;
|
if (pacsType.equals("RT") && upperItemName.contains("尿常规")) return true;
|
||||||
if (pacsType.equals("BT") && (upperItemName.contains("生化") || upperItemName.contains("SHQX"))) return true;
|
if (pacsType.equals("BT") && (upperItemName.contains("生化") || upperItemName.contains("SHQX")))
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@ -919,14 +905,22 @@ public class InspectPatientController {
|
|||||||
if (pacsType == null) return "未知检查";
|
if (pacsType == null) return "未知检查";
|
||||||
|
|
||||||
switch (pacsType.toUpperCase()) {
|
switch (pacsType.toUpperCase()) {
|
||||||
case "XCG": return "血常规";
|
case "XCG":
|
||||||
case "NCG": return "尿常规";
|
return "血常规";
|
||||||
case "ECG": return "心电图";
|
case "NCG":
|
||||||
case "US": return "超声检查";
|
return "尿常规";
|
||||||
case "BT": return "生化";
|
case "ECG":
|
||||||
case "RT": return "尿常规";
|
return "心电图";
|
||||||
case "CBC": return "血常规";
|
case "US":
|
||||||
default: return pacsType;
|
return "超声检查";
|
||||||
|
case "BT":
|
||||||
|
return "生化";
|
||||||
|
case "RT":
|
||||||
|
return "尿常规";
|
||||||
|
case "CBC":
|
||||||
|
return "血常规";
|
||||||
|
default:
|
||||||
|
return pacsType;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1054,13 +1048,11 @@ public class InspectPatientController {
|
|||||||
}
|
}
|
||||||
list.add(inspectPatientitemsSaveReqVO);
|
list.add(inspectPatientitemsSaveReqVO);
|
||||||
patientitemsService.updatePatientitemInfo(list);
|
patientitemsService.updatePatientitemInfo(list);
|
||||||
if(dataMap.get("personimg")!=null)
|
if (dataMap.get("personimg") != null) {
|
||||||
{
|
|
||||||
|
|
||||||
String headurl = dataMap.get("personimg").toString();
|
String headurl = dataMap.get("personimg").toString();
|
||||||
String base64 = HttpUtils.getImageAsBase64(headurl);
|
String base64 = HttpUtils.getImageAsBase64(headurl);
|
||||||
if(base64!=null|| base64!="")
|
if (base64 != null || base64 != "") {
|
||||||
{
|
|
||||||
InspectPatientSaveReqVO updateReqVO = new InspectPatientSaveReqVO();
|
InspectPatientSaveReqVO updateReqVO = new InspectPatientSaveReqVO();
|
||||||
updateReqVO.setMedicalSn(medicalSn);
|
updateReqVO.setMedicalSn(medicalSn);
|
||||||
updateReqVO.setHeadPicUrl(base64);
|
updateReqVO.setHeadPicUrl(base64);
|
||||||
@ -1099,11 +1091,13 @@ public class InspectPatientController {
|
|||||||
public CommonResult<InspectPatientDO> getPatientInfo(@RequestParam("medicalSn") String medicalSn) {
|
public CommonResult<InspectPatientDO> getPatientInfo(@RequestParam("medicalSn") String medicalSn) {
|
||||||
return success(patientService.getPatientInfo(medicalSn));
|
return success(patientService.getPatientInfo(medicalSn));
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/PatientBySearchKey")
|
@GetMapping("/PatientBySearchKey")
|
||||||
@Operation(summary = "根据姓名、身份证号、体检编号获得患者信息")
|
@Operation(summary = "根据姓名、身份证号、体检编号获得患者信息")
|
||||||
public CommonResult<List<InspectPatientDO>> getPatientBySearchKey(@RequestParam("searchKey") String searchKey) {
|
public CommonResult<List<InspectPatientDO>> getPatientBySearchKey(@RequestParam("searchKey") String searchKey) {
|
||||||
return success(patientService.getPatientBySearchKey(searchKey));
|
return success(patientService.getPatientBySearchKey(searchKey));
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/getecgTj")
|
@GetMapping("/getecgTj")
|
||||||
@Operation(summary = "获取体检ecg数据")
|
@Operation(summary = "获取体检ecg数据")
|
||||||
public CommonResult<Boolean> GetApiEcgInfo(@RequestParam("medicalSn") String medicalSn) {
|
public CommonResult<Boolean> GetApiEcgInfo(@RequestParam("medicalSn") String medicalSn) {
|
||||||
@ -1116,23 +1110,21 @@ public class InspectPatientController {
|
|||||||
pacsDataService.createPacsData(inspectPacs);
|
pacsDataService.createPacsData(inspectPacs);
|
||||||
return success(true);
|
return success(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/GetApiPatientInfo")
|
@GetMapping("/GetApiPatientInfo")
|
||||||
@Operation(summary = "获取公卫患者信息")
|
@Operation(summary = "获取公卫患者信息")
|
||||||
public CommonResult<InspectApiInfoVO> GetApiPatientInfo(@RequestParam("idCard") String idCard) throws JsonProcessingException {
|
public CommonResult<InspectApiInfoVO> GetApiPatientInfo(@RequestParam("idCard") String idCard) throws JsonProcessingException {
|
||||||
ConfigDO config = configService.getConfigByKey("url.patientinfo");
|
ConfigDO config = configService.getConfigByKey("url.patientinfo");
|
||||||
String url = config.getValue();
|
String url = config.getValue();
|
||||||
InspectApiInfoVO inspectApiInfoVO =new InspectApiInfoVO();
|
InspectApiInfoVO inspectApiInfoVO = new InspectApiInfoVO();
|
||||||
if(url!=null)
|
if (url != null) {
|
||||||
{
|
|
||||||
String response = HttpUtils.post(url + "?" + "idCard=" + idCard);
|
String response = HttpUtils.post(url + "?" + "idCard=" + idCard);
|
||||||
if(response!=null)
|
if (response != null) {
|
||||||
{
|
|
||||||
// 解析 JSON 响应
|
// 解析 JSON 响应
|
||||||
ObjectMapper objectMapper = new ObjectMapper();
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
Map<String, Object> responseMap = objectMapper.readValue(response, Map.class);
|
Map<String, Object> responseMap = objectMapper.readValue(response, Map.class);
|
||||||
Map<String, Object> dataMap = (Map<String, Object>) responseMap.get("data");
|
Map<String, Object> dataMap = (Map<String, Object>) responseMap.get("data");
|
||||||
if (dataMap != null)
|
if (dataMap != null) {
|
||||||
{
|
|
||||||
if (dataMap.get("idCard") != null) {
|
if (dataMap.get("idCard") != null) {
|
||||||
inspectApiInfoVO.setIdCard(dataMap.get("idCard").toString());
|
inspectApiInfoVO.setIdCard(dataMap.get("idCard").toString());
|
||||||
}
|
}
|
||||||
@ -1157,9 +1149,7 @@ public class InspectPatientController {
|
|||||||
if (dataMap.get("telephone") != null) {
|
if (dataMap.get("telephone") != null) {
|
||||||
inspectApiInfoVO.setTelephone(dataMap.get("telephone").toString());
|
inspectApiInfoVO.setTelephone(dataMap.get("telephone").toString());
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
return success("没有查询到相关信息");
|
return success("没有查询到相关信息");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1184,7 +1174,8 @@ public class InspectPatientController {
|
|||||||
Object dataObj = responseMap.get("data");
|
Object dataObj = responseMap.get("data");
|
||||||
if (dataObj != null) {
|
if (dataObj != null) {
|
||||||
// 将 data 字段解析为一个 List<Map<String, Object>>
|
// 将 data 字段解析为一个 List<Map<String, Object>>
|
||||||
List<Map<String, Object>> dataList = objectMapper.convertValue(dataObj, new TypeReference<List<Map<String, Object>>>() {});
|
List<Map<String, Object>> dataList = objectMapper.convertValue(dataObj, new TypeReference<List<Map<String, Object>>>() {
|
||||||
|
});
|
||||||
|
|
||||||
InspectPatientSaveReqVO inspectPatientSaveReqVO = new InspectPatientSaveReqVO();
|
InspectPatientSaveReqVO inspectPatientSaveReqVO = new InspectPatientSaveReqVO();
|
||||||
inspectPatientSaveReqVO.setMedicalSn(medicalSn);
|
inspectPatientSaveReqVO.setMedicalSn(medicalSn);
|
||||||
@ -1320,7 +1311,7 @@ public class InspectPatientController {
|
|||||||
// 发送POST请求
|
// 发送POST请求
|
||||||
String url = "http://114.55.171.231:48085/api/report/generate";
|
String url = "http://114.55.171.231:48085/api/report/generate";
|
||||||
String response = HttpUtils.postJson(url, jsonRequestBody);
|
String response = HttpUtils.postJson(url, jsonRequestBody);
|
||||||
if(response!=null) {
|
if (response != null) {
|
||||||
// 解析响应,如果成功则保存PDF URL
|
// 解析响应,如果成功则保存PDF URL
|
||||||
try {
|
try {
|
||||||
Map<String, Object> responseMap = objectMapper.readValue(response, Map.class);
|
Map<String, Object> responseMap = objectMapper.readValue(response, Map.class);
|
||||||
@ -1377,6 +1368,7 @@ public class InspectPatientController {
|
|||||||
return success(false, "更新报告URL失败:" + e.getMessage());
|
return success(false, "更新报告URL失败:" + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/getReportUrl")
|
@GetMapping("/getReportUrl")
|
||||||
@Operation(summary = "获取患者体检报告URL")
|
@Operation(summary = "获取患者体检报告URL")
|
||||||
public CommonResult<Map<String, Object>> getReportUrl(@RequestParam("cardId") String cardId) {
|
public CommonResult<Map<String, Object>> getReportUrl(@RequestParam("cardId") String cardId) {
|
||||||
@ -1427,13 +1419,57 @@ public class InspectPatientController {
|
|||||||
return CommonResult.error(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(), "查询异常:" + e.getMessage());
|
return CommonResult.error(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(), "查询异常:" + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@PutMapping("/updateMedicalDateTime")
|
@PutMapping("/updateMedicalDateTime")
|
||||||
@Operation(summary = "更新体检日期")
|
@Operation(summary = "更新体检日期")
|
||||||
public CommonResult<Boolean> updateMedicalDateTime(@RequestParam("medicalSn") String medicalSn,
|
public CommonResult<Boolean> updateMedicalDateTime(@RequestParam("medicalSn") String medicalSn,
|
||||||
@RequestParam(value = "medicalDateTime", required = false)
|
@RequestParam(value = "medicalDateTime", required = false)
|
||||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Date medicalDateTime)
|
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Date medicalDateTime) {
|
||||||
{
|
|
||||||
patientService.updateMedicalDateTime(medicalSn, medicalDateTime);
|
patientService.updateMedicalDateTime(medicalSn, medicalDateTime);
|
||||||
return success(true);
|
return success(true);
|
||||||
}
|
}
|
||||||
|
@GetMapping("/GetbarcodeInfo")
|
||||||
|
@Operation(summary = "获取样本码信息")
|
||||||
|
public CommonResult<BarcodeInfoVO> GetbarcodeInfo(@RequestParam("medicalSn") String medicalSn) {
|
||||||
|
|
||||||
|
// 获取患者信息
|
||||||
|
InspectPatientDO patientDO = patientService.getPatientInfo(medicalSn);
|
||||||
|
if (patientDO == null) {
|
||||||
|
return success("未找到该患者信息");
|
||||||
|
}
|
||||||
|
if(patientDO.getNcgcode()==null || patientDO.getXcgcode()==null|| patientDO.getShqx()==null)
|
||||||
|
{
|
||||||
|
return success("条码不存在");
|
||||||
|
}
|
||||||
|
BarcodeInfoVO barcodeInfoVO = new BarcodeInfoVO();
|
||||||
|
barcodeInfoVO.setName(patientDO.getPName());
|
||||||
|
barcodeInfoVO.setGender(patientDO.getGender());
|
||||||
|
int age = StrUtils.calculateAgeFromIdCard(patientDO.getCardId());
|
||||||
|
barcodeInfoVO.setAge(age);
|
||||||
|
// 设置当前时间字符串
|
||||||
|
LocalDateTime currentDateTime = LocalDateTime.now();
|
||||||
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||||
|
String currentDateTimeStr = currentDateTime.format(formatter);
|
||||||
|
barcodeInfoVO.setExaminationDate(currentDateTimeStr);
|
||||||
|
// 初始化条形码集合
|
||||||
|
List<BarcodeInfoVO.Barcode> barcodes = new ArrayList<>();
|
||||||
|
BarcodeInfoVO.Barcode ncgbarcode = new BarcodeInfoVO.Barcode();
|
||||||
|
ncgbarcode.setCode(patientDO.getNcgcode());
|
||||||
|
ncgbarcode.setName("尿常规");
|
||||||
|
barcodes.add(ncgbarcode);
|
||||||
|
|
||||||
|
BarcodeInfoVO.Barcode xcgbarcode = new BarcodeInfoVO.Barcode();
|
||||||
|
xcgbarcode.setCode(patientDO.getXcgcode());
|
||||||
|
xcgbarcode.setName("血常规");
|
||||||
|
barcodes.add(xcgbarcode);
|
||||||
|
|
||||||
|
BarcodeInfoVO.Barcode shqxbarcode = new BarcodeInfoVO.Barcode();
|
||||||
|
shqxbarcode.setCode(patientDO.getShqx());
|
||||||
|
shqxbarcode.setName("生化");
|
||||||
|
barcodes.add(shqxbarcode);
|
||||||
|
barcodeInfoVO.setBarcodes(barcodes);
|
||||||
|
|
||||||
|
return success(barcodeInfoVO);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -0,0 +1,34 @@
|
|||||||
|
package cn.iocoder.yudao.module.inspect.controller.admin.inspectpatient.vo;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class BarcodeInfoVO {
|
||||||
|
|
||||||
|
@Schema(description = "姓名")
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@Schema(description = "性别")
|
||||||
|
private String gender;
|
||||||
|
|
||||||
|
@Schema(description = "年龄")
|
||||||
|
private Integer age;
|
||||||
|
|
||||||
|
@Schema(description = "体检日期")
|
||||||
|
private String examinationDate;
|
||||||
|
|
||||||
|
@Schema(description = "条形码集合")
|
||||||
|
private List<Barcode> barcodes;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public static class Barcode {
|
||||||
|
@Schema(description = "条形码编码")
|
||||||
|
private String code;
|
||||||
|
|
||||||
|
@Schema(description = "条形码名称")
|
||||||
|
private String name;
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user