From 534752f3327233e6c8dcaa75b0b3c922cb8bce0e Mon Sep 17 00:00:00 2001 From: zane Date: Thu, 29 Aug 2024 15:58:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E8=A7=86=E5=9B=BE=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/BaseHttpClient.java | 15 ++ .../glxp/mipsdl/client/CommonHttpClient.java | 10 + .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 170 ++++++++++++--- .../com/glxp/mipsdl/constant/Constants.java | 10 + .../mipsdl/controller/UdiWmsController.java | 21 ++ .../mipsdl/entity/ctqyy/PhysicDictEntity.java | 33 +++ .../mipsdl/entity/ctqyy/PlanInfoEntity.java | 52 +++++ .../mipsdl/entity/ctqyy/PresInfoEntity.java | 41 ++++ .../entity/thrsys/ThrOrderDetailEntity.java | 130 ++++++++++++ .../base/UdiwmsBasicSkPrescribeRequest.java | 116 ++++++++++ .../mipsdl/req/base/UdiwmsProductRequest.java | 17 ++ .../req/base/UdiwmsThrOrderRequest.java | 193 +++++++++++++++++ .../mipsdl/res/ctqyy/ThrOrderResponse.java | 199 ++++++++++++++++++ .../thirddao/ctqyy/PhysicDictMapper.java | 16 ++ .../mipsdl/thirddao/ctqyy/PlanInfoMapper.java | 13 ++ .../mipsdl/thirddao/ctqyy/PresInfoMapper.java | 13 ++ src/main/resources/application-dev.yml | 9 + .../mapper/other/ctqyy/PhysicDictMapper.xml | 5 + .../mapper/other/ctqyy/PlanInfoMapper.xml | 5 + .../mapper/other/ctqyy/PresInfoMapper.xml | 5 + 20 files changed, 1038 insertions(+), 35 deletions(-) create mode 100644 src/main/java/com/glxp/mipsdl/entity/ctqyy/PhysicDictEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/entity/ctqyy/PlanInfoEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/entity/ctqyy/PresInfoEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/entity/thrsys/ThrOrderDetailEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java create mode 100644 src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java create mode 100644 src/main/java/com/glxp/mipsdl/res/ctqyy/ThrOrderResponse.java create mode 100644 src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PhysicDictMapper.java create mode 100644 src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PlanInfoMapper.java create mode 100644 src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PresInfoMapper.java create mode 100644 src/main/resources/mybatis/mapper/other/ctqyy/PhysicDictMapper.xml create mode 100644 src/main/resources/mybatis/mapper/other/ctqyy/PlanInfoMapper.xml create mode 100644 src/main/resources/mybatis/mapper/other/ctqyy/PresInfoMapper.xml diff --git a/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java b/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java index 9ad4684..a2bf8f8 100644 --- a/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java @@ -265,4 +265,19 @@ public interface BaseHttpClient { * @return */ BaseResponse queryUdiInvOutScanCode(ForInvOutScanCodeFilter forInvOutScanCodeFilter); + + /** + * 处方 + * @param udiwmsBasicSkPrescribeRequest + * @return + */ + BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); + + /** + * 采购计划 + * @param udiwmsThrOrderRequest + * @return + */ + BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest); + } diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java index 9a5bbe2..f0fa86c 100644 --- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java @@ -295,4 +295,14 @@ public abstract class CommonHttpClient implements BaseHttpClient { public BaseResponse getInvFeeResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) { return null; } + + @Override + public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { + return null; + } + + @Override + public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) { + return null; + } } 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 d3ba175..56c30af 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -31,15 +31,9 @@ import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao; import com.glxp.mipsdl.entity.auth.AuthUserEntity; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; import com.glxp.mipsdl.entity.basic.*; -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; +import com.glxp.mipsdl.entity.ctqyy.*; import com.glxp.mipsdl.entity.inout.*; -import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; -import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity; -import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity; +import com.glxp.mipsdl.entity.thrsys.*; import com.glxp.mipsdl.http.HttpClient; import com.glxp.mipsdl.req.base.*; import com.glxp.mipsdl.req.base.forthird.ForInvProductsFilter; @@ -50,12 +44,16 @@ import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest; import com.glxp.mipsdl.res.BaseResponse; import com.glxp.mipsdl.res.PageSimpleResponse; import com.glxp.mipsdl.res.ctqyy.CtBaseResponse; +import com.glxp.mipsdl.res.ctqyy.ThrOrderResponse; import com.glxp.mipsdl.res.udiwms.*; import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.order.OrderUploadLogService; import com.glxp.mipsdl.service.system.SysParamConfigService; import com.glxp.mipsdl.service.thrsys.ThrCorpService; import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService; +import com.glxp.mipsdl.thirddao.ctqyy.PhysicDictMapper; +import com.glxp.mipsdl.thirddao.ctqyy.PlanInfoMapper; +import com.glxp.mipsdl.thirddao.ctqyy.PresInfoMapper; import com.glxp.mipsdl.util.*; import lombok.extern.slf4j.Slf4j; import org.dom4j.Document; @@ -116,6 +114,13 @@ public class CtqyyClient extends CommonHttpClient { BasicProductsDao basicProductsDao; @Resource private OrderUploadLogService orderUploadLogService; + @Resource + private PhysicDictMapper physicDictMapper; + @Resource + private PresInfoMapper presInfoMapper; + @Resource + private PlanInfoMapper planInfoMapper; + /** * 拼接xml请求头 @@ -185,39 +190,71 @@ public class CtqyyClient extends CommonHttpClient { } } - + /** + * 器械从三方拉取 + * 药品从视图拉取 + * @param udiwmsProductRequest + * @return + */ @Override public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) { - CtqyyRequest ctqyyRequest = new CtqyyRequest(); - ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict")); - ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PI_QUERY_URL), ctqyyRequest); - response = parserResult(response); - try { - BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - Map map = (Map) baseResponse.getData(); - List zzzyyProductsResponse = JSON.parseArray(map.get("list") + "", ZzzyyProductsResponse.class); - for (ZzzyyProductsResponse productsResponse : zzzyyProductsResponse) { - //判断要是规格和型号一致就是取规格 不一致就合并 - if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isNotEmpty(productsResponse.getStandard())) { - if (productsResponse.getModel_number().equals(productsResponse.getStandard())) { - productsResponse.setStandard(productsResponse.getStandard()); - } else { - productsResponse.setStandard(productsResponse.getStandard() + productsResponse.getModel_number()); + if(udiwmsProductRequest.getMedicalType().equals(Constants.MEDICAL_TYPE_DEVICE)){ + CtqyyRequest ctqyyRequest = new CtqyyRequest(); + ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict")); + ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest)); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PI_QUERY_URL), ctqyyRequest); + response = parserResult(response); + try { + BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); + Map map = (Map) baseResponse.getData(); + List zzzyyProductsResponse = JSON.parseArray(map.get("list") + "", ZzzyyProductsResponse.class); + for (ZzzyyProductsResponse productsResponse : zzzyyProductsResponse) { + //判断要是规格和型号一致就是取规格 不一致就合并 + if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isNotEmpty(productsResponse.getStandard())) { + if (productsResponse.getModel_number().equals(productsResponse.getStandard())) { + productsResponse.setStandard(productsResponse.getStandard()); + } else { + productsResponse.setStandard(productsResponse.getStandard() + productsResponse.getModel_number()); + } + } else if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isBlank(productsResponse.getStandard())) { + productsResponse.setStandard(productsResponse.getModel_number()); } - } else if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isBlank(productsResponse.getStandard())) { - productsResponse.setStandard(productsResponse.getModel_number()); } + map.put("list", JSON.toJSON(zzzyyProductsResponse)); + baseResponse.setData(""); + baseResponse.setData(map); + return baseResponse; + } catch (Exception e) { + log.error("解析长泰区医院智业接口返回产品信息字典数据异常，返回结果：{}", response); + log.error("异常信息：{}", e); + return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); } - map.put("list", JSON.toJSON(zzzyyProductsResponse)); - baseResponse.setData(""); - baseResponse.setData(map); - return baseResponse; - } catch (Exception e) { - log.error("解析长泰区医院智业接口返回产品信息字典数据异常，返回结果：{}", response); - log.error("异常信息：{}", e); - return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); + }else if(udiwmsProductRequest.getMedicalType().equals(Constants.MEDICAL_TYPE_DRUG)){ + Map map = new HashMap(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + //补充其他查询条件 + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()),PhysicDictEntity::getPhysicCode,udiwmsProductRequest.getCode()); + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()),PhysicDictEntity::getPhysicName,udiwmsProductRequest.getName()); + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()),PhysicDictEntity::getPhysicNo,udiwmsProductRequest.getRegisterNo()); + List physicDictEntities = physicDictMapper.selectList(wrapper); + List thrProductsEntityList = null; + if(CollUtil.isNotEmpty(physicDictEntities)){ + //数据处理以thr_products 返回 + thrProductsEntityList = physicDictEntities.stream().map(dict -> { + ThrProductsEntity products = new ThrProductsEntity(); + products.setCode(dict.getPhysicCode()); + products.setName(dict.getPhysicName()); + products.setMeasname(dict.getPhysicUnit()); + products.setSpec(dict.getPhysicSpec()); + products.setRegisterNo(dict.getPhysicNo()); + return products; + }).collect(Collectors.toList()); + } + map.put("list",thrProductsEntityList); + return ResultVOUtils.success(map); } + log.error("解析长泰区医院医疗类型，返回结果：{}", udiwmsProductRequest.getMedicalType()); + return ResultVOUtils.error(500,"医疗类型不正确，medicalType："+udiwmsProductRequest.getMedicalType()); } @Override @@ -1305,4 +1342,67 @@ public class CtqyyClient extends CommonHttpClient { } return udiwmsPreInOrderRequest; } + + + /** + * 处方拉取视图 + * @param udiwmsBasicSkPrescribeRequest + * @return + */ + @Override + public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { + Map map = new HashMap(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + //补充其他查询条件 + List presInfoEntities = presInfoMapper.selectList(wrapper); + List basicSkPrescribeResponses = null; + if(CollUtil.isNotEmpty(presInfoEntities)){ + //数据处理以basic_sk_prescribe，basic_sk_prescribe_item 主子返回 + basicSkPrescribeResponses = presInfoEntities.stream().map(pres -> { + BasicSkPrescribeResponse basicSkPrescribeResponse = new BasicSkPrescribeResponse(); + List itemList = new ArrayList<>(); + BasicSkPrescribeItemEntity item = new BasicSkPrescribeItemEntity(); + //TODO 封装数据 + + + itemList.add(item); + basicSkPrescribeResponse.setItemList(itemList); + return basicSkPrescribeResponse; + }).collect(Collectors.toList()); + } + map.put("list",basicSkPrescribeResponses); + return ResultVOUtils.success(map); + } + + + /** + * 采购计划拉取视图 + * @param udiwmsThrOrderRequest + * @return + */ + @Override + public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) { + Map map = new HashMap(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + //补充其他查询条件 + List planInfoEntities = planInfoMapper.selectList(wrapper); + List thrOrderResponses = null; + if(CollUtil.isNotEmpty(planInfoEntities)){ + //数据处理以thr_order，thr_order_detail 主子返回 + thrOrderResponses = planInfoEntities.stream().map(plan->{ + ThrOrderResponse thrOrderResponse = new ThrOrderResponse(); + List detailList = new ArrayList<>(); + ThrOrderDetailEntity detail = new ThrOrderDetailEntity(); + //TODO 封装数据 + + + detailList.add(detail); + thrOrderResponse.setDetailList(detailList); + return thrOrderResponse; + }).collect(Collectors.toList()); + } + map.put("list",thrOrderResponses); + return ResultVOUtils.success(); + } + } diff --git a/src/main/java/com/glxp/mipsdl/constant/Constants.java b/src/main/java/com/glxp/mipsdl/constant/Constants.java index 1b31f31..ce79571 100644 --- a/src/main/java/com/glxp/mipsdl/constant/Constants.java +++ b/src/main/java/com/glxp/mipsdl/constant/Constants.java @@ -177,4 +177,14 @@ public interface Constants { */ int THIRD_ORDER_RECEIVE = 2; + //医疗类型 + /** + * 器械 + */ + int MEDICAL_TYPE_DEVICE = 1; + /** + * 药品 + */ + int MEDICAL_TYPE_DRUG = 2; + } diff --git a/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java b/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java index f4fccf3..10522e4 100644 --- a/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java +++ b/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java @@ -310,4 +310,25 @@ public class UdiWmsController { return ClientProcessor.getHttpClient().postRelProduct(postRelProductRequest); } + + /** + * 处方入库 + * @param udiwmsBasicSkPrescribeRequest + * @return + */ + @PostMapping("/udiwms/erp/getPrescribes") + public BaseResponse getPrescribes(@RequestBody UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { + return ClientProcessor.getHttpClient().getPrescribes(udiwmsBasicSkPrescribeRequest); + } + + /** + * 采购计划入库 + * @param udiwmsThrOrderRequest + * @return + */ + @PostMapping("/udiwms/erp/getThrOrders") + public BaseResponse getThrOrders(@RequestBody UdiwmsThrOrderRequest udiwmsThrOrderRequest) { + return ClientProcessor.getHttpClient().getThrOrders(udiwmsThrOrderRequest); + } + } diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/PhysicDictEntity.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/PhysicDictEntity.java new file mode 100644 index 0000000..b6d5b11 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/PhysicDictEntity.java @@ -0,0 +1,33 @@ +package com.glxp.mipsdl.entity.ctqyy; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName(value = "V_YPZS_PHYSIC_DICT") +public class PhysicDictEntity { + + @TableField("PHYSIC_CODE") + private String physicCode; + @TableField("PHYSIC_NO") + private String physicNo; + @TableField("PHYSIC_NAME") + private String physicName; + @TableField("PHYSIC_SPEC") + private String physicSpec; + @TableField("PHYSIC_UNIT") + private String physicUnit; + @TableField("PACK_UNIT") + private String packUnit; + @TableField("PACK_SPEC") + private String packSpec; + @TableField("PACK_UNTUCK") + private String packUntuck; + @TableField("PACK_UNTUCK_RESI") + private String packUntuckResi; + @TableField("COUNTRY_CODE") + private String countryCode; + +} diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/PlanInfoEntity.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/PlanInfoEntity.java new file mode 100644 index 0000000..a0de2cb --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/PlanInfoEntity.java @@ -0,0 +1,52 @@ +package com.glxp.mipsdl.entity.ctqyy; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName(value = "V_YPZS_PLAN_INFO") +public class PlanInfoEntity { + + @TableField("CGDBH") + private String cgdbh; + @TableField("YPBM") + private String ypbm; + @TableField("YPMC") + private String ypmc; + @TableField("JXMC") + private String jxmc; + @TableField("GGMC") + private String ggmc; + @TableField("BZDW") + private String bzdw; + @TableField("ZXSYDW") + private String zxsydw; + @TableField("ZHB") + private String zhb; + @TableField("SCQYBM") + private String scqybm; + @TableField("SCQYMC") + private String scqymc; + @TableField("YKBM") + private String ykbm; + @TableField("YKMC") + private String ykmc; + @TableField("ZBJ") + private String zbj; + @TableField("GJJ") + private String gjj; + @TableField("GMSL") + private String gmsl; + @TableField("PSQYBM") + private String psqybm; + @TableField("PSQYMC") + private String psqymc; + @TableField("BZ") + private String bz; + @TableField("TPJG") + private String tpjg; + + +} diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/PresInfoEntity.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/PresInfoEntity.java new file mode 100644 index 0000000..6e32d69 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/PresInfoEntity.java @@ -0,0 +1,41 @@ +package com.glxp.mipsdl.entity.ctqyy; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName(value = "V_YPZS_PRES_INFO") +public class PresInfoEntity { + + @TableField("TABLE_TYPE") + private String tableType; + @TableField("LAYPHYSIC_NO") + private String layphysicNo; + @TableField("PRESCRIBE_NUMBER") + private String prescribeNumber; + @TableField("PRESCRIBE_SUB_NUMBER") + private String prescribeSubNumber; + @TableField("LAY_PHYSIC_TIME") + private String layPhysicTime; + @TableField("STORAGE_CODE") + private String storageCode; + @TableField("STORAGE_NAME") + private String storageName; + @TableField("SICK_ID") + private String sickId; + @TableField("RESIDENCE_NO") + private String residenceNo; + @TableField("PHYSIC_CODE") + private String physicCode; + @TableField("PHYSIC_NAME") + private String physicName; + @TableField("LAY_PHYSIC_QUANTITY") + private String layPhysicQuantity; + @TableField("PHYSIC_UNIT") + private String physicUnit; + @TableField("COST") + private String cost; + +} diff --git a/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrOrderDetailEntity.java b/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrOrderDetailEntity.java new file mode 100644 index 0000000..da5db53 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrOrderDetailEntity.java @@ -0,0 +1,130 @@ +package com.glxp.mipsdl.entity.thrsys; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName(value = "thr_order_detail") +public class ThrOrderDetailEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer id; + + /** + * + */ + private String productId; + + /** + * + */ + private String productName; + + /** + * + */ + private String spec; + + /** + * + */ + private String batchNo; + + /** + * + */ + private String expireDate; + + /** + * + */ + private String productDate; + + /** + * + */ + private String count; + + /** + * + */ + private String reCount; + + /** + * + */ + private String orderIdFk; + + /** + * + */ + private String thirdSysFk; + + /** + * 单价 + */ + private BigDecimal price; + + /** + * 往来单位 + */ + private String corpName; + + /** + * 医疗器械注册人 + */ + private String ylqxzcrbarmc; + + /** + * 注册证号 + */ + private String zczbhhzbapzbh; + + /** + * 生产企业 + */ + private String manufactory; + + /** + * 创建人 + */ + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + /** + * + */ + private String supId; + + /** + * + */ + private String supName; +} + diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java new file mode 100644 index 0000000..096e5b3 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java @@ -0,0 +1,116 @@ +package com.glxp.mipsdl.req.base; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest{ + /** + * + */ + private Integer id; + + /** + * 处方编码 + */ + private String code; + + /** + * 病人编码 + */ + private String sickerCode; + + /** + * 开方时间 + */ + private Date prescribeDate; + + /** + * 开方医生 + */ + private String createDr; + + /** + * 处方费用 + */ + private BigDecimal amount; + + /** + * 就诊科室编码 + */ + private String deptCode; + + /** + * 就诊科室名称 + */ + private String deptName; + + /** + * 诊断内容 + */ + private String diagnosis; + + /** + * 备注 + */ + private String remark; + + /** + * 创建人 + */ + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * + */ + private String adNum; + + /** + * 就诊卡号 + */ + private String clinicNumber; + + /** + * 处方赋码状态 1:未赋码；2：赋码中；3：已赋码 + */ + private Byte tagStatus; + + /** + * 处方下载转换状态 1:未转换；2：部分转换；3：已转换 + */ + private Byte trDiStatus; + + /** + * 处方赋码错误信息 + */ + private String tagMsg; + + /** + * 工位 + */ + private String workPlaceCode; + + /** + * + */ + private String addr; + +} + diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java index 7865ef0..9b0eb6b 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java @@ -1,5 +1,6 @@ package com.glxp.mipsdl.req.base; +import com.glxp.mipsdl.constant.Constants; import lombok.Data; /** @@ -63,4 +64,20 @@ public class UdiwmsProductRequest extends ListPageRequest { */ private String remark3; + /** + * 医疗类型 器械 1 药品 2 + */ + private Integer medicalType; + + /** + * 为空默认 器械 1 + * @return + */ + public Integer getMedicalType() { + if(medicalType == null){ + return Constants.MEDICAL_TYPE_DEVICE; + } + return medicalType; + } + } diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java new file mode 100644 index 0000000..a180d78 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java @@ -0,0 +1,193 @@ +package com.glxp.mipsdl.req.base; + +import java.util.Date; +import lombok.Data; + +@Data +public class UdiwmsThrOrderRequest { + /** + * + */ + private Integer id; + + /** + * + */ + private String billNo; + + /** + * + */ + private String billdate; + + /** + * + */ + private String corpId; + + /** + * + */ + private String corpName; + + /** + * + */ + private String billType; + + /** + * + */ + private String billFlag; + + /** + * + */ + private String thirdSysFk; + + /** + * 原始单据类型 + */ + private String originType; + + /** + * 起始日期 + */ + private String startDate; + + /** + * 结束日期 + */ + private String endDate; + + /** + * 审核人 + */ + private String reviewUser; + + /** + * 地址 + */ + private String address; + + /** + * 联系人 + */ + private String linkMan; + + /** + * 联系电话 + */ + private String linkTel; + + /** + * 备注 + */ + private String remark; + + /** + * 备注1 + */ + private String remark1; + + /** + * 备注2 + */ + private String remark2; + + /** + * 备注3 + */ + private String remark3; + + /** + * + */ + private Byte type; + + /** + * + */ + private String locStorageCode; + + /** + * + */ + private Byte editStatus; + + /** + * 分库 + */ + private String invWarehouseCode; + + /** + * 医疗器械注册人 + */ + private String ylqxzcrbarmc; + + /** + * 注册证号 + */ + private String zczbhhzbapzbh; + + /** + * 生产企业 + */ + private String manufactory; + + /** + * 判断来源至哪里1：第三方 2：自己创建 + */ + private Byte thirdPartyDate; + + /** + * + */ + private String unitIdFk; + + /** + * 往来分库 + */ + private String fromSubInvCode; + + /** + * 创建人 + */ + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * + */ + private Byte inoutType; + + /** + * + */ + private String deptCode; + + /** + * + */ + private String invCode; + + /** + * + */ + private Date reviewTime; +} + diff --git a/src/main/java/com/glxp/mipsdl/res/ctqyy/ThrOrderResponse.java b/src/main/java/com/glxp/mipsdl/res/ctqyy/ThrOrderResponse.java new file mode 100644 index 0000000..792ee75 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/res/ctqyy/ThrOrderResponse.java @@ -0,0 +1,199 @@ +package com.glxp.mipsdl.res.ctqyy; + +import java.util.Date; +import java.util.List; + +import com.glxp.mipsdl.entity.thrsys.ThrOrderDetailEntity; +import lombok.Data; + +@Data +public class ThrOrderResponse { + /** + * + */ + private Integer id; + + /** + * + */ + private String billNo; + + /** + * + */ + private String billdate; + + /** + * + */ + private String corpId; + + /** + * + */ + private String corpName; + + /** + * + */ + private String billType; + + /** + * + */ + private String billFlag; + + /** + * + */ + private String thirdSysFk; + + /** + * 原始单据类型 + */ + private String originType; + + /** + * 起始日期 + */ + private String startDate; + + /** + * 结束日期 + */ + private String endDate; + + /** + * 审核人 + */ + private String reviewUser; + + /** + * 地址 + */ + private String address; + + /** + * 联系人 + */ + private String linkMan; + + /** + * 联系电话 + */ + private String linkTel; + + /** + * 备注 + */ + private String remark; + + /** + * 备注1 + */ + private String remark1; + + /** + * 备注2 + */ + private String remark2; + + /** + * 备注3 + */ + private String remark3; + + /** + * + */ + private Byte type; + + /** + * + */ + private String locStorageCode; + + /** + * + */ + private Byte editStatus; + + /** + * 分库 + */ + private String invWarehouseCode; + + /** + * 医疗器械注册人 + */ + private String ylqxzcrbarmc; + + /** + * 注册证号 + */ + private String zczbhhzbapzbh; + + /** + * 生产企业 + */ + private String manufactory; + + /** + * 判断来源至哪里1：第三方 2：自己创建 + */ + private Byte thirdPartyDate; + + /** + * + */ + private String unitIdFk; + + /** + * 往来分库 + */ + private String fromSubInvCode; + + /** + * 创建人 + */ + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * + */ + private Byte inoutType; + + /** + * + */ + private String deptCode; + + /** + * + */ + private String invCode; + + /** + * + */ + private Date reviewTime; + + private List detailList; + +} + diff --git a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PhysicDictMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PhysicDictMapper.java new file mode 100644 index 0000000..9f6f9de --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PhysicDictMapper.java @@ -0,0 +1,16 @@ +package com.glxp.mipsdl.thirddao.ctqyy; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.entity.ctqyy.PhysicDictEntity; +import com.glxp.mipsdl.req.base.UdiwmsProductRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +@DS("ctqyySql") +public interface PhysicDictMapper extends BaseMapper { + +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PlanInfoMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PlanInfoMapper.java new file mode 100644 index 0000000..2f93e1d --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PlanInfoMapper.java @@ -0,0 +1,13 @@ +package com.glxp.mipsdl.thirddao.ctqyy; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.entity.ctqyy.PlanInfoEntity; +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +@DS("ctqyySql") +public interface PlanInfoMapper extends BaseMapper { + +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PresInfoMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PresInfoMapper.java new file mode 100644 index 0000000..1a7598e --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PresInfoMapper.java @@ -0,0 +1,13 @@ +package com.glxp.mipsdl.thirddao.ctqyy; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.entity.ctqyy.PresInfoEntity; +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +@DS("ctqyySql") +public interface PresInfoMapper extends BaseMapper { + +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9cedc0e..82e4c63 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -32,6 +32,15 @@ spring: username: root password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver + ctqyySql: + # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy + # username: SD_UDIJK + # password: SD_UDIJK + # driver-class-name: oracle.jdbc.driver.OracleDrive + url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: 123456 + driver-class-name: com.p6spy.engine.spy.P6SpyDriver hikari: connection-timeout: 60000 maximum-pool-size: 60 diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/PhysicDictMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/PhysicDictMapper.xml new file mode 100644 index 0000000..1d91d7e --- /dev/null +++ b/src/main/resources/mybatis/mapper/other/ctqyy/PhysicDictMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/PlanInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/PlanInfoMapper.xml new file mode 100644 index 0000000..b7624e7 --- /dev/null +++ b/src/main/resources/mybatis/mapper/other/ctqyy/PlanInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/PresInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/PresInfoMapper.xml new file mode 100644 index 0000000..f31f04a --- /dev/null +++ b/src/main/resources/mybatis/mapper/other/ctqyy/PresInfoMapper.xml @@ -0,0 +1,5 @@ + + + + +