From b2b34206da592d9c888972a391d32a5f6ce1a1ee Mon Sep 17 00:00:00 2001 From: zane Date: Thu, 5 Sep 2024 15:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOriginController.java | 2 +- .../inout/IoCodeTempController.java | 2 +- .../api/entity/collect/IoCollectOrder.java | 3 + .../com/glxp/api/http/ErpBasicClient.java | 19 +++++ .../req/basic/GetSickPrescribeRequest.java | 5 ++ .../collect/IoCollectOrderService.java | 78 +++++++++++++++++++ .../collect/IoCollectOriginService.java | 34 ++++++-- 7 files changed, 136 insertions(+), 7 deletions(-) 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 54ecbcbbb..8adc1d1d3 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -22,6 +22,6 @@ public class IoCollectOriginController { @PostMapping("/udiwms/basic/collect/origin/order/download") public BaseResponse downloadOrder(@RequestBody CollectOrderRequest collectOrderRequest) { - return collectOriginService.downloadOrder(collectOrderRequest); + return collectOriginService.downloadOrderV2(collectOrderRequest); } } 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 7fa8369ec..3f4eb6e79 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -233,7 +233,7 @@ public class IoCodeTempController extends BaseController { CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); collectOrderRequest.setBusType("YPCF002"); collectOrderRequest.setBillNo(code); - BaseResponse baseResponse = collectOriginService.downloadOrder(collectOrderRequest); + BaseResponse baseResponse = collectOriginService.downloadOrderV2(collectOrderRequest); if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()){ collectOrder = collectOrderService.getByBillNo(code); //=============================================// diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index fc0378343..455020da2 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java @@ -218,6 +218,9 @@ public class IoCollectOrder implements Serializable { @TableField(exist = false) private List collectOrderBizResponseList; + @TableField(exist = false) + private List bizList; + /** *上传状态(1.未上传,2.已上传,3.上传失败) diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index f9b6e1ae0..7d8103a13 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -10,6 +10,7 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.basic.BasicSkProjectDetailEntity; import com.glxp.api.entity.basic.BasicSkProjectEntity; import com.glxp.api.entity.basic.BasicSkSickerEntity; +import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.thrsys.ThrManufacturerEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; @@ -29,6 +30,7 @@ import com.glxp.api.res.basic.BasicSkProjectDetailResponse; import com.glxp.api.res.basic.BasicSkProjectResponse; import com.glxp.api.res.basic.BasicSkSickerResponse; import com.glxp.api.res.chs.YbHcflEntityResponse; +import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.res.thrsys.UdiwmsWarehouseDetail; @@ -213,6 +215,23 @@ public class ErpBasicClient { } } + public BaseResponse> getPrescribeV2(GetSickPrescribeRequest getSickPrescribeRequest) { + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(getSickPrescribeRequest.getThirdSys()); + String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getPrescribes"; + 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/req/basic/GetSickPrescribeRequest.java b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java index 65541b963..1f718aa19 100644 --- a/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java @@ -18,4 +18,9 @@ public class GetSickPrescribeRequest extends ListPageRequest { * 住院号（必传) */ private String adNum; + + /** + * 工位编码 + */ + private Long workPlaceCode; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 5d36936ae..3eb6f7d92 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -444,6 +444,84 @@ public class IoCollectOrderService extends ServiceImpl ioCollectOrderList,String addr) { + //下载处方 + if (CollUtil.isNotEmpty(ioCollectOrderList)){ + for (IoCollectOrder collectOrder : ioCollectOrderList) { + if (collectOrderMapper.exists(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, collectOrder.getBillNo()))) { + continue; + } + SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(addr); + if (sysWorkplaceDocumentEntity == null){ + continue; + } + if(collectOrder.getWorkPlaceCode() == null){ + //自动分配工位 + final Long[] defaultWorkplace = {null}; + List sysWorkplaces = sysWorkplaceService.getAllByBusType(addr); + if (CollUtil.isNotEmpty(sysWorkplaces)) { + if (sysWorkplaces.size() == 1) { + defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); + } else { + List addWorkplace = new ArrayList<>(); + for (SysWorkplaceResponse sysWorkplace : sysWorkplaces) { + //获取是否有正在处理的工位 + List collectOrderList1 = collectOrderMapper.selectList(new LambdaQueryWrapper() + .eq(IoCollectOrder::getWorkPlaceCode, sysWorkplace.getWorkplaceId()).in(IoCollectOrder::getTagStatus, -1, 1, 2)); + sysWorkplace.setOrderCount(collectOrderList1.size()); + if (IntUtil.value(sysWorkplace.getOrderCount()) > 0) { + addWorkplace.add(sysWorkplace); + } + } + if (addWorkplace.size() > 0) { + Optional minCountObject = addWorkplace.stream() + .min((o1, o2) -> Integer.compare(o1.getOrderCount(), o2.getOrderCount())); + minCountObject.ifPresent(sysWorkplace -> defaultWorkplace[0] = sysWorkplace.getWorkplaceId()); + } else { + defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); + } + } + } + collectOrder.setWorkPlaceCode(defaultWorkplace[0]); + } + + collectOrder.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode()); + collectOrder.setOrderCirType(sysWorkplaceDocumentEntity.getOrderCirType()); + if (collectOrder.getWorkPlaceCode() != null) { + collectOrder.setTagStatus(1); + } + this.save(collectOrder); + List bizList = collectOrder.getBizList(); + if (CollUtil.isNotEmpty(bizList)){ + for(IoCollectOrderBiz collectOrderBiz : bizList){ + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(collectOrderBiz.getRelId() + ""); + if (udiRelevanceResponse != null) { + collectOrderBiz.setYbbm(udiRelevanceResponse.getYbbm()); + collectOrderBiz.setPayFeeCode(udiRelevanceResponse.getPayFeeCode()); + collectOrderBiz.setNameCode(udiRelevanceResponse.getNameCode()); + if (IntUtil.value(udiRelevanceResponse.getProductsType()) == 2) { + collectOrderBiz.setGgxh(udiRelevanceResponse.getBzgg()); + collectOrderBiz.setMeasureUnit(udiRelevanceResponse.getPrepnUnit()); + } + } + } + collectOrderBizService.saveBatch(bizList); + } + if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1 && IntUtil.value(collectOrder.getTagStatus()) == 1) { + splitFifoCodeService.lockInventoryByOrder(collectOrder.getBillNo(), 1); + } + + } + } + + } + @Transactional(rollbackFor = Exception.class) public void removeCode(DeleteTageCodeRequest deleteTageCodeRequest) { Integer delType = deleteTageCodeRequest.getDelType(); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java index e55bd7979..b245173bd 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java @@ -3,19 +3,20 @@ package com.glxp.api.service.collect; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity; import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; +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.req.inout.FilterOrderRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkPrescribeResponse; -import com.glxp.api.service.basic.BasicSkPrescirbeDetailService; -import com.glxp.api.service.basic.BasicSkPrescribeService; +import com.glxp.api.service.basic.*; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -31,9 +32,12 @@ public class IoCollectOriginService { @Resource private ErpBasicClient erpBasicClient; @Resource - BasicSkPrescribeService basicSkPrescribeService; + private BasicSkPrescribeService basicSkPrescribeService; @Resource - BasicSkPrescirbeDetailService basicSkPrescirbeDetailService; + private BasicSkPrescirbeDetailService basicSkPrescirbeDetailService; + @Resource + private IoCollectOrderService ioCollectOrderService; + @Resource IoCollectOrderService collectOrderService; @@ -77,4 +81,24 @@ public class IoCollectOriginService { return ResultVOUtils.error("下载失败"); } + + public BaseResponse downloadOrderV2(CollectOrderRequest collectOrderRequest) { + //拉取药品处方 + if (collectOrderRequest.getBusType().equals("YPCF002")) { + GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest(); + getSickPrescribeRequest.setPage(1); + getSickPrescribeRequest.setLimit(100); + getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo()); + getSickPrescribeRequest.setThirdSys("thirdId"); + getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); + BaseResponse> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest); + if (baseResponse.getCode() == 20000) { + List list = baseResponse.getData().getList(); + collectOrderService.importPrescribe(list,collectOrderRequest.getBusType()); + return ResultVOUtils.success("下载成功"); + } + } + return ResultVOUtils.error("下载失败"); + + } }