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 docus_archivefile.af_collect_task set state='4',end_time=now() where patient_id=#{patientId} and sysflag=#{sysflag} + + UPDATE docus_archivefile.af_collect_task + SET remark = #{remark},end_time=now() + WHERE id = #{id} +