report

common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java

@@ -4,20 +4,27 @@ import com.docus.server.collect.infrastructure.enums.IIntegerEnum;
 
 public enum CollectTypeEnum implements IIntegerEnum {
 
-    WEBSERVICE_XML_DEPT(0, "WEBSERVICE_XML_DEPT"),
+    WEBSERVICE_XML_DEPT(0, "WEBSERVICE_XML_DEPT", "科室信息"),
-    WEBSERVICE_XML_USER(1, "WEBSERVICE_XML_USER"),
+    WEBSERVICE_XML_USER(1, "WEBSERVICE_XML_USER", "用户信息"),
-    WEBSERVICE_XML_BASIC(2, "WEBSERVICE_XML_BASIC"),
+    WEBSERVICE_XML_BASIC(2, "WEBSERVICE_XML_BASIC", "新增/修改基础数据"),
-    WEBSERVICE_XML_SA_REPORT(3, "WEBSERVICE_XML_SA_REPORT"),
+    WEBSERVICE_XML_SA_REPORT(3, "WEBSERVICE_XML_SA_REPORT", "手麻报告信息"),
-    WEBSERVICE_XML_ICU_REPORT(4, "WEBSERVICE_XML_ICU_REPORT"),
+    WEBSERVICE_XML_ICU_REPORT(4, "WEBSERVICE_XML_ICU_REPORT", "重症报告信息"),
-    WEBSERVICE_XML_INSERT_INSPECTION_REPORT(5, "WEBSERVICE_XML_INSERT_INSPECTION_REPORT"),
+    WEBSERVICE_XML_EXAMINATION_REPORT(5, "WEBSERVICE_XML_EXAMINATION_REPORT", "检验报告信息"),
-    WEBSERVICE_XML_UPDATE_INSPECTION_REPORT(6, "WEBSERVICE_XML_UPDATE_INSPECTION_REPORT");
+    WEBSERVICE_XML_INSERT_INSPECTION_REPORT(6, "WEBSERVICE_XML_INSERT_INSPECTION_REPORT", "新增检查报告的信息"),
+    WEBSERVICE_XML_UPDATE_INSPECTION_REPORT(7, "WEBSERVICE_XML_UPDATE_INSPECTION_REPORT", "更新检查报告的信息");
 
     private Integer value;
     private String display;
+    private String desc;
 
-    CollectTypeEnum(Integer value, String display) {
+    CollectTypeEnum(Integer value, String display, String desc) {
         this.value = value;
         this.display = display;
+        this.desc = desc;
+    }
+
+    public String getDesc() {
+        return desc;
     }
 
     @Override
@@ -30,8 +37,4 @@ public enum CollectTypeEnum implements IIntegerEnum {
 
         return display;
     }
-
-    public static CollectTypeEnum fromValue(Integer value) {
-        return IIntegerEnum.fromValue(CollectTypeEnum.class, value);
-    }
 }

common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/TaskOriginalMessage.java

@@ -35,6 +35,10 @@ public class TaskOriginalMessage implements Serializable {
     @TableField("name")
     private String name;
 
+    @ApiModelProperty(value = "采集描述")
+    @TableField("desc")
+    private String desc;
+
     @ApiModelProperty(value = "采集类型")
     @TableField("collect_type")
     private CollectTypeEnum collectType;

common-collect/src/main/java/com/docus/server/visitor/VisitorProcessor.java

@@ -69,6 +69,7 @@ public class VisitorProcessor extends AbstractProcessor {
                 return wsResult.fail(params);
             }
         } catch (Exception e) {
+            log.error(e.getMessage(), e);
             return wsResult.fail(params);
         }
     }

common-collect/src/main/java/com/docus/server/ws/IReportServer.java

