From 00d48f095be96ad23f56879ddcd63637741d4379 Mon Sep 17 00:00:00 2001
From: wangsq <944414428@qq.com>
Date: Mon, 8 Apr 2024 16:01:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E9=97=AE=E8=AF=8A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8C=82=E5=8F=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E8=A6=81=E6=B1=82=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=BA=E7=A9=BA=E8=BF=9B=E8=A1=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
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<String> departmentIds;
 
     public String doctorId;
-
+    // 医生姓名
     public String doctorName;
+    // 就诊类型 0:未知 1:初诊 2:复诊
+    public Integer visitingStatus;
+    // 医生企业微信ID
+    public String doctorWorkWechatId;
 
     public List<String> getStrList(String val){
         List<String> dataList = new ArrayList<>();