患者就诊/住院记录

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/ObrController.java

@@ -0,0 +1,66 @@
+package com.ruoyi.web.work.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.work.domain.Obr;
+import com.ruoyi.web.work.service.IObrService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * obr
+ * @author lsw
+ * @date 2024-07-23
+ */
+@RestController
+@RequestMapping("/work/obr")
+public class ObrController extends BaseController {
+    @Autowired
+    private IObrService obrService;
+
+    @PreAuthorize("@ss.hasPermi('work:obr:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Obr obr){
+        startPage();
+        List<Obr> list = obrService.selectList(obr);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:obr:query')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id){
+        return AjaxResult.success(obrService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:obr:add')")
+    @Log(title = "obr", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Obr obr){
+        return toAjax(obrService.save(obr));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:obr:edit')")
+    @Log(title = "obr", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody Obr obr){
+        return toAjax(obrService.updateById(obr));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:obr:remove')")
+    @Log(title = "obr", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids){
+        return toAjax(obrService.removeByIds(Arrays.asList(ids)));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/ObxController.java

@@ -0,0 +1,66 @@
+package com.ruoyi.web.work.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.work.domain.Obx;
+import com.ruoyi.web.work.service.IObxService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * obx
+ * @author lsw
+ * @date 2024-07-23
+ */
+@RestController
+@RequestMapping("/work/obx")
+public class ObxController extends BaseController {
+    @Autowired
+    private IObxService obxService;
+
+    @PreAuthorize("@ss.hasPermi('work:obx:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Obx obx){
+        startPage();
+        List<Obx> list = obxService.selectList(obx);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:obx:query')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id){
+        return AjaxResult.success(obxService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:obx:add')")
+    @Log(title = "obx", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Obx obx){
+        return toAjax(obxService.save(obx));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:obx:edit')")
+    @Log(title = "obx", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody Obx obx){
+        return toAjax(obxService.updateById(obx));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:obx:remove')")
+    @Log(title = "obx", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids){
+        return toAjax(obxService.removeByIds(Arrays.asList(ids)));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/PatientController.java

@@ -4,16 +4,12 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.web.work.domain.PatientCard;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -35,6 +31,18 @@ public class PatientController extends BaseController {
     @Autowired
     private IPatientService patientService;
 
+    @ApiOperation(value = "查询科室中所有患者信息列表")
+    @Anonymous
+    @GetMapping("/department")
+    public TableDataInfo getPatientByDepartment(@RequestParam("department")String department) {
+        startPage();
+        startPage();
+        List<PatientCard> list=patientService.getPatientByDepartment(department);
+        return getDataTable(list);
+    }
+
+
+
     @ApiOperation(value = "获取患者信息列表")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:patient:list')")

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/Pv1Controller.java

@@ -1,24 +1,22 @@
 package com.ruoyi.web.work.controller;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.web.work.domain.Patient;
+import com.ruoyi.web.work.domain.PatientCard;
+import com.ruoyi.web.work.domain.Pv1;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.web.work.domain.Pv1;
 import com.ruoyi.web.work.service.IPv1Service;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,9 +30,36 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RestController
 @RequestMapping("/work/pv1")
 public class Pv1Controller extends BaseController {
+
     @Autowired
     private IPv1Service pv1Service;
 
+
+    @ApiOperation(value = "根据姓名、科室、病种查询就诊信息列表")
+    @Anonymous
+    @GetMapping("/patientCard")
+    public TableDataInfo getPatientCardByNameOrRoomOrEntity(@RequestParam("patientName") String patientName,
+                                                            @RequestParam("departmentName") String departmentName,
+                                                            @RequestParam("entity") String entity) {
+        startPage();
+        List<PatientCard> list=pv1Service.getPatientCardByNameOrRoomOrEntity(patientName,departmentName,entity);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "根据患者ID查询所有信息列表")
+    @Anonymous
+    @GetMapping("/patient")
+    public Map getPatientCardPatientId(@RequestParam("patientId")Integer id) {
+        startPage();
+        Map<String,Object> map=pv1Service.getPatientCardPatientId(id);
+        Map<String,Object> result=new HashMap<>();
+        result.put("code",200);
+        result.put("msg","success");
+        result.put("data",map);
+        return result;
+    }
+
+
     @ApiOperation(value = "获取住院信息列表")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:pv1:list')")

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/Pv2Controller.java

@@ -1,82 +0,0 @@
-package com.ruoyi.web.work.controller;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.ruoyi.common.annotation.Anonymous;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.web.work.domain.Pv2;
-import com.ruoyi.web.work.service.IPv2Service;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 住院信息2
- * @author lsw
- * @date 2024-07-19
- */
-@Api(tags = "住院信息管理")
-@Anonymous
-@RestController
-@RequestMapping("/work/pv2")
-public class Pv2Controller extends BaseController {
-    @Autowired
-    private IPv2Service pv2Service;
-
-    @ApiOperation(value = "获取住院信息列表")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:pv2:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(Pv2 pv2){
-        startPage();
-        List<Pv2> list = pv2Service.selectList(pv2);
-        return getDataTable(list);
-    }
-
-    @ApiOperation(value = "根据id查询住院信息")
-    @Anonymous
-   // @PreAuthorize("@ss.hasPermi('work:pv2:query')")
-    @GetMapping(value = "/detail/{id}")
-    public AjaxResult detail(@PathVariable("id") Long id){
-        return AjaxResult.success(pv2Service.getById(id));
-    }
-
-    @ApiOperation(value = "添加住院信息")
-    @Anonymous
-   // @PreAuthorize("@ss.hasPermi('work:pv2:add')")
-    @Log(title = "住院信息2", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    public AjaxResult add(@RequestBody Pv2 pv2){
-        return toAjax(pv2Service.save(pv2));
-    }
-
-    @ApiOperation(value = "修改住院信息")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:pv2:edit')")
-    @Log(title = "住院信息2", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody Pv2 pv2){
-        return toAjax(pv2Service.updateById(pv2));
-    }
-
-    @ApiOperation(value = "删除住院信息")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:pv2:remove')")
-    @Log(title = "住院信息2", businessType = BusinessType.DELETE)
-    @GetMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids){
-        return toAjax(pv2Service.removeByIds(Arrays.asList(ids)));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Obr.java

@@ -0,0 +1,122 @@
+package com.ruoyi.web.work.domain;
+
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.experimental.Accessors;
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+@Data
+@TableName(value = "tb_obr")
+@Accessors(chain = true)
+public class Obr{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty(value = "就诊卡号")
+    private String cardId;
+
+    @ApiModelProperty(value = "医嘱操作码")
+    private String orderCode;
+
+    @ApiModelProperty(value = "申请单序号")
+    private String applicationNo;
+
+    @ApiModelProperty(value = "医嘱明细序号")
+    private String medOrderCode;
+
+    @ApiModelProperty(value = "报告单号")
+    private String reportNo;
+
+    @ApiModelProperty(value = "医技号")
+    private String medOrderNo;
+
+    @ApiModelProperty(value = "医技项目信息")
+    private String medTechProInfo;
+
+    @ApiModelProperty(value = "医技项目名称")
+    private String medTechProName;
+
+    @ApiModelProperty(value = "报告单类别名称")
+    private String reportClass;
+
+    @ApiModelProperty(value = "医嘱申请时间")
+    private String medOrderAppTime;
+
+    @ApiModelProperty(value = "检验或检查开始时间")
+    private String chkStartTime;
+
+    @ApiModelProperty(value = "危机报告标志")
+    private String reportStatus;
+
+    @ApiModelProperty(value = "检查部位或样本名称")
+    private String examinePart;
+
+    @ApiModelProperty(value = "申请医生代码")
+    private String appEmployeeId;
+
+    @ApiModelProperty(value = "申请医生姓名")
+    private String appEmployeeName;
+
+    @ApiModelProperty(value = "申请科室代码")
+    private String appDeptCode;
+
+    @ApiModelProperty(value = "申请科室名称")
+    private String appDeptName;
+
+    @ApiModelProperty(value = "执行科室代码")
+    private String executeDeptCode;
+
+    @ApiModelProperty(value = "执行科室名称")
+    private String executeDeptName;
+
+    @ApiModelProperty(value = "发布时间")
+    private String releaseTime;
+
+    @ApiModelProperty(value = "报告单类别编码")
+    private String repTypeCode;
+
+    @ApiModelProperty(value = "结果标志")
+    private String resultFlag;
+
+    @ApiModelProperty(value = "报告类型")
+    private String repType;
+
+    @ApiModelProperty(value = "报告审核Id")
+    private String checkEmployeeId;
+
+    @ApiModelProperty(value = "报告审核者")
+    private String checkEmployeeName;
+
+    @ApiModelProperty(value = "审核日期")
+    private String checkTime;
+
+    @ApiModelProperty(value = "报告发布者id")
+    private String publisherEmployeeId;
+
+    @ApiModelProperty(value = "报告发布者")
+    private String publisherEmployeeName;
+
+    @ApiModelProperty(value = "发布时间")
+    private String publisherTime;
+
+    @ApiModelProperty(value = "报告录入人ID")
+    private String reportEntryId;
+
+    @ApiModelProperty(value = "报告录入人名称")
+    private String reportEntryName;
+
+    @ApiModelProperty(value = "报告单日期")
+    private String enterTime;
+
+    @ApiModelProperty(value = "预约单号")
+    private String bookingNo;
+
+    @ApiModelProperty(value = "患者ID")
+    private Long patientId;
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Obx.java

@@ -0,0 +1,60 @@
+package com.ruoyi.web.work.domain;
+
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.experimental.Accessors;
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+@Data
+@TableName(value = "tb_obx")
+@Accessors(chain = true)
+public class Obx{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty(value = "obrid")
+    private Long obrId;
+
+    @ApiModelProperty(value = "序号")
+    private String serialNo;
+
+    @ApiModelProperty(value = "数据类型")
+    private String dataType;
+
+    @ApiModelProperty(value = "医技观察项目")
+    private String mecTechObsProject;
+
+    @ApiModelProperty(value = "观察子项")
+    private String obsProjectDetail;
+
+    @ApiModelProperty(value = "项目结果信息")
+    private String projectInfo;
+
+    @ApiModelProperty(value = "项目单位 单位代码")
+    private String unitCode;
+
+    @ApiModelProperty(value = "项目单位 单位名称")
+    private String unitName;
+
+    @ApiModelProperty(value = "结果参考值")
+    private String result;
+
+    @ApiModelProperty(value = "高低标志")
+    private String sign;
+
+    @ApiModelProperty(value = "微生物观察分类")
+    private String obsClassification;
+
+    @ApiModelProperty(value = "检验方法")
+    private String testMethod;
+
+    @ApiModelProperty(value = "患者ID")
+    private Long patientId;
+
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Pv1.java

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.experimental.Accessors;
 /**
  * @author lsw
- * @date 2024-07-19
+ * @date 2024-07-23
  */
 @Data
 @TableName(value = "tb_pv1")
@@ -32,6 +32,12 @@ public class Pv1{
     @ApiModelProperty(value = "患者位置")
     private String bed;
 
+    @ApiModelProperty(value = "科室")
+    private String department;
+
+    @ApiModelProperty(value = "主治医师代码")
+    private String doctorCode;
+
     @ApiModelProperty(value = "主治医师")
     private String physician;
 
@@ -62,6 +68,21 @@ public class Pv1{
     @ApiModelProperty(value = "出院时间")
     private String dischargeTime;
 
+    @ApiModelProperty(value = "危重级别:0-一般病人1-危重病人")
+    private String level;
+
+    @ApiModelProperty(value = "出区原因")
+    private String reasonArea;
+
+    @ApiModelProperty(value = "婴儿信息标识：Y-是 N-否")
+    private String babyCode;
+
+    @ApiModelProperty(value = "入区时间")
+    private String entryTime;
+
+    @ApiModelProperty(value = "出区时间")
+    private String exitTime;
+
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
@@ -76,11 +97,8 @@ public class Pv1{
     @TableField(fill = FieldFill.UPDATE)
     private String updateBy;
 
-    @ApiModelProperty(value = "患者ID")
+    @ApiModelProperty(value = "患者信息ID")
     private Long msgId;
 
-    @ApiModelProperty(value = "科室")
-    private String department;
-
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Pv2.java

@@ -1,59 +0,0 @@
-package com.ruoyi.web.work.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.experimental.Accessors;
-/**
- * @author lsw
- * @date 2024-07-19
- */
-@Data
-@TableName(value = "tb_pv2")
-@Accessors(chain = true)
-public class Pv2{
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    @ApiModelProperty(value = "患者ID")
-    private Long patientId;
-
-    @ApiModelProperty(value = "危重级别: 0-一般病人 1-危重病人")
-    private String level;
-
-    @ApiModelProperty(value = "入区时间")
-    private String entryTime;
-
-    @ApiModelProperty(value = "出区时间")
-    private String exitTime;
-
-    @ApiModelProperty(value = "出区原因： 治愈 好转稳定 恶化 死亡")
-    private String reasonArea;
-
-    @ApiModelProperty(value = "婴儿信息标识：Y-是 N-否")
-    private String babyCode;
-
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateBy;
-
-    @TableField(fill = FieldFill.UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "患者ID")
-    private String msgId;
-
-
-}

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/DgMapper.java

@@ -10,4 +10,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface DgMapper extends BaseMapper<Dg> {
     List<Dg> selectList(Dg dg);
+
+    List<Dg> getDgByPatientId(Integer id);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/ObrMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.web.work.mapper;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Obr;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+public interface ObrMapper extends BaseMapper<Obr> {
+    List<Obr> selectList(Obr obr);
+
+    List<Obr> getObrByPatientId(Integer id);
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/ObxMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.web.work.mapper;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Obx;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+public interface ObxMapper extends BaseMapper<Obx> {
+    List<Obx> selectList(Obx obx);
+
+    List<Obx> getObxByPatientId(Integer id);
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/PatientMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.work.mapper;
 import java.util.List;
 import com.ruoyi.web.work.domain.Patient;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.work.domain.PatientCard;
 
 /**
  * @author lsw
@@ -10,4 +11,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PatientMapper extends BaseMapper<Patient> {
     List<Patient> selectList(Patient patient);
+
+    List<PatientCard> getPatientCardByNameOrRoomOrEntity(String patientName, String departmentName, String entity);
+
+    List<Patient> getPatientByPatientId(Integer id);
+
+    List<PatientCard> getPatientByDepartment(String department);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/Pv1Mapper.java

@@ -1,13 +1,22 @@
 package com.ruoyi.web.work.mapper;
 
 import java.util.List;
+
+import com.ruoyi.web.work.domain.Dg;
+import com.ruoyi.web.work.domain.Patient;
+import com.ruoyi.web.work.domain.PatientCard;
 import com.ruoyi.web.work.domain.Pv1;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @author lsw
- * @date 2024-07-19
+ * @date 2024-07-23
  */
 public interface Pv1Mapper extends BaseMapper<Pv1> {
     List<Pv1> selectList(Pv1 pv1);
+
+    List<PatientCard> getPatientCardByNameOrRoomOrEntity(String patientName, String departmentName, String entity);
+
+    List<Pv1> getPv1ByPatientId(Integer id);
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/Pv2Mapper.java

@@ -1,13 +0,0 @@
-package com.ruoyi.web.work.mapper;
-
-import java.util.List;
-import com.ruoyi.web.work.domain.Pv2;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @author lsw
- * @date 2024-07-19
- */
-public interface Pv2Mapper extends BaseMapper<Pv2> {
-    List<Pv2> selectList(Pv2 pv2);
-}

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IPv2Service.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IObrService.java

@@ -1,13 +1,13 @@
 package com.ruoyi.web.work.service;
 
 import java.util.List;
-import com.ruoyi.web.work.domain.Pv2;
+import com.ruoyi.web.work.domain.Obr;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * @author lsw
- * @date 2024-07-19
+ * @date 2024-07-23
  */
-public interface IPv2Service extends IService<Pv2>{
-    List<Pv2> selectList(Pv2 pv2);
+public interface IObrService extends IService<Obr>{
+    List<Obr> selectList(Obr obr);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IObxService.java

@@ -0,0 +1,13 @@
+package com.ruoyi.web.work.service;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Obx;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+public interface IObxService extends IService<Obx>{
+    List<Obx> selectList(Obx obx);
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IPatientService.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.work.service;
 import java.util.List;
 import com.ruoyi.web.work.domain.Patient;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.work.domain.PatientCard;
 
 /**
  * @author lsw
@@ -10,4 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IPatientService extends IService<Patient>{
     List<Patient> selectList(Patient patient);
+
+
+    List<PatientCard> getPatientByDepartment(String department);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IPv1Service.java

@@ -1,13 +1,22 @@
 package com.ruoyi.web.work.service;
 
 import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.web.work.domain.PatientCard;
 import com.ruoyi.web.work.domain.Pv1;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * @author lsw
- * @date 2024-07-19
+ * @date 2024-07-23
  */
 public interface IPv1Service extends IService<Pv1>{
     List<Pv1> selectList(Pv1 pv1);
+
+    List<PatientCard> getPatientCardByNameOrRoomOrEntity(String patientName, String departmentName, String entity);
+
+    Map<String, Object> getPatientCardPatientId(Integer id);
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/ObrServiceImpl.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.work.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.web.work.mapper.ObrMapper;
+import com.ruoyi.web.work.domain.Obr;
+import com.ruoyi.web.work.service.IObrService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+@Service
+public class ObrServiceImpl extends ServiceImpl<ObrMapper, Obr> implements IObrService {
+    @Autowired
+    private ObrMapper obrMapper;
+
+    @Override
+    public List<Obr> selectList(Obr obr) {
+        return obrMapper.selectList(obr);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/ObxServiceImpl.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.work.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.web.work.mapper.ObxMapper;
+import com.ruoyi.web.work.domain.Obx;
+import com.ruoyi.web.work.service.IObxService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+@Service
+public class ObxServiceImpl extends ServiceImpl<ObxMapper, Obx> implements IObxService {
+    @Autowired
+    private ObxMapper obxMapper;
+
+    @Override
+    public List<Obx> selectList(Obx obx) {
+        return obxMapper.selectList(obx);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/PatientServiceImpl.java

@@ -1,6 +1,9 @@
 package com.ruoyi.web.work.service.impl;
 
+import java.util.Collections;
 import java.util.List;
+
+import com.ruoyi.web.work.domain.PatientCard;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.web.work.mapper.PatientMapper;
@@ -21,4 +24,11 @@ public class PatientServiceImpl extends ServiceImpl<PatientMapper, Patient> impl
     public List<Patient> selectList(Patient patient) {
         return patientMapper.selectList(patient);
     }
+
+    @Override
+    public List<PatientCard> getPatientByDepartment(String department) {
+        return patientMapper.getPatientByDepartment(department);
+    }
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/Pv1ServiceImpl.java

@@ -1,24 +1,64 @@
 package com.ruoyi.web.work.service.impl;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.web.work.domain.*;
+import com.ruoyi.web.work.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.web.work.mapper.Pv1Mapper;
-import com.ruoyi.web.work.domain.Pv1;
 import com.ruoyi.web.work.service.IPv1Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * @author lsw
- * @date 2024-07-19
+ * @date 2024-07-23
  */
 @Service
 public class Pv1ServiceImpl extends ServiceImpl<Pv1Mapper, Pv1> implements IPv1Service {
     @Autowired
     private Pv1Mapper pv1Mapper;
 
+    @Autowired
+    private DgMapper dgMapper;
+
+    @Autowired
+    private PatientMapper patientMapper;
+
+    @Autowired
+    private ObxMapper obxMapper;
+
+    @Autowired
+    private ObrMapper obrMapper;
+
     @Override
     public List<Pv1> selectList(Pv1 pv1) {
         return pv1Mapper.selectList(pv1);
     }
+
+    @Override
+    public List<PatientCard> getPatientCardByNameOrRoomOrEntity(String patientName, String departmentName, String entity) {
+        return pv1Mapper.getPatientCardByNameOrRoomOrEntity(patientName,departmentName,entity);
+    }
+
+    @Override
+    public Map<String, Object> getPatientCardPatientId(Integer id) {
+        List<Pv1> pv1 = pv1Mapper.getPv1ByPatientId(id);
+        List<Dg> dg=dgMapper.getDgByPatientId(id);
+        List<Patient> patient=patientMapper.getPatientByPatientId(id);
+        List<Obx> obx=obxMapper.getObxByPatientId(id);
+        List<Obr> obr=obrMapper.getObrByPatientId(id);
+        Map<String, Object> map=new HashMap<>();
+        map.put("patient",patient);
+        map.put("dg",dg);
+        map.put("obx",obx);
+        map.put("obr",obr);
+        map.put("pv1",pv1);
+        return map;
+    }
+
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/Pv2ServiceImpl.java

@@ -1,24 +0,0 @@
-package com.ruoyi.web.work.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.web.work.mapper.Pv2Mapper;
-import com.ruoyi.web.work.domain.Pv2;
-import com.ruoyi.web.work.service.IPv2Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @author lsw
- * @date 2024-07-19
- */
-@Service
-public class Pv2ServiceImpl extends ServiceImpl<Pv2Mapper, Pv2> implements IPv2Service {
-    @Autowired
-    private Pv2Mapper pv2Mapper;
-
-    @Override
-    public List<Pv2> selectList(Pv2 pv2) {
-        return pv2Mapper.selectList(pv2);
-    }
-}

ruoyi-admin/src/main/resources/application-druid.yml

@@ -9,6 +9,9 @@ spring:
                 url: jdbc:mysql://123.60.57.26:3306/hospital?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: gogo-2636616
+#                url: jdbc:mysql://123.60.57.26:3306/hospital?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: gogo-2636616
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/mapper/work/DgMapper.xml

@@ -3,10 +3,10 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.web.work.mapper.DgMapper">
-    
+
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Dg">
         select * from tb_dg
-        <where>  
+        <where>
             <if test="patientId != null  and patientId != ''"> and patient_id = #{patientId}</if>
             <if test="diagnosticCode != null  and diagnosticCode != ''"> and diagnostic_code = #{diagnosticCode}</if>
             <if test="diagnosisTime != null  and diagnosisTime != ''"> and diagnosis_time = #{diagnosisTime}</if>
@@ -15,4 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-</mapper>
+    <select id="getDgByPatientId" resultType="com.ruoyi.web.work.domain.Dg">
+        select * from tb_dg where patient_id=#{id}
+    </select>
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/work/ObrMapper.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.web.work.mapper.ObrMapper">
+
+    <select id="selectList" resultType="com.ruoyi.web.work.domain.Obr">
+        select * from tb_obr
+        <where>
+            <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
+            <if test="orderCode != null  and orderCode != ''"> and order_code = #{orderCode}</if>
+            <if test="applicationNo != null  and applicationNo != ''"> and application_no = #{applicationNo}</if>
+            <if test="medOrderCode != null  and medOrderCode != ''"> and med_order_code = #{medOrderCode}</if>
+            <if test="reportNo != null  and reportNo != ''"> and report_no = #{reportNo}</if>
+            <if test="medOrderNo != null  and medOrderNo != ''"> and med_order_no = #{medOrderNo}</if>
+            <if test="medTechProInfo != null  and medTechProInfo != ''"> and med_tech_pro_info = #{medTechProInfo}</if>
+            <if test="medTechProName != null  and medTechProName != ''"> and med_tech_pro_name like concat('%', #{medTechProName}, '%')</if>
+            <if test="reportClass != null  and reportClass != ''"> and report_class = #{reportClass}</if>
+            <if test="medOrderAppTime != null  and medOrderAppTime != ''"> and med_order_app_time = #{medOrderAppTime}</if>
+            <if test="chkStartTime != null  and chkStartTime != ''"> and chk_start_time = #{chkStartTime}</if>
+            <if test="reportStatus != null  and reportStatus != ''"> and report_status = #{reportStatus}</if>
+            <if test="examinePart != null  and examinePart != ''"> and examine_part = #{examinePart}</if>
+            <if test="appEmployeeId != null  and appEmployeeId != ''"> and app_employee_id = #{appEmployeeId}</if>
+            <if test="appEmployeeName != null  and appEmployeeName != ''"> and app_employee_name like concat('%', #{appEmployeeName}, '%')</if>
+            <if test="appDeptCode != null  and appDeptCode != ''"> and app_dept_code = #{appDeptCode}</if>
+            <if test="appDeptName != null  and appDeptName != ''"> and app_dept_name like concat('%', #{appDeptName}, '%')</if>
+            <if test="executeDeptCode != null  and executeDeptCode != ''"> and execute_dept_code = #{executeDeptCode}</if>
+            <if test="executeDeptName != null  and executeDeptName != ''"> and execute_dept_name like concat('%', #{executeDeptName}, '%')</if>
+            <if test="releaseTime != null  and releaseTime != ''"> and release_time = #{releaseTime}</if>
+            <if test="repTypeCode != null  and repTypeCode != ''"> and rep_type_code = #{repTypeCode}</if>
+            <if test="resultFlag != null  and resultFlag != ''"> and result_flag = #{resultFlag}</if>
+            <if test="repType != null  and repType != ''"> and rep_type = #{repType}</if>
+            <if test="checkEmployeeId != null  and checkEmployeeId != ''"> and check_employee_id = #{checkEmployeeId}</if>
+            <if test="checkEmployeeName != null  and checkEmployeeName != ''"> and check_employee_name like concat('%', #{checkEmployeeName}, '%')</if>
+            <if test="checkTime != null  and checkTime != ''"> and check_time = #{checkTime}</if>
+            <if test="publisherEmployeeId != null  and publisherEmployeeId != ''"> and publisher_employee_id = #{publisherEmployeeId}</if>
+            <if test="publisherEmployeeName != null  and publisherEmployeeName != ''"> and publisher_employee_name like concat('%', #{publisherEmployeeName}, '%')</if>
+            <if test="publisherTime != null  and publisherTime != ''"> and publisher_time = #{publisherTime}</if>
+            <if test="reportEntryId != null  and reportEntryId != ''"> and report_entry_id = #{reportEntryId}</if>
+            <if test="reportEntryName != null  and reportEntryName != ''"> and report_entry_name like concat('%', #{reportEntryName}, '%')</if>
+            <if test="enterTime != null  and enterTime != ''"> and enter_time = #{enterTime}</if>
+            <if test="bookingNo != null  and bookingNo != ''"> and booking_no = #{bookingNo}</if>
+            <if test="patientId != null "> and patient_id = #{patientId}</if>
+        </where>
+    </select>
+
+    <select id="getObrByPatientId" resultType="com.ruoyi.web.work.domain.Obr">
+        select * from tb_obr where patient_id=#{id}
+    </select>
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/work/ObxMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.web.work.mapper.ObxMapper">
+
+    <select id="selectList" resultType="com.ruoyi.web.work.domain.Obx">
+        select * from tb_obx
+        <where>
+            <if test="obrId != null "> and obr_id = #{obrId}</if>
+            <if test="serialNo != null  and serialNo != ''"> and serial_no = #{serialNo}</if>
+            <if test="dataType != null  and dataType != ''"> and data_type = #{dataType}</if>
+            <if test="mecTechObsProject != null  and mecTechObsProject != ''"> and mec_tech_obs_project = #{mecTechObsProject}</if>
+            <if test="obsProjectDetail != null  and obsProjectDetail != ''"> and obs_project_detail = #{obsProjectDetail}</if>
+            <if test="projectInfo != null  and projectInfo != ''"> and project_info = #{projectInfo}</if>
+            <if test="unitCode != null  and unitCode != ''"> and unit_code = #{unitCode}</if>
+            <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
+            <if test="result != null  and result != ''"> and result = #{result}</if>
+            <if test="sign != null  and sign != ''"> and sign = #{sign}</if>
+            <if test="obsClassification != null  and obsClassification != ''"> and obs_classification = #{obsClassification}</if>
+            <if test="testMethod != null  and testMethod != ''"> and test_method = #{testMethod}</if>
+            <if test="patientId != null "> and patient_id = #{patientId}</if>
+        </where>
+    </select>
+
+    <select id="getObxByPatientId" resultType="com.ruoyi.web.work.domain.Obx">
+        select * from tb_obx where patient_id=#{id}
+    </select>
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/work/PatientMapper.xml

@@ -3,10 +3,10 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.web.work.mapper.PatientMapper">
-    
+
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Patient">
         select * from tb_patient
-        <where>  
+        <where>
             <if test="patId != null  and patId != ''"> and pat_id = #{patId}</if>
             <if test="patientCode != null  and patientCode != ''"> and patient_code = #{patientCode}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -34,4 +34,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-</mapper>
+    <select id="getPatientCardByNameOrRoomOrEntity" resultType="com.ruoyi.web.work.domain.PatientCard">
+
+    </select>
+
+    <select id="getPatientByPatientId" resultType="com.ruoyi.web.work.domain.Patient">
+        select * from tb_patient where id=#{id}
+    </select>
+
+    <select id="getPatientByDepartment" resultType="com.ruoyi.web.work.domain.PatientCard">
+        select * from tb_patient
+        where id in (select patient_id from tb_pv1 where department=#{department})
+    </select>
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/work/Pv1Mapper.xml

@@ -3,10 +3,10 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.web.work.mapper.Pv1Mapper">
-    
+
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Pv1">
         select * from tb_pv1
-        <where>  
+        <where>
             <if test="patientId != null "> and patient_id = #{patientId}</if>
             <if test="cardId != null "> and card_id = #{cardId}</if>
             <if test="patientCategory != null  and patientCategory != ''"> and patient_category = #{patientCategory}</if>
@@ -26,4 +26,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-</mapper>
+
+    <select id="getPatientCardByNameOrRoomOrEntity" resultType="com.ruoyi.web.work.domain.PatientCard">
+        select * from tb_pv1
+<!--        <where>-->
+<!--            <if test="patientName!=null or patientName!=''">-->
+<!--                patient_id in (select id from tb_patient where tb_patient.name=#{patientName} )-->
+<!--            </if>-->
+<!--            <if test="departmentName!=null or departmentName!=''">-->
+<!--                and department=#{departmentName}-->
+<!--            </if>-->
+<!--            <if test="entity!=null or entity!=''">-->
+<!--                and entity=#{entity}-->
+<!--            </if>-->
+<!--        </where>-->
+
+
+    </select>
+
+    <select id="getPv1ByPatientId" resultType="com.ruoyi.web.work.domain.Pv1">
+        select * from tb_pv1 where patient_id=#{id}
+    </select>
+
+
+
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/work/Pv2Mapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.web.work.mapper.Pv2Mapper">
-    
-    <select id="selectList" resultType="com.ruoyi.web.work.domain.Pv2">
-        select * from tb_pv2
-        <where>  
-            <if test="patientId != null "> and patient_id = #{patientId}</if>
-            <if test="level != null  and level != ''"> and level = #{level}</if>
-            <if test="entryTime != null  and entryTime != ''"> and entry_time = #{entryTime}</if>
-            <if test="exitTime != null  and exitTime != ''"> and exit_time = #{exitTime}</if>
-            <if test="reasonArea != null  and reasonArea != ''"> and reason_area = #{reasonArea}</if>
-            <if test="babyCode != null  and babyCode != ''"> and baby_code = #{babyCode}</if>
-            <if test="msgId != null  and msgId != ''"> and msg_id = #{msgId}</if>
-        </where>
-    </select>
-
-</mapper>