fix：修改数据库表

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/DgController.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/DiagnosisController.java

@@ -4,9 +4,9 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.web.work.service.IDiagnosisService;
 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;
@@ -18,8 +18,7 @@ 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.Dg;
-import com.ruoyi.web.work.service.IDgService;
+import com.ruoyi.web.work.domain.Diagnosis;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
@@ -30,18 +29,23 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @Api(tags = "诊断管理")
 @Anonymous
 @RestController
-@RequestMapping("/work/dg")
-public class DgController extends BaseController {
+@RequestMapping("/work/diagnosis")
+public class DiagnosisController extends BaseController {
     @Autowired
-    private IDgService dgService;
+    private IDiagnosisService dgService;
 
     @ApiOperation(value = "获取诊断列表")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:dg:list')")
     @GetMapping("/list")
-    public TableDataInfo list(Dg dg){
+    public TableDataInfo list(Diagnosis diagnosis){
         startPage();
-        List<Dg> list = dgService.selectList(dg);
+        List<Diagnosis> list = dgService.selectList(diagnosis);
+
+        System.out.println("diagnosis: "+diagnosis);
+        System.out.println("list: "+list);
+
+
         return getDataTable(list);
     }
 
@@ -58,7 +62,7 @@ public class DgController extends BaseController {
     //@PreAuthorize("@ss.hasPermi('work:dg:add')")
     @Log(title = "诊断", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody Dg dg){
+    public AjaxResult add(@RequestBody Diagnosis dg){
         return toAjax(dgService.save(dg));
     }
 
@@ -67,7 +71,7 @@ public class DgController extends BaseController {
     //@PreAuthorize("@ss.hasPermi('work:dg:edit')")
     @Log(title = "诊断", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody Dg dg){
+    public AjaxResult edit(@RequestBody Diagnosis dg){
         return toAjax(dgService.updateById(dg));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/NkController.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/NextOfKinController.java

@@ -4,10 +4,9 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.web.work.domain.NextOfKin;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.OpenAPIDefinition;
-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;
@@ -19,8 +18,7 @@ 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.Nk;
-import com.ruoyi.web.work.service.INkService;
+import com.ruoyi.web.work.service.INextOfKinService;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
@@ -32,17 +30,17 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @Anonymous
 @RestController
 @RequestMapping("/work/nk")
-public class NkController extends BaseController {
+public class NextOfKinController extends BaseController {
     @Autowired
-    private INkService nkService;
+    private INextOfKinService nkService;
 
     @ApiOperation(value = "获取亲属信息列表")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:nk:list')")
     @GetMapping("/list")
-    public TableDataInfo list(Nk nk){
+    public TableDataInfo list(NextOfKin nk){
         startPage();
-        List<Nk> list = nkService.selectList(nk);
+        List<NextOfKin> list = nkService.selectList(nk);
         return getDataTable(list);
     }
 
@@ -59,7 +57,7 @@ public class NkController extends BaseController {
     //@PreAuthorize("@ss.hasPermi('work:nk:add')")
     @Log(title = "亲属关系", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody Nk nk){
+    public AjaxResult add(@RequestBody NextOfKin nk){
         return toAjax(nkService.save(nk));
     }
 
@@ -68,7 +66,7 @@ public class NkController extends BaseController {
     //@PreAuthorize("@ss.hasPermi('work:nk:edit')")
     @Log(title = "亲属关系", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody Nk nk){
+    public AjaxResult edit(@RequestBody NextOfKin nk){
         return toAjax(nkService.updateById(nk));
     }
 

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

@@ -1,69 +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.*;
-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
- */
-@Api(tags = "科室申请管理")
-@Anonymous
-@RestController
-@RequestMapping("/work/obr")
-public class ObrController extends BaseController {
-    @Autowired
-    private IObrService obrService;
-
-    @ApiOperation(value = "获取科室申请列表")
-    //@PreAuthorize("@ss.hasPermi('work:obr:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(Obr obr){
-        startPage();
-        List<Obr> list = obrService.selectList(obr);
-        return getDataTable(list);
-    }
-
-    @ApiOperation(value = "根据Id获取科室申请列表")
-    //@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

@@ -1,75 +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.*;
-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
- */
-@Api(tags = "检测项目管理")
-@Anonymous
-@RestController
-@RequestMapping("/work/obx")
-public class ObxController extends BaseController {
-    @Autowired
-    private IObxService obxService;
-
-
-    @ApiOperation(value = "获取检测项目列表")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:obx:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(Obx obx){
-        startPage();
-        List<Obx> list = obxService.selectList(obx);
-        return getDataTable(list);
-    }
-
-    @ApiOperation(value = "根据Id获取检测项目列表")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:obx:query')")
-    @GetMapping(value = "/detail/{id}")
-    public AjaxResult detail(@PathVariable("id") Long id){
-        return AjaxResult.success(obxService.getById(id));
-    }
-
-    @Anonymous
-    //@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));
-    }
-
-    @Anonymous
-    //@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));
-    }
-
-    @Anonymous
-    //@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/OrdersController.java

@@ -1,69 +0,0 @@
-package com.ruoyi.web.work.controller;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.ruoyi.common.annotation.Anonymous;
-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.*;
-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.Orders;
-import com.ruoyi.web.work.service.IOrdersService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * orders
- * @author lsw
- * @date 2024-07-24
- */
-@Api(tags = "医嘱信息管理")
-@Anonymous
-@RestController
-@RequestMapping("/work/orders")
-public class OrdersController extends BaseController {
-    @Autowired
-    private IOrdersService ordersService;
-
-
-    @PreAuthorize("@ss.hasPermi('work:orders:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(Orders orders){
-        startPage();
-        List<Orders> list = ordersService.selectList(orders);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('work:orders:query')")
-    @GetMapping(value = "/detail/{id}")
-    public AjaxResult detail(@PathVariable("id") Long id){
-        return AjaxResult.success(ordersService.getById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('work:orders:add')")
-    @Log(title = "orders", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    public AjaxResult add(@RequestBody Orders orders){
-        return toAjax(ordersService.save(orders));
-    }
-
-    @PreAuthorize("@ss.hasPermi('work:orders:edit')")
-    @Log(title = "orders", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody Orders orders){
-        return toAjax(ordersService.updateById(orders));
-    }
-
-    @PreAuthorize("@ss.hasPermi('work:orders:remove')")
-    @Log(title = "orders", businessType = BusinessType.DELETE)
-    @GetMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids){
-        return toAjax(ordersService.removeByIds(Arrays.asList(ids)));
-    }
-}

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

@@ -0,0 +1,80 @@
+package com.ruoyi.web.work.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.ruoyi.common.annotation.Anonymous;
+
+import com.ruoyi.web.work.domain.Request;
+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.*;
+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.Report;
+import com.ruoyi.web.work.service.IReportService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * report
+ * @author lsw
+ * @date 2024-07-24
+ */
+@Api(tags = "医嘱信息管理")
+@Anonymous
+@RestController
+@RequestMapping("/work/report")
+public class ReportController extends BaseController {
+    @Autowired
+    private IReportService reportService;
+
+
+    @ApiOperation(value = "根据患者ID获取此人的全部医嘱信息列表")
+    //@PreAuthorize("@ss.hasPermi('work:request:list')")
+    @GetMapping("/patid/{patId}")
+    public TableDataInfo getAllReportByPatId(@PathVariable("patId") Long patId){
+        startPage();
+        List<Request> list = reportService.getAllReportByPatId(patId);
+        return getDataTable(list);
+    }
+
+
+    //@PreAuthorize("@ss.hasPermi('work:report:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Report report){
+        startPage();
+        List<Report> list = reportService.selectList(report);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:report:query')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id){
+        return AjaxResult.success(reportService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:report:add')")
+    @Log(title = "report", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Report report){
+        return toAjax(reportService.save(report));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:report:edit')")
+    @Log(title = "report", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody Report report){
+        return toAjax(reportService.updateById(report));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:report:remove')")
+    @Log(title = "report", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids){
+        return toAjax(reportService.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -0,0 +1,80 @@
+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.*;
+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.Request;
+import com.ruoyi.web.work.service.IRequestService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * request
+ * @author lsw
+ * @date 2024-07-23
+ */
+@Api(tags = "科室申请管理")
+@Anonymous
+@RestController
+@RequestMapping("/work/request")
+public class RequestController extends BaseController {
+
+    @Autowired
+    private IRequestService requestService;
+
+    @ApiOperation(value = "根据患者ID获取此人的全部科室申请列表")
+    //@PreAuthorize("@ss.hasPermi('work:request:list')")
+    @GetMapping("/patid/{patId}")
+    public TableDataInfo getAllRequestByPatId(@PathVariable("patId") Long patId){
+        startPage();
+        List<Request> list = requestService.getAllRequestByPatId(patId);
+        return getDataTable(list);
+    }
+
+
+    @ApiOperation(value = "获取科室申请列表")
+    //@PreAuthorize("@ss.hasPermi('work:request:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Request request){
+        startPage();
+        List<Request> list = requestService.selectList(request);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "根据Id获取科室申请列表")
+    //@PreAuthorize("@ss.hasPermi('work:request:query')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id){
+        return AjaxResult.success(requestService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:request:add')")
+    @Log(title = "request", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Request request){
+        return toAjax(requestService.save(request));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:request:edit')")
+    @Log(title = "request", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody Request request){
+        return toAjax(requestService.updateById(request));
+    }
+
+    @PreAuthorize("@ss.hasPermi('work:request:remove')")
+    @Log(title = "request", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids){
+        return toAjax(requestService.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -0,0 +1,84 @@
+package com.ruoyi.web.work.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.web.work.domain.Request;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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.Result;
+import com.ruoyi.web.work.service.IResultService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * request
+ * @author lsw
+ * @date 2024-07-23
+ */
+@Api(tags = "检测项目管理")
+@Anonymous
+@RestController
+@RequestMapping("/work/result")
+public class ResultController extends BaseController {
+    @Autowired
+    private IResultService resultService;
+
+
+    @ApiOperation(value = "根据患者ID获取此人的全部检查项目列表")
+    //@PreAuthorize("@ss.hasPermi('work:request:list')")
+    @GetMapping("/patid/{patId}")
+    public TableDataInfo getAllResultByPatId(@PathVariable("patId") Long patId){
+        startPage();
+        List<Result> list = resultService.getAllResultByPatId(patId);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "获取检测项目列表")
+    @Anonymous
+    //@PreAuthorize("@ss.hasPermi('work:request:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Result result){
+        startPage();
+        List<Result> list = resultService.selectList(result);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "根据Id获取检测项目列表")
+    @Anonymous
+    //@PreAuthorize("@ss.hasPermi('work:request:query')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id){
+        return AjaxResult.success(resultService.getById(id));
+    }
+
+    @Anonymous
+    //@PreAuthorize("@ss.hasPermi('work:request:add')")
+    @Log(title = "request", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Result request){
+        return toAjax(resultService.save(request));
+    }
+
+    @Anonymous
+    //@PreAuthorize("@ss.hasPermi('work:request:edit')")
+    @Log(title = "request", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody Result request){
+        return toAjax(resultService.updateById(request));
+    }
+
+    @Anonymous
+    //@PreAuthorize("@ss.hasPermi('work:request:remove')")
+    @Log(title = "request", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids){
+        return toAjax(resultService.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -4,8 +4,9 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.web.work.domain.Visit;
 import com.ruoyi.web.work.domain.dto.PatientCardDto;
-import com.ruoyi.web.work.domain.Pv1;
+import com.ruoyi.web.work.service.IVisitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +15,6 @@ 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.service.IPv1Service;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
@@ -25,11 +25,12 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @Api(tags = "住院信息管理")
 @Anonymous
 @RestController
-@RequestMapping("/work/pv1")
-public class Pv1Controller extends BaseController {
+@RequestMapping("/work/visit")
+public class VisitController extends BaseController {
 
     @Autowired
-    private IPv1Service pv1Service;
+    private IVisitService visitService;
+
 
     //@PreAuthorize("@ss.hasPermi('work:pv1:list')")
     @ApiOperation(value = "获取所有科室")
@@ -37,7 +38,7 @@ public class Pv1Controller extends BaseController {
     @GetMapping("/department")
     public TableDataInfo getAllDepartment() {
         startPage();
-        List<PatientCardDto> list=pv1Service.getAllDepartment();
+        List<PatientCardDto> list=visitService.getAllDepartment();
         return getDataTable(list);
     }
 
@@ -48,7 +49,7 @@ public class Pv1Controller extends BaseController {
                                                             @RequestParam(value = "departmentName",required = false) String departmentName,
                                                           @RequestParam(value = "physician",required = false) String physician){
         startPage();
-        List<PatientCardDto> list=pv1Service.getPatientCardByNameOrDepartment(patientName,departmentName,physician);
+        List<PatientCardDto> list=visitService.getPatientCardByNameOrDepartmentOrPhysician(patientName,departmentName,physician);
         return getDataTable(list);
     }
 
@@ -57,9 +58,9 @@ public class Pv1Controller extends BaseController {
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:pv1:list')")
     @GetMapping("/list")
-    public TableDataInfo list(Pv1 pv1){
+    public TableDataInfo list(Visit visit){
         startPage();
-        List<Pv1> list = pv1Service.selectList(pv1);
+        List<Visit> list = visitService.selectList(visit);
         return getDataTable(list);
     }
 
@@ -68,7 +69,7 @@ public class Pv1Controller extends BaseController {
     //@PreAuthorize("@ss.hasPermi('work:pv1:query')")
     @GetMapping(value = "/detail/{id}")
     public AjaxResult detail(@PathVariable("id") Long id){
-        return AjaxResult.success(pv1Service.getById(id));
+        return AjaxResult.success(visitService.getById(id));
     }
 
     @ApiOperation(value = "添加住院信息")
@@ -76,8 +77,8 @@ public class Pv1Controller extends BaseController {
     //@PreAuthorize("@ss.hasPermi('work:pv1:add')")
     @Log(title = "住院信息", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody Pv1 pv1){
-        return toAjax(pv1Service.save(pv1));
+    public AjaxResult add(@RequestBody Visit pv1){
+        return toAjax(visitService.save(pv1));
     }
 
     @ApiOperation(value = "修改住院信息")
@@ -85,8 +86,8 @@ public class Pv1Controller extends BaseController {
     //@PreAuthorize("@ss.hasPermi('work:pv1:edit')")
     @Log(title = "住院信息", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody Pv1 pv1){
-        return toAjax(pv1Service.updateById(pv1));
+    public AjaxResult edit(@RequestBody Visit pv1){
+        return toAjax(visitService.updateById(pv1));
     }
 
     @ApiOperation(value = "删除住院信息")
@@ -95,6 +96,6 @@ public class Pv1Controller extends BaseController {
     @Log(title = "住院信息", businessType = BusinessType.DELETE)
     @GetMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids){
-        return toAjax(pv1Service.removeByIds(Arrays.asList(ids)));
+        return toAjax(visitService.removeByIds(Arrays.asList(ids)));
     }
 }

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

@@ -1,53 +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_dg")
-@Accessors(chain = true)
-public class Dg{
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    @ApiModelProperty(value = "患者ID")
-    private String patientId;
-
-    @ApiModelProperty(value = "诊断代码")
-    private String diagnosticCode;
-
-    @ApiModelProperty(value = "诊断时间")
-    private String diagnosisTime;
-
-    @ApiModelProperty(value = "诊断类型代码： 0-主要诊断 1-第一辅诊 2-第二辅诊")
-    private String diagnosticType;
-
-    @ApiModelProperty(value = "诊断类别代码： 0-门诊诊断 1-入院诊断 2-出院诊断 3-中医入院诊断 4-中医出院诊断 5-修正诊断 6-最终诊断 7-初步诊断 8 目前诊断 9-术前诊断 10-术后诊断 11-产后诊断 99-其他诊断")
-    private String diagnosticCategoryCode;
-
-    @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;
-
-
-}

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

@@ -6,8 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
-import java.util.Date;
+import java.sql.Timestamp;
 
 /**
  * 诊断信息
@@ -17,32 +16,45 @@ import java.util.Date;
 @Accessors(chain = true)
 public class Diagnosis {
 
-    private Integer id;
+    private Long id;
+
     @ApiModelProperty(value = "就诊ID")
-    private Integer visitId;//就诊ID
+    private Long visitId;//就诊ID
+
     @ApiModelProperty(value = "患者ID")
-    private Integer patId;//患者ID
+    private Long patId;//患者ID
+
     @ApiModelProperty(value = "科室名称")
     private String departmentName; //科室名称
+
     @ApiModelProperty(value = "主治医师")
     private String doctor; //主治医师
+
     @ApiModelProperty(value = "诊断代码")
     private String diagnosticCode; //诊断代码
+
     @ApiModelProperty(value = "诊断名称")
     private String diagnosticName;//诊断名称
+
     @ApiModelProperty(value = "诊断时间")
-    private LocalDateTime diagnosisTime; //诊断时间
+    private Timestamp diagnosisTime; //诊断时间
+
     @ApiModelProperty(value = "诊断类型代码")
     private String diagnosticType; //诊断类型代码
+
     @ApiModelProperty(value = "诊断类别代码")
     private String diagnosticCategoryCode; //诊断类别代码
+
     private String createBy;
+
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private Timestamp createTime;
+
     private String updateBy;
+
     @TableField(fill = FieldFill.UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private Timestamp updateTime;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Nk.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/NextOfKin.java

@@ -1,6 +1,6 @@
 package com.ruoyi.web.work.domain;
 
-import java.util.Date;
+import java.sql.Timestamp;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -15,17 +15,20 @@ import lombok.experimental.Accessors;
 @Data
 @TableName(value = "tb_next_of_kin")
 @Accessors(chain = true)
-public class Nk{
+public class NextOfKin{
     private static final long serialVersionUID = 1L;
 
     private Long id;
 
-    @ApiModelProperty(value = "患者id")
-    private Long patId;
+    @ApiModelProperty(value = "卫宁患者id")
+    private Long wnPatId;
 
     @ApiModelProperty(value = "近亲姓名")
     private String name;
 
+    @ApiModelProperty(value = "患者id")
+    private Long patId;
+
     @ApiModelProperty(value = "近亲关系 SEL 自己 SPO 配偶 CHD 孩子 MTH 母亲 FTH 父亲 SIB 同胞 BRO 兄弟 SIS 姐妹 FND 朋友 EMR 雇主 OTH 其他")
     private String kinship;
 
@@ -46,14 +49,14 @@ public class Nk{
 
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private Timestamp createTime;
 
     @TableField(fill = FieldFill.UPDATE)
-    private Date updateBy;
+    private Timestamp updateBy;
 
     @TableField(fill = FieldFill.UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private Timestamp updateTime;
 
 
 }

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

@@ -1,47 +0,0 @@
-package com.ruoyi.web.work.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-@TableName("tb_obr_request")
-@Data
-@Accessors(chain = true)
-
-public class ObrRequest {
-
-    private Integer id;
-    private Integer orcId;
-    private String medOrderCode; //医嘱明细序号
-    private String reportNo; //报告单号
-    private String medOrderNo; //医技号
-    private String cardId; //就诊卡号
-    private String medTechProInfo; //医技项目信息
-    private String medTechProName;//医技项目名称
-    private String reportClass; //报告单类别名称
-    private String medOrderAppTime; //医嘱申请时间
-    private String chkStartTime; //检验或检查开始时间
-    private String reportStatus; //危机报告标志
-    private String examinePart; //检查部位或样本名称
-    private String appEmployeeId; //申请医生代码
-    private String appEmployeeName; //申请医生姓名
-    private String appDeptCode; //申请科室代码
-    private String appDeptName; //申请科室名称
-    private String executeDeptCode; //执行科室代码
-    private String executeDeptName; //执行科室名称
-    private String releaseTime; //发布时间
-    private String repTypeCode; //报告单类别编码
-    private String resultFlag; //结果标志
-    private String repType; //报告类型
-    private String checkEmployeeId; //报告审核Id
-    private String checkEmployeeName; //报告审核者
-    private String checkTime; //审核日期
-    private String publisherEmployeeId; //报告发布者id
-    private String publisherEmployee_name; //报告发布者
-    private String publisherTime; //发布时间
-    private String reportEntryId; //报告录入人ID
-    private String reportEntryName; //报告录入人名称
-    private String enterTime; //报告单日期
-    private String bookingNo; //预约单号
-
-}

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

@@ -1,41 +0,0 @@
-package com.ruoyi.web.work.domain;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-@TableName("tb_obx_result")
-@Data
-@Accessors(chain = true)
-public class ObxResult {
-
-    private Integer id;
-
-    private Integer obrId; //报告项目ID
-
-    private String serialNo;//序号
-
-    private String dataType;//数据类型
-
-    private String mecTechObsProject;//医技观察项目
-
-    private String mecTechObsName; //医技观察名称
-
-    private String obsProjectDetail;//观察子项
-
-    private String projectInfo;//项目结果信息
-
-    private String unitCode;//项目单位  单位代码
-
-    private String unitName;//项目单位 单位名称
-
-    private String result;//结果参考值
-
-    private String sign;//高低标志
-
-    private String obsClassification;//微生物观察分类
-
-    private String testMethod;//检验方法
-
-}

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.work.domain;
 
+import java.sql.Timestamp;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -21,7 +22,7 @@ public class Patient{
     private Long id;
 
     @ApiModelProperty(value = "卫宁患者ID")
-    private String patId;
+    private String wnPatId;
 
     @ApiModelProperty(value = "患者标识符")
     private String patientCode;
@@ -31,7 +32,7 @@ public class Patient{
 
     @ApiModelProperty(value = "出生时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date birthDate;
+    private Timestamp birthDate;
 
     @ApiModelProperty(value = "性别")
     private String sex;
@@ -59,7 +60,7 @@ public class Patient{
 
     @ApiModelProperty(value = "事件触发时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date eventTime;
+    private Timestamp eventTime;
 
     @ApiModelProperty(value = "住院业务类型：(1入院登记 2入区登记 3转区接收(出A区后入B区) 4转科转床接收(同科室换床) 5出区 6出区召回 7出院 8取消出院 9新生儿登记 10修改病人信息 门诊业务类型： 1患者建卡 2修改病人信息 3门诊挂号 4取消挂号 5就诊结束)")
     private String eventType;
@@ -84,7 +85,7 @@ public class Patient{
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private Timestamp createTime;
 
     @ApiModelProperty(value = "更新人")
     @TableField(fill = FieldFill.UPDATE)
@@ -94,6 +95,6 @@ public class Patient{
     @ApiModelProperty(value = "更新时间")
     @TableField(fill = FieldFill.UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private Timestamp updateTime;
 
 }

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

@@ -1,110 +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-23
- */
-@Data
-@TableName(value = "tb_pv1")
-@Accessors(chain = true)
-public class Pv1{
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    @ApiModelProperty(value = "患者ID")
-    private Long patientId;
-
-    @ApiModelProperty(value = "就诊卡号")
-    private Long cardId;
-
-    @ApiModelProperty(value = "患者类别")
-    private String patientCategory;
-
-    @ApiModelProperty(value = "患者位置")
-    private String bed;
-
-    @ApiModelProperty(value = "科室")
-    private String department;
-
-    @ApiModelProperty(value = "主治医师代码")
-    private String doctorCode;
-
-    @ApiModelProperty(value = "主治医师")
-    private String physician;
-
-    @ApiModelProperty(value = "主管护士代码")
-    private String nurseCode;
-
-    @ApiModelProperty(value = "入院次数")
-    private String hospitalizedNumber;
-
-    @ApiModelProperty(value = "收费类别")
-    private String feeCategory;
-
-    @ApiModelProperty(value = "出院方式 1-治愈 2-好转 3 -稳定 4-恶化 5-死亡 9 -其他")
-    private String dischargeMethod;
-
-    @ApiModelProperty(value = "医疗机构代码")
-    private String medicalCode;
-
-    @ApiModelProperty(value = " 在院状态 0 入院登记 1 病区分床 2 病人出区 3 病人出院 4 取消结算 5 进入 ICU 6 进入产房 7 转科状态 8 数据转出 9 入院作")
-    private String hospitalStatus;
-
-    @ApiModelProperty(value = "门诊挂号状态： 0-有效 1-无效")
-    private String registrationStatus;
-
-    @ApiModelProperty(value = "入院时间")
-    private String admissionTime;
-
-    @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;
-
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    @TableField(fill = FieldFill.UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateBy;
-
-    @ApiModelProperty(value = "患者信息ID")
-    private Long msgId;
-
-    @ApiModelProperty(value = "病区代码")
-    private String wardCode;
-
-    @ApiModelProperty(value = "病区代名称")
-    private String wardName;
-
-
-}

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Orders.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Report.java

@@ -4,14 +4,17 @@ import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.experimental.Accessors;
+
+import java.sql.Timestamp;
+
 /**
  * @author lsw
  * @date 2024-07-24
  */
 @Data
-@TableName(value = "tb_orders")
+@TableName(value = "tb_orc_report")
 @Accessors(chain = true)
-public class Orders{
+public class Report{
     private static final long serialVersionUID = 1L;
 
     private Long id;
@@ -50,7 +53,7 @@ public class Orders{
     private String orderApplicantName;
 
     @ApiModelProperty(value = "医嘱生效日期")
-    private String effectiveDate;
+    private Timestamp effectiveDate;
 
     @ApiModelProperty(value = "医嘱确认代码")
     private String orderConfirmCode;

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

@@ -4,14 +4,17 @@ import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.experimental.Accessors;
+
+import java.sql.Timestamp;
+
 /**
  * @author lsw
  * @date 2024-07-23
  */
 @Data
-@TableName(value = "tb_obr")
+@TableName(value = "tb_obr_request")
 @Accessors(chain = true)
-public class Obr{
+public class Request{
     private static final long serialVersionUID = 1L;
 
     private Long id;
@@ -20,10 +23,7 @@ public class Obr{
     private String cardId;
 
     @ApiModelProperty(value = "医嘱操作码")
-    private String orderCode;
-
-    @ApiModelProperty(value = "申请单序号")
-    private String applicationNo;
+    private String orcId;
 
     @ApiModelProperty(value = "医嘱明细序号")
     private String medOrderCode;
@@ -44,7 +44,7 @@ public class Obr{
     private String reportClass;
 
     @ApiModelProperty(value = "医嘱申请时间")
-    private String medOrderAppTime;
+    private Timestamp medOrderAppTime;
 
     @ApiModelProperty(value = "检验或检查开始时间")
     private String chkStartTime;
@@ -74,7 +74,7 @@ public class Obr{
     private String executeDeptName;
 
     @ApiModelProperty(value = "发布时间")
-    private String releaseTime;
+    private Timestamp releaseTime;
 
     @ApiModelProperty(value = "报告单类别编码")
     private String repTypeCode;
@@ -92,7 +92,7 @@ public class Obr{
     private String checkEmployeeName;
 
     @ApiModelProperty(value = "审核日期")
-    private String checkTime;
+    private Timestamp checkTime;
 
     @ApiModelProperty(value = "报告发布者id")
     private String publisherEmployeeId;
@@ -101,7 +101,7 @@ public class Obr{
     private String publisherEmployeeName;
 
     @ApiModelProperty(value = "发布时间")
-    private String publisherTime;
+    private Timestamp publisherTime;
 
     @ApiModelProperty(value = "报告录入人ID")
     private String reportEntryId;
@@ -110,13 +110,11 @@ public class Obr{
     private String reportEntryName;
 
     @ApiModelProperty(value = "报告单日期")
-    private String enterTime;
+    private Timestamp enterTime;
 
     @ApiModelProperty(value = "预约单号")
     private String bookingNo;
 
-    @ApiModelProperty(value = "患者ID")
-    private Long patientId;
 
 
 }

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

@@ -9,9 +9,9 @@ import lombok.experimental.Accessors;
  * @date 2024-07-23
  */
 @Data
-@TableName(value = "tb_obx")
+@TableName(value = "tb_obx_result")
 @Accessors(chain = true)
-public class Obx{
+public class Result{
     private static final long serialVersionUID = 1L;
 
     private Long id;
@@ -55,9 +55,5 @@ public class Obx{
     @ApiModelProperty(value = "检验方法")
     private String testMethod;
 
-    @ApiModelProperty(value = "患者ID")
-    private Long patientId;
-
-
 
 }

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

@@ -1,5 +1,18 @@
 package com.ruoyi.web.work.domain;
 
+import java.sql.Timestamp;
+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-23
+=======
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,52 +23,97 @@ import java.time.LocalDateTime;
 
 /**
  * 就诊记录
+>>>>>>> 69578e590975eaecfdcae1c17163fa34af959b7e
  */
 @Data
 @TableName(value = "tb_visit")
 @Accessors(chain = true)
+
 public class Visit {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
 
-    private Integer id;
     @ApiModelProperty(value = "患者ID")
-    private Integer patId;
+    private Long patId;
+
     @ApiModelProperty(value = "就诊卡号")
-    private String cardId;
-    @ApiModelProperty(value = "患者分类")
+    private Long cardId;
+
+    @ApiModelProperty(value = "患者类别")
     private String patClass;
+
+    @ApiModelProperty(value = "患者位置")
+    private String bed;
+
     @ApiModelProperty(value = "科室")
     private String department;
-    @ApiModelProperty(value = "床位")
-    private String bed;
-    @ApiModelProperty(value = "医生代码")
+
+    @ApiModelProperty(value = "病区代码")
+    private String wardCode;
+
+    @ApiModelProperty(value = "病区代名称")
+    private String wardName;
+
+    @ApiModelProperty(value = "主治医师代码")
     private String doctorCode;
+
     @ApiModelProperty(value = "主治医师")
     private String physician;
+
     @ApiModelProperty(value = "主管护士代码")
     private String nurseCode;
+
     @ApiModelProperty(value = "入院次数")
     private String hospitalizedNumber;
+
     @ApiModelProperty(value = "收费类别")
     private String feeCategory;
-    @ApiModelProperty(value = "出院方式")
+
+    @ApiModelProperty(value = "出院方式 1-治愈 2-好转 3 -稳定 4-恶化 5-死亡 9 -其他")
     private String dischargeMethod;
+
     @ApiModelProperty(value = "医疗机构代码")
     private String medicalCode;
-    @ApiModelProperty(value = "在院状态")
+
+    @ApiModelProperty(value = " 在院状态 0 入院登记 1 病区分床 2 病人出区 3 病人出院 4 取消结算 5 进入 ICU 6 进入产房 7 转科状态 8 数据转出 9 入院作")
     private String hospitalStatus;
-    @ApiModelProperty(value = "门诊挂号状态")
+
+    @ApiModelProperty(value = "门诊挂号状态： 0-有效 1-无效")
     private String registrationStatus;
+
     @ApiModelProperty(value = "入院时间")
-    private LocalDateTime admissionTime;
+    private Timestamp admissionTime;
+
     @ApiModelProperty(value = "出院时间")
-    private LocalDateTime dischargeTime;
-    private String createBy;  //创建人
+    private Timestamp dischargeTime;
+
+    @ApiModelProperty(value = "危重级别:0-一般病人1-危重病人")
+    private String level;
+
+    @ApiModelProperty(value = "出区原因")
+    private String reasonArea;
+
+    @ApiModelProperty(value = "婴儿信息标识：Y-是 N-否")
+    private String babyCode;
+
+    @ApiModelProperty(value = "入区时间")
+    private Timestamp entryTime;
+
+    @ApiModelProperty(value = "出区时间")
+    private Timestamp exitTime;
+
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Data createTime;  //创建时间
-    private String updateBy;  //更新人
+    private Timestamp createTime;
+
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
     @TableField(fill = FieldFill.UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Data updateTime;  //更新时间
+    private Timestamp updateTime;
 
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
 }

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.sql.Timestamp;
+
 @Data
 @Accessors(chain = true)
 public class PatientCardDto {
@@ -24,14 +26,14 @@ public class PatientCardDto {
 
 
     @ApiModelProperty(value = "出院时间")
-    private String dischargeTime;
+    private Timestamp dischargeTime;
 
 
     @ApiModelProperty(value = "就诊ID")
     private String pvId;
 
     @ApiModelProperty(value = "患者ID")
-    private String patientId;
+    private String patId;
 
     @ApiModelProperty(value = "就诊卡号")
     private String cardId;

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

@@ -1,22 +0,0 @@
-package com.ruoyi.web.work.mapper;
-
-import java.util.List;
-import com.ruoyi.web.work.domain.Dg;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.work.domain.dto.Pv1MedicalRecord;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author lsw
- * @date 2024-07-19
- */
-public interface DgMapper extends BaseMapper<Dg> {
-    List<Dg> selectList(Dg dg);
-
-    List<Dg> getDgByCard(String card);
-
-    List<Pv1MedicalRecord> getMedicalRecord(@Param("beginTime") String beginTime,
-                                            @Param("endTime") String endTime,
-                                            @Param("patientId") Long patientId);
-
-}

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

@@ -2,7 +2,9 @@ package com.ruoyi.web.work.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.web.work.domain.Diagnosis;
-import com.ruoyi.web.work.domain.Visit;
+
+import java.util.List;
 
 public interface DiagnosisMapper extends BaseMapper<Diagnosis> {
+    List<Diagnosis> selectList(Diagnosis diagnosis);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/NkMapper.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/NextOfKinMapper.java

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

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

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

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

@@ -1,9 +0,0 @@
-package com.ruoyi.web.work.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.work.domain.ObrRequest;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface ObrRequestMapper extends BaseMapper<ObrRequest> {
-}

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

@@ -1,16 +0,0 @@
-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> getObxByCard(String card);
-
-}

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

@@ -1,12 +0,0 @@
-package com.ruoyi.web.work.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.work.domain.ObxResult;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface ObxResultMapper extends BaseMapper<ObxResult> {
-
-
-}

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

@@ -1,15 +0,0 @@
-package com.ruoyi.web.work.mapper;
-
-import java.util.List;
-import com.ruoyi.web.work.domain.Orders;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.work.domain.Pv1;
-
-/**
- * @author lsw
- * @date 2024-07-24
- */
-public interface OrdersMapper extends BaseMapper<Orders> {
-    List<Orders> selectList(Orders orders);
-
-}

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

@@ -1,24 +0,0 @@
-package com.ruoyi.web.work.mapper;
-
-import java.util.List;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.web.work.domain.dto.PatientCardDto;
-import com.ruoyi.web.work.domain.Pv1;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.work.domain.dto.Pv1MedicalRecord;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author lsw
- * @date 2024-07-23
- */
-public interface Pv1Mapper extends BaseMapper<Pv1> {
-    List<Pv1> selectList(Pv1 pv1);
-
-    List<PatientCardDto> getPatientCardByNameOrDepartment(@Param("patientName") String patientName, @Param("departmentName") String departmentName, @Param("physician") String physician);
-
-    List<PatientCardDto> getAllDepartment();
-
-    List<Pv1> getMedicalRecord(@Param("beginTime") String beginTime,@Param("endTime")  String endTime,@Param("patientId")  Long patientId);
-}

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

@@ -0,0 +1,16 @@
+package com.ruoyi.web.work.mapper;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Report;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.work.domain.Request;
+
+/**
+ * @author lsw
+ * @date 2024-07-24
+ */
+public interface ReportMapper extends BaseMapper<Report> {
+    List<Report> selectList(Report report);
+
+    List<Request> getAllReportByPatId(Long patId);
+}

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

@@ -0,0 +1,19 @@
+package com.ruoyi.web.work.mapper;
+
+import java.util.List;
+
+import com.ruoyi.web.work.domain.Request;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+public interface RequestMapper extends BaseMapper<Request> {
+    List<Request> selectList(Request request);
+
+    List<Request> getRequestByCard(String card);
+
+
+    List<Request> getAllRequestByPatId(Long patId);
+}

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

@@ -0,0 +1,19 @@
+package com.ruoyi.web.work.mapper;
+
+import java.util.List;
+
+import com.ruoyi.web.work.domain.Request;
+import com.ruoyi.web.work.domain.Result;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+public interface ResultMapper extends BaseMapper<Result> {
+    List<Result> selectList(Result result);
+
+    List<Result> getResultByCard(String card);
+
+    List<Result> getAllResultByPatId(Long patId);
+}

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

@@ -1,17 +1,23 @@
 package com.ruoyi.web.work.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.work.domain.EmployeeInfo;
-import com.ruoyi.web.work.domain.Visit;
-import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
+import com.ruoyi.web.work.domain.Visit;
+import com.ruoyi.web.work.domain.dto.PatientCardDto;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
 /**
- * @author zeng
- * @date 2024-07-18
+ * @author lsw
+ * @date 2024-07-23
  */
-@Mapper
 public interface VisitMapper extends BaseMapper<Visit> {
+    List<Visit> selectList(Visit visit);
+
+    List<PatientCardDto> getPatientCardByNameOrDepartmentOrPhysician(@Param("patientName") String patientName, @Param("departmentName") String departmentName, @Param("physician") String physician);
+
+    List<PatientCardDto> getAllDepartment();
 
+    List<Visit> getMedicalRecord(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("patientId") Long patientId);
 }

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

@@ -1,19 +0,0 @@
-package com.ruoyi.web.work.service;
-
-import java.util.List;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.web.work.domain.Dg;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @author lsw
- * @date 2024-07-19
- */
-public interface IDgService extends IService<Dg>{
-    List<Dg> selectList(Dg dg);
-
-    AjaxResult getMedicalRecord(String beginTime, String endTime,Long patientId);
-
-    List<Dg> getDgByCard(String card);
-}

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

@@ -1,10 +1,17 @@
 package com.ruoyi.web.work.service;
 
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.domain.Diagnosis;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.work.domain.Request;
 
-import java.util.List;
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+public interface IDiagnosisService extends IService<Diagnosis>{
+    List<Diagnosis> selectList(Diagnosis diagnosis);
 
-public interface IDiagnosisService {
-    //根据就诊ID获取诊断详情
-    List<Diagnosis> getDiagnosisInfoByVisitId(String visitId);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/INkService.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/service/INextOfKinService.java

@@ -1,13 +1,13 @@
 package com.ruoyi.web.work.service;
 
 import java.util.List;
-import com.ruoyi.web.work.domain.Nk;
+import com.ruoyi.web.work.domain.NextOfKin;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * @author lsw
  * @date 2024-07-19
  */
-public interface INkService extends IService<Nk>{
-    List<Nk> selectList(Nk nk);
+public interface INextOfKinService extends IService<NextOfKin>{
+    List<NextOfKin> selectList(NextOfKin nk);
 }

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

@@ -1,19 +0,0 @@
-package com.ruoyi.web.work.service;
-
-import java.util.List;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.web.work.domain.Obr;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.work.domain.Obx;
-
-/**
- * @author lsw
- * @date 2024-07-23
- */
-public interface IObrService extends IService<Obr>{
-
-    List<Obr> selectList(Obr obr);
-
-    List<Obr> getObrByCard(String card);
-}

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

@@ -1,16 +0,0 @@
-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);
-
-
-    List<Obx> getObxByCard(String card);
-}

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

@@ -1,16 +0,0 @@
-package com.ruoyi.web.work.service;
-
-import java.util.List;
-import com.ruoyi.web.work.domain.Orders;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.work.domain.Pv1;
-
-/**
- * @author lsw
- * @date 2024-07-24
- */
-public interface IOrdersService extends IService<Orders>{
-    List<Orders> selectList(Orders orders);
-
-
-}

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

@@ -1,23 +0,0 @@
-package com.ruoyi.web.work.service;
-
-import java.util.List;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.web.work.domain.dto.PatientCardDto;
-import com.ruoyi.web.work.domain.Pv1;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.work.domain.dto.Pv1MedicalRecord;
-
-/**
- * @author lsw
- * @date 2024-07-23
- */
-public interface IPv1Service extends IService<Pv1>{
-    List<Pv1> selectList(Pv1 pv1);
-
-    List<PatientCardDto> getPatientCardByNameOrDepartment(String patientName, String departmentName, String physician);
-
-    List<PatientCardDto> getAllDepartment();
-
-    List<Pv1> getMedicalRecord(String beginTime, String endTime, Long patientId);
-}

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

@@ -0,0 +1,17 @@
+package com.ruoyi.web.work.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.work.domain.Report;
+import com.ruoyi.web.work.domain.Request;
+
+/**
+ * @author lsw
+ * @date 2024-07-24
+ */
+public interface IReportService extends IService<Report>{
+    List<Report> selectList(Report report);
+
+
+    List<Request> getAllReportByPatId(Long patId);
+}

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

@@ -0,0 +1,20 @@
+package com.ruoyi.web.work.service;
+
+import java.util.List;
+
+import com.ruoyi.web.work.domain.Request;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+public interface IRequestService extends IService<Request>{
+
+    List<Request> selectList(Request request);
+
+    List<Request> getRequestByCard(String card);
+
+    List<Request> getAllRequestByPatId(Long patId);
+}

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

@@ -0,0 +1,20 @@
+package com.ruoyi.web.work.service;
+
+import java.util.List;
+
+import com.ruoyi.web.work.domain.Request;
+import com.ruoyi.web.work.domain.Result;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+public interface IResultService extends IService<Result>{
+    List<Result> selectList(Result result);
+
+
+    List<Result> getResultByCard(String card);
+
+    List<Result> getAllResultByPatId(Long patId);
+}

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

@@ -1,12 +1,21 @@
 package com.ruoyi.web.work.service;
 
+import java.util.List;
+
 import com.ruoyi.web.work.domain.Visit;
+import com.ruoyi.web.work.domain.dto.PatientCardDto;
+import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.time.LocalDateTime;
-import java.util.List;
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+public interface IVisitService extends IService<Visit>{
+    List<Visit> selectList(Visit visit);
+
+    List<PatientCardDto> getPatientCardByNameOrDepartmentOrPhysician(String patientName, String departmentName, String physician);
 
-public interface IVisitService {
+    List<PatientCardDto> getAllDepartment();
 
-    //根据就诊卡号获取就诊记录列表
-    List<Visit> getVisitByCardId(String cardId, LocalDateTime startTime, LocalDateTime endTime);
+    List<Visit> getMedicalRecord(String beginTime, String endTime, Long patientId);
 }

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

@@ -1,11 +0,0 @@
-package com.ruoyi.web.work.service;
-
-import com.ruoyi.web.work.domain.ObrRequest;
-
-import java.util.List;
-
-public interface ObrRequestService {
-
-    //根据就诊卡号查询患者报告
-    List<ObrRequest> getObrRequestByCardId(String cardId);
-}

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

@@ -1,11 +0,0 @@
-package com.ruoyi.web.work.service;
-
-import com.ruoyi.web.work.domain.ObxResult;
-
-import java.util.List;
-
-public interface ObxResultService {
-
-    //根据检测报告ID获取报告结果
-    List<ObxResult> getObxResultByObrId(String obrId);
-}

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

@@ -1,36 +0,0 @@
-package com.ruoyi.web.work.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.web.work.mapper.DgMapper;
-import com.ruoyi.web.work.domain.Dg;
-import com.ruoyi.web.work.service.IDgService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @author lsw
- * @date 2024-07-19
- */
-@Service
-public class DgServiceImpl extends ServiceImpl<DgMapper, Dg> implements IDgService {
-    @Autowired
-    private DgMapper dgMapper;
-
-    @Override
-    public List<Dg> selectList(Dg dg) {
-        return dgMapper.selectList(dg);
-    }
-
-    @Override
-    public AjaxResult getMedicalRecord(String beginTime, String endTime,Long patientId) {
-        return AjaxResult.success(dgMapper.getMedicalRecord(beginTime,endTime,patientId));
-    }
-
-    @Override
-    public List<Dg> getDgByCard(String card) {
-        return dgMapper.getDgByCard(card);
-    }
-}

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

@@ -1,26 +1,29 @@
 package com.ruoyi.web.work.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.domain.Diagnosis;
-import com.ruoyi.web.work.mapper.DiagnosisMapper;
 import com.ruoyi.web.work.service.IDiagnosisService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.ruoyi.web.work.mapper.DiagnosisMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import java.util.List;
-
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
 @Service
 public class DiagnosisServiceImpl extends ServiceImpl<DiagnosisMapper, Diagnosis> implements IDiagnosisService {
+    @Autowired
+    private DiagnosisMapper diagnosisMapper;
 
-    /**
-     * 根据就诊ID获取诊断详情
-     * @param visitId
-     * @return
-     */
     @Override
-    public List<Diagnosis> getDiagnosisInfoByVisitId(String visitId) {
-        LambdaQueryWrapper<Diagnosis> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Diagnosis::getVisitId,visitId);
-        return baseMapper.selectList(wrapper);
+    public List<Diagnosis> selectList(Diagnosis diagnosis) {
+        return diagnosisMapper.selectList(diagnosis);
     }
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/NextOfKinServiceImpl.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.NextOfKinMapper;
+import com.ruoyi.web.work.domain.NextOfKin;
+import com.ruoyi.web.work.service.INextOfKinService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+@Service
+public class NextOfKinServiceImpl extends ServiceImpl<NextOfKinMapper, NextOfKin> implements INextOfKinService {
+    @Autowired
+    private NextOfKinMapper nextOfKinMapper;
+
+    @Override
+    public List<NextOfKin> selectList(NextOfKin nk) {
+        return nextOfKinMapper.selectList(nk);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/NkServiceImpl.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.NkMapper;
-import com.ruoyi.web.work.domain.Nk;
-import com.ruoyi.web.work.service.INkService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @author lsw
- * @date 2024-07-19
- */
-@Service
-public class NkServiceImpl extends ServiceImpl<NkMapper, Nk> implements INkService {
-    @Autowired
-    private NkMapper nkMapper;
-
-    @Override
-    public List<Nk> selectList(Nk nk) {
-        return nkMapper.selectList(nk);
-    }
-}

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

@@ -1,26 +0,0 @@
-package com.ruoyi.web.work.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.work.domain.ObrRequest;
-import com.ruoyi.web.work.mapper.ObrRequestMapper;
-import com.ruoyi.web.work.service.ObrRequestService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class ObrRequestServiceImpl extends ServiceImpl<ObrRequestMapper, ObrRequest> implements ObrRequestService {
-
-    /**
-     * 根据就诊卡号查询患者报告
-     * @param cardId
-     * @return
-     */
-    @Override
-    public List<ObrRequest> getObrRequestByCardId(String cardId) {
-        LambdaQueryWrapper<ObrRequest> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ObrRequest::getCardId,cardId);
-        return baseMapper.selectList(wrapper);
-    }
-}

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

@@ -1,38 +0,0 @@
-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.common.core.domain.AjaxResult;
-import com.ruoyi.web.work.domain.Obx;
-import com.ruoyi.web.work.mapper.ObxMapper;
-import com.ruoyi.web.work.mapper.Pv1Mapper;
-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);
-    }
-
-    @Override
-    public List<Obr> getObrByCard(String card) {
-        return obrMapper.getObrByCard(card);
-    }
-}

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

@@ -1,26 +0,0 @@
-package com.ruoyi.web.work.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.work.domain.ObxResult;
-import com.ruoyi.web.work.mapper.ObxResultMapper;
-import com.ruoyi.web.work.service.ObxResultService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class ObxResultServiceImpl extends ServiceImpl<ObxResultMapper, ObxResult> implements ObxResultService {
-
-    /**
-     * 根据检测报告ID获取报告结果
-     * @param obrId
-     * @return
-     */
-    @Override
-    public List<ObxResult> getObxResultByObrId(String obrId) {
-        LambdaQueryWrapper<ObxResult> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ObxResult::getObrId,obrId);
-        return baseMapper.selectList(wrapper);
-    }
-}

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

@@ -1,37 +0,0 @@
-package com.ruoyi.web.work.service.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.ruoyi.web.work.mapper.Pv1Mapper;
-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;
-
-    @Autowired
-    private Pv1Mapper pv1Mapper;
-
-    @Override
-    public List<Obx> selectList(Obx obx) {
-        return obxMapper.selectList(obx);
-    }
-
-    @Override
-    public List<Obx> getObxByCard(String card) {
-        return obxMapper.getObxByCard(card);
-    }
-
-
-}

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

@@ -1,29 +0,0 @@
-package com.ruoyi.web.work.service.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.ruoyi.web.work.domain.Pv1;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.web.work.mapper.OrdersMapper;
-import com.ruoyi.web.work.domain.Orders;
-import com.ruoyi.web.work.service.IOrdersService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @author lsw
- * @date 2024-07-24
- */
-@Service
-public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> implements IOrdersService {
-    @Autowired
-    private OrdersMapper ordersMapper;
-
-    @Override
-    public List<Orders> selectList(Orders orders) {
-        return ordersMapper.selectList(orders);
-    }
-
-
-}

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

@@ -1,48 +0,0 @@
-package com.ruoyi.web.work.service.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.web.work.domain.*;
-import com.ruoyi.web.work.domain.dto.PatientCardDto;
-import com.ruoyi.web.work.domain.dto.Pv1MedicalRecord;
-import com.ruoyi.web.work.mapper.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.web.work.service.IPv1Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @author lsw
- * @date 2024-07-23
- */
-@Service
-public class Pv1ServiceImpl extends ServiceImpl<Pv1Mapper, Pv1> implements IPv1Service {
-    @Autowired
-    private Pv1Mapper pv1Mapper;
-
-
-    @Override
-    public List<Pv1> selectList(Pv1 pv1) {
-        return pv1Mapper.selectList(pv1);
-    }
-
-    @Override
-    public List<PatientCardDto> getPatientCardByNameOrDepartment(String patientName, String departmentName, String physician) {
-          return pv1Mapper.getPatientCardByNameOrDepartment(patientName,departmentName,physician);
-    }
-
-
-    @Override
-    public List<PatientCardDto> getAllDepartment() {
-        return pv1Mapper.getAllDepartment();
-    }
-
-    @Override
-    public List<Pv1> getMedicalRecord(String beginTime, String endTime, Long patientId) {
-        return pv1Mapper.getMedicalRecord(beginTime,endTime,patientId);
-    }
-
-
-}

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

@@ -0,0 +1,34 @@
+package com.ruoyi.web.work.service.impl;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.ruoyi.web.work.domain.Request;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.web.work.mapper.ReportMapper;
+import com.ruoyi.web.work.domain.Report;
+import com.ruoyi.web.work.service.IReportService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @author lsw
+ * @date 2024-07-24
+ */
+@Service
+public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements IReportService {
+    @Autowired
+    private ReportMapper reportMapper;
+
+    @Override
+    public List<Report> selectList(Report report) {
+        return reportMapper.selectList(report);
+    }
+
+    @Override
+    public List<Request> getAllReportByPatId(Long patId) {
+        return reportMapper.getAllReportByPatId(patId);
+    }
+
+
+}

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

@@ -0,0 +1,37 @@
+package com.ruoyi.web.work.service.impl;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.web.work.mapper.RequestMapper;
+import com.ruoyi.web.work.domain.Request;
+import com.ruoyi.web.work.service.IRequestService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+@Service
+public class RequestServiceImpl extends ServiceImpl<RequestMapper, Request> implements IRequestService {
+    @Autowired
+    private RequestMapper requestMapper;
+
+
+    @Override
+    public List<Request> selectList(Request request) {
+        return requestMapper.selectList(request);
+    }
+
+    @Override
+    public List<Request> getRequestByCard(String card) {
+        return requestMapper.getRequestByCard(card);
+    }
+
+    @Override
+    public List<Request> getAllRequestByPatId(Long patId) {
+        return requestMapper.getAllRequestByPatId(patId);
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.ruoyi.web.work.service.impl;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.ruoyi.web.work.domain.Request;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.web.work.mapper.ResultMapper;
+import com.ruoyi.web.work.domain.Result;
+import com.ruoyi.web.work.service.IResultService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
+@Service
+public class ResultServiceImpl extends ServiceImpl<ResultMapper, Result> implements IResultService {
+    @Autowired
+    private ResultMapper resultMapper;
+
+    @Override
+    public List<Result> selectList(Result result) {
+        return resultMapper.selectList(result);
+    }
+
+    @Override
+    public List<Result> getResultByCard(String card) {
+        return resultMapper.getResultByCard(card);
+    }
+
+    @Override
+    public List<Result> getAllResultByPatId(Long patId) {
+        return resultMapper.getAllResultByPatId(patId);
+    }
+
+
+}

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

@@ -1,30 +1,46 @@
 package com.ruoyi.web.work.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.work.domain.Visit;
-import com.ruoyi.web.work.mapper.VisitMapper;
-import com.ruoyi.web.work.service.IVisitService;
-import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
+import com.ruoyi.web.work.domain.*;
+import com.ruoyi.web.work.domain.dto.PatientCardDto;
+import com.ruoyi.web.work.mapper.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.web.work.service.IVisitService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @author lsw
+ * @date 2024-07-23
+ */
 @Service
 public class VisitServiceImpl extends ServiceImpl<VisitMapper, Visit> implements IVisitService {
+    @Autowired
+    private VisitMapper visitMapper;
+
+
+    @Override
+    public List<Visit> selectList(Visit visit) {
+        return visitMapper.selectList(visit);
+    }
+
+    @Override
+    public List<PatientCardDto> getPatientCardByNameOrDepartmentOrPhysician(String patientName, String departmentName, String physician) {
+        return visitMapper.getPatientCardByNameOrDepartmentOrPhysician(patientName, departmentName, physician);
+    }
+
 
-    /**
-     * 根据就诊卡号获取就诊记录列表
-     * @param cardId
-     * @return
-     */
     @Override
-    public List<Visit> getVisitByCardId(String cardId, LocalDateTime startTime, LocalDateTime endTime) {
-        LambdaQueryWrapper<Visit> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Visit::getCardId,cardId);
-        if (startTime != null && endTime != null){
-            wrapper.between(Visit::getAdmissionTime,startTime,endTime);
-        }
-        return baseMapper.selectList(wrapper);
+    public List<PatientCardDto> getAllDepartment() {
+        return visitMapper.getAllDepartment();
     }
+
+    @Override
+    public List<Visit> getMedicalRecord(String beginTime, String endTime, Long patientId) {
+        return visitMapper.getMedicalRecord(beginTime, endTime, patientId);
+    }
+
+
 }

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

@@ -2,31 +2,34 @@
 <!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.DgMapper">
+<mapper namespace="com.ruoyi.web.work.mapper.DiagnosisMapper">
 
-    <select id="selectList" resultType="com.ruoyi.web.work.domain.Dg">
-        select * from tb_dg
+    <select id="selectList" resultType="com.ruoyi.web.work.domain.Diagnosis">
+        select * from tb_diagnosis
         <where>
             <if test="id != null "> and id = #{id}</if>
-            <if test="patientId != null  and patientId != ''"> and patient_id = #{patientId}</if>
+            <if test="patId != null  and patId != ''"> and pat_id = #{patId}</if>
+            <if test="visitId != null  and visitId != ''"> and visit_id = #{visitId}</if>
+            <if test="doctor != null  and doctor != ''"> and doctor = #{doctor}</if>
             <if test="diagnosticCode != null  and diagnosticCode != ''"> and diagnostic_code = #{diagnosticCode}</if>
+            <if test="diagnosticName != null  and diagnosticName != ''"> and diagnostic_name = #{diagnosticName}</if>
             <if test="diagnosisTime != null  and diagnosisTime != ''"> and diagnosis_time = #{diagnosisTime}</if>
             <if test="diagnosticType != null  and diagnosticType != ''"> and diagnostic_type = #{diagnosticType}</if>
             <if test="diagnosticCategoryCode != null  and diagnosticCategoryCode != ''"> and diagnostic_category_code = #{diagnosticCategoryCode}</if>
         </where>
     </select>
 
-    <select id="getDgByCard" resultType="com.ruoyi.web.work.domain.Dg">
-        select * from tb_dg where card_id=#{card}
+    <select id="getDiagnosisByCard" resultType="com.ruoyi.web.work.domain.Diagnosis">
+        select * from tb_diagnosis where card_id=#{card}
     </select>
 
     <select id="getMedicalRecord" resultType="com.ruoyi.web.work.domain.dto.Pv1MedicalRecord">
-        SELECT tb_dg.diagnostic_code,tb_dg.create_time,tb_pv1.discharge_time,tb_pv1.card_id
-        FROM tb_dg
-                 JOIN tb_pv1 ON tb_dg.patient_id=tb_pv1.patient_id
+        SELECT tb_diagnosis.diagnostic_name,tb_diagnosis.create_time,tb_visit.discharge_time,tb_visit.card_id
+        FROM tb_diagnosis
+                 JOIN tb_visit ON tb_diagnosis.pat_id=tb_visit.pat_id
         <where>
             <if test="patientId !=null and patientId!=''">
-                and tb_dg.patient_id=#{patientId}
+                and tb_diagnosis.pat_id=#{patId}
             </if>
             <if test="beginTime !=null and beginTime!='' and endTime!=null and endTime!=''">
                 and  diagnosis_time BETWEEN #{beginTime} and #{endTime};
@@ -36,6 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
+    <select id="getDiagnosisByCardId" resultType="com.ruoyi.web.work.domain.Diagnosis">
+        SELECT * from tb_diagnosis
+        where tb_diagnosis.visit_id in (SELECT tb_visit.id from tb_visit WHERE tb_visit.card_id=#{cardId})
+    </select>
 
 
 </mapper>

ruoyi-admin/src/main/resources/mapper/work/NkMapper.xml → ruoyi-admin/src/main/resources/mapper/work/NextOfKinMapper.xml

@@ -2,10 +2,11 @@
 <!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.NkMapper">
+<mapper namespace="com.ruoyi.web.work.mapper.NextOfKinMapper">
 
-    <select id="selectList" resultType="com.ruoyi.web.work.domain.Nk">
-        select * from tb_next_of_kin
+
+    <select id="selectList" resultType="com.ruoyi.web.work.domain.NextOfKin">
+      select * from tb_next_of_kin
         <where>
             <if test="id != null "> and id = #{id}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>

ruoyi-admin/src/main/resources/mapper/work/OrdersMapper.xml → ruoyi-admin/src/main/resources/mapper/work/ReportMapper.xml

@@ -2,10 +2,10 @@
 <!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.OrdersMapper">
+<mapper namespace="com.ruoyi.web.work.mapper.ReportMapper">
 
-    <select id="selectList" resultType="com.ruoyi.web.work.domain.Orders">
-        select * from tb_orders
+    <select id="selectList" resultType="com.ruoyi.web.work.domain.Report">
+        select * from tb_report
         <where>
             <if test="id != null "> and id = #{id}</if>
             <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
@@ -27,6 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="getAllReportByPatId" resultType="com.ruoyi.web.work.domain.Request">
+        SELECT * FROM tb_orc_report
+        WHERE tb_orc_report.card_id IN
+              ( SELECT tb_visit.card_id FROM tb_visit WHERE tb_visit.pat_id = #{patId} )
+    </select>
 
 
 </mapper>

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

@@ -2,15 +2,14 @@
 <!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">
+<mapper namespace="com.ruoyi.web.work.mapper.RequestMapper">
 
-    <select id="selectList" resultType="com.ruoyi.web.work.domain.Obr">
-        select * from tb_obr
+    <select id="selectList" resultType="com.ruoyi.web.work.domain.Request">
+        select * from tb_obr_request
         <where>
             <if test="id != null "> and id = #{id}</if>
             <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="orcId != null  and orcId != ''"> and orc_id = #{orcId}</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>
@@ -41,14 +40,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="getObrByCard" resultType="com.ruoyi.web.work.domain.Obr">
-        select * from tb_obr where card_id=#{card}
+    <select id="getRequestByCard" resultType="com.ruoyi.web.work.domain.Request">
+        select * from tb_obr_request where card_id=#{card}
     </select>
 
+    <select id="getAllRequestByPatId" resultType="com.ruoyi.web.work.domain.Request">
+        select * from tb_obr_request
+        WHERE tb_obr_request.card_id in
+              (SELECT tb_visit.card_id from tb_visit where tb_visit.pat_id=#{patId} )
+
+    </select>
 
 
 </mapper>

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

@@ -2,10 +2,10 @@
 <!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">
+<mapper namespace="com.ruoyi.web.work.mapper.ResultMapper">
 
-    <select id="selectList" resultType="com.ruoyi.web.work.domain.Obx">
-        select * from tb_obx
+    <select id="selectList" resultType="com.ruoyi.web.work.domain.Result">
+        select * from tb_obx_result
         <where>
             <if test="id != null "> and id = #{id}</if>
             <if test="obrId != null "> and obr_id = #{obrId}</if>
@@ -21,16 +21,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="getObxByCard" resultType="com.ruoyi.web.work.domain.Obx">
-        SELECT * FROM tb_obx
-            JOIN tb_obr on tb_obx.obr_id=tb_obr.id
-                where tb_obr.card_id=#{card}
+    <select id="getResultByCard" resultType="com.ruoyi.web.work.domain.Result">
+        SELECT * FROM tb_obx_result
+            JOIN tb_obr_request on tb_obx_result.obr_id=tb_obr_request.id
+                where tb_obr_request.card_id=#{card}
     </select>
 
+    <select id="getAllResultByPatId" resultType="com.ruoyi.web.work.domain.Result">
+        SELECT * FROM tb_obx_result
+        WHERE tb_obx_result.obr_id IN
+              (SELECT tb_obr_request.id FROM tb_obr_request
+                    WHERE tb_obr_request.card_id IN
+                        ( SELECT tb_visit.card_id FROM tb_visit WHERE tb_visit.pat_id = #{patId} ))
+    </select>
 
 
 </mapper>

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

@@ -2,18 +2,20 @@
 <!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.Pv1Mapper">
+<mapper namespace="com.ruoyi.web.work.mapper.VisitMapper">
 
-    <select id="selectList" resultType="com.ruoyi.web.work.domain.Pv1">
-        select * from tb_pv1
+    <select id="selectList" resultType="com.ruoyi.web.work.domain.Visit">
+        select * from tb_visit
         <where>
             <if test="id != null "> and id = #{id}</if>
-            <if test="patientId != null "> and patient_id = #{patientId}</if>
+            <if test="patId != null "> and pat_id = #{patId}</if>
             <if test="cardId != null "> and card_id = #{cardId}</if>
-            <if test="patientCategory != null  and patientCategory != ''"> and patient_category = #{patientCategory}</if>
+            <if test="patClass != null  and patClass != ''"> and pat_class = #{patClass}</if>
             <if test="bed != null  and bed != ''"> and bed = #{bed}</if>
+            <if test="department != null  and department != ''"> and department = #{department}</if>
             <if test="physician != null  and physician != ''"> and physician = #{physician}</if>
             <if test="nurseCode != null  and nurseCode != ''"> and nurse_code = #{nurseCode}</if>
+            <if test="doctorCode != null  and doctorCode != ''"> and doctor_code = #{doctorCode}</if>
             <if test="hospitalizedNumber != null  and hospitalizedNumber != ''"> and hospitalized_number = #{hospitalizedNumber}</if>
             <if test="feeCategory != null  and feeCategory != ''"> and fee_category = #{feeCategory}</if>
             <if test="dischargeMethod != null  and dischargeMethod != ''"> and discharge_method = #{dischargeMethod}</if>
@@ -22,55 +24,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="registrationStatus != null  and registrationStatus != ''"> and registration_status = #{registrationStatus}</if>
             <if test="admissionTime != null  and admissionTime != ''"> and admission_time = #{admissionTime}</if>
             <if test="dischargeTime != null  and dischargeTime != ''"> and discharge_time = #{dischargeTime}</if>
-            <if test="msgId != null "> and msg_id = #{msgId}</if>
-            <if test="department != null  and department != ''"> and department = #{department}</if>
+            <if test="level != null  and level != ''"> and level = #{level}</if>
+            <if test="reasonArea != null  and reasonArea != ''"> and reasonArea = #{reasonArea}</if>
             <if test="wardCode != null  and wardCode != ''"> and ward_code = #{wardCode}</if>
             <if test="wardName != null  and wardName != ''"> and ward_name = #{wardName}</if>
         </where>
     </select>
 
 
-    <select id="getPatientCardByNameOrDepartment" resultType="com.ruoyi.web.work.domain.dto.PatientCardDto">
+    <select id="getPatientCardByNameOrDepartmentOrPhysician" resultType="com.ruoyi.web.work.domain.dto.PatientCardDto">
         SELECT
-            tb_pv1.department,
-            tb_pv1.physician,
+            tb_visit.department,
+            tb_visit.physician,
             tb_patient.`name`,
-            tb_pv1.discharge_method,
-            tb_pv1.discharge_time,
-            tb_pv1.id,
-            tb_pv1.patient_id,
-            tb_pv1.card_id
+            tb_visit.discharge_method,
+            tb_visit.discharge_time,
+            tb_visit.id,
+            tb_visit.pat_id,
+            tb_visit.card_id
         FROM
-            tb_pv1
+            tb_visit
                 JOIN
-            tb_patient ON tb_pv1.patient_id = tb_patient.id
+            tb_patient ON tb_visit.pat_id = tb_patient.id
         <where>
             <if test="patientName!='' and patientName!=null">
-                tb_patient.`name` like concat('%', #{patientName}, '%')
+               AND tb_patient.`name` like concat('%', #{patientName}, '%')
             </if>
             <if test="departmentName!='' and departmentName!= null">
-                AND tb_pv1.department =#{departmentName}
+                AND tb_visit.department =#{departmentName}
             </if>
             <if test="physician!='' and physician!= null">
-                AND tb_pv1.physician like concat('%', #{physician}, '%')
+                AND tb_visit.physician like concat('%', #{physician}, '%')
             </if>
         </where>
     </select>
 
 
     <select id="getAllDepartment" resultType="com.ruoyi.web.work.domain.dto.PatientCardDto">
-        select department from tb_pv1 GROUP BY department
+        select department from tb_visit GROUP BY department
     </select>
 
 
-    <select id="getMedicalRecord" resultType="com.ruoyi.web.work.domain.Pv1">
+    <select id="getMedicalRecord" resultType="com.ruoyi.web.work.domain.Visit">
         SELECT *
-        FROM tb_pv1
+        FROM tb_visit
         <where>
-            <if test="patientId!='' and patientId!=null"></if>
-                and tb_pv1.patient_id=#{patientId}
+            <if test="patientId != '' and patientId != null"></if>
+                and tb_visit.pat_id=#{patientId}
             <if test="beginTime !=null and beginTime != '' and endTime != null and endTime != ''">
-                and  tb_pv1.admission_time BETWEEN #{beginTime} ANd #{endTime}
+                and  tb_visit.admission_time BETWEEN #{beginTime} AND #{endTime}
             </if>
         </where>