From c4e32c0f89905b457e839b0c00a195a37d61e536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BF=9B=E6=89=8D?= Date: Mon, 8 Apr 2024 13:27:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8A=A0=E4=B8=8A=E8=AE=A2=E5=8D=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ynxbd/wx/config/MessagePushConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java b/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java index 62c7a4a..54d8ac9 100644 --- a/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java +++ b/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java @@ -199,7 +199,7 @@ public class MessagePushConfig { String url = PWEHelper.getH5PWEUrl(reg.getOutTradeNo(),reg.getOpenid()); if(url==null||"".equals(url)){ - log.warn("[推送][推送]AI智能问诊推送通知失败，问诊获取参数为空"); + log.warn("[推送][推送]AI智能问诊推送通知失败，问诊获取参数为空 outTradeNo-{}",reg.getOutTradeNo()); return; } @@ -232,7 +232,7 @@ public class MessagePushConfig { } String url = PWEHelper.getH5PWEUrl(outTradeNo,openId); if(url==null||"".equals(url)){ - log.warn("[推送]AI问诊报告推送通知失败，问诊获取参数为空"); + log.warn("[推送]AI问诊报告推送通知失败，问诊获取参数为空 outTradeNo-{}",outTradeNo); return; } From 3be5e51e81f40d564270e13699c7faaa8536d8e1 Mon Sep 17 00:00:00 2001 From: wangsq <944414428@qq.com> Date: Mon, 8 Apr 2024 16:01:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=82=E6=95=B0=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ynxbd/common/action/PWEAction.java | 9 ++++++--- src/main/java/com/ynxbd/common/dao/PWEReportDao.java | 2 +- src/main/java/com/ynxbd/wx/pwe/bean/PWERegister.java | 6 +++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ynxbd/common/action/PWEAction.java b/src/main/java/com/ynxbd/common/action/PWEAction.java index c85effe..d74e127 100644 --- a/src/main/java/com/ynxbd/common/action/PWEAction.java +++ b/src/main/java/com/ynxbd/common/action/PWEAction.java @@ -114,6 +114,7 @@ public class PWEAction extends BaseAction { String progress = body.getString("progress"); Register order = new PWEReportDao().selectRegOrderInfo(registeredId); log.info("[预问诊]6.3 预问诊完成通知 partnerId={}, hospitalId={}, registeredId={}, progress={}", partnerId, hospitalId, registeredId, progress); + if ("1".equals(progress)) { log.info("[预问诊]报告生成进度100%"); MessagePushConfig.regAIReport(order.getPatientId(), order.getOutTradeNo(), order.getOpenid()); @@ -125,10 +126,9 @@ public class PWEAction extends BaseAction { } - // 返回挂号信息 /** - * [预问诊]挂号查询 + * [预问诊]6.2 挂号查询 GetRegisteredInfo（必选） */ @Action("GetRegisteredInfo") public PWEResult GetRegisteredInfo(HttpServletRequest req) { @@ -162,7 +162,7 @@ public class PWEAction extends BaseAction { } PWERegister reg = new PWERegister(); -// reg.setName(order.getPatientName()); + reg.setName(ObjectUtils.isEmpty(order.getPatientName())? "": order.getPatientName()); reg.setSex(gender); reg.setAge(age); reg.setRegisteredId(order.getOutTradeNo()); @@ -171,6 +171,9 @@ public class PWEAction extends BaseAction { reg.setDepartmentIds(reg.getStrList(order.getDeptCode())); reg.setDoctorId(order.getDoctCode()); reg.setDoctorName(order.getDoctName()); + reg.setQuery(""); + reg.setVisitingStatus(0); + reg.setDoctorWorkWechatId(""); return PWEResult.success(reg); } catch (Exception e) { diff --git a/src/main/java/com/ynxbd/common/dao/PWEReportDao.java b/src/main/java/com/ynxbd/common/dao/PWEReportDao.java index e4893d4..2e2d78f 100644 --- a/src/main/java/com/ynxbd/common/dao/PWEReportDao.java +++ b/src/main/java/com/ynxbd/common/dao/PWEReportDao.java @@ -38,7 +38,7 @@ public class PWEReportDao { * @param outTradeNo 订单号 */ public Register selectRegOrderInfo(String outTradeNo) { - String sql = "select r.idCardNo, r.deptCode, r.deptName, r.doctCode, r.doctName, r.outTradeNo, r.bankTransNo, r.tradeNo, r.patientId, r.openid, p.name as patientName, p.sex, p.birthday" + + String sql = "select r.idCardNo, r.deptCode, r.deptName, r.doctCode, r.doctName, r.outTradeNo, r.bankTransNo, r.tradeNo, r.patientId, r.openid, r.refundResult, r.payStatus, r.hisStatus, p.name as patientName, p.sex, p.birthday" + " from register as r left join patientBase as p on (r.patientId = p.patientId and r.openid = p.openid)" + " where r.outTradeNo = ?"; return DataBase.selectOne(sql, Register.class, ps -> { diff --git a/src/main/java/com/ynxbd/wx/pwe/bean/PWERegister.java b/src/main/java/com/ynxbd/wx/pwe/bean/PWERegister.java index 20d32bd..2e41cf5 100644 --- a/src/main/java/com/ynxbd/wx/pwe/bean/PWERegister.java +++ b/src/main/java/com/ynxbd/wx/pwe/bean/PWERegister.java @@ -34,8 +34,12 @@ public class PWERegister implements Serializable { public List departmentIds; public String doctorId; - + // 医生姓名 public String doctorName; + // 就诊类型 0:未知 1:初诊 2:复诊 + public Integer visitingStatus; + // 医生企业微信ID + public String doctorWorkWechatId; public List getStrList(String val){ List dataList = new ArrayList<>(); From 89fa9034cfb4dcbe88899ca70193336e4e18fdfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BF=9B=E6=89=8D?= Date: Mon, 8 Apr 2024 16:05:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9AI=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=9A=84=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ynxbd/wx/config/MessagePushConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java b/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java index 54d8ac9..02670b0 100644 --- a/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java +++ b/src/main/java/com/ynxbd/wx/config/MessagePushConfig.java @@ -209,7 +209,7 @@ public class MessagePushConfig { .add("url", url) .add("organizeName",ORGANIZENAME) .build(); - OkHttpHelper.post(OBS_DOCUMENT, requestBody); + OkHttpHelper.post(REG_AI_URL, requestBody); } catch (Exception e) { log.warn("[推送]AI智能问诊推送通知错误-{}", e.getMessage()); } @@ -242,7 +242,7 @@ public class MessagePushConfig { .add("url", url) .add("organizeName",ORGANIZENAME) .build(); - OkHttpHelper.post(OBS_DOCUMENT, requestBody); + OkHttpHelper.post(REG_AI_URL, requestBody); } catch (Exception e) { log.warn("[推送]AI问诊报告推送通知错误-{}", e.getMessage()); }