@@ -10,6 +10,7 @@ import javax.jws.WebService;
 public interface IReportServer {
     /**
      * 接收手麻报告信息
+     *
      * @param saReportMessage 手麻报告信息
      * @return 返回信息
      */
@@ -17,13 +18,23 @@ public interface IReportServer {
 
     /**
      * 接收重症报告信息
+     *
      * @param icuReportMessage 重症报告信息
      * @return 返回信息
      */
     String pushICUReport(String icuReportMessage);
 
+    /**
+     * 接收检验报告信息
+     *
+     * @param examinationReportMessage 检验报告信息
+     * @return 返回信息
+     */
+    String pushExaminationReport(String examinationReportMessage);
+
     /**
      * 接收检查报告的信息 - 新增
+     *
      * @param inspectionReportMessage 检查报告信息 - 新增
      * @return 成功或者异常信息
      */
@@ -31,6 +42,7 @@ public interface IReportServer {
 
     /**
      * 接收检查报告的信息 - 更新
+     *
      * @param inspectionReportMessage 检查报告信息 -更新
      * @return 成功或者异常信息
      */

common-collect/src/main/java/com/docus/server/ws/IWebServiceServer.java

@@ -2,7 +2,7 @@ package com.docus.server.ws;
 
 import javax.jws.WebService;
 
-@WebService(targetNamespace = "http://impl.webservice.collection.server.docus.com/")
+@WebService
 public interface IWebServiceServer {
 
     /**

common-collect/src/main/java/com/docus/server/ws/convert/TaskOriginalMessageConverter.java

@@ -18,6 +18,7 @@ public class TaskOriginalMessageConverter {
         TaskOriginalMessage taskOriginalMessage = new TaskOriginalMessage();
         taskOriginalMessage.setId(idService.getDateSeq());
         taskOriginalMessage.setName(collectType.name());
+        taskOriginalMessage.setDesc(collectType.getDesc());
         taskOriginalMessage.setCollectType(collectType);
         taskOriginalMessage.setJsonStr(json);
         taskOriginalMessage.setSource(xml);

common-collect/src/main/java/com/docus/server/ws/impl/BasicServiceImpl.java

@@ -28,7 +28,7 @@ public class BasicServiceImpl implements IBasicService {
 
     @Override
     @TrackGroup(
-        group = "WEBSERVICE_XML_BASIC", desc = "新增基础数据",
+        group = "WEBSERVICE_XML_BASIC",
         beanNames = {"tBasicConverter", "wsBasicResultImpl"},
         processor = VisitorProcessor.class)
     public String setTBasic(String message) {
@@ -46,7 +46,7 @@ public class BasicServiceImpl implements IBasicService {
      */
     @Override
     @TrackGroup(
-        group = "WEBSERVICE_XML_BASIC", desc = "更新基础数据",
+        group = "WEBSERVICE_XML_BASIC",
         beanNames = {"tBasicConverter", "wsBasicResultImpl"},
         processor = VisitorProcessor.class)
     public String updateTBasic(String message) {

common-collect/src/main/java/com/docus/server/ws/impl/DeptServerImpl.java

@@ -31,7 +31,7 @@ public class DeptServerImpl implements IDeptServer {
      */
     @Override
     @TrackGroup(
-        group = "WEBSERVICE_XML_DEPT", desc = "接收科室信息",
+        group = "WEBSERVICE_XML_DEPT",
         beanNames = {"powerDeptConverter", "wsDeptResultImpl"},
         processor = VisitorProcessor.class)
     public String deptModify(String message) {

common-collect/src/main/java/com/docus/server/ws/impl/ReportServerImpl.java

@@ -3,7 +3,7 @@ package com.docus.server.ws.impl;
 import com.docus.core.util.json.JSON;
 import com.docus.log.annotation.TrackGroup;
 import com.docus.log.context.TrackHelper;
-import com.docus.server.collect.infrastructure.pojo.dto.ReportDTO;
+import com.docus.server.archivefile.pojo.dto.ReportDTO;
 import com.docus.server.visitor.VisitorProcessor;
 import com.docus.server.ws.IReportServer;
 import com.docus.server.ws.IReportService;
@@ -22,36 +22,61 @@ public class ReportServerImpl implements IReportServer {
     @Resource
     private IReportService reportService;
 
-    /**
-     * @param message 原始报文
-     * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举
-     * @see com.docus.server.ws.convert.IConverter 通用转化器
-     * @see com.docus.server.ws.IWsResult 通用返回结果
-     * @see VisitorProcessor 通用处理器
-     */
     @Override
     @TrackGroup(
-        group = "WEBSERVICE_XML_SA_REPORT", desc = "接收手麻报告信息",
+        group = "WEBSERVICE_XML_SA_REPORT",
         beanNames = {"reportConverter", "wsReportResultImpl"},
         processor = VisitorProcessor.class)
     public String pushSAReport(String message) {
-        log.info("收到手麻消息：{}", message);
+        report();
-        reportService.report(JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), ReportDTO.class));
         return null;
     }
 
     @Override
-    public String pushICUReport(String icuReportMessage) {
+    @TrackGroup(
+        group = "WEBSERVICE_XML_ICU_REPORT",
+        beanNames = {"reportConverter", "wsReportResultImpl"},
+        processor = VisitorProcessor.class)
+    public String pushICUReport(String message) {
+        log.info("收到重症消息：{}", message);
+        report();
+        return null;
+    }
+
+    @Override
+    @TrackGroup(
+        group = "WEBSERVICE_XML_EXAMINATION_REPORT",
+        beanNames = {"reportConverter", "wsReportResultImpl"},
+        processor = VisitorProcessor.class)
+    public String pushExaminationReport(String message) {
+        log.info("收到检验报告消息：{}", message);
+        report();
         return null;
     }
 
     @Override
-    public String pushAddInspectionReport(String inspectionReportMessage) {
+    @TrackGroup(
+        group = "WEBSERVICE_XML_INSERT_INSPECTION_REPORT",
+        beanNames = {"reportConverter", "wsReportResultImpl"},
+        processor = VisitorProcessor.class)
+    public String pushAddInspectionReport(String message) {
+        log.info("收到检查报告新增消息：{}", message);
+        report();
         return null;
     }
 
     @Override
-    public String pushUpdateInspectionReport(String inspectionReportMessage) {
+    @TrackGroup(
+        group = "WEBSERVICE_XML_UPDATE_INSPECTION_REPORT",
+        beanNames = {"reportConverter", "wsReportResultImpl"},
+        processor = VisitorProcessor.class)
+    public String pushUpdateInspectionReport(String message) {
+        log.info("收到检查报告更新消息：{}", message);
+        report();
         return null;
     }
+
+    private void report() {
+        reportService.report(JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), ReportDTO.class));
+    }
 }

common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java

@@ -31,7 +31,7 @@ public class UserServerImpl implements IUserServer {
      */
     @Override
     @TrackGroup(
-        group = "WEBSERVICE_XML_USER", desc = "接收用户信息",
+        group = "WEBSERVICE_XML_USER",
         beanNames = {"powerUserConverter", "wsUserResultImpl"},
         processor = VisitorProcessor.class)
     public String userModify(String message) {

common-collect/src/main/java/com/docus/server/ws/listener/ReportDownListener.java

@@ -7,11 +7,11 @@ import com.docus.core.util.Func;
 import com.docus.infrastructure.web.api.CommonResult;
 import com.docus.infrastructure.web.api.ResultCode;
 import com.docus.server.archivefile.mapper.AfReportRecordMapper;
+import com.docus.server.archivefile.pojo.dto.ReportDTO;
+import com.docus.server.archivefile.pojo.dto.ReportDownDTO;
+import com.docus.server.archivefile.pojo.dto.ReportDownPatientDTO;
+import com.docus.server.archivefile.pojo.dto.ReportDownScanFileDTO;
 import com.docus.server.archivefile.pojo.entity.AfReportRecord;
-import com.docus.server.collect.infrastructure.pojo.dto.ReportDTO;
-import com.docus.server.collect.infrastructure.pojo.dto.ReportDownDTO;
-import com.docus.server.collect.infrastructure.pojo.dto.ReportDownPatientDTO;
-import com.docus.server.collect.infrastructure.pojo.dto.ReportDownScanFileDTO;
 import com.docus.server.ws.event.TaskConsumptionReportDownEvent;
 import com.docus.server.ws.event.ThreePartyPushReportDownEvent;
 import lombok.extern.slf4j.Slf4j;
@@ -80,7 +80,7 @@ public class ReportDownListener {
     @EventListener
     @Async("threadPoolExecutor")
     public void taskConsumptionReporDown(TaskConsumptionReportDownEvent taskConsumptionReportDownEvent) {
-        ReportDTO reportDto = taskConsumptionReportDownEvent.ReportDTO();
+        ReportDTO reportDto = taskConsumptionReportDownEvent.getReportDTO();
         // 组织基础信息数据
         ReportDownPatientDTO reportDownPatientDto = new ReportDownPatientDTO(reportDto);