From 22e5a9cac1f3074cb6188ce845ab1eff51e4135b Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Thu, 25 Sep 2025 21:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=B7=9E=E5=81=A5=E5=BA=B7=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/common/MapperTurboFilter.java | 6 +- .../system/webservices/LisWebService.java | 2 +- .../webservices/WebServiceConfiguration.java | 17 ++-- lisinterface_gzszyy/pom.xml | 26 ++++++ .../mapper/LabUploadreportPtMapper.java | 7 ++ .../gzszyy/mapper/LisMapper_gzszyy.java | 22 +++++ .../gzszyy/mapper/V_LAR_EXAM_INFOMapper.java | 9 ++ .../gzszyy/mapper/V_TESTDETAILSMapper.java | 9 ++ .../gzszyy/mapper/V_lab_microbeMapper.java | 9 ++ .../mapper/V_lab_susceptibilityMapper.java | 9 ++ .../gzszyy/pojo/LabUploadreportPt.java | 18 ++++ .../gzszyy/pojo/V_LAR_EXAM_INFO.java | 76 ++++++++++++++++ .../gzszyy/pojo/V_TESTDETAILS.java | 73 ++++++++++++++++ .../gzszyy/pojo/V_lab_microbe.java | 49 +++++++++++ .../gzszyy/pojo/V_lab_susceptibility.java | 45 ++++++++++ .../service/impl/Lisinterface_gzszyy.java | 86 +++++++++++++++++++ .../gzszyy/task/GzszyyTask.java | 30 +++++++ .../resources/mapper/LisMapper_gzszyy.xml | 33 +++++++ .../jldermyy/mapper/LisMapper_jldermyy.java | 8 ++ .../service/impl/Lisinterface_jldermyy.java | 7 +- .../LisWebServicesImpl_jldermyy.java | 82 +++++++++++++++--- .../resources/mapper/LisMapper_jldermyy.xml | 21 +++++ lisinterface_start/pom.xml | 6 ++ pom.xml | 1 + 24 files changed, 621 insertions(+), 30 deletions(-) create mode 100644 lisinterface_gzszyy/pom.xml create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LabUploadreportPtMapper.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LisMapper_gzszyy.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_LAR_EXAM_INFOMapper.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_TESTDETAILSMapper.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_lab_microbeMapper.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_lab_susceptibilityMapper.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/LabUploadreportPt.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_LAR_EXAM_INFO.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_TESTDETAILS.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_lab_microbe.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_lab_susceptibility.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/service/impl/Lisinterface_gzszyy.java create mode 100644 lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/task/GzszyyTask.java create mode 100644 lisinterface_gzszyy/src/main/resources/mapper/LisMapper_gzszyy.xml create mode 100644 lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/mapper/LisMapper_jldermyy.java create mode 100644 lisinterface_jldermyy/src/main/resources/mapper/LisMapper_jldermyy.xml diff --git a/liscommon/src/main/java/com/czlisinterface/system/common/MapperTurboFilter.java b/liscommon/src/main/java/com/czlisinterface/system/common/MapperTurboFilter.java index 60b865e..36aae2e 100644 --- a/liscommon/src/main/java/com/czlisinterface/system/common/MapperTurboFilter.java +++ b/liscommon/src/main/java/com/czlisinterface/system/common/MapperTurboFilter.java @@ -1,12 +1,10 @@ package com.czlisinterface.system.common; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; + import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.classic.turbo.TurboFilter; import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.FilterReply; -import org.slf4j.Marker; + public class MapperTurboFilter extends Filter { private static final String MAPPER_PACKAGE_PREFIX = "com.czlisinterface"; diff --git a/liscommon/src/main/java/com/czlisinterface/system/webservices/LisWebService.java b/liscommon/src/main/java/com/czlisinterface/system/webservices/LisWebService.java index 43c317f..4c454b5 100644 --- a/liscommon/src/main/java/com/czlisinterface/system/webservices/LisWebService.java +++ b/liscommon/src/main/java/com/czlisinterface/system/webservices/LisWebService.java @@ -8,7 +8,7 @@ import javax.jws.WebService; public interface LisWebService { String WEBSERVICE_NAME = "LisWebService"; String TARGET_NAMESPACE = "http://demo.webservice.shanhy.com"; - String WEBSERVICE_INTERFACE_NAME = "com.czlis.AllInterface.webservices.LisWebService"; + String WEBSERVICE_INTERFACE_NAME = "com.czlisinterface.system.webservices.LisWebService"; @WebMethod String hello(@WebParam(name = "userName3") String name); diff --git a/liscommon/src/main/java/com/czlisinterface/system/webservices/WebServiceConfiguration.java b/liscommon/src/main/java/com/czlisinterface/system/webservices/WebServiceConfiguration.java index 9c1cf47..fd56d14 100644 --- a/liscommon/src/main/java/com/czlisinterface/system/webservices/WebServiceConfiguration.java +++ b/liscommon/src/main/java/com/czlisinterface/system/webservices/WebServiceConfiguration.java @@ -29,10 +29,10 @@ public class WebServiceConfiguration { private LisWebService lisWebService; @Value("${lisinterface.action.type:}") - private String lisClass; + String lisClass; @Value("${lisinterface.webservice.open:}") - private String open; + String open; /** * Apache CXF 核心架构是以BUS为核心，整合其他组件。 @@ -76,16 +76,15 @@ public class WebServiceConfiguration { */ @Bean public Endpoint endpoint() { - //没有位子启用这个。暂时注释掉 if(open.equals("1")){ Endpoint endpoint = new EndpointImpl(springBus(), lisWebService); switch (lisClass){ -// case "nzzyy": -// endpoint.publish("/ws/receiverCritical"); -// break; -// default: -// endpoint.publish("/ws/lisWsApi"); -// break; + case "nzzyy": + endpoint.publish("/ws/receiverCritical"); + break; + default: + endpoint.publish("/ws/lisWsApi"); + break; } return endpoint; diff --git a/lisinterface_gzszyy/pom.xml b/lisinterface_gzszyy/pom.xml new file mode 100644 index 0000000..71e9d18 --- /dev/null +++ b/lisinterface_gzszyy/pom.xml @@ -0,0 +1,26 @@ + + 4.0.0 + + org.example + lisinterface8.0 + 1.0 + + + lisinterface_gzszyy + jar + + lisinterface_gzszyy + + + UTF-8 + + + + + org.example + liscommon + 1.0 + + + diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LabUploadreportPtMapper.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LabUploadreportPtMapper.java new file mode 100644 index 0000000..1137dba --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LabUploadreportPtMapper.java @@ -0,0 +1,7 @@ +package com.czlisinterface.gzszyy.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.czlisinterface.gzszyy.pojo.LabUploadreportPt; + +public interface LabUploadreportPtMapper extends BaseMapper { +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LisMapper_gzszyy.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LisMapper_gzszyy.java new file mode 100644 index 0000000..162e21e --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/LisMapper_gzszyy.java @@ -0,0 +1,22 @@ +package com.czlisinterface.gzszyy.mapper; + +import com.czlisinterface.gzszyy.pojo.V_LAR_EXAM_INFO; +import com.czlisinterface.gzszyy.pojo.V_TESTDETAILS; +import com.czlisinterface.gzszyy.pojo.V_lab_microbe; +import com.czlisinterface.gzszyy.pojo.V_lab_susceptibility; +import com.czlisinterface.system.pojo.LabReqmain; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Mapper +public interface LisMapper_gzszyy { + List getV_LAR_EXAM_INFO(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh); + List getV_TESTDETAILS(@Param("jyrq")Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh); + List getV_lab_susceptibility(@Param("jyrq")Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh); + List getV_lab_microbe(@Param("jyrq")Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh); + List> getData(); +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_LAR_EXAM_INFOMapper.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_LAR_EXAM_INFOMapper.java new file mode 100644 index 0000000..575b668 --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_LAR_EXAM_INFOMapper.java @@ -0,0 +1,9 @@ +package com.czlisinterface.gzszyy.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.czlisinterface.gzszyy.pojo.V_LAR_EXAM_INFO; + +@DS("sqlpt") +public interface V_LAR_EXAM_INFOMapper extends BaseMapper { +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_TESTDETAILSMapper.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_TESTDETAILSMapper.java new file mode 100644 index 0000000..56e8244 --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_TESTDETAILSMapper.java @@ -0,0 +1,9 @@ +package com.czlisinterface.gzszyy.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.czlisinterface.gzszyy.pojo.V_TESTDETAILS; + +@DS("sqlpt") +public interface V_TESTDETAILSMapper extends BaseMapper { +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_lab_microbeMapper.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_lab_microbeMapper.java new file mode 100644 index 0000000..d00dae7 --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_lab_microbeMapper.java @@ -0,0 +1,9 @@ +package com.czlisinterface.gzszyy.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.czlisinterface.gzszyy.pojo.V_lab_microbe; + +@DS("sqlpt") +public interface V_lab_microbeMapper extends BaseMapper { +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_lab_susceptibilityMapper.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_lab_susceptibilityMapper.java new file mode 100644 index 0000000..129e91f --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/mapper/V_lab_susceptibilityMapper.java @@ -0,0 +1,9 @@ +package com.czlisinterface.gzszyy.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.czlisinterface.gzszyy.pojo.V_lab_susceptibility; + +@DS("sqlpt") +public interface V_lab_susceptibilityMapper extends BaseMapper { +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/LabUploadreportPt.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/LabUploadreportPt.java new file mode 100644 index 0000000..5acbc5f --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/LabUploadreportPt.java @@ -0,0 +1,18 @@ +package com.czlisinterface.gzszyy.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabUploadreportPt { + private String uptype; + private Date jyrq; + private String yq; + private String ybh; + private Date shsj; +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_LAR_EXAM_INFO.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_LAR_EXAM_INFO.java new file mode 100644 index 0000000..3ee5aaa --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_LAR_EXAM_INFO.java @@ -0,0 +1,76 @@ +package com.czlisinterface.gzszyy.pojo; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("LAR_EXAM_INFO") +public class V_LAR_EXAM_INFO { + private String RPT_CODE; + private String RPT_DT; + private String PERSONAL_ID; + private String APP_CODE; + private String OP_EM_HP_EX_MARK; + private String OP_EM_HP_EX_NO; + private String CARDTYPE; + private String CARDNO; + private String NAME; + private String SEX; + private String SEX_NAME; + private String BIRTHDAY; + private String WARD_NAME; + private String BED_NO; + private String TEST_RPT_NAME; + private String LAB_TYPE_CODE; + private String LAB_TYPE_NAME; + private String MICROBE_TEST_MARK; + private String SPE_INSPECT_MARK; + private String EXAM_PURPOSE; + private String DETAIL_COUNT; + private String DIAG_CODE; + private String DIAG_NAME; + private String SPECIMEN_NO; + private String SAMP_CLASS; + private String SAMP_CNAME; + private String SPECIMEN_STATUS_DESC; + private String SAMP_DT; + private String SAMP_ORGAN_CODE; + private String SAMP_ORGAN_NAME; + private String SAMP_IDCARD; + private String SAMP_NAME; + private String ACCEPT_DT; + private String TESTMETHOD; + private String TEST_NOTE; + private String ORGAN_CODE; + private String ORGAN_NAME; + private String APP_DPT_CODE; + private String APP_DPT_NAME; + private String APP_DOC_IDCARD; + private String APP_DOC_NAME; + private String TEST_DPT_CODE; + private String TEST_DPT_NAME; + private String TEST_DOC_IDCARD; + private String TEST_DOC_NAME; + private String TEST_DT; + private String PRINT_DTIME; + private String RPT_IDCARD; + private String RPT_DOCTOR; + private String RV_IDCARD; + private String RV_NAME; + private String CHECK_AUDIT_TIME; + private Integer REC_NUMB; + private String CARDTYPE_ORI; + private String CARDTYPE_NAME_ORI; + private String SAMP_ORGAN_CODE_ORI; + private String SAMP_ORGAN_NAME_ORI; + private String TEST_ORGAN_CODE_ORI; + private String TEST_ORGAN_NAME_ORI; + private String TEST_DPT_CODE_ORI; + private String TEST_DPT_NAME_ORI; + private String SAMP_CLASS_ORI; + private String SAMP_CLASS_NAME_ORI; +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_TESTDETAILS.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_TESTDETAILS.java new file mode 100644 index 0000000..d9b730a --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_TESTDETAILS.java @@ -0,0 +1,73 @@ +package com.czlisinterface.gzszyy.pojo; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("TESTDETAILS") +public class V_TESTDETAILS { + private String RESULT_ID; + private String RPT_DT; + private String PERSONAL_ID; + private String APP_CODE; + private String RPT_CODE; + private String OP_EM_HP_EX_MARK; + private String OP_EM_HP_EX_NO; + private String CARDTYPE; + private String CARDNO; + private String LAB_TYPE_CODE; + private String LAB_TYPE_NAME; + private String EX_PROJ_CODE; + private String EX_PROJ_NAME; + private String INP_EX_PROJ_CODE; + private String INP_EX_PROJ_NAME; + private String HOS_EX_PROJ_CODE; + private String HOS_EX_PROJ_NAME; + private String EX_PROJ_SN; + private String INDICATOR_CODE_RAW; + private String INDICATOR_NAME_RAW; + private String LONIC_CODE; + private String EX_RPT_TYPE; + private String NO_RPT; + private String RPT_UNIT; + private String IF_MARK; + private String RESULT_INTERPRE_CODE; + private String RESULT_INTERPRE_NAME; + private String REF_RANGE; + private BigDecimal UNL; + private BigDecimal LNL; + private BigDecimal UCL; + private String LCL; + private String ORGAN_CODE; + private String ORGAN_NAME; + private String DPT_CODE; + private String DPT_NAME; + private String TESTER_IDCARD; + private String TESTER_NAME; + private String TEST_DT; + private String AUTH_DOCTOR_CODE; + private String AUTH_DOCTOR_NAME; + private String HOS_PACK_NO; + private String HOS_PACK_NAME; + private String EX_RPT_TYPE_ORI; + private String EX_RPT_TYPE_NAME_ORI; + private String EX_PROJ_CODE_ORI; + private String EX_PROJ_NAME_ORI; + private String ORGAN_CODE_ORI; + private String ORGAN_NAME_ORI; + private String DPT_CODE_ORI; + private String DPT_NAME_ORI; + private String CARDTYPE_ORI; + private String CARDTYPE_NAME_ORI; + private String TEST_EQUI_DESC; + private String TEST_EQUI_ID; + private String TEST_EQUI_NAME; + private String PRINT_ORDER; + private String PATHO_DESC; +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_lab_microbe.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_lab_microbe.java new file mode 100644 index 0000000..52ac143 --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_lab_microbe.java @@ -0,0 +1,49 @@ +package com.czlisinterface.gzszyy.pojo; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("lab_microbe") +public class V_lab_microbe { + private String ORGAN_CODE; + private String ORGAN_NAME; + private String LAB_RESULT_ID; + private String RPT_CODE; + private String PATIENT_ID; + private String OP_EM_HP_EX_MARK; + private String OP_EM_HP_EX_NO; + private String CARDTYPE; + private String CARDNO; + private String MICROBE_CODE_RAW; + private String MICROBE_NAME_RAW; + private String MICROBE_CODE; + private String MICROBE_NAME; + private String LAB_INSTRUMENT_NAME; + private String LAB_TEST_METHOD; + private String MICROBE_CULTURE_DESC; + private String COLONY_FORM; + private String MICROBE_AMOUNT; + private String MULTI_BACTERIA_MARK; + private String CULTURE_MEDIUM; + private String CULTURE_DURATION; + private String CULTURE_CONDITION; + private String FINDING_WAY; + private String NO_RPT; + private String TEST_EQUI_DESC; + private String TEST_EQUI_ID; + private String TEST_EQUI_NAME; + private String EXP_BOARD_ORDER; + private String EXP_BOARD_NAME; + private String TEST_PERFORMER_ID; + private String TEST_PERFORMER_NAME; + private String TEST_DTIME; + private String AUTHENTICATOR_ID; + private String AUTHENTICATOR_NAME; + private String AUTHENTICATION_DTIME; + private String LAST_UPDATE_DTIME; +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_lab_susceptibility.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_lab_susceptibility.java new file mode 100644 index 0000000..c27ca2e --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/pojo/V_lab_susceptibility.java @@ -0,0 +1,45 @@ +package com.czlisinterface.gzszyy.pojo; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("lab_susceptibility") +public class V_lab_susceptibility { + private String ORGAN_CODE; + private String ORGAN_NAME; + private String SUSCEPT_RESULT_ID; + private String PATIENT_ID; + private String OP_EM_HP_EX_MARK; + private String OP_EM_HP_EX_NO; + private String CARDTYPE; + private String CARDNO; + private String RPT_CODE; + private String PRINT_ORDER; + private String MICROBE_CODE; + private String MICROBE_NAME; + private String SEQUENCE_NO; + private String SUSC_METHOD; + private String ANTIBIOTIC_CODE; + private String ANTIBIOTIC_NAME; + private String SENSITIVITY_CODE; + private String SENSITIVITY_NAME; + private String REF_RANGER; + private String DRUG_CONCENTRATION; + private String BACSTA_CONCEN; + private String BACSTA_DIAMETER; + private String SUSC_RESULT_DESC; + private String IS_NATURAL_RESISTANCE; + private String EXP_BOARD_ORDER; + private String TEST_PERFORMER_ID; + private String TEST_PERFORMER_NAME; + private String TEST_DTIME; + private String RESULT_DTIME; + private String AUTHENTICATOR_ID; + private String AUTHENTICATOR_NAME; + private String AUTHENTICATION_DTIME; +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/service/impl/Lisinterface_gzszyy.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/service/impl/Lisinterface_gzszyy.java new file mode 100644 index 0000000..8944452 --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/service/impl/Lisinterface_gzszyy.java @@ -0,0 +1,86 @@ +package com.czlisinterface.gzszyy.service.impl; + +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.czlisinterface.gzszyy.mapper.*; +import com.czlisinterface.gzszyy.pojo.*; +import com.czlisinterface.system.service.impl.CommonImpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Configuration; + +import javax.annotation.Resource; +import com.czlisinterface.system.pojo.*; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 高州市中医院接口 + * 全民健康平台接口 + */ +@Slf4j +@Configuration +@ConditionalOnProperty(name="lisinterface.action.type",havingValue = "gzszyy") +public class Lisinterface_gzszyy extends CommonImpl { + + @Resource + LisMapper_gzszyy lisMapperGzszyy; + @Resource + V_lab_microbeMapper vLabMicrobeMapper; + @Resource + V_lab_susceptibilityMapper vLabSusceptibilityMapper; + @Resource + V_LAR_EXAM_INFOMapper vLAR_EXAM_INFOMapper; + @Resource + V_TESTDETAILSMapper vTESTDETAILSMapper; + @Resource + LabUploadreportPtMapper labUploadreportPtMapper; + + + /** + * 发送数据到平台中间库，为mysql数据库 + * @return + */ + public Result sendData(){ + List> dataList = lisMapperGzszyy.getData(); + for (Map stringObjectMap : dataList) { + Date jyrq = (Date) stringObjectMap.get("jyrq"); + String yq = stringObjectMap.get("yq").toString(); + String ybh = stringObjectMap.get("ybh").toString(); + Date confirmdt = (Date)stringObjectMap.get("confirmdt"); + List vLarExamInfoList = lisMapperGzszyy.getV_LAR_EXAM_INFO(jyrq, yq, ybh); + LabUploadreportPt labUploadreportPt = new LabUploadreportPt(); + labUploadreportPt.setJyrq(jyrq); + labUploadreportPt.setYq(yq); + labUploadreportPt.setYbh(ybh); + labUploadreportPt.setShsj(confirmdt); + try{ + for (V_LAR_EXAM_INFO vLarExamInfo : vLarExamInfoList) { + vLAR_EXAM_INFOMapper.insert(vLarExamInfo); + } + List vTestdetailsList = lisMapperGzszyy.getV_TESTDETAILS(jyrq, yq, ybh); + for (V_TESTDETAILS vTestdetails : vTestdetailsList) { + vTESTDETAILSMapper.insert(vTestdetails); + } + List vLabSusceptibilityList = lisMapperGzszyy.getV_lab_susceptibility(jyrq, yq, ybh); + for (V_lab_susceptibility vLabSusceptibility : vLabSusceptibilityList) { + vLabSusceptibilityMapper.insert(vLabSusceptibility); + } + List vLabMicrobeList = lisMapperGzszyy.getV_lab_microbe(jyrq, yq, ybh); + for (V_lab_microbe vLabMicrobe : vLabMicrobeList) { + vLabMicrobeMapper.insert(vLabMicrobe); + } + labUploadreportPt.setUptype("1"); //成功 + }catch (Exception e){ + e.printStackTrace(); + labUploadreportPt.setUptype("0"); //失败 + log.error("插入数据到健康平台中间表失败；",e); + } + + labUploadreportPtMapper.insert(labUploadreportPt); + + } + return new Result("0","上传成功！"); + } +} diff --git a/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/task/GzszyyTask.java b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/task/GzszyyTask.java new file mode 100644 index 0000000..83dbc00 --- /dev/null +++ b/lisinterface_gzszyy/src/main/java/com/czlisinterface/gzszyy/task/GzszyyTask.java @@ -0,0 +1,30 @@ +package com.czlisinterface.gzszyy.task; + +import com.czlisinterface.gzszyy.service.impl.Lisinterface_gzszyy; +import com.czlisinterface.system.pojo.Result; +import com.czlisinterface.system.task.BaskCommonTask; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Configuration; + +import javax.annotation.Resource; +import java.util.Date; + +@Slf4j +@Configuration +@ConditionalOnProperty(name="lisinterface.task.job",havingValue = "gzszyy") +public class GzszyyTask extends BaskCommonTask { + + @Resource + Lisinterface_gzszyy lisinterfaceGzszyy; + + + @Override + public void execute() { + sendData(); + } + + public void sendData(){ + lisinterfaceGzszyy.sendData(); + } +} diff --git a/lisinterface_gzszyy/src/main/resources/mapper/LisMapper_gzszyy.xml b/lisinterface_gzszyy/src/main/resources/mapper/LisMapper_gzszyy.xml new file mode 100644 index 0000000..a2e6be2 --- /dev/null +++ b/lisinterface_gzszyy/src/main/resources/mapper/LisMapper_gzszyy.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/mapper/LisMapper_jldermyy.java b/lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/mapper/LisMapper_jldermyy.java new file mode 100644 index 0000000..64fa683 --- /dev/null +++ b/lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/mapper/LisMapper_jldermyy.java @@ -0,0 +1,8 @@ +package com.czlisinterface.jldermyy.mapper; + +import java.util.List; +import java.util.Map; + +public interface LisMapper_jldermyy { + List> getAddChange(String sfxmdh); +} diff --git a/lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/service/impl/Lisinterface_jldermyy.java b/lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/service/impl/Lisinterface_jldermyy.java index 4e08ff2..ed0ab17 100644 --- a/lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/service/impl/Lisinterface_jldermyy.java +++ b/lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/service/impl/Lisinterface_jldermyy.java @@ -47,8 +47,8 @@ public class Lisinterface_jldermyy extends CommonImpl { @Resource CommonUtil commonUtil; -// @Resource -// HisMapper_jldermyy hisMapperJldermyy; + @Resource + HisMapper_jldermyy hisMapperJldermyy; @Resource LisWarningUtil lisWarningUtil; @@ -64,6 +64,9 @@ public class Lisinterface_jldermyy extends CommonImpl { switch (method){ case "getDictDPM": return getDictDPM(""); + case "test": + List labreqmain = hisMapperJldermyy.getLabreqmain(); + return new Result("0","查询成功！",labreqmain); } return new Result("-1","没有找到接口方法！"); diff --git a/lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/webservice/LisWebServicesImpl_jldermyy.java b/lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/webservice/LisWebServicesImpl_jldermyy.java index 2e94d50..024850c 100644 --- a/lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/webservice/LisWebServicesImpl_jldermyy.java +++ b/lisinterface_jldermyy/src/main/java/com/czlisinterface/jldermyy/webservice/LisWebServicesImpl_jldermyy.java @@ -1,6 +1,9 @@ package com.czlisinterface.jldermyy.webservice; import cn.hutool.core.util.XmlUtil; +import com.czlisinterface.jldermyy.mapper.LisMapper_jldermyy; +import com.czlisinterface.jldermyy.service.impl.Lisinterface_jldermyy; +import com.czlisinterface.system.utils.CommonUtil; import com.czlisinterface.system.webservices.LisWebService; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -8,16 +11,23 @@ import org.springframework.context.annotation.Configuration; import org.w3c.dom.Document; import org.w3c.dom.NodeList; +import javax.annotation.Resource; import javax.jws.WebService; import javax.xml.xpath.XPathConstants; +import java.util.*; @Slf4j @Configuration -@ConditionalOnProperty(name="lisinterface.webservice.type",havingValue = "yzsfybjy") +@ConditionalOnProperty(name="lisinterface.webservice.type",havingValue = "jldermyy_new1") @WebService(name = LisWebService.WEBSERVICE_NAME, targetNamespace = LisWebService.TARGET_NAMESPACE, endpointInterface = LisWebServicesImpl_jldermyy.WEBSERVICE_INTERFACE_NAME) public class LisWebServicesImpl_jldermyy implements LisWebServices_jldermyy{ + @Resource + LisMapper_jldermyy lisMapperJldermyy; + @Resource + CommonUtil commonUtil; + /** * 采血费附加计费 * @param xmlStr @@ -25,25 +35,69 @@ public class LisWebServicesImpl_jldermyy implements LisWebServices_jldermyy{ */ @Override public String bloodCharge(String xmlStr) { - log.info("采血附加费接口：{}",xmlStr); - Document document = XmlUtil.parseXml(xmlStr); - NodeList nodeListBySample = XmlUtil.getNodeListByXPath("//Req/LisSamplecollect/Row", document); - for (int i = 1; i <= nodeListBySample.getLength(); i++) { - String deptId = String.valueOf(XmlUtil.getByXPath("//Req/LisSamplecollect/Row[" + i + "]/DeptId", document, XPathConstants.STRING)); - String orderCode = String.valueOf(XmlUtil.getByXPath("//Req/LisSamplecollect/Row[" + i + "]/OrderCode", document, XPathConstants.STRING)); - //申请单号 - String applyNo =String.valueOf(XmlUtil.getByXPath("//Req/LisSamplecollect/Row[" + i + "]/ApplyNo", document, XPathConstants.STRING)); - System.out.println("deptId:"+deptId); - System.out.println("orderCode:"+orderCode); - System.out.println("applyNo:"+applyNo); + log.info("采血附加费接口,入参：{}",xmlStr); + try{ + Document document = XmlUtil.parseXml(xmlStr); + NodeList nodeListBySample = XmlUtil.getNodeListByXPath("//Req/LisSamplecollect/Row", document); + String sfxmdhStr = ""; + for (int i = 1; i <= nodeListBySample.getLength(); i++) { + String deptId = String.valueOf(XmlUtil.getByXPath("//Req/LisSamplecollect/Row[" + i + "]/DeptId", document, XPathConstants.STRING)); + String orderCode = String.valueOf(XmlUtil.getByXPath("//Req/LisSamplecollect/Row[" + i + "]/OrderCode", document, XPathConstants.STRING)); + //申请单号 + String applyNo =String.valueOf(XmlUtil.getByXPath("//Req/LisSamplecollect/Row[" + i + "]/ApplyNo", document, XPathConstants.STRING)); + System.out.println("deptId:"+deptId); + System.out.println("orderCode:"+orderCode); + System.out.println("applyNo:"+applyNo); + sfxmdhStr += ",'"+ orderCode + "'"; + } + //返回参数 + Map outCalcModelMap = new HashMap(); + outCalcModelMap.put("Status",""); + outCalcModelMap.put("Content",""); + outCalcModelMap.put("CollNum",""); + List> conList = new ArrayList>(); + List> addChangeList = lisMapperJldermyy.getAddChange(sfxmdhStr); + for (Map stringObjectMap : addChangeList) { + if(stringObjectMap == null) continue; + String sampletips = String.valueOf(stringObjectMap.get("sampletips")); + String sfxmdm = String.valueOf(stringObjectMap.get("sfxmdm")); + Map conListMap = new HashMap<>(); + conListMap.put("ContainerId",""); + conListMap.put("ContainerName",sampletips); + conListMap.put("ContainerNum","1"); + conListMap.put("ContainerFeeCode",sfxmdm); + conList.add(conListMap); + } + outCalcModelMap.put("ConList",conList); + outCalcModelMap.put("OrderCodeList",sfxmdhStr);//医嘱号列表，用逗号隔开 + return toXmlStr(outCalcModelMap,"0","成功！"); + }catch (Exception e){ + e.printStackTrace(); + log.error("调用接口失败："+e); + return toXmlStr(null,"-1","失败！"+e.getMessage()); } - //返回参数 - return ""; } @Override public String hello(String name) { return name; } + + + private String toXmlStr(Map paramMap,String ret,String msg){ + Map msgHeadMap = new HashMap<>(); + msgHeadMap.put("SrvId","02025"); + msgHeadMap.put("ResSysId","041001-4"); + msgHeadMap.put("ResTag",""); + msgHeadMap.put("ResMsg",""); + msgHeadMap.put("MsgId", UUID.randomUUID()); + msgHeadMap.put("MsgCheckCode",""); + msgHeadMap.put("Dt",commonUtil.currentStringTime()); + msgHeadMap.put("Remark",""); + Map map = new HashMap<>(); + map.put("MsgHead",msgHeadMap); + map.put("OutCalcModel",paramMap); + return XmlUtil.mapToXmlStr(map, "Req"); + } } diff --git a/lisinterface_jldermyy/src/main/resources/mapper/LisMapper_jldermyy.xml b/lisinterface_jldermyy/src/main/resources/mapper/LisMapper_jldermyy.xml new file mode 100644 index 0000000..056b424 --- /dev/null +++ b/lisinterface_jldermyy/src/main/resources/mapper/LisMapper_jldermyy.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/lisinterface_start/pom.xml b/lisinterface_start/pom.xml index 33b934e..e5bef65 100644 --- a/lisinterface_start/pom.xml +++ b/lisinterface_start/pom.xml @@ -32,6 +32,11 @@ lisinterface_yzsfybjy 1.0 + + org.example + lisinterface_gzszyy + 1.0 + @@ -80,6 +85,7 @@ liscommon-1.0.jar lisinterface_jldermyy-1.0.jar lisinterface_yzsfybjy-1.0.jar + lisinterface_gzszyy-1.0.jar diff --git a/pom.xml b/pom.xml index 7fc1f3a..20c3c92 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,7 @@ lisinterface_jldermyy lisinterface_start lisinterface_yzsfybjy + lisinterface_gzszyy