From d2f97a6ad2568cd551a030673a3c363090f0e36b Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Tue, 20 Jan 2026 09:45:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A2=85=E5=B7=9E=E4=B8=89=E9=99=A2?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E8=A7=86=E5=9B=BE=E6=B7=BB=E5=8A=A0=E5=BF=83?=
 =?UTF-8?q?=E7=90=86=E9=87=8F=E8=A1=A8=E7=AD=BE=E5=90=8D=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docus/server/archive/mapper/TBasicMapper.java    |  2 ++
 .../docus/server/mzsy/entity/MzsyReportDataView.java |  2 ++
 .../docus/server/mzsy/job/MzsyReportCollectJob.java  | 12 ++++++++++++
 .../resources/mapper/MzsyReportDataViewMapper.xml    |  2 ++
 src/main/resources/mapper/TBasicMapper.xml           |  5 +++++
 5 files changed, 23 insertions(+)

diff --git a/src/main/java/com/docus/server/archive/mapper/TBasicMapper.java b/src/main/java/com/docus/server/archive/mapper/TBasicMapper.java
index 177def3..c6df816 100644
--- a/src/main/java/com/docus/server/archive/mapper/TBasicMapper.java
+++ b/src/main/java/com/docus/server/archive/mapper/TBasicMapper.java
@@ -46,4 +46,6 @@ public interface TBasicMapper {
     int cancelTask(@Param("patientId") String patientId, @Param("sysflag") String collectorId);
 
     PatientState getPatientState(@Param("patientId")  String patientId);
+
+    int updateTaskRemarkById(@Param("id") Long id,@Param("remark") String remark);
 }
diff --git a/src/main/java/com/docus/server/mzsy/entity/MzsyReportDataView.java b/src/main/java/com/docus/server/mzsy/entity/MzsyReportDataView.java
index c28dc66..08c98a9 100644
--- a/src/main/java/com/docus/server/mzsy/entity/MzsyReportDataView.java
+++ b/src/main/java/com/docus/server/mzsy/entity/MzsyReportDataView.java
@@ -34,6 +34,8 @@ public class MzsyReportDataView {
     private String fpatJzh;
     @ApiModelProperty("分检验，检查，心电等，LIS、US，DX，CT，ECG")
     private String fpatModule;
+    @ApiModelProperty("报告签名医生")
+    private String reportDoctor;
     @ApiModelProperty("最后更新时间")
     private Date updateTime;
 }
diff --git a/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java b/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java
index f868db5..4cad059 100644
--- a/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java
+++ b/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java
@@ -107,6 +107,18 @@ public class MzsyReportCollectJob {
             if (size <= 0) {
                 return;
             }
+            // 验证心理量表签名情况
+            for (MzsyReportDataView reportDataView : mzsyReportDataViewList) {
+                if ("心理量表".equals(reportDataView.getFpatModule()) && Func.isBlank(reportDataView.getReportDoctor())) {
+                    tBasicMapper.updateTaskRemarkById(task.getTaskId(),"心理量表存在未签名报告！");
+                    log.warn("住院号：{}，住院次数：{},记账号：{} 采集视图数据,心理量表:{} 未签名！",reportPatientTwoDto.getInpatientNo(), hospitalTwoDto.getAdmissTimes(), jzh,reportDataView.getFfileName());
+                    return;
+                }
+            }
+
+
+
+
             TableJsonRead tableJsonRead = new TableJsonRead();
             JSONObject moduleAlisConfig = tableJsonRead.Read("data-config", "mzsy-module-alis", JSONObject.class);
 
diff --git a/src/main/resources/mapper/MzsyReportDataViewMapper.xml b/src/main/resources/mapper/MzsyReportDataViewMapper.xml
index dc51db3..09d61d0 100644
--- a/src/main/resources/mapper/MzsyReportDataViewMapper.xml
+++ b/src/main/resources/mapper/MzsyReportDataViewMapper.xml
@@ -16,6 +16,7 @@
             FFILE_PATH AS ffilePath,
             FPAT_JZH AS fpatJzh,
             FPAT_MODULE AS fpatModule,
+            REPORT_DOCTOR AS reportDoctor,
             UPDATE_TIME AS updateTime
         from dbo.V_REPORT_DATA
         where FPAT_JZH = #{jzh}
@@ -49,6 +50,7 @@
         FFILE_PATH AS ffilePath,
         FPAT_JZH AS fpatJzh,
         FPAT_MODULE AS fpatModule,
+        REPORT_DOCTOR AS reportDoctor,
         UPDATE_TIME AS updateTime
         from dbo.V_REPORT_DATA
         where ZYH=#{inpatientNo}
diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml
index e86e09b..3da61ba 100644
--- a/src/main/resources/mapper/TBasicMapper.xml
+++ b/src/main/resources/mapper/TBasicMapper.xml
@@ -37,6 +37,11 @@
     <update id="cancelTask">
         update docus_archivefile.af_collect_task set state='4',end_time=now() where patient_id=#{patientId} and sysflag=#{sysflag}
     </update>
+    <update id="updateTaskRemarkById">
+        UPDATE docus_archivefile.af_collect_task
+        SET remark = #{remark},end_time=now()
+        WHERE id = #{id}
+    </update>
     <select id="getTbasicByReportTimeAndInpNoOrIdCard" resultType="com.docus.server.archive.entity.TBasic">
         select
             patient_id as patientId,