Pārlūkot izejas kodu

小程序就医记录、检测项目,诊断结果

Ciallo 9 mēneši atpakaļ
vecāks
revīzija
9d8702a298
25 mainītis faili ar 20 papildinājumiem un 123 dzēšanām
  1. 1 5
      ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_DgController.java
  2. 4 12
      ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/ObrController.java
  3. 4 9
      ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/ObxController.java
  4. 2 9
      ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/OrdersController.java
  5. 0 19
      ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/PatientController.java
  6. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/ObrMapper.java
  7. 0 1
      ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/ObxMapper.java
  8. 0 2
      ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/OrdersMapper.java
  9. 1 3
      ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/PatientMapper.java
  10. 0 3
      ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/Pv1Mapper.java
  11. 0 1
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IObrService.java
  12. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IObxService.java
  13. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IOrdersService.java
  14. 0 3
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IPatientService.java
  15. 0 1
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IPv1Service.java
  16. 0 6
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/ObrServiceImpl.java
  17. 1 5
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/ObxServiceImpl.java
  18. 1 4
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/OrdersServiceImpl.java
  19. 0 9
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/PatientServiceImpl.java
  20. 0 4
      ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/Pv1ServiceImpl.java
  21. 1 3
      ruoyi-admin/src/main/resources/mapper/work/ObrMapper.xml
  22. 0 5
      ruoyi-admin/src/main/resources/mapper/work/ObxMapper.xml
  23. 0 3
      ruoyi-admin/src/main/resources/mapper/work/OrdersMapper.xml
  24. 2 6
      ruoyi-admin/src/main/resources/mapper/work/PatientMapper.xml
  25. 0 7
      ruoyi-admin/src/main/resources/mapper/work/Pv1Mapper.xml

+ 1 - 5
ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_DgController.java

@@ -1,12 +1,8 @@
 package com.ruoyi.web.work.api;
 
-import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.annotation.Log;
+
 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.service.IUserService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.web.work.domain.Obx;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +22,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author lsw
  * @date 2024-07-23
  */
+@Api(tags = "科室申请管理")
 @Anonymous
 @RestController
 @RequestMapping("/work/obr")
