From 5ba25cb53dab2ef0f8052a93796ef67a8a2ee820 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 10 六月 2025 14:53:49 +0800
Subject: [PATCH] 代码提交
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java | 2
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRKResponse.java | 31 ++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020Soap.java | 40 +++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/package-info.java | 2
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020.class | 0
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWreq.class | 0
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 87 ++++++-
jh-server/src/main/resources/application.yaml | 4
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java | 4
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 1
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java | 2
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 5
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsMessagebody.java | 18 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRK.java | 29 ++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/ApplicationTemplate.java | 176 ++++++++++++++
jh-module-ecg/jh-module-ecg-biz/pom.xml | 5
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/ObjectFactory.class | 0
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/package-info.class | 0
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsRequest.java | 20 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java | 5
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSaveReqVO.java | 3
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsMessagebody.class | 0
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020Soap.class | 0
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsRequest.class | 0
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWreq.java | 95 +++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/ObjectFactory.java | 72 ++++++
/dev/null | 17 -
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRK.class | 0
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020.java | 94 +++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java | 5
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRKResponse.class | 0
31 files changed, 680 insertions(+), 37 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/pom.xml b/jh-module-ecg/jh-module-ecg-biz/pom.xml
index c9756f8..d8aa7b7 100644
--- a/jh-module-ecg/jh-module-ecg-biz/pom.xml
+++ b/jh-module-ecg/jh-module-ecg-biz/pom.xml
@@ -158,6 +158,11 @@
<version>3.5.5</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>3.5.5</version>
+ </dependency>
+ <dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.3.1</version>
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
index 4b8f4a7..11bc862 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
@@ -125,6 +125,7 @@
@Operation(summary = "鑾峰緱棰勭害鍒嗛〉")
@PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
public CommonResult<PageResult<AppointmentRespVO>> getAppointmentPage(@Valid AppointmentPageReqVO pageReqVO) {
+ pageReqVO.setStatus("1");
PageResult<AppointmentDO> pageResult = appointmentService.getAppointmentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, AppointmentRespVO.class));
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
index 4df0c4b..99c449b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
@@ -79,7 +79,10 @@
@Schema(description = "棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�")
private String bookSrc;
+ @Schema(description = "鐢宠鍗曠姸鎬�")
+ private String status;
+
@Schema(description = "宸蹭粯娆�")
private Integer paid;
-}
\ No newline at end of file
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java
index 52ce8f5..4643cf1 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java
@@ -89,6 +89,6 @@
@Schema(description = "宸蹭粯娆�")
private Integer paid;
- @TableField(exist = false)
+// @TableField(exist = false)
private String status;
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
index 5e6efac..3f49886 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -79,11 +79,12 @@
@Operation(summary = "璁惧棰嗙敤瀹屾垚")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+ String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ createReqVO.setOperater(userNickname);
CommonResult<Long> result = devRentService.readyOperation(createReqVO);
try {
- String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
Long rentId = createReqVO.getId();
devRentService.feeConfirm(rentId, userHisId, userNickname, true); // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
} catch (Exception e) {
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSaveReqVO.java
index f1e7df7..117c09a 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSaveReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSaveReqVO.java
@@ -73,4 +73,7 @@
@Schema(description = "鎮ｈ�呰鎯�")
PatDetails patDetails;
+
+ @Schema(description = "鎿嶄綔浜�")
+ String operater;
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
index 5ff5641..03f1c11 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
@@ -194,7 +194,7 @@
).toList();
// 杩囨护鍑� [瀹夎涓璢 鐨勶紝鍑嗗鍙彿 璇ュ伐浣嶅簲璇� 鏈�澶氬彧鏈変竴涓� [瀹夎涓璢
if (installingQueueDOList.size() > 0) {
- QueueDO onStageItem = installingQueueDOList.getFirst();
+ QueueDO onStageItem = installingQueueDOList.get(0);
CallSaveReqVO callSaveReqVO = BeanUtils.toBean(onStageItem, CallSaveReqVO.class);
callSaveReqVO.setId(null);
callSaveReqVO.setCallType(1); // 瑁呮満鍙彿
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
index 98c9d1a..d864a17 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
@@ -8,6 +8,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
import java.time.LocalDate;
import java.util.List;
@@ -39,6 +40,7 @@
.eqIfPresent(AppointmentDO::getBookCheckType, reqVO.getBookCheckType())
.eqIfPresent(AppointmentDO::getBookSrc, reqVO.getBookSrc())
.eqIfPresent(AppointmentDO::getPaid, reqVO.getPaid())
+ .eqIfPresent(AppointmentDO::getStatus, reqVO.getStatus())
.orderByDesc(AppointmentDO::getId));
}
@@ -49,6 +51,9 @@
@Select("select * from lihu.appointment where pat_id = #{patId} and book_check_type = #{checkType} and to_days(book_date) = to_days(Now()) limit 1")
AppointmentDO getByPatAndCheckTypeAndBookDate(@Param("patId") String patId, @Param("checkType") Integer checkType);
+ @Update("update lihu.appointment set status = #{status} where apply_no = #{applyNo};")
+ Integer updateStatusByApplyNo(@Param("applyNo") String applyNo, @Param("status") String status);
+
@Select("select * from lihu.appointment where episode_id = #{episodeId} and apply_no = #{applyNo} limit 1")
AppointmentDO getByEpisodeIdAndApplyNo(@Param("episodeId") String episodeId, @Param("applyNo") String applyNo);
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
index 13e68f3..d43196c 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
@@ -371,6 +371,7 @@
// 灏咥ppointmentDO杞崲涓篈ppointmentSaveReqVO骞朵繚瀛�
AppointmentSaveReqVO saveReqVO = BeanUtils.toBean(appointment, AppointmentSaveReqVO.class);
+ saveReqVO.setStatus("1");
return createAppointment(saveReqVO);
} catch (Exception e) {
log.error("[handleAppointmentCreate][澶勭悊棰勭害鍒涘缓澶辫触 dataMap({})]", dataMap, e);
@@ -501,7 +502,8 @@
// 浠巇ataMap涓彁鍙栫敵璇峰崟鍙�
- String status = Optional.ofNullable(dataMap.get("controlActProcess")).map(controlActProcess -> (Map<String, Object>) controlActProcess).map(controlActProcess -> (Map<String, Object>) controlActProcess.get("subject")).map(subject -> (Map<String, Object>) subject.get("placerGroup")).map(placerGroup -> (Map<String, Object>) placerGroup.get("component2")).map(component2 -> (Map<String, Object>) component2.get("observationRequest")).map(observationRequest -> (Map<String, Object>) observationRequest.get("component1")).map(component1 -> (Map<String, Object>) component1.get("processStep")).map(processStep -> (Map<String, Object>) processStep.get("code")).map(code -> (Map<String, Object>) code.get("displayName")).map(displayName -> (String) displayName.get("value")).orElseThrow(() -> exception(APPOINTMENT_CREATE_FAIL));
+// String status = Optional.ofNullable(dataMap.get("controlActProcess")).map(controlActProcess -> (Map<String, Object>) controlActProcess).map(controlActProcess -> (Map<String, Object>) controlActProcess.get("subject")).map(subject -> (Map<String, Object>) subject.get("placerGroup")).map(placerGroup -> (Map<String, Object>) placerGroup.get("component2")).map(component2 -> (Map<String, Object>) component2.get("observationRequest")).map(observationRequest -> (Map<String, Object>) observationRequest.get("component1")).map(component1 -> (Map<String, Object>) component1.get("processStep")).map(processStep -> (Map<String, Object>) processStep.get("code")).map(code -> (Map<String, Object>) code.get("displayName")).map(displayName -> (String) displayName.get("value")).orElseThrow(() -> exception(APPOINTMENT_CREATE_FAIL));
+ String status = Optional.ofNullable(dataMap.get("controlActProcess")).map(controlActProcess -> (Map<String, Object>) controlActProcess).map(controlActProcess -> (Map<String, Object>) controlActProcess.get("subject")).map(subject -> (Map<String, Object>) subject.get("placerGroup")).map(placerGroup -> (Map<String, Object>) placerGroup.get("component2")).map(component2 -> (Map<String, Object>) component2.get("observationRequest")).map(observationRequest -> (Map<String, Object>) observationRequest.get("component1")).map(component1 -> (Map<String, Object>) component1.get("processStep")).map(processStep -> (Map<String, Object>) processStep.get("code")).map(code -> (String) code.get("code")).orElseThrow(() -> exception(APPOINTMENT_CREATE_FAIL));
existingAppointment.setStatus(status);
// 灏咥ppointmentDO杞崲涓篈ppointmentSaveReqVO骞舵洿鏂�
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/ApplicationTemplate.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/ApplicationTemplate.java
new file mode 100644
index 0000000..cfa645f
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/ApplicationTemplate.java
@@ -0,0 +1,176 @@
+package cn.lihu.jh.module.ecg.service.devrent;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class ApplicationTemplate {
+
+ /**
+ * 杩斿洖鐨刋ML澶暱浜嗭紝涓嶆兂鐪嬩簡锛岀洿鎺ユ壘涓ā鏉匡紝鎶婇渶瑕佺殑鍊兼斁杩涘幓锛岃繑鍥炵粨鏉焇O^
+ *
+ * @return
+ */
+ public String getXML(String applyNo, String checkStatue, String checkName, String updater, String patDeptCode, String patDeptName, String patWardCode, String patWardName, String patBedno, String lsh, String booksrc, String patid, String patName) {
+ String xml = "<POOR_IN200902UV ITSVersion=\"XML_1.0\"\n" +
+ " xmlns=\"urn:hl7-org:v3\"\n" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"urn:hl7-org:v3 ../multicacheschemas/POOR_IN200902UV.xsd\">\n" +
+ " <id root=\"2.16.156.10011.2.5.1.1\" extension=\"c8c67234-d026-479b-9f56-36127cb93772\"/>\n" +
+ " <creationTime value=\"" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + "\"/>\n" +
+ " <interactionId root=\"2.16.156.10011.2.5.1.2\" extension=\"\"/>\n" +
+ " <processingCode code=\"P\"/>\n" +
+ " <processingModeCode/>\n" +
+ " <acceptAckCode code=\"AL\"/>\n" +
+ " <receiver typeCode=\"RCV\">\n" +
+ " <device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
+ " <id>\n" +
+ " <item root=\"2.16.156.10011.2.5.1.3\" extension=\"\"/>\n" +
+ " </id>\n" +
+ " </device>\n" +
+ " </receiver>\n" +
+ " <sender typeCode=\"SND\">\n" +
+ " <device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
+ " <id>\n" +
+ " <item root=\"2.16.156.10011.2.5.1.3\" extension=\"\"/>\n" +
+ " </id>\n" +
+ " </device>\n" +
+ " </sender>\n" +
+ " <controlActProcess classCode=\"CACT\" moodCode=\"EVN\">\n" +
+ " <subject typeCode=\"SUBJ\" xsi:nil=\"false\">\n" +
+ " <placerGroup>\n" +
+ " <component2>\n" +
+ " <observationRequest classCode=\"OBS\">\n" +
+ " <id>\n" +
+ " <item extension=\"" + applyNo + "\" root=\"2.16.156.10011.1.24\"/>\n" +
+ " </id>\n" +
+ " <code/>\n" +
+ " <statusCode/>\n" +
+ " <effectiveTime xsi:type=\"IVL_TS\"/>\n" +
+ " <performer typeCode=\"PRF\">\n" +
+ " <time>\n" +
+ " <low value=\"" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + "\"/>\n" +
+ " </time>\n" +
+ " <assignedEntity classCode=\"ASSIGNED\">\n" +
+ " <id>\n" +
+ " <item extension=\"" + updater + "\" root=\"2.16.156.10011.1.4\"/>\n" +
+ " </id>\n" +
+ " <assignedPerson determinerCode=\"INSTANCE\" classCode=\"PSN\">\n" +
+ " <name xsi:type=\"BAG_EN\">\n" +
+ " <item>\n" +
+ " <part value=\"\"/>\n" +
+ " </item>\n" +
+ " </name>\n" +
+ " </assignedPerson>\n" +
+ " </assignedEntity>\n" +
+ " </performer>\n" +
+ " <location typeCode=\"LOC\" xsi:nil=\"false\">\n" +
+ " <time/>\n" +
+ " <serviceDeliveryLocation classCode=\"SDLOC\">\n" +
+ " <serviceProviderOrganization determinerCode=\"INSTANCE\" classCode=\"ORG\">\n" +
+ " <id>\n" +
+ " <item extension=\"" + patDeptCode + "\" root=\"2.16.156.10011.1.26\"/>\n" +
+ " </id>\n" +
+ " <name xsi:type=\"BAG_EN\">\n" +
+ " <item>\n" +
+ " <part value=\"" + patDeptName + "\"/>\n" +
+ " </item>\n" +
+ " </name>\n" +
+ " </serviceProviderOrganization>\n" +
+ " </serviceDeliveryLocation>\n" +
+ " </location>\n" +
+ " <component1 contextConductionInd=\"true\">\n" +
+ " <processStep classCode=\"PROC\">\n" +
+ " <code code=\"" + checkStatue + "\" codeSystem=\"2.16.156.10011. 2.5.1.12\">\n" +
+ " <displayName value=\"" + checkName + "\"/>\n" +
+ " <originalText value=\"\"/>\n" +
+ " </code>\n" +
+ " </processStep>\n" +
+ " </component1>\n" +
+ " </observationRequest>\n" +
+ " </component2>\n" +
+ " <componentOf1 contextConductionInd=\"false\" xsi:nil=\"false\" typeCode=\"COMP\">\n" +
+ " <encounter classCode=\"ENC\" moodCode=\"EVN\">\n" +
+ " <id>\n" +
+ " <item extension=\"\" root=\"2.16.156.10011.2.5.1.8\"/>\n" +
+ " <item extension=\"" + lsh + "\" root=\"2.16.156.10011.2.5.1.9\"/>\n" +
+ " </id>\n" +
+ " <code codeSystem=\"2.16.156.10011.2.3.1.271\" code=\"" + booksrc + "\">\n" +
+ " <displayName value=\"\"/>\n" +
+ " </code>\n" +
+ " <statusCode code=\"Active\"/>\n" +
+ " <subject typeCode=\"SBJ\">\n" +
+ " <patient classCode=\"PAT\">\n" +
+ " <id>\n" +
+ " <item root=\"2.16.156.10011.2.5.1.5\" extension=\"\"/>\n" +
+ " <item root=\"2.16.156.10011.2.5.1.4\" extension=\"" + patid + "\"/>\n" +
+ " <item root=\"2.16.156.10011.1.11\" extension=\"\"/>\n" +
+ " <item root=\"2.16.156.10011.1.12\" extension=\"\"/>\n" +
+ " </id>\n" +
+ " <patientPerson classCode=\"PSN\" determinerCode=\"INSTANCE\" xsi:nil=\"false\">\n" +
+ " <name xsi:type=\"DSET_EN\">\n" +
+ " <item>\n" +
+ " <part value=\"" + patName + "\"/>\n" +
+ " </item>\n" +
+ " </name>\n" +
+ " </patientPerson>\n" +
+ " </patient>\n" +
+ " </subject>\n" +
+ " <location typeCode=\"LOC\">\n" +
+ " <time/>\n" +
+ " <serviceDeliveryLocation classCode=\"SDLOC\">\n" +
+ " <location classCode=\"PLC\" determinerCode=\"INSTANCE\">\n" +
+ " <id>\n" +
+ " <item extension=\"\"/>\n" +
+ " </id>\n" +
+ " <name xsi:type=\"BAG_EN\">\n" +
+ " <item use=\"IDE\">\n" +
+ " <part value=\"" + patBedno + "\"/>\n" +
+ " </item>\n" +
+ " </name>\n" +
+ " <asLocatedEntityPartOf classCode=\"LOCE\">\n" +
+ " <location classCode=\"PLC\" determinerCode=\"INSTANCE\">\n" +
+ " <id>\n" +
+ " <item extension=\"null\"/>\n" +
+ " </id>\n" +
+ " <name xsi:type=\"BAG_EN\">\n" +
+ " <item use=\"IDE\">\n" +
+ " <part value=\"null\"/>\n" +
+ " </item>\n" +
+ " </name>\n" +
+ " </location>\n" +
+ " </asLocatedEntityPartOf>\n" +
+ " </location>\n" +
+ " <serviceProviderOrganization classCode=\"ORG\" determinerCode=\"INSTANCE\">\n" +
+ " <id>\n" +
+ " <item extension=\"" + patDeptCode + "\"/>\n" +
+ " </id>\n" +
+ " <name xsi:type=\"BAG_EN\">\n" +
+ " <item use=\"IDE\">\n" +
+ " <part value=\"" + patDeptName + "\"/>\n" +
+ " </item>\n" +
+ " </name>\n" +
+ " <asOrganizationPartOf classCode=\"PART\">\n" +
+ " <wholeOrganization classCode=\"ORG\" determinerCode=\"INSTANCE\">\n" +
+ " <id>\n" +
+ " <item extension=\"" + patWardCode + "\"/>\n" +
+ " </id>\n" +
+ " <name xsi:type=\"BAG_EN\">\n" +
+ " <item use=\"IDE\">\n" +
+ " <part value=\"" + patWardName + "\"/>\n" +
+ " </item>\n" +
+ " </name>\n" +
+ " </wholeOrganization>\n" +
+ " </asOrganizationPartOf>\n" +
+ " </serviceProviderOrganization>\n" +
+ " </serviceDeliveryLocation>\n" +
+ " </location>\n" +
+ " </encounter>\n" +
+ " </componentOf1>\n" +
+ " </placerGroup>\n" +
+ " </subject>\n" +
+ " </controlActProcess>\n" +
+ "</POOR_IN200902UV>";
+ System.out.println("-------------xml鐨勫�间负:" + xml);
+ return xml;
+ }
+
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
index 263b9a5..6ec2cc4 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -24,8 +24,10 @@
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
import cn.lihu.jh.module.ecg.feign.FeeConfirmFeignService;
import cn.lihu.jh.module.ecg.service.queue.QueueServiceTxFunctions;
-import cn.lihu.jh.module.ecg.webservice.client.JHFWWebServiceClient;
+import cn.lihu.jh.module.ecg.webservice.WebServiceClient;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -73,8 +75,11 @@
@Resource
CheckTypeMapper checkTypeMapper;
- @Resource
- private JHFWWebServiceClient jhfwWebServiceClient;
+ @Autowired
+ private WebServiceClient webServiceClient;
+
+ @Value("${spring.profiles.active}")
+ private String active;
@Override
@@ -156,6 +161,20 @@
procAffinityWhenRoutineFinish(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes());
}
+ //妫�鏌ュ畬鎴愬悗锛屾鏃舵鏌ョ櫥璁板啓鎴愪簡锛岄渶瑕佸皢杩欎釜鍥炲啓缁欓泦鎴愬钩鍙�(绾夸笂鐜鎵嶅洖鍐�)
+ if (active.equals("prod")) {
+ AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
+ ApplicationTemplate app = new ApplicationTemplate();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "3", "妫�鏌ョ櫥璁�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3");
+ }
+ }
+
return CommonResult.success(rent_id);
}
@@ -180,14 +199,19 @@
throw exception(DEVICE_NOT_FREE);
}
-// //璁惧棰嗗彇瀹屾垚鍚庯紝姝ゆ椂妫�鏌ョ櫥璁板啓鎴愪簡锛岄渶瑕佸皢杩欎釜鍥炲啓缁欓泦鎴愬钩鍙�
-// String action = "S0405";
-// String message = "";
-
-
-// jhfwWebServiceClient.callJHFWTYRK(action, message);
-
-
+ //璁惧棰嗗彇瀹屾垚鍚庯紝姝ゆ椂妫�鏌ョ櫥璁板啓鎴愪簡锛岄渶瑕佸皢杩欎釜鍥炲啓缁欓泦鎴愬钩鍙�(绾夸笂鐜鎵嶅洖鍐�)
+ if (active.equals("prod")) {
+ AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
+ ApplicationTemplate app = new ApplicationTemplate();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "3", "妫�鏌ョ櫥璁�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("webservice鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3");
+ }
+ }
List<Integer> jobTypeList = new ArrayList<Integer>();
jobTypeList.add(DevRentStateEnum.RECEIVED.getState());
jobTypeList.add(DevRentStateEnum.RECEIVED_CANCELLED.getState());
@@ -446,6 +470,19 @@
createReqVO.setState(DevRentStateEnum.ROUTINE_CANCELLED.getState());
updateDevRent(createReqVO);
+ if (active.equals("prod")) {
+ AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
+ ApplicationTemplate app = new ApplicationTemplate();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "4", "鍙栨秷妫�鏌�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ }
+ }
+
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId(rent_id);
jobRecordSaveReqVO.setDevId(null);
@@ -506,6 +543,20 @@
createReqVO.setState(DevRentStateEnum.RECEIVED_CANCELLED.getState());
updateDevRent(createReqVO);
+ if (active.equals("prod")) {
+ AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
+ ApplicationTemplate app = new ApplicationTemplate();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "4", "鍙栨秷妫�鏌�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ }
+ }
+
+
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId(rent_id);
jobRecordSaveReqVO.setDevId(null);
@@ -565,6 +616,19 @@
createReqVO.setId(rent_id);
createReqVO.setState(DevRentStateEnum.INSTALL_CANCELLED.getState());
updateDevRent(createReqVO);
+
+ if (active.equals("prod")) {
+ AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
+ ApplicationTemplate app = new ApplicationTemplate();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "4", "鍙栨秷妫�鏌�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ }
+ }
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId(rent_id);
@@ -886,6 +950,5 @@
return "01";
}
-
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/JHFWWebService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/JHFWWebService.java
deleted file mode 100644
index b830cad..0000000
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/JHFWWebService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.lihu.jh.module.ecg.webservice;
-
-import cn.lihu.jh.module.ecg.webservice.dto.JHFWRequest;
-import cn.lihu.jh.module.ecg.webservice.dto.JHFWResponse;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-/**
- * JHFW WebService鎺ュ彛
- */
-@WebService(targetNamespace = "urn:hl7-org:v3", name = "SAMPLEBSSoap")
-@XmlSeeAlso({JHFWRequest.class, JHFWResponse.class})
-public interface JHFWWebService {
-
- /**
- * JHFWTYRK鏂规硶
- *
- * @param request 璇锋眰鍙傛暟
- * @return 鍝嶅簲缁撴灉
- */
- @WebMethod(operationName = "JHFWTYRK", action = "urn:hl7-org:v3/ZHIP.JHFWTYRK.BS.JHFWTYRK.JHFWTYRK")
- @WebResult(name = "JHFWTYRKResult", targetNamespace = "urn:hl7-org:v3")
- @RequestWrapper(localName = "JHFWTYRK", targetNamespace = "urn:hl7-org:v3", className = "cn.lihu.jh.module.ecg.webservice.dto.JHFWRequest")
- @ResponseWrapper(localName = "JHFWTYRKResponse", targetNamespace = "urn:hl7-org:v3", className = "cn.lihu.jh.module.ecg.webservice.dto.JHFWResponse")
- JHFWResponse jhfwtyrk(@WebParam(name = "parameters", targetNamespace = "urn:hl7-org:v3") JHFWRequest request);
-}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/client/JHFWWebServiceClient.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/client/JHFWWebServiceClient.java
deleted file mode 100644
index 5fc9aad..0000000
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/client/JHFWWebServiceClient.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package cn.lihu.jh.module.ecg.webservice.client;
-
-import cn.lihu.jh.module.ecg.webservice.JHFWWebService;
-import cn.lihu.jh.module.ecg.webservice.dto.JHFWRequest;
-import cn.lihu.jh.module.ecg.webservice.dto.JHFWResponse;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.springframework.stereotype.Component;
-
-/**
- * JHFW WebService瀹㈡埛绔�
- */
-@Slf4j
-@Component
-public class JHFWWebServiceClient {
-
- private static final String WSDL_URL = "http://10.0.4.36/ZHIP/Service/ZHIP.JHFWTYRK.BS.JHFWTYRK.cls?wsdl";
- private final JHFWWebService webService;
-
- public JHFWWebServiceClient() {
- JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
- factory.setServiceClass(JHFWWebService.class);
- factory.setAddress(WSDL_URL);
- this.webService = (JHFWWebService) factory.create();
- }
-
- /**
- * 璋冪敤JHFWTYRK鏂规硶
- *
- * @param action 鎿嶄綔绫诲瀷
- * @param message 娑堟伅鍐呭
- * @return 鍝嶅簲缁撴灉
- */
- public String callJHFWTYRK(String action, String message) {
- try {
- JHFWRequest request = new JHFWRequest();
- JHFWRequest.JHFWreq req = new JHFWRequest.JHFWreq();
- req.setAction(action);
- req.setRdn("");
- req.setMessage(message);
- request.setReq(req);
-
- JHFWResponse response = webService.jhfwtyrk(request);
- return response.getResult();
- } catch (Exception e) {
- log.error("[callJHFWTYRK][璋冪敤澶辫触 action({}) message({})]", action, message, e);
- throw new RuntimeException("璋冪敤WebService澶辫触", e);
- }
- }
-}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/dto/JHFWRequest.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/dto/JHFWRequest.java
deleted file mode 100644
index 6916c70..0000000
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/dto/JHFWRequest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.lihu.jh.module.ecg.webservice.dto;
-
-import lombok.Data;
-
-import javax.xml.bind.annotation.*;
-
-/**
- * JHFW璇锋眰瀵硅薄
- */
-@Data
-@XmlRootElement(name = "JHFWTYRK", namespace = "urn:hl7-org:v3")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class JHFWRequest {
-
- @XmlElement(name = "req", namespace = "urn:hl7-org:v3")
- private JHFWreq req;
-
- @Data
- @XmlAccessorType(XmlAccessType.FIELD)
- public static class JHFWreq {
- @XmlElement(name = "action", namespace = "urn:hl7-org:v3")
- private String action;
-
- @XmlElement(name = "rdn", namespace = "urn:hl7-org:v3")
- private String rdn;
-
- @XmlElement(name = "message", namespace = "urn:hl7-org:v3")
- private String message;
- }
-}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/dto/JHFWResponse.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/dto/JHFWResponse.java
deleted file mode 100644
index a22d9ec..0000000
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/dto/JHFWResponse.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.lihu.jh.module.ecg.webservice.dto;
-
-import lombok.Data;
-
-import javax.xml.bind.annotation.*;
-
-/**
- * JHFW鍝嶅簲瀵硅薄
- */
-@Data
-@XmlRootElement(name = "JHFWTYRKResponse", namespace = "urn:hl7-org:v3")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class JHFWResponse {
-
- @XmlElement(name = "JHFWTYRKResult", namespace = "urn:hl7-org:v3")
- private String result;
-}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsMessagebody.class b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsMessagebody.class
new file mode 100644
index 0000000..dc611eb
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsMessagebody.class
Binary files differ
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsMessagebody.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsMessagebody.java
new file mode 100644
index 0000000..ea11a74
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsMessagebody.java
@@ -0,0 +1,18 @@
+
+package cn.lihu.jh.module.ecg.webservice.ws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Ens_Messagebody")
+@XmlSeeAlso({
+ EnsRequest.class
+})
+public class EnsMessagebody {
+
+
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsRequest.class b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsRequest.class
new file mode 100644
index 0000000..052c48c
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsRequest.class
Binary files differ
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsRequest.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsRequest.java
new file mode 100644
index 0000000..8989f2d
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/EnsRequest.java
@@ -0,0 +1,20 @@
+
+package cn.lihu.jh.module.ecg.webservice.ws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Ens_Request")
+@XmlSeeAlso({
+ JHFWreq.class
+})
+public class EnsRequest
+ extends EnsMessagebody
+{
+
+
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRK.class b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRK.class
new file mode 100644
index 0000000..82a8201
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRK.class
Binary files differ
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRK.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRK.java
new file mode 100644
index 0000000..2e7e1a5
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRK.java
@@ -0,0 +1,29 @@
+
+package cn.lihu.jh.module.ecg.webservice.ws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "req"
+})
+@XmlRootElement(name = "JHFWTYRK")
+public class JHFWTYRK {
+
+ protected JHFWreq req;
+
+
+ public JHFWreq getReq() {
+ return req;
+ }
+
+
+ public void setReq(JHFWreq value) {
+ this.req = value;
+ }
+
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRKResponse.class b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRKResponse.class
new file mode 100644
index 0000000..314c019
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRKResponse.class
Binary files differ
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRKResponse.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRKResponse.java
new file mode 100644
index 0000000..03af10d
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWTYRKResponse.java
@@ -0,0 +1,31 @@
+
+package cn.lihu.jh.module.ecg.webservice.ws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "jhfwtyrkResult"
+})
+@XmlRootElement(name = "JHFWTYRKResponse")
+public class JHFWTYRKResponse {
+
+ @XmlElement(name = "JHFWTYRKResult", required = true)
+ protected String jhfwtyrkResult;
+
+
+ public String getJHFWTYRKResult() {
+ return jhfwtyrkResult;
+ }
+
+
+ public void setJHFWTYRKResult(String value) {
+ this.jhfwtyrkResult = value;
+ }
+
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWreq.class b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWreq.class
new file mode 100644
index 0000000..51909d9
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWreq.class
Binary files differ
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWreq.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWreq.java
new file mode 100644
index 0000000..363d257
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/JHFWreq.java
@@ -0,0 +1,95 @@
+
+package cn.lihu.jh.module.ecg.webservice.ws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "JHFWreq", propOrder = {
+ "action",
+ "rdn",
+ "message"
+})
+public class JHFWreq
+ extends EnsRequest
+{
+
+ protected String action;
+ protected String rdn;
+ protected String message;
+
+ /**
+ * 锟斤拷取action锟斤拷锟皆碉拷值锟斤拷
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getAction() {
+ return action;
+ }
+
+ /**
+ * 锟斤拷锟斤拷action锟斤拷锟皆碉拷值锟斤拷
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setAction(String value) {
+ this.action = value;
+ }
+
+ /**
+ * 锟斤拷取rdn锟斤拷锟皆碉拷值锟斤拷
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getRdn() {
+ return rdn;
+ }
+
+ /**
+ * 锟斤拷锟斤拷rdn锟斤拷锟皆碉拷值锟斤拷
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setRdn(String value) {
+ this.rdn = value;
+ }
+
+ /**
+ * 锟斤拷取message锟斤拷锟皆碉拷值锟斤拷
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getMessage() {
+ return message;
+ }
+
+ /**
+ * 锟斤拷锟斤拷message锟斤拷锟皆碉拷值锟斤拷
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setMessage(String value) {
+ this.message = value;
+ }
+
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/ObjectFactory.class b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/ObjectFactory.class
new file mode 100644
index 0000000..c0c8573
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/ObjectFactory.class
Binary files differ
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/ObjectFactory.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/ObjectFactory.java
new file mode 100644
index 0000000..1028444
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/ObjectFactory.java
@@ -0,0 +1,72 @@
+
+package cn.lihu.jh.module.ecg.webservice.ws;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the cn.lihu.jh.module.ecg.webservice.ws package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: cn.lihu.jh.module.ecg.webservice.ws
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link JHFWTYRK }
+ *
+ */
+ public JHFWTYRK createJHFWTYRK() {
+ return new JHFWTYRK();
+ }
+
+ /**
+ * Create an instance of {@link JHFWreq }
+ *
+ */
+ public JHFWreq createJHFWreq() {
+ return new JHFWreq();
+ }
+
+ /**
+ * Create an instance of {@link JHFWTYRKResponse }
+ *
+ */
+ public JHFWTYRKResponse createJHFWTYRKResponse() {
+ return new JHFWTYRKResponse();
+ }
+
+ /**
+ * Create an instance of {@link EnsMessagebody }
+ *
+ */
+ public EnsMessagebody createEnsMessagebody() {
+ return new EnsMessagebody();
+ }
+
+ /**
+ * Create an instance of {@link EnsRequest }
+ *
+ */
+ public EnsRequest createEnsRequest() {
+ return new EnsRequest();
+ }
+
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020.class b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020.class
new file mode 100644
index 0000000..3d666ae
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020.class
Binary files differ
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020.java
new file mode 100644
index 0000000..ae16f8e
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020.java
@@ -0,0 +1,94 @@
+
+package cn.lihu.jh.module.ecg.webservice.ws;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.2.9-b130926.1035
+ * Generated source version: 2.2
+ *
+ */
+@WebServiceClient(name = " SAMPLEBS ", targetNamespace = "urn:hl7-org:v3", wsdlLocation = "http://10.0.4.36/ZHIP/Service/ZHIP.JHFWTYRK.BS.JHFWTYRK.cls?wsdl")
+public class _0020SAMPLEBS_0020
+ extends Service
+{
+
+ private final static URL _0020SAMPLEBS_0020_WSDL_LOCATION;
+ private final static WebServiceException _0020SAMPLEBS_0020_EXCEPTION;
+ private final static QName _0020SAMPLEBS_0020_QNAME = new QName("urn:hl7-org:v3", " SAMPLEBS ");
+
+ static {
+ URL url = null;
+ WebServiceException e = null;
+ try {
+ url = new URL("http://10.0.4.36/ZHIP/Service/ZHIP.JHFWTYRK.BS.JHFWTYRK.cls?wsdl");
+ } catch (MalformedURLException ex) {
+ e = new WebServiceException(ex);
+ }
+ _0020SAMPLEBS_0020_WSDL_LOCATION = url;
+ _0020SAMPLEBS_0020_EXCEPTION = e;
+ }
+
+ public _0020SAMPLEBS_0020() {
+ super(__getWsdlLocation(), _0020SAMPLEBS_0020_QNAME);
+ }
+
+ public _0020SAMPLEBS_0020(WebServiceFeature... features) {
+ super(__getWsdlLocation(), _0020SAMPLEBS_0020_QNAME, features);
+ }
+
+ public _0020SAMPLEBS_0020(URL wsdlLocation) {
+ super(wsdlLocation, _0020SAMPLEBS_0020_QNAME);
+ }
+
+ public _0020SAMPLEBS_0020(URL wsdlLocation, WebServiceFeature... features) {
+ super(wsdlLocation, _0020SAMPLEBS_0020_QNAME, features);
+ }
+
+ public _0020SAMPLEBS_0020(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public _0020SAMPLEBS_0020(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+ super(wsdlLocation, serviceName, features);
+ }
+
+ /**
+ *
+ * @return
+ * returns _0020SAMPLEBS_0020Soap
+ */
+ @WebEndpoint(name = " SAMPLEBS Soap")
+ public _0020SAMPLEBS_0020Soap get_0020SAMPLEBS_0020Soap() {
+ return super.getPort(new QName("urn:hl7-org:v3", " SAMPLEBS Soap"), _0020SAMPLEBS_0020Soap.class);
+ }
+
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns _0020SAMPLEBS_0020Soap
+ */
+ @WebEndpoint(name = " SAMPLEBS Soap")
+ public _0020SAMPLEBS_0020Soap get_0020SAMPLEBS_0020Soap(WebServiceFeature... features) {
+ return super.getPort(new QName("urn:hl7-org:v3", " SAMPLEBS Soap"), _0020SAMPLEBS_0020Soap.class, features);
+ }
+
+ private static URL __getWsdlLocation() {
+ if (_0020SAMPLEBS_0020_EXCEPTION!= null) {
+ throw _0020SAMPLEBS_0020_EXCEPTION;
+ }
+ return _0020SAMPLEBS_0020_WSDL_LOCATION;
+ }
+
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020Soap.class b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020Soap.class
new file mode 100644
index 0000000..3145557
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020Soap.class
Binary files differ
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020Soap.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020Soap.java
new file mode 100644
index 0000000..07a3f77
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/_0020SAMPLEBS_0020Soap.java
@@ -0,0 +1,40 @@
+
+package cn.lihu.jh.module.ecg.webservice.ws;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.2.9-b130926.1035
+ * Generated source version: 2.2
+ *
+ */
+@WebService(name = " SAMPLEBS Soap", targetNamespace = "urn:hl7-org:v3")
+@XmlSeeAlso({
+ ObjectFactory.class
+})
+public interface _0020SAMPLEBS_0020Soap {
+
+
+ /**
+ *
+ * @param req
+ * @return
+ * returns java.lang.String
+ */
+ @WebMethod(operationName = "JHFWTYRK", action = "urn:hl7-org:v3/ZHIP.JHFWTYRK.BS.JHFWTYRK.JHFWTYRK")
+ @WebResult(name = "JHFWTYRKResult", targetNamespace = "urn:hl7-org:v3")
+ @RequestWrapper(localName = "JHFWTYRK", targetNamespace = "urn:hl7-org:v3", className = "cn.lihu.jh.module.ecg.webservice.ws.JHFWTYRK")
+ @ResponseWrapper(localName = "JHFWTYRKResponse", targetNamespace = "urn:hl7-org:v3", className = "cn.lihu.jh.module.ecg.webservice.ws.JHFWTYRKResponse")
+ public String jhfwtyrk(
+ @WebParam(name = "req", targetNamespace = "urn:hl7-org:v3")
+ JHFWreq req);
+
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/package-info.class b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/package-info.class
new file mode 100644
index 0000000..ce3dfdf
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/package-info.class
Binary files differ
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/package-info.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/package-info.java
new file mode 100644
index 0000000..fd8c474
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/webservice/ws/package-info.java
@@ -0,0 +1,2 @@
+@javax.xml.bind.annotation.XmlSchema(namespace = "urn:hl7-org:v3", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package cn.lihu.jh.module.ecg.webservice.ws;
diff --git a/jh-server/src/main/resources/application.yaml b/jh-server/src/main/resources/application.yaml
index 54a1011..2766ce4 100644
--- a/jh-server/src/main/resources/application.yaml
+++ b/jh-server/src/main/resources/application.yaml
@@ -3,8 +3,8 @@
name: jh-server
profiles:
-# active: prod
- active: stage
+ active: prod
+# active: stage
main:
allow-circular-references: true # 鍏佽寰幆渚濊禆锛屽洜涓洪」鐩槸涓夊眰鏋舵瀯锛屾棤娉曢伩鍏嶈繖涓儏鍐点��
--
Gitblit v1.9.3