From dbe6477e0951d09a351ba819e94a47d4c08b60f3 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 26 Sep 2024 15:58:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=99=A8=E6=A2=B0=E5=A4=84=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/constant/BusTypeConstant.java | 1 + .../collect/IoCollectOriginController.java | 17 ++++++ .../inout/IoCodeTempController.java | 16 +++--- .../com/glxp/api/http/ErpBasicClient.java | 16 ++++++ .../api/service/collect/DownloadFactory.java | 4 ++ .../service/collect/down/QXCF001Download.java | 57 +++++++++++++++++++ .../collect/down/ThrOrderDownload.java | 4 +- 7 files changed, 105 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/glxp/api/service/collect/down/QXCF001Download.java diff --git a/src/main/java/com/glxp/api/constant/BusTypeConstant.java b/src/main/java/com/glxp/api/constant/BusTypeConstant.java index a45e0f1e9..c172a327b 100644 --- a/src/main/java/com/glxp/api/constant/BusTypeConstant.java +++ b/src/main/java/com/glxp/api/constant/BusTypeConstant.java @@ -2,6 +2,7 @@ package com.glxp.api.constant; public enum BusTypeConstant { YPCF002("药品处方单","YPCF002"), + QXCF001("器械处方单","QXCF001"), CGJH001("采购计划","CGJH001"), LYRK("领药入库","LYRK"), GMRK("购买入库","GMRK"), diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index f69f6963e..90a5f6734 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -90,6 +90,23 @@ public class IoCollectOriginController extends BaseController { BaseResponse> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest); return baseResponse; + }else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) { + GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest(); + getSickPrescribeRequest.setLimit(collectOrderRequest.getLimit()); + getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo()); + getSickPrescribeRequest.setThirdSys("thirdId"); + getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); + getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType()); + getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime()); + getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()); + getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords()); + getSickPrescribeRequest.setPage(collectOrderRequest.getPage()); + getSickPrescribeRequest.setFromCorpName(collectOrderRequest.getFromCorpName()); + getSickPrescribeRequest.setShipperName(collectOrderRequest.getShipperName()); + getSickPrescribeRequest.setBusType(collectOrderRequest.getBusType()); + + BaseResponse> baseResponse = erpBasicClient.getPrescribeQx(getSickPrescribeRequest); + return baseResponse; } else { FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); filterThrOrderRequest.setLimit(collectOrderRequest.getLimit()); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index b0e21a95f..14ed604ac 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -156,8 +156,15 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "单据号不能为空！"); } String code = addEnterCodeRequest.getCode(); - IoCollectOrderResponse collectOrder = collectOrderService.unionSearch(addEnterCodeRequest.getWorkPlaceCode(), addEnterCodeRequest.getBusType(), code); + IoCollectOrderResponse collectOrder = collectOrderService.unionSearch(null, addEnterCodeRequest.getBusType(), code); if (collectOrder == null) { + //查询原始单据查到为异常提示 + IoCollectOrderOrigin ioCollectOrigin = collectOriginService.getOrderByCode(code); + if (ioCollectOrigin != null){ + BaseResponse response = ResultVOUtils.error(501, "单据已下载,转化异常"); + response.setData(code); + return response; + } //=============================================// //本地数据库 无此单据时 触发 用billNo 到 处方下载方法 进行下载 CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); @@ -169,13 +176,6 @@ public class IoCodeTempController extends BaseController { collectOrder = collectOrderService.unionSearch(null, null, code); //=============================================// if (collectOrder == null) { - //查询原始单据查到为异常提示 - IoCollectOrderOrigin ioCollectOrigin = collectOriginService.getOrderByCode(code); - if (ioCollectOrigin != null){ - BaseResponse response = ResultVOUtils.error(501, "单据已下载,转化异常"); - response.setData(code); - return response; - } BaseResponse response = ResultVOUtils.error(501, "查无此单据号,先选择要处理的单据"); response.setData(code); return response; diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index e5debdfcb..4f4c2d7e2 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -227,6 +227,22 @@ public class ErpBasicClient { return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); } } + public BaseResponse> getPrescribeQx(GetSickPrescribeRequest getSickPrescribeRequest) { + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(getSickPrescribeRequest.getThirdSys()); + String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getPrescribesQx"; + try { + String response = httpOkClient.uCloudPost(url, getSickPrescribeRequest); +// String response = "{\"code\":20000,\"data\":{\"total\":108,\"list\":[{\"code\":\"2038979\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121237\",\"itemName\":\"Ⅱ级护理\",\"measureUnit\":\"\",\"remark\":\"\",\"thrId\":\"121237\"}],\"prescribeDate\":\"2017-09-30 23:19:19\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":0,\"code\":\"2038983\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":0,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121346\",\"itemName\":\"外科护理常规\",\"measureUnit\":\"\",\"remark\":\"\",\"thrId\":\"121346\"}],\"prescribeDate\":\"2017-09-30 23:19:19\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":18.3,\"code\":\"2091375\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":18.3,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121914\",\"itemName\":\"鼻饲管置管\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"\",\"thrId\":\"121914\"}],\"prescribeDate\":\"2017-10-13 09:29:57\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":1.3,\"code\":\"2102067\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":1.3,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"950030000004\",\"itemName\":\"一次性注射器50ml(16#側 /支)\",\"measureCount\":\"1\",\"measureUnit\":\"支\",\"remark\":\"\",\"thrId\":\"950030000004\"}],\"prescribeDate\":\"2017-10-15 23:20:22\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":231.5,\"code\":\"2099946\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":231.5,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121258\",\"itemName\":\"生化全套\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"\",\"thrId\":\"121258\"}],\"prescribeDate\":\"2017-10-15 09:31:50\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":14.8,\"code\":\"2174111\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":5.2,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"250ml:12.5g/瓶(软袋)\",\"itemCode\":\"120007\",\"itemName\":\"5%葡萄糖注射液\",\"measureCount\":\"250\",\"measureUnit\":\"ml\",\"remark\":\"bid\",\"thrId\":\"120007\"},{\"amount\":9.6,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"2ml:0.2g*10瓶/盒\",\"itemCode\":\"120441\",\"itemName\":\"西咪替丁注射液\",\"measureCount\":\"0.4\",\"measureUnit\":\"g\",\"remark\":\"bid\",\"thrId\":\"120441\"}],\"prescribeDate\":\"2017-10-31 09:05:06\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":10.8,\"code\":\"2205765\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":10.8,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"122411\",\"itemName\":\"中心吸氧\",\"measureCount\":\"3\",\"measureUnit\":\"小时\",\"remark\":\"\",\"thrId\":\"122411\"}],\"prescribeDate\":\"2017-11-06 17:37:48\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":11,\"code\":\"2069829\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":11,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"950023000006\",\"itemName\":\"3M透明敷料10*12\",\"measureCount\":\"1\",\"measureUnit\":\"片\",\"remark\":\"\",\"thrId\":\"950023000006\"}],\"prescribeDate\":\"2017-10-09 10:06:00\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":0,\"code\":\"2069861\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":0,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121352\",\"itemName\":\"流质饮食\",\"measureUnit\":\"\",\"remark\":\"\",\"thrId\":\"121352\"}],\"prescribeDate\":\"2017-10-09 10:07:08\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":46.15,\"code\":\"2135833\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":4.8,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"100ml:0.9g/瓶(塑瓶)\",\"itemCode\":\"119989\",\"itemName\":\"0.9%氯化钠注射液\",\"measureCount\":\"100\",\"measureUnit\":\"ml\",\"remark\":\"bid\",\"thrId\":\"119989\"},{\"amount\":41.35,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"30mg/瓶\",\"itemCode\":\"120244\",\"itemName\":\"注射用兰索拉唑\",\"measureCount\":\"30\",\"measureUnit\":\"mg\",\"remark\":\"bid\",\"thrId\":\"120244\"}],\"prescribeDate\":\"2017-10-23 09:05:58\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"code\":\"2182176\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"122532\",\"itemName\":\"静脉采血费\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"\",\"thrId\":\"122532\"}],\"prescribeDate\":\"2017-11-01 16:26:03\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.56,\"code\":\"2201702\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.56,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"1ml:10mg*10支/盒\",\"itemCode\":\"120530\",\"itemName\":\"盐酸吗啡注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"prn\",\"thrId\":\"120530\"}],\"prescribeDate\":\"2017-11-06 08:47:22\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.56,\"code\":\"2200047\",\"createDr\":\"叶小聪/223\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.56,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"1ml:10mg*10支/盒\",\"itemCode\":\"120530\",\"itemName\":\"盐酸吗啡注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120530\"}],\"prescribeDate\":\"2017-11-05 17:45:57\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"code\":\"2194412\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121236\",\"itemName\":\"Ⅰ级护理\",\"measureUnit\":\"\",\"remark\":\"\",\"thrId\":\"121236\"}],\"prescribeDate\":\"2017-11-04 09:30:42\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.6,\"code\":\"2194402\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.6,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"122411\",\"itemName\":\"中心吸氧\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"qd\",\"thrId\":\"122411\"}],\"prescribeDate\":\"2017-11-04 09:30:26\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":1.8,\"code\":\"2040306\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":1.8,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121952\",\"itemName\":\"引流管冲洗(留置引流次日起每日收)\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"qd\",\"thrId\":\"121952\"}],\"prescribeDate\":\"2017-09-30 23:19:19\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":2.7,\"code\":\"2040307\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":2.7,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121953\",\"itemName\":\"引流管冲洗(只更换引流装置)\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"qod\",\"thrId\":\"121953\"}],\"prescribeDate\":\"2017-09-30 23:24:45\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":19.9,\"code\":\"2058185\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":19.9,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121291\",\"itemName\":\"大换药\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"\",\"thrId\":\"121291\"}],\"prescribeDate\":\"2017-10-06 09:19:19\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":2.3,\"code\":\"2091369\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":2.3,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121945\",\"itemName\":\"胃肠减压(负压引流)\",\"measureCount\":\"1\",\"measureUnit\":\"日\",\"remark\":\"qd\",\"thrId\":\"121945\"}],\"prescribeDate\":\"2017-10-13 09:28:56\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.25,\"code\":\"2093698\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.25,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"960098000002\",\"itemName\":\"一次性负压引流器(1000ml/个)\",\"measureCount\":\"1\",\"measureUnit\":\"个\",\"remark\":\"\",\"thrId\":\"960098000002\"}],\"prescribeDate\":\"2017-10-13 15:36:55\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.25,\"code\":\"2102073\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.25,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"960098000002\",\"itemName\":\"一次性负压引流器(1000ml/个)\",\"measureCount\":\"1\",\"measureUnit\":\"个\",\"remark\":\"\",\"thrId\":\"960098000002\"}],\"prescribeDate\":\"2017-10-15 23:42:20\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":0.81,\"code\":\"2172059\",\"createDr\":\"叶小聪/223\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":0.81,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"2ml:10mg*10瓶/盒\",\"itemCode\":\"120531\",\"itemName\":\"盐酸甲氧氯普胺注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"st\",\"thrId\":\"120531\"}],\"prescribeDate\":\"2017-10-30 16:51:24\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":231.5,\"code\":\"2168562\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":231.5,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121258\",\"itemName\":\"生化全套\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"\",\"thrId\":\"121258\"}],\"prescribeDate\":\"2017-10-30 09:02:13\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":0.81,\"code\":\"2130636\",\"createDr\":\"叶小聪/223\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":0.81,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"2ml:10mg*10瓶/盒\",\"itemCode\":\"120531\",\"itemName\":\"盐酸甲氧氯普胺注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"st\",\"thrId\":\"120531\"}],\"prescribeDate\":\"2017-10-21 19:52:26\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":7.96,\"code\":\"2140486\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":4.8,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"100ml:5g/瓶(软袋)\",\"itemCode\":\"120005\",\"itemName\":\"5%葡萄糖注射液\",\"measureCount\":\"100\",\"measureUnit\":\"ml\",\"remark\":\"bid\",\"thrId\":\"120005\"},{\"amount\":3.16,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"1ml:10mg/支\",\"itemCode\":\"120025\",\"itemName\":\"盐酸消旋山莨菪碱注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"bid\",\"thrId\":\"120025\"}],\"prescribeDate\":\"2017-10-24 10:06:05\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"code\":\"2120625\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"950046000001\",\"itemName\":\"特殊采血管\",\"measureCount\":\"1\",\"measureUnit\":\"支\",\"remark\":\"\",\"thrId\":\"950046000001\"}],\"prescribeDate\":\"2017-10-19 16:25:26\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.56,\"code\":\"2188160\",\"createDr\":\"杨文显/010\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.56,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"1ml:10mg*10支/盒\",\"itemCode\":\"120530\",\"itemName\":\"盐酸吗啡注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120530\"}],\"prescribeDate\":\"2017-11-02 21:35:41\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"code\":\"2182177\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"950046000001\",\"itemName\":\"特殊采血管\",\"measureCount\":\"1\",\"measureUnit\":\"支\",\"remark\":\"\",\"thrId\":\"950046000001\"}],\"prescribeDate\":\"2017-11-01 16:26:03\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.56,\"code\":\"2182850\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.56,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"1ml:10mg*10支/盒\",\"itemCode\":\"120530\",\"itemName\":\"盐酸吗啡注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120530\"}],\"prescribeDate\":\"2017-11-01 19:04:18\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":60.7,\"code\":\"2099947\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":60.7,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121223\",\"itemName\":\"血常规（CRP)\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"\",\"thrId\":\"121223\"}],\"prescribeDate\":\"2017-10-15 09:31:50\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":0.81,\"code\":\"2161456\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":0.81,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"2ml:10mg*10瓶/盒\",\"itemCode\":\"120531\",\"itemName\":\"盐酸甲氧氯普胺注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120531\"}],\"prescribeDate\":\"2017-10-28 09:21:47\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.56,\"code\":\"2172543\",\"createDr\":\"郑华滨/015\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.56,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"1ml:10mg*10支/盒\",\"itemCode\":\"120530\",\"itemName\":\"盐酸吗啡注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120530\"}],\"prescribeDate\":\"2017-10-30 21:13:08\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.56,\"code\":\"2164343\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.56,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"1ml:10mg*10支/盒\",\"itemCode\":\"120530\",\"itemName\":\"盐酸吗啡注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120530\"}],\"prescribeDate\":\"2017-10-28 21:43:11\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.56,\"code\":\"2160284\",\"createDr\":\"叶小聪/223\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.56,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"1ml:10mg*10支/盒\",\"itemCode\":\"120530\",\"itemName\":\"盐酸吗啡注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120530\"}],\"prescribeDate\":\"2017-10-27 20:30:41\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":0,\"code\":\"2204649\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":0,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"120593\",\"itemName\":\"自动出院\",\"measureUnit\":\"\",\"remark\":\"\",\"thrId\":\"120593\"}],\"prescribeDate\":\"2017-11-06 13:38:05\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":7.9,\"code\":\"2074420\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":6.5,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"500ml:29.5g/瓶(软袋)\",\"itemCode\":\"120016\",\"itemName\":\"葡萄糖氯化钠注射液\",\"measureCount\":\"500\",\"measureUnit\":\"ml\",\"remark\":\"bid\",\"thrId\":\"120016\"},{\"amount\":1.4,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"10ml:1g*1瓶/支\",\"itemCode\":\"120242\",\"itemName\":\"氯化钾注射液\",\"measureCount\":\"15\",\"measureUnit\":\"ml\",\"remark\":\"bid\",\"thrId\":\"120242\"}],\"prescribeDate\":\"2017-10-10 09:05:49\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.25,\"code\":\"2126200\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.25,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"960098000002\",\"itemName\":\"一次性负压引流器(1000ml/个)\",\"measureCount\":\"1\",\"measureUnit\":\"个\",\"remark\":\"\",\"thrId\":\"960098000002\"}],\"prescribeDate\":\"2017-10-20 16:42:19\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":0.81,\"code\":\"2135839\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":0.81,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"2ml:10mg*10瓶/盒\",\"itemCode\":\"120531\",\"itemName\":\"盐酸甲氧氯普胺注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120531\"}],\"prescribeDate\":\"2017-10-23 09:06:52\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.56,\"code\":\"2178238\",\"createDr\":\"叶小聪/223\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.56,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"1ml:10mg*10支/盒\",\"itemCode\":\"120530\",\"itemName\":\"盐酸吗啡注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120530\"}],\"prescribeDate\":\"2017-10-31 23:36:40\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":1.98,\"code\":\"2193587\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":1.98,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"2ml:20mg/支\",\"itemCode\":\"120125\",\"itemName\":\"呋塞米注射液\",\"measureCount\":\"20\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120125\"}],\"prescribeDate\":\"2017-11-04 08:42:31\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.56,\"code\":\"2197293\",\"createDr\":\"郑华滨/015\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.56,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"1ml:10mg*10支/盒\",\"itemCode\":\"120530\",\"itemName\":\"盐酸吗啡注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120530\"}],\"prescribeDate\":\"2017-11-05 05:58:48\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":1.98,\"code\":\"2201710\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":1.98,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"2ml:20mg/支\",\"itemCode\":\"120125\",\"itemName\":\"呋塞米注射液\",\"measureCount\":\"20\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120125\"}],\"prescribeDate\":\"2017-11-06 08:47:22\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":3.56,\"code\":\"2192700\",\"createDr\":\"林添福/072\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":3.56,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"1ml:10mg*10支/盒\",\"itemCode\":\"120530\",\"itemName\":\"盐酸吗啡注射液\",\"measureCount\":\"10\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120530\"}],\"prescribeDate\":\"2017-11-03 20:02:58\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":0,\"code\":\"2038984\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":0,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"122334\",\"itemName\":\"测血压qd或bid\",\"measureUnit\":\"\",\"remark\":\"\",\"thrId\":\"122334\"}],\"prescribeDate\":\"2017-09-30 23:19:19\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":0.33,\"code\":\"2038990\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":0.33,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"5mg*100片/瓶\",\"itemCode\":\"120226\",\"itemName\":\"甲氧氯普胺片\",\"measureCount\":\"5\",\"measureUnit\":\"mg\",\"remark\":\"tid\",\"thrId\":\"120226\"}],\"prescribeDate\":\"2017-09-30 23:19:19\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":9.77,\"code\":\"2039064\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":0.5,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"10ml:90mgl/瓶\",\"itemCode\":\"119994\",\"itemName\":\"0.9%氯化钠注射液\",\"measureCount\":\"5\",\"measureUnit\":\"ml\",\"remark\":\"bid\",\"thrId\":\"119994\"},{\"amount\":9.27,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"2ml:12500iu*10支/盒\",\"itemCode\":\"120181\",\"itemName\":\"肝素钠注射液\",\"measureCount\":\"50\",\"measureUnit\":\"IU\",\"remark\":\"bid\",\"thrId\":\"120181\"}],\"prescribeDate\":\"2017-09-30 22:06:47\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":1.98,\"code\":\"2164572\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":1.98,\"category\":\"药品\",\"count\":\"0\",\"ggxh\":\"2ml:20mg/支\",\"itemCode\":\"120125\",\"itemName\":\"呋塞米注射液\",\"measureCount\":\"20\",\"measureUnit\":\"mg\",\"remark\":\"qd\",\"thrId\":\"120125\"}],\"prescribeDate\":\"2017-10-29 08:13:33\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":60.7,\"code\":\"2168563\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":60.7,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121223\",\"itemName\":\"血常规（CRP)\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"\",\"thrId\":\"121223\"}],\"prescribeDate\":\"2017-10-30 09:02:13\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":19.9,\"code\":\"2069828\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":19.9,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121291\",\"itemName\":\"大换药\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"\",\"thrId\":\"121291\"}],\"prescribeDate\":\"2017-10-09 10:06:00\",\"remark\":\"\",\"sickCode\":\"0000362743\"},{\"amount\":18.3,\"code\":\"2126187\",\"createDr\":\"卢进炜/220\",\"deptCode\":\"90\",\"deptName\":\"外科\",\"diagnosis\":\"卵巢恶性肿瘤\",\"itemList\":[{\"amount\":18.3,\"category\":\"项目\",\"count\":\"0\",\"ggxh\":\"\",\"itemCode\":\"121914\",\"itemName\":\"鼻饲管置管\",\"measureCount\":\"1\",\"measureUnit\":\"次\",\"remark\":\"\",\"thrId\":\"121914\"}],\"prescribeDate\":\"2017-10-20 16:40:02\",\"remark\":\"\",\"sickCode\":\"0000362743\"}]},\"message\":\"success\"}\n"; + BaseResponse> listBaseResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + + return listBaseResponse; + } catch (Exception e) { + log.error("获取器械处方信息", e); + return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); + } + } /** diff --git a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java index 9e1d0c176..228e74473 100644 --- a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java +++ b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java @@ -17,6 +17,8 @@ public class DownloadFactory { @Resource private YPCF002Download ypcf002Download; + @Resource + private QXCF001Download qxcf001Download; @Resource private ThrOrderDownload thrOrderDownload; @@ -34,6 +36,8 @@ public class DownloadFactory { } if (busType.equals(BusTypeConstant.YPCF002.getBusType())) { return ypcf002Download.downloadOrder(collectOrderRequest); + }else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) { + return qxcf001Download.downloadOrder(collectOrderRequest); } else { return thrOrderDownload.downloadOrder(collectOrderRequest); } diff --git a/src/main/java/com/glxp/api/service/collect/down/QXCF001Download.java b/src/main/java/com/glxp/api/service/collect/down/QXCF001Download.java new file mode 100644 index 000000000..b395e9d0f --- /dev/null +++ b/src/main/java/com/glxp/api/service/collect/down/QXCF001Download.java @@ -0,0 +1,57 @@ +package com.glxp.api.service.collect.down; + +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.req.basic.GetSickPrescribeRequest; +import com.glxp.api.req.collect.CollectOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.collect.IoCollectOrderService; +import com.glxp.api.util.IntUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class QXCF001Download implements IDownload { + @Resource + private ErpBasicClient erpBasicClient; + @Resource + ThrOrderDownload thrOrderDownload; + + @Override + public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { + int page = 1; + int limit = 100; + GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest(); + getSickPrescribeRequest.setLimit(limit); + getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo()); + getSickPrescribeRequest.setThirdSys("thirdId"); + getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); + getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType()); + getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime()); + getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()); + getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords()); + while (true) { + getSickPrescribeRequest.setPage(page); + BaseResponse> baseResponse = erpBasicClient.getPrescribeQx(getSickPrescribeRequest); + + // TODO: 2024/9/11 添加一张中间表（io_collect_order_origin）原始表做为转换 + + if (baseResponse.getCode() == 20000) { + List list = baseResponse.getData().getList(); + thrOrderDownload.importThrOrder(list, collectOrderRequest); + if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) { + page++; + } else { + break; + } + } else { + return ResultVOUtils.error(500, "下载第三方系统产品信息异常"); + } + } + return ResultVOUtils.success("下载成功"); + } +} diff --git a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java index 0638b9694..444ddcc7c 100644 --- a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java +++ b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java @@ -102,11 +102,11 @@ public class ThrOrderDownload implements IDownload { for (IoCollectOrderBiz entity : thrOrder.getBizList()) { IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); BeanUtil.copyProperties(entity, collectOrderBiz); - UdiRelevanceEntity basicUdirelEntity = udiRelevanceDao.selectOne(new LambdaQueryWrapper().eq(UdiRelevanceEntity::getMainId, entity.getThrCode())); + UdiRelevanceEntity basicUdirelEntity = udiRelevanceDao.selectOne(new LambdaQueryWrapper().eq(UdiRelevanceEntity::getMainId, entity.getThrCode()).last("limit 1")); if (basicUdirelEntity != null) { collectOrderBiz.setRelId(basicUdirelEntity.getId()); BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new LambdaQueryWrapper().eq(BasicProductsEntity::getUuid, basicUdirelEntity.getUuid()).last("limit 1")); - if (StrUtil.isEmpty(basicProductsEntity.getNameCode())) { + if (basicProductsEntity == null || StrUtil.isEmpty(basicProductsEntity.getNameCode())) { errorMsg.append(entity.getCpmctymc()).append("字典未对照").append(";"); } } else {