From d749c2c746d5e160b25275d0c93b38529f452432 Mon Sep 17 00:00:00 2001
From: haorp <754760654@qq.com>
Date: Wed, 4 Jun 2025 14:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=B0=83=E7=94=A8-?=
 =?UTF-8?q?=E4=BA=A7=E5=90=8E=E5=BA=B7=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/dao/master/AppointmentMapper.java   |   3 +
 .../permission/service/AppointmentService.java     |   4 +-
 .../service/impl/AppointmentServiceImpl.java       |   6 +
 .../resources/mainOrm/master/AppointmentMapper.xml | 123 +++++++++++++++++++++
 .../service/impl/MatnRehabServiceImpl.java         |   4 +-
 5 files changed, 137 insertions(+), 3 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/AppointmentMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/AppointmentMapper.java
index 79403f8..04a7fac 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/AppointmentMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/AppointmentMapper.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.permission.dao.master;
 
 import com.lyms.platform.permission.model.AppointmentQuery;
+import com.lyms.platform.permission.model.MedicalRecordVo;
 import com.lyms.platform.pojo.AppointmentModel;
 
 import java.util.List;
@@ -8,4 +9,6 @@ import java.util.List;
 public interface AppointmentMapper {
     List<AppointmentModel> queryAppointment(AppointmentQuery appointmentQuery);
     int queryAppointmentCount(AppointmentQuery appointmentQuery);
+
+    List<MedicalRecordVo> queryList(MedicalRecordVo medicalRecordVo);
 }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/AppointmentService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/AppointmentService.java
index dcbb661..3428a62 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/AppointmentService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/AppointmentService.java
@@ -1,12 +1,14 @@
 package com.lyms.platform.permission.service;
 
 import com.lyms.platform.permission.model.AppointmentQuery;
+import com.lyms.platform.permission.model.MedicalRecordVo;
 import com.lyms.platform.pojo.AppointmentModel;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 public interface AppointmentService {
     List<AppointmentModel> queryAppointment(AppointmentQuery appointmentQuery);
     int queryAppointmentCount(AppointmentQuery appointmentQuery);
+
+    List<MedicalRecordVo> queryList(MedicalRecordVo medicalRecordVo);
 }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java
index fb996fc..0923484 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java
@@ -3,6 +3,7 @@ package com.lyms.platform.permission.service.impl;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.permission.dao.master.AppointmentMapper;
 import com.lyms.platform.permission.model.AppointmentQuery;
+import com.lyms.platform.permission.model.MedicalRecordVo;
 import com.lyms.platform.permission.service.AppointmentService;
 import com.lyms.platform.pojo.AppointmentModel;
 import com.lyms.platform.pojo.DtFm;
@@ -33,4 +34,9 @@ public class AppointmentServiceImpl implements AppointmentService {
     public int queryAppointmentCount(AppointmentQuery appointmentQuery) {
         return appointmentMapper.queryAppointmentCount(appointmentQuery);
     }
+
+    @Override
+    public List<MedicalRecordVo> queryList(MedicalRecordVo medicalRecordVo) {
+        return appointmentMapper.queryList(medicalRecordVo);
+    }
 }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml
