From 728e2162ad1f41c3b8b2d3cc52eca615968d940d Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 9 Apr 2024 11:00:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=8B=E8=BD=BD=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/mipsdl/client/ctqyy/CtqyyClient.java | 6 ++++++ .../mipsdl/client/ctqyy/entity/InvResultEntity.java | 9 +++++++++ .../glxp/mipsdl/res/udiwms/ThrInvResultResponse.java | 11 +++++++++++ 3 files changed, 26 insertions(+) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 3953327..6edbdf0 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -773,6 +773,12 @@ public class CtqyyClient extends CommonHttpClient { thrInvResultResponse.setType("1"); thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + ""); thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + ""); + + thrInvResultResponse.setSickerCode(ptxhInvResponse.getVisitNo()); + thrInvResultResponse.setSickerName(ptxhInvResponse.getSickName()); + thrInvResultResponse.setChargeTime(ptxhInvResponse.getFeeTime()); + thrInvResultResponse.setChargeUser(ptxhInvResponse.getFeeUper()); + thrInvResultResponses.add(thrInvResultResponse); } } diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java index 9e1f0df..ab99612 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java @@ -57,4 +57,13 @@ public class InvResultEntity { private String factoryCode; @JsonProperty("factoryName") private String factoryName; + + @JsonProperty("visitNo") + private String visitNo; + @JsonProperty("sickName") + private String sickName; + @JsonProperty("feeTime") + private String feeTime; + @JsonProperty("feeUper") + private String feeUper; } diff --git a/src/main/java/com/glxp/mipsdl/res/udiwms/ThrInvResultResponse.java b/src/main/java/com/glxp/mipsdl/res/udiwms/ThrInvResultResponse.java index 440c50b..b028a39 100644 --- a/src/main/java/com/glxp/mipsdl/res/udiwms/ThrInvResultResponse.java +++ b/src/main/java/com/glxp/mipsdl/res/udiwms/ThrInvResultResponse.java @@ -170,4 +170,15 @@ public class ThrInvResultResponse { * 患者名称 */ private String sickerName; + + /** + * 收费时间 + */ + private String chargeTime; + + /** + * 收费人员 + */ + private String chargeUser; + } From be59f9845b87fcb18b2e59bfdb6522aaf6f4cbf1 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 9 Apr 2024 11:44:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=8B=E8=BD=BD=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/mipsdl/client/ctqyy/CtqyyClient.java | 11 +++++------ .../mipsdl/client/ctqyy/entity/InvResultEntity.java | 9 --------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 6edbdf0..0a6f18e 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -773,12 +773,6 @@ public class CtqyyClient extends CommonHttpClient { thrInvResultResponse.setType("1"); thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + ""); thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + ""); - - thrInvResultResponse.setSickerCode(ptxhInvResponse.getVisitNo()); - thrInvResultResponse.setSickerName(ptxhInvResponse.getSickName()); - thrInvResultResponse.setChargeTime(ptxhInvResponse.getFeeTime()); - thrInvResultResponse.setChargeUser(ptxhInvResponse.getFeeUper()); - thrInvResultResponses.add(thrInvResultResponse); } } @@ -841,6 +835,11 @@ public class CtqyyClient extends CommonHttpClient { // else // thrInvResultResponse.setInvCode(ptxhInvResponse.getInDept()); + thrInvResultResponse.setSickerCode(ptxhInvResponse.getVisitNo()); + thrInvResultResponse.setSickerName(ptxhInvResponse.getSickName()); + thrInvResultResponse.setChargeTime(ptxhInvResponse.getFeeTime()); + thrInvResultResponse.setChargeUser(ptxhInvResponse.getFeeOper()); + thrInvResultResponse.setInvCode("1000003"); thrInvResultResponse.setDeptCode("1002"); thrInvResultResponse.setSickerCode(ptxhInvResponse.getVisitNo()); diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java index ab99612..9e1f0df 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java @@ -57,13 +57,4 @@ public class InvResultEntity { private String factoryCode; @JsonProperty("factoryName") private String factoryName; - - @JsonProperty("visitNo") - private String visitNo; - @JsonProperty("sickName") - private String sickName; - @JsonProperty("feeTime") - private String feeTime; - @JsonProperty("feeUper") - private String feeUper; }