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

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

@@ -1,7 +1,7 @@
 package com.ruoyi.web.work.api;
 
-
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.work.api.util.AppUtil;
 import com.ruoyi.web.work.service.IDgService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,9 +17,8 @@ public class Api_DgController {
     @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);
+                                       @RequestParam("endTime") String endTime){
+        return dgService.getMedicalRecord(beginTime,endTime, AppUtil.getUser().getOpenId());
     }
 
     @ApiOperation(value = "根据就诊卡号获取用户诊断信息")

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

@@ -30,7 +30,6 @@ public class PatientController extends BaseController {
     @Autowired
     private IPatientService patientService;
 
-
     @ApiOperation(value = "获取患者信息列表")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:patient:list')")

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

@@ -74,21 +74,6 @@ public class Patient{
     @ApiModelProperty(value = "婴儿序号")
     private String yexh;
 
-    @ApiModelProperty(value = "卡标志")
-    private String cardSign;
-
-    @ApiModelProperty(value = "卡类别")
-    private String cardClass;
-
-    @ApiModelProperty(value = "卡号记录状况")
-    private String cardRecord;
-
-    @ApiModelProperty(value = "卡号类型")
-    private String cardType;
-
-    @ApiModelProperty(value = "就诊卡号")
-    private String cardNumber;
-
     @ApiModelProperty(value = "创建人")
     @TableField(fill = FieldFill.INSERT)
     private String createBy;

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

@@ -35,6 +35,10 @@ public class PatientCard {
 
     @ApiModelProperty(value = "患者ID")
     private String patientId;
+
+    @ApiModelProperty(value = "就诊卡号")
+    private String cardId;
+
     //
     ////病历号
     //private String blh;

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

@@ -26,11 +26,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="brkh != null  and brkh != ''"> and brkh = #{brkh}</if>
             <if test="sfzh != null  and sfzh != ''"> and sfzh = #{sfzh}</if>
             <if test="yexh != null  and yexh != ''"> and yexh = #{yexh}</if>
-            <if test="cardSign != null  and cardSign != ''"> and card_sign = #{cardSign}</if>
-            <if test="cardClass != null  and cardClass != ''"> and card_class = #{cardClass}</if>
-            <if test="cardRecord != null  and cardRecord != ''"> and card_record = #{cardRecord}</if>
-            <if test="cardType != null  and cardType != ''"> and card_type = #{cardType}</if>
-            <if test="cardNumber != null  and cardNumber != ''"> and card_number = #{cardNumber}</if>
             <if test="msgType != null  and msgId != ''"> and msg_Type = #{msgType}</if>
         </where>
     </select>

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

@@ -38,7 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tb_pv1.discharge_method,
             tb_pv1.discharge_time,
             tb_pv1.id,
-            tb_pv1.patient_id
+            tb_pv1.patient_id,
+            tb_pv1.card_id
         FROM
             tb_pv1
                 JOIN
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 tb_patient.`name` like concat('%', #{patientName}, '%')
             </if>
             <if test="departmentName!='' and departmentName!= null">
-                AND tb_pv1.department like concat('%', #{departmentName}, '%')
+                AND tb_pv1.department =#{departmentName}
             </if>
             <if test="physician!='' and physician!= null">
                 AND tb_pv1.physician like concat('%', #{physician}, '%')