index 9858ce8..13b1aee 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml
@@ -66,4 +66,127 @@
         and <![CDATA[checkTime>=#{startTime}]]>
         and <![CDATA[checkTime<=#{endTime}]]>
     </select>
+
+
+    <select id="queryList" parameterType="com.lyms.platform.permission.model.MedicalRecordVo" resultType="com.lyms.platform.permission.model.MedicalRecordVo">
+        SELECT
+        MDTRT_ID as mdtrtId,
+        PID ,
+        NAME,
+        CARD_NO as cardNo,
+        AGE,
+        PHONE,
+        GENDER,
+        ZY_TYPE as zyType,
+        MED_TYPE as medType,
+        DEPARTMENT,
+        DIAGNOSIS,
+        DIAGNOSIS_CODE as diagnosisCode,
+        OPERATION,
+        OPERATION_CODE as oprtationCode,
+        MEDICINE,
+        DELIVERY_TYPE as deliveryType,
+        DELIVERY_TIME as deliveryTime,
+        MATN_AFTER_DAY as matnAfterDay,
+        FEED_TYPE as feedType,
+        MATN_HISTORY as matnHistory,
+        MODIFIED,
+        CREATED
+        FROM medical_record
+        WHERE 1=1
+
+        <!-- 基本信息查询条件 -->
+        <if test="mdtrtId != null and mdtrtId != ''">
+            AND MDTRT_ID = #{mdtrtId}
+        </if>
+
+        <if test="pid != null and pid != ''">
+            AND PID = #{pid}
+        </if>
+
+        <if test="name != null and name != ''">
+            AND NAME = #{name}
+        </if>
+
+        <if test="cardNo != null and cardNo != ''">
+            AND CARD_NO = #{cardNo}
+        </if>
+
+        <if test="age != null">
+            AND AGE = #{age}
+        </if>
+
+        <if test="phone != null and phone != ''">
+            AND PHONE = #{phone}
+        </if>
+
+        <if test="gender != null and gender != ''">
+            AND GENDER = #{gender}
+        </if>
+
+        <!-- 医疗信息查询条件 -->
+        <if test="zyType != null and zyType != ''">
+            AND ZY_TYPE = #{zyType}
+        </if>
+
+        <if test="medType != null and medType != ''">
+            AND MED_TYPE = #{medType}
+        </if>
+
+        <if test="department != null and department != ''">
+            AND DEPARTMENT = #{department}
+        </if>
+
+        <if test="diagnosis != null and diagnosis != ''">
+            AND DIAGNOSIS = #{diagnosis}
+        </if>
+
+        <if test="diagnosisCode != null and diagnosisCode != ''">
+            AND DIAGNOSIS_CODE = #{diagnosisCode}
+        </if>
+
+        <if test="operation != null and operation != ''">
+            AND OPERATION = #{operation}
+        </if>
+
+        <if test="operationCode != null and operationCode != ''">
+            AND OPERATION_CODE = #{operationCode}
+        </if>
+
+        <if test="medicine != null and medicine != ''">
+            AND MEDICINE = #{medicine}
+        </if>
+
+        <!-- 分娩与产后信息查询条件 -->
+        <if test="deliveryType != null and deliveryType != ''">
+            AND DELIVERY_TYPE = #{deliveryType}
+        </if>
+
+        <if test="deliveryTime != null">
+            AND DELIVERY_TIME = #{deliveryTime}
+        </if>
+
+        <if test="matnAfterDay != null">
+            AND MATN_AFTER_DAY = #{matnAfterDay}
+        </if>
+
+        <if test="feedType != null and feedType != ''">
+            AND FEED_TYPE = #{feedType}
+        </if>
+
+        <if test="matnHistory != null and matnHistory != ''">
+            AND MATN_HISTORY = #{matnHistory}
+        </if>
+
+        <!-- 时间范围查询条件 -->
+        <if test="modified != null">
+            AND MODIFIED = #{modified}
+        </if>
+
+        <if test="created != null">
+            AND CREATED = #{created}
+        </if>
+
+        ORDER BY CREATED DESC
+    </select>
 </mapper>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java
index a76a875..9881875 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java
@@ -40,7 +40,7 @@ public class MatnRehabServiceImpl implements MatnRehabService {
     private PatientWeightService2 patientWeightService2;
 
     @Autowired
-    private MedicalRecordService medicalRecordService;
+    private AppointmentService appointmentService;
 
     @Override
     public BaseObjectResponse queryInfo(String phone) {
@@ -74,7 +74,7 @@ public class MatnRehabServiceImpl implements MatnRehabService {
                         MedicalRecordVo medicalRecordVo = new MedicalRecordVo();
                         medicalRecordVo.setCardNo(patients.getCardNo());
                         // 诊断手术赋值
-                        List<MedicalRecordVo> list = medicalRecordService.queryList(medicalRecordVo);
+                        List<MedicalRecordVo> list = appointmentService.queryList(medicalRecordVo);
                         if(CollectionUtils.isNotEmpty(list)){
                             MedicalRecordVo medicalRecordVo1 = list.get(0);
                             data.put("diagnosis",medicalRecordVo1.getDiagnosis());
-- 
1.8.3.1