From ac10b5157102e630139505d385399c183d890ea5 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 20 Dec 2023 22:50:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=8F=E5=AE=89=EF=BC=8C=E9=95=BF=E6=B3=B0?= =?UTF-8?q?=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 34 ++++- .../glxp/mipsdl/client/zaxyy/ZaxyyClient.java | 2 +- .../ctqyy/BasicSkPrescribeItemEntity.java | 117 ++++++++++++++++++ .../entity/thrsys/ThrProductsEntity.java | 52 +++----- .../res/udiwms/BasicSkPrescribeResponse.java | 6 +- 5 files changed, 171 insertions(+), 40 deletions(-) create mode 100644 src/main/java/com/glxp/mipsdl/entity/ctqyy/BasicSkPrescribeItemEntity.java 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 ada309a..7f9c722 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -31,6 +31,7 @@ import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity; import com.glxp.mipsdl.entity.basic.BasicCorpEntity; import com.glxp.mipsdl.entity.basic.BasicProductsEntity; import com.glxp.mipsdl.entity.basic.BasicUdirelEntity; +import com.glxp.mipsdl.entity.ctqyy.BasicSkPrescribeItemEntity; import com.glxp.mipsdl.entity.ctqyy.MaterialDictEntity; import com.glxp.mipsdl.entity.ctqyy.PriceClassEntity; import com.glxp.mipsdl.entity.ctqyy.ThrHslbEntity; @@ -66,6 +67,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; @Slf4j @@ -286,7 +289,7 @@ public class CtqyyClient extends CommonHttpClient { */ public BaseResponse getSickInfo(GetSickRequest getSickRequest) { CtqyyRequest ctqyyRequest = new CtqyyRequest(); - ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict")); + ctqyyRequest.setMsgHeader(getMsgHeader("getSickVisitInfo")); ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(getSickRequest)); String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URI_GET_SICKER), ctqyyRequest); response = parserResult(response); @@ -294,9 +297,9 @@ public class CtqyyClient extends CommonHttpClient { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); Map map = (Map) baseResponse.getData(); List basicSkSickerResponses = JSON.parseArray(map.get("list") + "", BasicSkSickerResponse.class); - for (BasicSkSickerResponse productsResponse : basicSkSickerResponses) { - - } +// for (BasicSkSickerResponse productsResponse : basicSkSickerResponses) { +// +// } map.put("list", JSON.toJSON(basicSkSickerResponses)); baseResponse.setData(""); baseResponse.setData(map); @@ -316,7 +319,7 @@ public class CtqyyClient extends CommonHttpClient { */ public BaseResponse getSickPescribe(GetSickPrescribeRequest getSickPrescribeRequest) { CtqyyRequest ctqyyRequest = new CtqyyRequest(); - ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict")); + ctqyyRequest.setMsgHeader(getMsgHeader("getResiPresInfo")); ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(getSickPrescribeRequest)); String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URI_GET_SICKER_PRESCIRBE), ctqyyRequest); response = parserResult(response); @@ -325,7 +328,12 @@ public class CtqyyClient extends CommonHttpClient { Map map = (Map) baseResponse.getData(); List basicSkPrescribeResponses = JSON.parseArray(map.get("list") + "", BasicSkPrescribeResponse.class); for (BasicSkPrescribeResponse basicSkPrescribeResponse : basicSkPrescribeResponses) { - + List itemEntities = basicSkPrescribeResponse.getItemList(); + if (CollUtil.isNotEmpty(itemEntities)) { + for (BasicSkPrescribeItemEntity itemEntity : itemEntities) { + itemEntity.setCount("0"); + } + } } map.put("list", JSON.toJSON(basicSkPrescribeResponses)); baseResponse.setData(""); @@ -339,6 +347,20 @@ public class CtqyyClient extends CommonHttpClient { } +// public String getStrConut(String str) { +// if (StrUtil.isNotEmpty(str)) { +// return "0"; +// } +// Pattern pattern = Pattern.compile("\\d+"); +// Matcher matcher = pattern.matcher(str); +// String strCount = ""; +// while (matcher.find()) { +// strCount = strCount + matcher.group(); +// } +// return strCount; +// } + + /** * 获取项目组套字典 * diff --git a/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java b/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java index fe71c11..f57b940 100644 --- a/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java @@ -196,7 +196,7 @@ public class ZaxyyClient extends CommonHttpClient { ZaZyRequest zaZyRequest = new ZaZyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialType")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsBusTypeRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_BUS_TYPE_QUERY_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_BUS_TYPE_QUERY_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/BasicSkPrescribeItemEntity.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/BasicSkPrescribeItemEntity.java new file mode 100644 index 0000000..32d3100 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/BasicSkPrescribeItemEntity.java @@ -0,0 +1,117 @@ +package com.glxp.mipsdl.entity.ctqyy; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 处方用药信息表 + * + * @TableName basic_sk_prescribe_item + */ +@TableName(value = "basic_sk_prescribe_item") +@Data +public class BasicSkPrescribeItemEntity implements Serializable { + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 第三方id + */ + @TableField(value = "thrId") + private String thrId; + + /** + * 患者编码 + */ + @TableField(value = "sickerCode") + private String sickerCode; + + /** + * 处方编码 + */ + @TableField(value = "prescribeCode") + private String prescribeCode; + + /** + * 耗材产品id + */ + @TableField(value = "relId") + private Long relId; + + /** + * 名称 + */ + @TableField(value = "itemName") + private String itemName; + + /** + * 编码 + */ + @TableField(value = "itemCode") + private String itemCode; + + /** + * 计量数量 + */ + @TableField(value = "measureCount") + private String measureCount; + + /** + * 计量单位 + */ + @TableField(value = "measureUnit") + private String measureUnit; + + /** + * 类别 + */ + @TableField(value = "category") + private String category; + + /** + * 频率 + */ + @TableField(value = "frequency") + private String frequency; + + /** + * 数量 + */ + @TableField(value = "count") + private String count; + + /** + * 单价 + */ + @TableField(value = "price") + private BigDecimal price; + + /** + * 总价 + */ + @TableField(value = "amount") + private BigDecimal amount; + + /** + * 规格型号 + */ + @TableField(value = "ggxh") + private String ggxh; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrProductsEntity.java b/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrProductsEntity.java index bb50888..64c4ecf 100644 --- a/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrProductsEntity.java +++ b/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrProductsEntity.java @@ -19,181 +19,157 @@ public class ThrProductsEntity extends Model { /** * 产品编码 */ - @TableField(value = "code") private String code; /** * 通用名称 */ - @TableField(value = "`name`") private String name; /** * 计量单位 */ - @TableField(value = "measname") private String measname; - @TableField(value = "spec") private String spec; /** * 注册证号 */ - @TableField(value = "registerNo") + @TableField("registerNo") private String registerNo; /** * 生产厂家 */ - @TableField(value = "manufactory") private String manufactory; - @TableField(value = "thirdSysFk") + @TableField("thirdSysFk") private String thirdSysFk; /** * 产品类别 */ - @TableField(value = "cplb") private String cplb; /** * 分类编码 */ - @TableField(value = "flbm") private String flbm; /** * 器械类别 */ - @TableField(value = "qxlb") private String qxlb; /** * 医保编码 */ - @TableField(value = "ybbm") private String ybbm; /** * 商品条码 */ - @TableField(value = "sptm") private String sptm; /** * 注册人社会信用号 */ - @TableField(value = "tyshxydm") private String tyshxydm; /** * 注册证 备案证号 */ - @TableField(value = "zczbhhzbapzbh") private String zczbhhzbapzbh; /** * 注册/备案人名称 */ - @TableField(value = "ylqxzcrbarmc") private String ylqxzcrbarmc; /** * 注册/备案人英文名称 */ - @TableField(value = "ylqxzcrbarywmc") private String ylqxzcrbarywmc; /** * 产品描述 */ - @TableField(value = "cpms") private String cpms; /** * 更新时间 */ - @TableField(value = "updateTime") + @TableField("updateTime") private Date updateTime; /** * 供应商名称 */ - @TableField(value = "supName") + @TableField("supName") private String supName; /** * 型号 */ - @TableField(value = "model") private String model; /** * 规格型号（规格型号二合一字段） */ - @TableField(value = "`standard`") private String standard; /** * 其他编码 */ - @TableField(value = "qtbm") private String qtbm; /** * 注册证有效期截止时间 */ - @TableField(value = "zczyxqz") private String zczyxqz; /** * 备注 备注字段暂未启用，为保留字段 */ - @TableField(value = "remark") private String remark; /** * 备注1 */ - @TableField(value = "remark1") private String remark1; /** * 备注2 */ - @TableField(value = "remark2") private String remark2; /** * 备注3 */ - @TableField(value = "remark3") private String remark3; /** * 价格 */ - @TableField(value = "price") private String price; /** * 创建人 */ - @TableField(value = "`createUser`") + @TableField("createUser") private String createUser; /** * 创建时间 */ - @TableField(value = "createTime") + @TableField("createTime") private Date createTime; /** * 更新人 */ - @TableField(value = "updateUser") + @TableField("updateUser") private String updateUser; /** @@ -208,4 +184,16 @@ public class ThrProductsEntity extends Model { @TableField("supCode") private String supCode; -} \ No newline at end of file + @TableField("type") + private Integer type; + + @TableField(exist = false) + private String createByName; + + /** + * 处方项目字典 + */ + @TableField("prcitmcode") + private String prcitmcode; + +} diff --git a/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkPrescribeResponse.java b/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkPrescribeResponse.java index 8ef9898..a848536 100644 --- a/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkPrescribeResponse.java +++ b/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkPrescribeResponse.java @@ -1,9 +1,11 @@ package com.glxp.mipsdl.res.udiwms; +import com.glxp.mipsdl.entity.ctqyy.BasicSkPrescribeItemEntity; import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; @Data public class BasicSkPrescribeResponse { @@ -16,7 +18,7 @@ public class BasicSkPrescribeResponse { /** * 病人编码 */ - private String sickerCode; + private String sickCode; /** * 开方时间 @@ -69,5 +71,7 @@ public class BasicSkPrescribeResponse { */ private LocalDateTime updateTime; + private List itemList; + }