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

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

@@ -0,0 +1,36 @@
+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.*;
+
+@RestController
+@RequestMapping("/app/dg")
+public class Api_DgController {
+
+    @Autowired
+    private IDgService dgService;
+
+    @ApiOperation(value = "根据时间获取用户就医记录")
+    @GetMapping("/record")
+    public AjaxResult getMedicalRecord(@RequestParam("beginTime") String beginTime,
+                                       @RequestParam("endTime") String endTime,
+                                       @RequestParam("patientId") String patientId){
+        return dgService.getMedicalRecord(beginTime,endTime,patientId);
+    }
+
+    @ApiOperation(value = "根据就诊卡号获取用户诊断信息")
+    @GetMapping("/diagnosis/{card}")
+    public AjaxResult getDgByCard(@PathVariable("card") String card){
+        return dgService.getDgByCard(card);
+    }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_FollowController.java

@@ -35,6 +35,7 @@ public class Api_FollowController extends BaseController {
 
     @PostMapping("/push")
     public AjaxResult push(@Validated @RequestBody FollowRecordDto dto) {
+
         return followRecordService.push(dto);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_ObrController.java

@@ -0,0 +1,23 @@
+package com.ruoyi.web.work.api;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.work.mapper.ObrMapper;
+import com.ruoyi.web.work.service.IObrService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/app/obr")
+public class Api_ObrController {
+
+    @Autowired
+    private IObrService obrService;
+
+    @ApiOperation(value = "根据就诊卡号获取检测项目及结果")
+    @GetMapping("/examine/{card}")
+    public AjaxResult getObrAndObxByCard(@PathVariable("card") String card){
+        return obrService.getObrAndObxByCard(card);
+    }
+
+}

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

@@ -4,10 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.web.work.domain.PatientCard;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -29,6 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/work/patient")
 public class PatientController extends BaseController {
 
+
     @Autowired
     private IPatientService patientService;
 

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

@@ -54,15 +54,6 @@ public class Pv1Controller extends BaseController {
         return getDataTable(list);
     }
 
-    @ApiOperation(value = "根据就诊卡号查询就诊信息",notes = "通过就诊卡号获取")
-    @Anonymous
-    @GetMapping("/patientPv1")
-    public TableDataInfo getPatientPv1ByCard(@RequestParam("card") String card) {
-        startPage();
-        List<Pv1> list =pv1Service.getPatientPv1ByCard(card);
-        return getDataTable(list);
-    }
-
 
     @ApiOperation(value = "获取住院信息列表")
     @Anonymous

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

@@ -30,8 +30,11 @@ public class PatientCard {
     private String dischargeTime;
 
     //就诊卡号
-    @ApiModelProperty(value = "就诊卡号")
-    private String cardId;
+    @ApiModelProperty(value = "就诊ID")
+    private String pvId;
+
+    @ApiModelProperty(value = "患者ID")
+    private String patientId;
     //
     ////病历号
     //private String blh;

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

@@ -0,0 +1,21 @@
+package com.ruoyi.web.work.domain.dto;
+
+import lombok.Data;
+
+//就诊记录
+@Data
+public class DgMedicalRecord {
+
+    //诊断病名称
+    private String diagnosticCode;
+
+    //诊断时间
+    private String diagnosisTime;
+
+    //出院时间
+    private String dischargeTime;
+
+    //就诊卡号
+    private Integer cardId;
+
+}

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

@@ -3,6 +3,8 @@ 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.DgMedicalRecord;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author lsw
@@ -12,4 +14,9 @@ public interface DgMapper extends BaseMapper<Dg> {
     List<Dg> selectList(Dg dg);
 
     List<Dg> getDgByCard(String card);
+
+    List<DgMedicalRecord> getMedicalRecord(@Param("beginTime") String beginTime,
+                                           @Param("endTime") String endTime,
+                                           @Param("patientId") String patientId);
+
 }

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

@@ -1,6 +1,8 @@
 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;
@@ -15,4 +17,5 @@ public interface ObrMapper extends BaseMapper<Obr> {
     List<Obr> getObrByCard(String card);
 
     List<Obx> getPatientObrByPatientId(Integer patientId);
+
 }

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

@@ -23,4 +23,5 @@ public interface Pv1Mapper extends BaseMapper<Pv1> {
     List<PatientCard> getAllDepartment();
 
     Integer getPatientIdByCard(String card);
+
 }

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

@@ -1,6 +1,8 @@
 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;
 
@@ -10,4 +12,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IDgService extends IService<Dg>{
     List<Dg> selectList(Dg dg);
+
+    AjaxResult getMedicalRecord(String beginTime, String endTime,String patientId);
+
+    AjaxResult getDgByCard(String card);
 }

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

@@ -1,6 +1,8 @@
 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;
@@ -13,4 +15,6 @@ public interface IObrService extends IService<Obr>{
     List<Obr> selectList(Obr obr);
 
     List<Obx> getPatientObrByCard(String card);
+
+    AjaxResult getObrAndObxByCard(String card);
 }

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

@@ -20,5 +20,4 @@ public interface IPv1Service extends IService<Pv1>{
 
     Integer getPatientIdByCard(String card);
 
-    List<Pv1> getPatientPv1ByCard(String card);
 }

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

@@ -1,6 +1,8 @@
 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;
@@ -21,4 +23,14 @@ public class DgServiceImpl extends ServiceImpl<DgMapper, Dg> implements IDgServi
     public List<Dg> selectList(Dg dg) {
         return dgMapper.selectList(dg);
     }
+
+    @Override
+    public AjaxResult getMedicalRecord(String beginTime, String endTime,String patientId) {
+        return AjaxResult.success(dgMapper.getMedicalRecord(beginTime,endTime,patientId));
+    }
+
+    @Override
+    public AjaxResult getDgByCard(String card) {
+        return AjaxResult.success(dgMapper.getDgByCard(card));
+    }
 }

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

@@ -9,6 +9,7 @@ import com.ruoyi.web.work.domain.dto.FollowRecordDto;
 import com.ruoyi.web.work.mapper.FollowRecordMapper;
 import com.ruoyi.web.work.mapper.FollowTemplateMapper;
 import com.ruoyi.web.work.service.IFollowRecordService;
+import com.sun.jna.platform.win32.ShellAPI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,9 +1,13 @@
 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;
@@ -24,6 +28,9 @@ public class ObrServiceImpl extends ServiceImpl<ObrMapper, Obr> implements IObrS
     @Autowired
     private Pv1Mapper pv1Mapper;
 
+    @Autowired
+    private ObxMapper obxMapper;
+
     @Override
     public List<Obr> selectList(Obr obr) {
         return obrMapper.selectList(obr);
@@ -34,4 +41,14 @@ public class ObrServiceImpl extends ServiceImpl<ObrMapper, Obr> implements IObrS
         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);
+        List<Obx> obx=obxMapper.getObxByCard(card);
+        map.put("obr",obr);
+        map.put("obx",obx);
+        return AjaxResult.success(map);
+    }
 }

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

@@ -43,10 +43,5 @@ public class Pv1ServiceImpl extends ServiceImpl<Pv1Mapper, Pv1> implements IPv1S
         return pv1Mapper.getPatientIdByCard(card);
     }
 
-    @Override
-    public List<Pv1> getPatientPv1ByCard(String card) {
-        return pv1Mapper.getPv1ByCard(card);
-    }
-
 
 }

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Dg">
         select * from tb_dg
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="patientId != null  and patientId != ''"> and patient_id = #{patientId}</if>
             <if test="diagnosticCode != null  and diagnosticCode != ''"> and diagnostic_code = #{diagnosticCode}</if>
             <if test="diagnosisTime != null  and diagnosisTime != ''"> and diagnosis_time = #{diagnosisTime}</if>
