diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java index 87908ed..907da08 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.util.io.FileUtils; import cn.iocoder.yudao.framework.common.util.string.StrUtils; import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO; import cn.iocoder.yudao.module.infra.service.config.ConfigService; +import cn.iocoder.yudao.module.inspect.controller.admin.inspectapplylog.vo.InspectApplylogSaveReqVO; import cn.iocoder.yudao.module.inspect.controller.admin.inspectpacsdata.vo.InspectPacsDataSaveReqVO; import cn.iocoder.yudao.module.inspect.controller.admin.inspectpatientitems.vo.InspectPatientitemsSaveReqVO; import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectitems.InspectitemsDO; @@ -69,6 +70,8 @@ import javax.validation.Valid; import com.fasterxml.jackson.databind.ObjectMapper; +import cn.iocoder.yudao.module.inspect.service.inspectapplylog.InspectApplylogService; + @Tag(name = "管理后台 - 患者信息") @RestController @RequestMapping("/inspect/patient") @@ -87,6 +90,8 @@ public class InspectPatientController { private InspectPatientitemsService patientitemsService; @Resource private RestTemplate httpRestTemplate; + @Resource + private InspectApplylogService applylogService; @PostMapping("/create") @Operation(summary = "创建患者信息") @@ -454,6 +459,15 @@ public class InspectPatientController { // 将 Java 对象转换为 JSON 字符串 String jsonRequestBody = objectMapper.writeValueAsString(patient); + + // 保存日志 + InspectApplylogSaveReqVO logVO = new InspectApplylogSaveReqVO(); + logVO.setTime(LocalDateTime.now()); + logVO.setMedicalsn(patientDO.getMedicalSn()); + logVO.setIdcard(patientDO.getCardId()); + logVO.setJson(jsonRequestBody); + applylogService.createApplylog(logVO); + //获取配置项地址 ConfigDO config = configService.getConfigByKey("url.applytj"); // 发送 POST 请求 @@ -462,18 +476,13 @@ public class InspectPatientController { ConfigDO headconfig = configService.getConfigByKey("url.head"); String headurl = headconfig.getValue(); - //String response = HttpUtils.postJson(url, jsonRequestBody); + String response = HttpUtils.postJson(url, jsonRequestBody); InspectPatientSaveReqVO updateReqVO = new InspectPatientSaveReqVO(); updateReqVO.setMedicalSn(patientDO.getMedicalSn()); updateReqVO.setHospitalNo("121526004609160793");//乌兰察布第四医院 暂时写死 updateReqVO.setNcgcode(checkBarCode2); updateReqVO.setXcgcode(checkBarCode1); updateReqVO.setShqx(checkBarCode3); - //采用转base64 -// if(headurl!=null||headurl!="") -// { -// updateReqVO.setHeadPicUrl(headurl+"?certificatenumber="+patientDO.getCardId()); -// } patientService.updatePatientInfo(updateReqVO); } diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectapplylog/InspectApplylogDO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectapplylog/InspectApplylogDO.java index 73be9de..61866a6 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectapplylog/InspectApplylogDO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectapplylog/InspectApplylogDO.java @@ -14,12 +14,11 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; @TableName("tb_applylog") @KeySequence("tb_applylog_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 @Data -@EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class InspectApplylogDO extends BaseDO { +public class InspectApplylogDO { /** * 主键 @@ -29,22 +28,27 @@ public class InspectApplylogDO extends BaseDO { /** * 记录时间 */ + @TableField("time") private LocalDateTime time; /** * 体检编号 */ + @TableField("medicalsn") private String medicalsn; /** * 身份证 */ + @TableField("idcard") private String idcard; /** * 检验单参数json */ + @TableField("json") private String json; /** * 返回值 */ + @TableField("backnumber") private String backnumber; } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectapplylog/InspectApplylogMapper.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectapplylog/InspectApplylogMapper.java index c13e066..6993249 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectapplylog/InspectApplylogMapper.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectapplylog/InspectApplylogMapper.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectapplylog.InspectApplylogDO; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.inspect.controller.admin.inspectapplylog.vo.*; @@ -14,6 +15,7 @@ import cn.iocoder.yudao.module.inspect.controller.admin.inspectapplylog.vo.*; * * @author 赖浩 */ +@InterceptorIgnore(tenantLine = "true") @Mapper public interface InspectApplylogMapper extends BaseMapperX { diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectapplylog/InspectApplylogServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectapplylog/InspectApplylogServiceImpl.java index 32f68ef..fdaca25 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectapplylog/InspectApplylogServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectapplylog/InspectApplylogServiceImpl.java @@ -15,7 +15,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.inspect.dal.mysql.inspectapplylog.InspectApplylogMapper; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.inspect.enums.ErrorCodeConstants.*; + /** * 创建检验单日志记录 Service 实现类 @@ -57,7 +57,7 @@ public class InspectApplylogServiceImpl implements InspectApplylogService { private void validateApplylogExists(Integer id) { if (applylogMapper.selectById(id) == null) { - throw exception(APPLYLOG_NOT_EXISTS); + } }