@@ -29,17 +30,7 @@ public class ObrController extends BaseController {
     @Autowired
     private IObrService obrService;
 
-    @ApiOperation(value = "根据就诊卡号获取患者的全部检测报告",notes = "通过就诊卡号获取")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:obr:list')")
-    @GetMapping("/patientObr")
-    public TableDataInfo getPatientObrByCard(@RequestParam("card") String card){
-        startPage();
-        List<Obx> list = obrService.getPatientObrByCard(card);
-        return getDataTable(list);
-    }
-
-
+    @ApiOperation(value = "获取科室申请列表")
     @PreAuthorize("@ss.hasPermi('work:obr:list')")
     @GetMapping("/list")
     public TableDataInfo list(Obr obr){
@@ -48,6 +39,7 @@ public class ObrController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "根据Id获取科室申请列表")
     @PreAuthorize("@ss.hasPermi('work:obr:query')")
     @GetMapping(value = "/detail/{id}")
     public AjaxResult detail(@PathVariable("id") Long id){

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

@@ -4,6 +4,7 @@ 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;
@@ -21,6 +22,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author lsw
  * @date 2024-07-23
  */
+@Api(tags = "检测项目管理")
 @Anonymous
 @RestController
 @RequestMapping("/work/obx")
@@ -28,16 +30,8 @@ public class ObxController extends BaseController {
     @Autowired
     private IObxService obxService;
 
-    @ApiOperation(value = "根据就诊卡号获取患者的全部检查项目",notes = "通过就诊卡号获取")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:obx:list')")
-    @GetMapping("/patientObx")
-    public TableDataInfo getPatientObxByCard(@RequestParam("card") String card){
-        startPage();
-        List<Obx> list = obxService.getPatientObxByCard(card);
-        return getDataTable(list);
-    }
 
+    @ApiOperation(value = "获取检测项目列表")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:obx:list')")
     @GetMapping("/list")
@@ -47,6 +41,7 @@ public class ObxController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "根据Id获取检测项目列表")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:obx:query')")
     @GetMapping(value = "/detail/{id}")

+ 2 - 9
ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/OrdersController.java

@@ -5,6 +5,7 @@ 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;
@@ -22,6 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author lsw
  * @date 2024-07-24
  */
+@Api(tags = "医嘱信息管理")
 @Anonymous
 @RestController
 @RequestMapping("/work/orders")
@@ -29,15 +31,6 @@ public class OrdersController extends BaseController {
     @Autowired
     private IOrdersService ordersService;
 
-    @ApiOperation(value = "根据就诊卡号查询患者的医嘱信息",notes = "通过就诊卡号获取")
-    @Anonymous
-    @GetMapping("/patientPv1")
-    public TableDataInfo getPatientOderByCard(@RequestParam("card") String card) {
-        startPage();
-        List<Orders> list =ordersService.getPatientOderByCard(card);
-        return getDataTable(list);
-    }
-
 
     @PreAuthorize("@ss.hasPermi('work:orders:list')")
     @GetMapping("/list")

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

@@ -27,28 +27,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/work/patient")
 public class PatientController extends BaseController {
 
-
     @Autowired
     private IPatientService patientService;
 
-    //@ApiOperation(value = "查询科室中所有患者就诊列表")
-    //@Anonymous
-    //@GetMapping("/department")
-    //public TableDataInfo getPatientByDepartment(@RequestParam("department")String department) {
-    //    startPage();
-    //    List<PatientCard> list=patientService.getPatientByDepartment(department);
-    //    return getDataTable(list);
-    //}
-
-    @ApiOperation(value = "根据就诊卡号获取患者信息列表")
-    @Anonymous
-    //@PreAuthorize("@ss.hasPermi('work:patient:list')")
-    @GetMapping("/card")
-    public TableDataInfo getPatientByCard(@RequestParam("card") String card){
-        startPage();
-        List<Patient> list = patientService.getPatientByCard(card);
-        return getDataTable(list);
-    }
 
     @ApiOperation(value = "获取患者信息列表")
     @Anonymous

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

@@ -16,6 +16,6 @@ public interface ObrMapper extends BaseMapper<Obr> {
 
     List<Obr> getObrByCard(String card);
 
-    List<Obx> getPatientObrByPatientId(Integer patientId);
+
 
 }

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

@@ -13,5 +13,4 @@ public interface ObxMapper extends BaseMapper<Obx> {
 
     List<Obx> getObxByCard(String card);
 
-    List<Obx> getPatientObxByPatientId(Integer patientId);
 }

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

@@ -12,6 +12,4 @@ import com.ruoyi.web.work.domain.Pv1;
 public interface OrdersMapper extends BaseMapper<Orders> {
     List<Orders> selectList(Orders orders);
 
-    List<Orders> getOrdersByCard(String card);
-
 }

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

@@ -14,9 +14,7 @@ public interface PatientMapper extends BaseMapper<Patient> {
 
     List<PatientCard> getPatientCardByNameOrRoomOrEntity(String patientName, String departmentName, String entity);
 
-    List<Patient> getPatientByPatientId(Integer id);
-
     List<PatientCard> getPatientByDepartment(String department);
 
-    List<Patient> getPatientByCard(String card);
+
 }

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

@@ -18,10 +18,7 @@ public interface Pv1Mapper extends BaseMapper<Pv1> {
 
     List<PatientCard> getPatientCardByNameOrDepartment(@Param("patientName") String patientName,@Param("departmentName") String departmentName,@Param("physician") String physician);
 
-    List<Pv1> getPv1ByCard(String card);
-
     List<PatientCard> getAllDepartment();
 
-    Integer getPatientIdByCard(String card);
 
 }

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

@@ -14,7 +14,6 @@ import com.ruoyi.web.work.domain.Obx;
 public interface IObrService extends IService<Obr>{
     List<Obr> selectList(Obr obr);
 
-    List<Obx> getPatientObrByCard(String card);
 
     AjaxResult getObrAndObxByCard(String card);
 }

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

@@ -11,5 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IObxService extends IService<Obx>{
     List<Obx> selectList(Obx obx);
 
-    List<Obx> getPatientObxByCard(String card);
+
 }

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

@@ -12,5 +12,5 @@ import com.ruoyi.web.work.domain.Pv1;
 public interface IOrdersService extends IService<Orders>{
     List<Orders> selectList(Orders orders);
 
-    List<Orders> getPatientOderByCard(String card);
+
 }

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

@@ -12,7 +12,4 @@ import com.ruoyi.web.work.domain.PatientCard;
 public interface IPatientService extends IService<Patient>{
     List<Patient> selectList(Patient patient);
 
-    List<PatientCard> getPatientByDepartment(String department);
-
-    List<Patient> getPatientByCard(String card);
 }

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

@@ -18,6 +18,5 @@ public interface IPv1Service extends IService<Pv1>{
 
     List<PatientCard> getAllDepartment();
 
-    Integer getPatientIdByCard(String card);
 
 }

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

@@ -37,12 +37,6 @@ public class ObrServiceImpl extends ServiceImpl<ObrMapper, Obr> implements IObrS
     }
 
     @Override
-    public List<Obx> getPatientObrByCard(String card) {
-        Integer patientId=pv1Mapper.getPatientIdByCard(card);
-        return obrMapper.getPatientObrByPatientId(patientId);
-    }
-
-    @Override
     public AjaxResult getObrAndObxByCard(String card) {
         Map<String,Object> map=new HashMap();
         List<Obr> obr= obrMapper.getObrByCard(card);

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

@@ -28,9 +28,5 @@ public class ObxServiceImpl extends ServiceImpl<ObxMapper, Obx> implements IObxS
         return obxMapper.selectList(obx);
     }
 
-    @Override
-    public List<Obx> getPatientObxByCard(String card) {
-        Integer patientId=pv1Mapper.getPatientIdByCard(card);
-        return obxMapper.getPatientObxByPatientId(patientId);
-    }
+
 }

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

@@ -25,8 +25,5 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
         return ordersMapper.selectList(orders);
     }
 
-    @Override
-    public List<Orders> getPatientOderByCard(String card) {
-        return ordersMapper.getOrdersByCard(card);
-    }
+
 }

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