@@ -19,4 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from tb_dg where card_id=#{card}
     </select>
 
+    <select id="getMedicalRecord" resultType="com.ruoyi.web.work.domain.dto.DgMedicalRecord">
+        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
+        WHERE tb_dg.patient_id=#{patientId} and  diagnosis_time BETWEEN #{beginTime} and #{endTime};
+    </select>
+
+
+
 </mapper>

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

@@ -3,10 +3,11 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.web.work.mapper.NkMapper">
-    
+
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Nk">
         select * from tb_nk
-        <where>  
+        <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="patientId != null "> and patient_id = #{patientId}</if>
             <if test="nkNumber != null "> and nk_number = #{nkNumber}</if>
@@ -18,4 +19,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-</mapper>
+</mapper>

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Obr">
         select * from tb_obr
         <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>

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Obx">
         select * from tb_obx
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="obrId != null "> and obr_id = #{obrId}</if>
             <if test="serialNo != null  and serialNo != ''"> and serial_no = #{serialNo}</if>
             <if test="dataType != null  and dataType != ''"> and data_type = #{dataType}</if>

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Orders">
         select * from tb_orders
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
             <if test="operation != null  and operation != ''"> and operation = #{operation}</if>
             <if test="applicationNo != null  and applicationNo != ''"> and application_no = #{applicationNo}</if>

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Patient">
         select * from tb_patient
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="patId != null  and patId != ''"> and pat_id = #{patId}</if>
             <if test="patientCode != null  and patientCode != ''"> and patient_code = #{patientCode}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Pv1">
         select * from tb_pv1
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="patientId != null "> and patient_id = #{patientId}</if>
             <if test="cardId != null "> and card_id = #{cardId}</if>
             <if test="patientCategory != null  and patientCategory != ''"> and patient_category = #{patientCategory}</if>
@@ -36,7 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tb_patient.`name`,
             tb_pv1.discharge_method,
             tb_pv1.discharge_time,
-            tb_pv1.card_id
+            tb_pv1.id,
+            tb_pv1.patient_id
         FROM
             tb_pv1
                 JOIN