feat: 顺德人医，电子病历提交添加提交医生信息

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

@@ -84,9 +84,11 @@ public class SdBusinessServiceImpl implements SdBusinessService {
             verifyPatientIds(patientIds);
 
             // 添加提交记录
+            String content = "提交医生：" + recordSubmitDto.getSubmitDoctorName() + "," + recordSubmitDto.getSubmitDoctorCode()
+                    + "  " + Func.formatDateTime(recordSubmitDto.getSubmitTime());
             HospitalSubmitNodeLogAddDTO nodeLogAddDTO = new HospitalSubmitNodeLogAddDTO();
             nodeLogAddDTO.setPatientId(patientIds.get(0));
-            nodeLogAddDTO.setContent(new String[]{Func.formatDateTime(recordSubmitDto.getSubmitTime())});
+            nodeLogAddDTO.setContent(new String[]{content});
             nodeLogAddDTO.setSubmitNodeEnum(HospitalSubmitNodeEnum.EMR);
             nodeLogAddDTO.setCreater("电子病历提交");
             nodeLogAddDTO.setCreaterName("电子病历提交");
@@ -121,9 +123,9 @@ public class SdBusinessServiceImpl implements SdBusinessService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void trInpatientOutPatient(String patientId) {
-       if (trInpatientOutpatientDao.exists(patientId)){
+        if (trInpatientOutpatientDao.exists(patientId)) {
-           return;
+            return;
-       }
+        }
         String sdRyIndex = tBasicMapper.getSdRyIndex(patientId);
         if (Func.isBlank(sdRyIndex)) {
             log.warn("patientId：{} 没有患者索引！", patientId);

src/main/java/com/docus/server/message/converters/WsRecordSubmitMessageConvert.java

@@ -16,7 +16,8 @@ public class WsRecordSubmitMessageConvert {
         String name = null;
         Date submitTime = null;
         Integer inHospState = null;
-
+        String submitDoctorCode = null;
+        String submitDoctorName = null;
         XmlUtil xmlUtil = XmlUtil.of(str);
 
         try {
@@ -55,6 +56,20 @@ public class WsRecordSubmitMessageConvert {
         } catch (Exception ex) {
             throw new BaseException("解析 提交时间 出错！");
         }
+        try {
+            // 提交时间
+            Node submitDoctorCodeNode = xmlUtil.getNode("/Request/Msg/SUBMIT_DOCTOR_CODE");
+            submitDoctorCode = submitDoctorCodeNode.getTextContent();
+        } catch (Exception ex) {
+            throw new BaseException("解析 提交医生工号 出错！");
+        }
+        try {
+            // 提交时间
+            Node submitDoctorNameNode = xmlUtil.getNode("/Request/Msg/SUBMIT_DOCTOR_NAME");
+            submitDoctorName = submitDoctorNameNode.getTextContent();
+        } catch (Exception ex) {
+            throw new BaseException("解析 提交医生姓名 出错！");
+        }
 
         RecordSubmitDTO recordSubmitDTO = new RecordSubmitDTO();
         recordSubmitDTO.setInHospNo(inHospNo);
@@ -63,6 +78,8 @@ public class WsRecordSubmitMessageConvert {
         recordSubmitDTO.setName(name);
         recordSubmitDTO.setInHospIndexNo(inHospIndexNo);
         recordSubmitDTO.setSubmitTime(submitTime);
+        recordSubmitDTO.setSubmitDoctorCode(submitDoctorCode);
+        recordSubmitDTO.setSubmitDoctorName(submitDoctorName);
         return recordSubmitDTO;
     }
 }

src/main/java/com/docus/server/message/dto/RecordSubmitDTO.java

@@ -16,6 +16,10 @@ public class RecordSubmitDTO {
     private String name;
     // 提交时间
     private Date submitTime;
+    // 提交医生姓名
+    private String submitDoctorName;
+    // 提交医生工号
+    private String submitDoctorCode;
     // 住院状态0：在院 1：出院
     private Integer inHospState;
 }