From 41dc141f414d9cb1660f415be106e33ba14d4f74 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 21 Oct 2021 18:51:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=87=BA=E9=99=A2?= =?UTF-8?q?=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java | 7 +++++++ .../platform/operate/web/facade/BabyBookbuildingFacade.java | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java index 43131a7..1c7f52b 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -1005,6 +1005,13 @@ public class QhdfyHisService { if(info == null && StringUtils.isEmpty(info.getSyxh())){ continue; } + + if (StringUtils.isNotEmpty(info.getRyrq()) && StringUtils.isNotEmpty(info.getCyrq())) + { + map.put("ryrq",DateUtil.getyyyy_MM_dd(DateUtil.parseYyyyMMddHHssmm(info.getRyrq()))); + map.put("cyrq",DateUtil.getyyyy_MM_dd(DateUtil.parseYyyyMMddHHssmm(info.getCyrq()))); + } + String sqlstr = "select ZDMC as cyzdmc from jhemr.V_DIAGNOSIS_LYMS where syxh='"+info.getSyxh()+"' ORDER BY ZDRQ desc "; Connection conn2 = null; try { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index e2614d5..6041eff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -3950,9 +3950,7 @@ public class BabyBookbuildingFacade { public BaseResponse queryHisBabyDiagnosis(String blNo) { BaseObjectResponse objectResponse = new BaseObjectResponse(); if ("4".equals(HIS_VERSION)) { -// Map results = qhdfyHisService.queryHisBabyDiagnosis(blNo); Map results = qhdfyHisService.queryHisBabyDiagnosis2(blNo);//20210108 新规则 - //results.put("diagnosisItem", "用于测试，暂时固定，测试完成后通知修改恢复！"); objectResponse.setData(results); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); @@ -3963,6 +3961,15 @@ public class BabyBookbuildingFacade { objectResponse.setErrormsg("成功"); } + Map results = new HashMap<>(); + results.put("diagnosisItem", "用于测试，暂时固定，测试完成后通知修改恢复！"); + results.put("ryrq",DateUtil.getyyyy_MM_dd(DateUtil.parseYyyyMMddHHssmm("2020061102:36:00"))); + results.put("cyrq",DateUtil.getyyyy_MM_dd(DateUtil.parseYyyyMMddHHssmm("2020071102:36:00"))); + + objectResponse.setData(results); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; } -- 1.8.3.1