From 1a4625c97c89d55eab8bbc8aa78db93293986e90 Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Fri, 19 Jul 2024 21:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=B6=85=E5=A3=B0=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientexamlistController.java | 11 ++ .../vo/PatientexamlistPageReqVO.java | 14 +++ .../vo/PatientexamlistRespVO.java | 6 + .../vo/PatientexamlistSaveReqVO.java | 15 +++ .../patientexamlist/PatientexamlistDO.java | 8 ++ .../ultrasonic/medicalimg/medicalimgVO.java | 49 ++++++++ .../ultrasonic/medicalimg/upmedicalimgVO.java | 21 ++++ .../ultrasonic/ultrasonicController.java | 119 +++++++++++++++++- .../ultrasonic/medicalimg/medicalimgDO.java | 95 ++++++++++++++ .../medicalimg/medicalimgMapper.java | 19 +++ .../dal/ultrasonic/ultrasonicDO.java | 8 +- .../service/medicalimg/medicalimgService.java | 19 +++ .../medicalimg/medicalimgServiceImpl.java | 35 ++++++ .../service/ultrasonic/ultrasonicService.java | 13 +- .../ultrasonic/ultrasonicServiceImpl.java | 26 +++- .../mapper/ultrasonic/medicalimgMapper.xml | 44 +++++++ .../mapper/ultrasonic/ultrasonicMapper.xml | 9 +- .../src/main/resources/application-dev.yaml | 3 +- .../src/main/resources/application-local.yaml | 2 +- .../src/main/resources/application.yaml | 3 +- 20 files changed, 506 insertions(+), 13 deletions(-) create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/medicalimgVO.java create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/upmedicalimgVO.java create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/medicalimg/medicalimgDO.java create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/medicalimg/medicalimgMapper.java create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/medicalimg/medicalimgService.java create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/medicalimg/medicalimgServiceImpl.java create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/resources/mapper/ultrasonic/medicalimgMapper.xml diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java index 43d397c72..559b277a6 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java @@ -129,7 +129,18 @@ public class PatientexamlistController { } + @PutMapping("/examineupdate") + @Operation(summary = "超声审核更新数据") + @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:update')") + public CommonResult updateexaminelist(@Valid @RequestBody PatientexamlistSaveReqVO updateReqVO) { + LocalDateTime dateTime= LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + updateReqVO.setDiagDate(dateTime); + updateReqVO.setReviewDate(dateTime); + patientexamlistService.updatePatientexamlist(updateReqVO); + return success(true); + } } \ No newline at end of file diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistPageReqVO.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistPageReqVO.java index 760903955..9ae23a176 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistPageReqVO.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistPageReqVO.java @@ -91,4 +91,18 @@ public class PatientexamlistPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "登记单号") + private String regId; + + @Schema(description = "影像设备名称") + private String deviceName; + + @Schema(description = "阴性阳性标记：0 为阴性， 1为阳性") + private String diagFlag; + @Schema(description = "备注") + private String notes; + @Schema(description = "开单科室") + private String billDoctorDepartment; + + } \ No newline at end of file diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java index 6b6612116..7514c6fb2 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java @@ -119,4 +119,10 @@ public class PatientexamlistRespVO { @Schema(description = "阴性阳性标记：0 为阴性， 1为阳性") private String diagFlag; + @Schema(description = "备注") + private String notes; + + @Schema(description = "开单科室") + private String billDoctorDepartment; + } \ No newline at end of file diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistSaveReqVO.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistSaveReqVO.java index 282e61ad5..e27aa72ae 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistSaveReqVO.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistSaveReqVO.java @@ -79,4 +79,19 @@ public class PatientexamlistSaveReqVO { @Schema(description = "缩略图oss url, httP:oss url", example = "https://www.iocoder.cn") private String thumbnailImgUrl; + @Schema(description = "登记单号") + private String regId; + + @Schema(description = "影像设备名称") + private String deviceName; + + @Schema(description = "阴性阳性标记：0 为阴性， 1为阳性") + private String diagFlag; + + @Schema(description = "备注") + private String notes; + + @Schema(description = "开单科室") + private String billDoctorDepartment; + } \ No newline at end of file diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java index 166ddb14e..b4999ad97 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.tblist.dal.dataobject.patientexamlist; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.time.*; @@ -157,4 +158,11 @@ public class PatientexamlistDO extends BaseDO { @TableField(value = "diagFlag") private String diagFlag; + + @TableField(value = "notes") + private String notes; + + @TableField(value = "billDoctorDepartment") + private String billDoctorDepartment; + } \ No newline at end of file diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/medicalimgVO.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/medicalimgVO.java new file mode 100644 index 000000000..302bbd8c7 --- /dev/null +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/medicalimgVO.java @@ -0,0 +1,49 @@ +package cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class medicalimgVO { + + @Schema(description = "主键", example = "26467") + private String ID; + + @Schema(description = "地址", example = "1") + private String imgUrl; + + @Schema(description = "科室名称", example = "1") + private String departmentName; + + @Schema(description = "图像描述", example = "1") + private String imgDescription; + + @Schema(description = "科室代号", example = "1") + private String departmentCode; + + @Schema(description = "创建人", example = "1") + private String createPerson; + + @Schema(description = "创建时间", example = "1") + private LocalDateTime createDate; + + @Schema(description = "删除标记", example = "1") + private String isDelete; + + @Schema(description = "删除人", example = "1") + private String deletePerson; + + @Schema(description = "删除时间", example = "1") + private LocalDateTime deleteDate; + + @Schema(description = "机构ID", example = "1") + private String orgId; + + @Schema(description = "", example = "1") + private String regId; + + @Schema(description = "是否选中为报告图", example = "1") + private String selected; +} diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/upmedicalimgVO.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/upmedicalimgVO.java new file mode 100644 index 000000000..32cbe6523 --- /dev/null +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/medicalimg/upmedicalimgVO.java @@ -0,0 +1,21 @@ +package cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class upmedicalimgVO { + + @Schema(description = "主键", example = "26467") + private String id; + + @Schema(description = "删除标记", example = "1") + private String isDelete; + + @Schema(description = "删除人", example = "1") + private String deletePerson; + + @Schema(description = "是否为选中标记", example = "1") + private String selected; + +} diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java index f116e175f..99058a8f0 100644 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java @@ -1,6 +1,16 @@ package cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic; +import cn.hutool.core.date.DateTime; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.applyregistration.controller.admin.applyform.devicevo.DeviceVO; +import cn.iocoder.yudao.module.applyregistration.controller.admin.applyform.devicevo.deviceupVO; +import cn.iocoder.yudao.module.applyregistration.dal.dataobject.applyform.ApplyformDO; +import cn.iocoder.yudao.module.applyregistration.dal.device.DeviceDO; +import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg.medicalimgVO; +import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg.upmedicalimgVO; +import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg.medicalimgDO; import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.ultrasonicDO; +import cn.iocoder.yudao.module.ultrasoniccom.service.medicalimg.medicalimgService; import cn.iocoder.yudao.module.ultrasoniccom.service.ultrasonic.ultrasonicService; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; @@ -10,18 +20,21 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.nio.charset.StandardCharsets; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -35,7 +48,8 @@ public class ultrasonicController { private static final Logger log = LoggerFactory.getLogger(ApplyformController.class); @Resource private ultrasonicService ultrasonicService; - + @Resource + private medicalimgService medicalimgService; @GetMapping("/reporttemplatetlist") @Operation(summary = "获取模版表数据") @@ -45,6 +59,14 @@ public class ultrasonicController { List devicelist = ultrasonicService.getreporttemplate(); List filteredList=new ArrayList<>(); + // 按照 updateTime 字段降序排列，空值放在最后 + List sortedList = devicelist.stream() + .sorted(Comparator.comparing(ultrasonicDO::getUpdateTime, Comparator.nullsLast(Comparator.reverseOrder()))) + .collect(Collectors.toList()); + devicelist=sortedList; + + + if (!orgID.isEmpty()) { filteredList = devicelist.stream() @@ -124,5 +146,92 @@ public class ultrasonicController { return treeList; } + @GetMapping("/getimageslist") + @Operation(summary = "获取图片列表") + @Parameter(name = "orgid", description = "机构ID", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('ultrasoniccom:ultrasonic:create')") + public CommonResult> getimageslist(@RequestParam("orgID") String orgId,@RequestParam("regID") String regId,@RequestParam("select") String select) { + List devicelist = ultrasonicService.getmedicalimgist(orgId,regId,select); + return success(BeanUtils.toBean(devicelist, medicalimgDO.class)); + } + + @PutMapping("/examineimageupdate") + @Operation(summary = "超声审核更新图片数据") + @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:update')") + public CommonResult updateexamineimagelist(@Valid @RequestBody List updateReqVO) { + + if (!updateReqVO.isEmpty()) + { + //最终提交的数据 + List doList=new ArrayList<>(); + + //当前时间 + LocalDateTime dateTime= LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + //循环传递进来的参数 赋值 + for (upmedicalimgVO s : updateReqVO) { + //新增对象 + medicalimgDO medicalimgDO=new medicalimgDO(); + medicalimgDO.setId(s.getId()); + if(!s.getIsDelete().isEmpty()) + { + medicalimgDO.setIsDelete(s.getIsDelete()); + medicalimgDO.setDeletePerson(s.getDeletePerson()); + medicalimgDO.setDeleteDate(dateTime); + } + if(!s.getSelected().isEmpty()) + { + medicalimgDO.setSelected(s.getSelected()); + } + doList.add(medicalimgDO); + } + if (!doList.isEmpty()) + { + boolean bol= medicalimgService.updateBatchById(doList); + return success(bol); + } + else + { + return success(false); + } + } + else + { + + log.error("超声审核更新图片数据方法参数为空"); + return success(false); + } + + + } + + + + + @GetMapping("/upreporttemplatetime") + @Operation(summary = "更新模版表时间") + @DataPermission(enable = false) + @PreAuthorize("@ss.hasPermission('ultrasoniccom:ultrasonic:create')") + public CommonResult upreporttemplatetime(@RequestParam("pid") String pid) throws ParseException { + + //当前时间 + // 定义日期时间格式 + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + // 获取当前时间的字符串表示 + String currentDateTimeString = formatter.format(new Date()); + + // 将字符串解析为 Date 对象 + Date currentDateTime = formatter.parse(currentDateTimeString); + //新增对象 + ultrasonicDO ultrasonicDO=new ultrasonicDO(); + ultrasonicDO.setId(pid); + ultrasonicDO.setUpdateTime(currentDateTime); + + boolean bol= ultrasonicService.updateById(ultrasonicDO); + return success(bol); + + + } } diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/medicalimg/medicalimgDO.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/medicalimg/medicalimgDO.java new file mode 100644 index 000000000..a07e1686c --- /dev/null +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/medicalimg/medicalimgDO.java @@ -0,0 +1,95 @@ +package cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.time.LocalDateTime; + +@TableName("tb_medicalimg") +@Data +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class medicalimgDO { + + @TableId(type = IdType.INPUT) + private String id; + + /** + * 图像地址 + */ + @TableField("imgUrl") + private String imgUrl; + + /** + * 科室名称 + */ + @TableField("departmentName") + private String departmentName; + + /** + * 图像描述 + */ + @TableField("departmentName") + private String imgDescription; + + + /** + * 科室代号 + */ + @TableField("departmentCode") + private String departmentCode; + + /** + * 创建人 + */ + @TableField("createPerson") + private String createPerson; + + /** + * 创建时间 + */ + @TableField("createDate") + private LocalDateTime createDate; + + /** + * 是否删除 + */ + @TableField("isDelete") + private String isDelete; + + /** + * 删除人 + */ + @TableField("deletePerson") + private String deletePerson; + + /** + * 删除时间 + */ + @TableField("deleteDate") + private LocalDateTime deleteDate; + + /** + * orgId + */ + @TableField("orgId") + private String orgId; + + /** + * regId + */ + @TableField("regId") + private String regId; + + + /** + * selected + */ + @TableField("selected") + private String selected; +} diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/medicalimg/medicalimgMapper.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/medicalimg/medicalimgMapper.java new file mode 100644 index 000000000..bf5717a64 --- /dev/null +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/medicalimg/medicalimgMapper.java @@ -0,0 +1,19 @@ +package cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg; + +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.ultrasonicDO; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.dom4j.util.UserDataDocumentFactory; + +import java.util.List; + +@InterceptorIgnore(tenantLine = "true") +@Mapper +public interface medicalimgMapper extends BaseMapperX { + + List getmedicalimgist(@Param("orgId") String orgId,@Param("regId") String regId,@Param("select") String select); + + List getmedicalimgist(UserDataDocumentFactory UserDataDocumentFactory); +} diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/ultrasonicDO.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/ultrasonicDO.java index 3eabd3bfb..4b80ef4f0 100644 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/ultrasonicDO.java +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/ultrasonicDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic; +import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -8,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.*; import java.time.LocalDateTime; +import java.util.Date; @TableName("tb_reporttemplate") @Data @@ -18,7 +20,7 @@ import java.time.LocalDateTime; public class ultrasonicDO { @TableId(type = IdType.INPUT) - private String ID; + private String id; /** * 下拉框：体检模板，住院模板，门诊模板 @@ -105,4 +107,8 @@ public class ultrasonicDO { */ @TableField("pid") private String pid; + + @TableField("updateTime") + private Date updateTime; + } diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/medicalimg/medicalimgService.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/medicalimg/medicalimgService.java new file mode 100644 index 000000000..4a3051e38 --- /dev/null +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/medicalimg/medicalimgService.java @@ -0,0 +1,19 @@ +package cn.iocoder.yudao.module.ultrasoniccom.service.medicalimg; + +import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg.medicalimgVO; +import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg.medicalimgDO; +import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.ultrasonicDO; +import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; + +import javax.validation.Valid; +import java.util.List; + + +public interface medicalimgService extends IService { + + + + + void updatePatientexamlist(@Valid medicalimgVO medicalimgVO); +} diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/medicalimg/medicalimgServiceImpl.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/medicalimg/medicalimgServiceImpl.java new file mode 100644 index 000000000..3c4daee5f --- /dev/null +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/medicalimg/medicalimgServiceImpl.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.ultrasoniccom.service.medicalimg; + +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg.medicalimgVO; +import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg.medicalimgDO; +import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg.medicalimgMapper; +import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.ultrasonicDO; +import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.ultrasonicMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.List; + +@Service +@Validated +public class medicalimgServiceImpl extends ServiceImpl implements medicalimgService { + + @Resource + private ultrasonicMapper ultrasonicMapper; + + @Resource + private medicalimgMapper medicalimgMapper; + + + + @Override + public void updatePatientexamlist(medicalimgVO updateReqVO) { + + // 更新 + medicalimgDO updateObj = BeanUtils.toBean(updateReqVO, medicalimgDO.class); + medicalimgMapper.updateById(updateObj); + } +} diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicService.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicService.java index 33f1231fd..831282e9d 100644 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicService.java +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicService.java @@ -1,11 +1,17 @@ package cn.iocoder.yudao.module.ultrasoniccom.service.ultrasonic; +import cn.iocoder.yudao.module.applyregistration.dal.dataobject.applyform.ApplyformDO; +import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg.medicalimgVO; +import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg.medicalimgDO; import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.ultrasonicDO; +import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; +import javax.validation.Valid; import java.util.List; -public interface ultrasonicService { +public interface ultrasonicService extends IService { /** @@ -14,4 +20,9 @@ public interface ultrasonicService { * @return 申请登记记录 */ List getreporttemplate(); + + + List getmedicalimgist(@Param("orgId") String orgId, @Param("regId") String regId,@Param("select") String select); + + void updatePatientexamlist(@Valid medicalimgVO medicalimgVO); } diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicServiceImpl.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicServiceImpl.java index 03f69d950..c1618ba82 100644 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicServiceImpl.java +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicServiceImpl.java @@ -1,22 +1,44 @@ package cn.iocoder.yudao.module.ultrasoniccom.service.ultrasonic; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.applyregistration.dal.dataobject.applyform.ApplyformDO; +import cn.iocoder.yudao.module.applyregistration.dal.mysql.applyform.ApplyformMapper; +import cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic.medicalimg.medicalimgVO; +import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg.medicalimgDO; import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.ultrasonicDO; import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.ultrasonicMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; - +import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg.medicalimgMapper; import javax.annotation.Resource; import java.util.List; @Service @Validated -public class ultrasonicServiceImpl implements ultrasonicService{ +public class ultrasonicServiceImpl extends ServiceImpl implements ultrasonicService{ @Resource private ultrasonicMapper ultrasonicMapper; + @Resource + private medicalimgMapper medicalimgMapper; + @Override public List getreporttemplate() { return ultrasonicMapper.getreporttemplist(); } + + @Override + public List getmedicalimgist(String orgId, String regId,String select) { + return medicalimgMapper.getmedicalimgist(orgId,regId,select); + } + + @Override + public void updatePatientexamlist(medicalimgVO updateReqVO) { + + // 更新 + medicalimgDO updateObj = BeanUtils.toBean(updateReqVO, medicalimgDO.class); + medicalimgMapper.updateById(updateObj); + } } diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/resources/mapper/ultrasonic/medicalimgMapper.xml b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/resources/mapper/ultrasonic/medicalimgMapper.xml new file mode 100644 index 000000000..820a91591 --- /dev/null +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/resources/mapper/ultrasonic/medicalimgMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/resources/mapper/ultrasonic/ultrasonicMapper.xml b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/resources/mapper/ultrasonic/ultrasonicMapper.xml index fd27f06d6..72978eb6b 100644 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/resources/mapper/ultrasonic/ultrasonicMapper.xml +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/resources/mapper/ultrasonic/ultrasonicMapper.xml @@ -9,6 +9,13 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> \ No newline at end of file diff --git a/yudao-server/src/main/resources/application-dev.yaml b/yudao-server/src/main/resources/application-dev.yaml index cf0fb10d6..d4ae2bda9 100644 --- a/yudao-server/src/main/resources/application-dev.yaml +++ b/yudao-server/src/main/resources/application-dev.yaml @@ -202,4 +202,5 @@ justauth: cache: type: REDIS prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: - timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 \ No newline at end of file + timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 + diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index e23c1d097..0ad1c752e 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -171,6 +171,7 @@ logging: cn.iocoder.yudao.module.statistics.dal.mysql: debug cn.iocoder.yudao.module.crm.dal.mysql: debug cn.iocoder.yudao.module.erp.dal.mysql: debug + cn.iocoder.yudao.module.ultrasoniccom.dal: debug org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示 debug: false @@ -248,4 +249,3 @@ justauth: type: REDIS prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 - diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 6cb5386e3..d056b2527 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -261,4 +261,5 @@ debug: false # 积木报表配置 jeecg: jmreport: - saas-mode: tenant \ No newline at end of file + saas-mode: tenant +