Merge branch 'master' of http://114.55.171.231:3000/Euni4U/shanghai_backend

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/abpm/abpmController.java

@@ -26,6 +26,7 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
 import cn.iocoder.yudao.module.system.controller.admin.abpm.vo.*;
+import cn.iocoder.yudao.module.system.controller.admin.patientinfo.vo.patientinfoRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.abpm.abpmDO;
 import cn.iocoder.yudao.module.system.service.abpm.abpmService;
 
@@ -94,4 +95,11 @@ public class abpmController {
                         BeanUtils.toBean(list, abpmRespVO.class));
     }
 
+    @PostMapping("/insertAbpmPatientData")
+    @Operation(summary = "插入ABPM动态血压监测基础信息")
+    public CommonResult<Boolean> insertAbpmDataList(@RequestBody List<patientinfoRespVO> patientInfoList) {
+        abpmService.insertAbpmDataList(patientInfoList);
+        return success(true);
+    }
+
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/abpm/vo/abpmPageReqVO.java

@@ -19,6 +19,15 @@ public class abpmPageReqVO extends PageParam {
     @Schema(description = "患者注册ID", example = "3059")
     private String regid;
 
+    @Schema(description = "患者姓名", example = "张三")
+    private String name;
+
+    @Schema(description = "患者性别", example = "1")
+    private String gender;
+
+    @Schema(description = "患者年龄", example = "25")
+    private String age;
+
     @Schema(description = "机构ID", example = "3458")
     private String orgid;
 

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/abpm/vo/abpmRespVO.java

@@ -24,6 +24,18 @@ public class abpmRespVO {
     @ExcelProperty("患者注册ID")
     private String regid;
 
+    @Schema(description = "患者姓名", example = "张三")
+    @ExcelProperty("患者姓名")
+    private String name;
+
+    @Schema(description = "患者性别", example = "1")
+    @ExcelProperty("患者性别")
+    private String gender;
+
+    @Schema(description = "患者年龄", example = "25")
+    @ExcelProperty("患者年龄")
+    private String age;
+
     @Schema(description = "机构ID", example = "3458")
     @ExcelProperty("机构ID")
     private String orgid;

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/abpm/vo/abpmSaveReqVO.java

@@ -20,6 +20,15 @@ public class abpmSaveReqVO {
     @Schema(description = "患者注册ID", example = "3059")
     private String regid;
 
+    @Schema(description = "患者姓名", example = "张三")
+    private String name;
+
+    @Schema(description = "患者性别", example = "1")    
+    private String gender;
+
+    @Schema(description = "患者年龄", example = "25")
+    private String age;
+
     @Schema(description = "机构ID", example = "3458")
     private String orgid;
 

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/abpm/abpmDO.java

@@ -47,6 +47,21 @@ public class abpmDO {
      */
     @TableField("orgname")
     private String orgname;
+    /**
+     * 患者姓名
+     */
+    @TableField("name")
+    private String name;
+    /**
+     * 性别
+     */
+    @TableField("gender")
+    private String gender;
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
     /**
      * 管理机构
      */

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/abpm/abpmMapper.java

@@ -22,6 +22,9 @@ public interface abpmMapper extends BaseMapperX<abpmDO> {
                 .eqIfPresent(abpmDO::getExamid, reqVO.getExamid())
                 .eqIfPresent(abpmDO::getRegid, reqVO.getRegid())
                 .eqIfPresent(abpmDO::getOrgid, reqVO.getOrgid())
+                .eqIfPresent(abpmDO::getName, reqVO.getName())
+                .eqIfPresent(abpmDO::getGender, reqVO.getGender())
+                .eqIfPresent(abpmDO::getAge, reqVO.getAge())
                 .likeIfPresent(abpmDO::getOrgname, reqVO.getOrgname())
                 .eqIfPresent(abpmDO::getManagerorg, reqVO.getManagerorg())
                 .eqIfPresent(abpmDO::getDeviceid, reqVO.getDeviceid())

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/abpm/abpmService.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.service.abpm;
 import java.util.*;
 import javax.validation.*;
 import cn.iocoder.yudao.module.system.controller.admin.abpm.vo.*;
+import cn.iocoder.yudao.module.system.controller.admin.patientinfo.vo.patientinfoRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.abpm.abpmDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -59,4 +60,9 @@ public interface abpmService {
      */
     PageResult<abpmDO> getabpmPage(abpmPageReqVO pageReqVO);
 
+    /*
+    * 插入ABPM数据表基础信息
+    * */
+    void insertAbpmDataList(List<patientinfoRespVO> patientInfoList);
+
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/abpm/abpmServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.service.abpm;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.system.controller.admin.patientinfo.vo.patientinfoRespVO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -87,4 +88,26 @@ public class abpmServiceImpl implements abpmService {
         return abpmMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public void insertAbpmDataList(List<patientinfoRespVO> patientInfoList) {
+        if (CollUtil.isNotEmpty(patientInfoList)) {
+            List<abpmDO> abpmDataList = new ArrayList<>();
+            for (patientinfoRespVO patientInfo : patientInfoList) {
+                abpmDO abpm = new abpmDO();
+
+                abpm.setRegid(patientInfo.getRegid());
+                String examId = UUID.randomUUID().toString().replaceAll("-", ""); // 去除横线保持简洁
+                abpm.setExamid(examId);
+                abpm.setName(patientInfo.getName());
+                abpm.setGender(patientInfo.getGender());
+                abpm.setOrgid(patientInfo.getOrgid());
+                abpm.setOrgname(patientInfo.getOrgname());
+                abpm.setStatus(0); // 默认状态：0未申请
+                abpmDataList.add(abpm);
+            }
+            // 批量插入ABPM数据
+            abpmMapper.insertBatch(abpmDataList);
+        }
+    }
+
 }