@@ -25,15 +25,6 @@ public class PatientServiceImpl extends ServiceImpl<PatientMapper, Patient> impl
         return patientMapper.selectList(patient);
     }
 
-    @Override
-    public List<PatientCard> getPatientByDepartment(String department) {
-        return patientMapper.getPatientByDepartment(department);
-    }
-
-    @Override
-    public List<Patient> getPatientByCard(String card) {
-        return patientMapper.getPatientByCard(card);
-    }
 
 
 }

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

@@ -38,10 +38,6 @@ public class Pv1ServiceImpl extends ServiceImpl<Pv1Mapper, Pv1> implements IPv1S
         return pv1Mapper.getAllDepartment();
     }
 
-    @Override
-    public Integer getPatientIdByCard(String card) {
-        return pv1Mapper.getPatientIdByCard(card);
-    }
 
 
 }

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

@@ -49,8 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from tb_obr where card_id=#{card}
     </select>
 
-    <select id="getPatientObrByPatientId" resultType="com.ruoyi.web.work.domain.Obx">
-        select * from tb_obr where patient_id=#{patientId}
-    </select>
+
 
 </mapper>

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

@@ -30,11 +30,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 where tb_obr.card_id=#{card}
     </select>
 
-    <select id="getPatientObxByPatientId" 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.patient_id=#{patientId}
-    </select>
 
 
 </mapper>

+ 0 - 3
ruoyi-admin/src/main/resources/mapper/work/OrdersMapper.xml

@@ -27,9 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="getOrdersByCard" resultType="com.ruoyi.web.work.domain.Orders">
-        select * from tb_orders where card_id=#{card}
-    </select>
 
 
 </mapper>

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

@@ -39,9 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
-    <select id="getPatientByPatientId" resultType="com.ruoyi.web.work.domain.Patient">
-        select * from tb_patient where id=#{id}
-    </select>
+
 
     <select id="getPatientByDepartment" resultType="com.ruoyi.web.work.domain.PatientCard">
         SELECT
@@ -58,8 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where tb_pv1.department=#{department}
     </select>
 
-    <select id="getPatientByCard" resultType="com.ruoyi.web.work.domain.Patient">
-        select * from tb_patient where card_number=#{card}
-    </select>
+
 
 </mapper>

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

@@ -56,17 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="getPv1ByCard" resultType="com.ruoyi.web.work.domain.Pv1">
-        select * from tb_pv1 where card_id=#{card}
-    </select>
 
     <select id="getAllDepartment" resultType="com.ruoyi.web.work.domain.PatientCard">
         select department from tb_pv1 GROUP BY department
     </select>
 
-    <select id="getPatientIdByCard" resultType="java.lang.Integer">
-        select patient_id from tb_pv1 where card_id=#{card}
-    </select>
-
 
 </mapper>