fix: 佛山三院提交保存提交日志修改

src/main/java/com/docus/server/message/busservice/impl/FsBusinessServiceImpl.java

@@ -1,42 +1,28 @@
 package com.docus.server.message.busservice.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.core.exception.BaseException;
 import com.docus.infrastructure.web.api.CommonResult;
-import com.docus.infrastructure.web.api.ResultCode;
 import com.docus.server.message.busservice.FsBusinessService;
 import com.docus.server.message.config.CollectTaskConfig;
 import com.docus.server.message.controller.vo.PushInfoVo;
 import com.docus.server.message.converters.FsWsRecordSubmitMessageConvert;
-import com.docus.server.message.converters.NkWsRecordSubmitMessageConvert;
-import com.docus.server.message.dto.*;
-import com.docus.server.message.entity.CqcPushConfig;
-import com.docus.server.message.entity.TBasic;
+import com.docus.server.message.dto.FsRecordSubmitDTO;
+import com.docus.server.message.dto.TbasicQrPreciseCondition;
 import com.docus.server.message.feign.dto.CompensateTasRequest;
 import com.docus.server.message.feign.dto.HospitalSubmitNodeLogAddDTO;
 import com.docus.server.message.feign.enums.HospitalSubmitNodeEnum;
 import com.docus.server.message.feign.service.CollectTaskService;
 import com.docus.server.message.feign.service.HospitalSubmitNodeServiceApi;
-import com.docus.server.message.feign.vo.ArchiveAndRecallPushVo;
-import com.docus.server.message.mapper.CqcPushConfigMapper;
 import com.docus.server.message.mapper.TBasicMapper;
-import com.docus.server.message.validate.NkRecordSubmitValidate;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @BelongsProject: docus-unified-message
@@ -75,8 +61,9 @@ public class FsBusinessServiceImpl implements FsBusinessService {
             List<String> patientIds = tBasicMapper.getPatientIdByPreciseConditions(condition);
             verifyPatientIds(patientIds);
 
-            String submitDate = dto.getSubmitDate();
-            tBasicMapper.insertOrUpdateDoctorSubmitTime(patientIds.get(0), Func.parseDate(submitDate, "yyyy/M/d HH:mm:ss"));
+            String submitDateStr = dto.getSubmitDate();
+            Date submitDate = Func.parseDate(submitDateStr, "yyyy/M/d HH:mm:ss");
+            tBasicMapper.insertOrUpdateDoctorSubmitTime(patientIds.get(0), submitDate);
 
             compensateTask("电子病历提交",patientIds, taskConfig.getCollectorIds());
             tBasicMapper.updateEmrSubmitState(patientIds.get(0), 1);
@@ -84,7 +71,7 @@ public class FsBusinessServiceImpl implements FsBusinessService {
             // 添加提交记录
             HospitalSubmitNodeLogAddDTO nodeLogAddDTO = new HospitalSubmitNodeLogAddDTO();
             nodeLogAddDTO.setPatientId(patientIds.get(0));
-            nodeLogAddDTO.setContent(new String[]{submitDate});
+            nodeLogAddDTO.setContent(new String[]{Func.formatDateTime(submitDate)});
             nodeLogAddDTO.setSubmitNodeEnum(HospitalSubmitNodeEnum.EMR);
             nodeLogAddDTO.setCreater("电子病历提交");
             nodeLogAddDTO.setCreaterName("电子病历提交");