From e394475011cf0267b5d1533255502e8e97105769 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Mon, 28 Feb 2022 14:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E4=BF=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PatientController.java              | 33 ++++++++++++++++++----
 .../src/main/resources/application-dev.yml         | 19 +++++++++----
 .../src/main/resources/application-prod.yml        | 19 +++++++++----
 3 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
index 53bafdb..8fc78f7 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
@@ -293,21 +293,41 @@ public class PatientController {
         baseResponse.setErrorcode(1);
         LymsPatient patient2=null;
 
+        //是否有病例
+        int pcaseSize=0;
+        LymsPcase pcase=new LymsPcase();
+        pcase.setMobile(patient.getIdno());
+        List<LymsPcase> cLst =lymsPcaseService.list(Wrappers.query(pcase));
+        pcaseSize=cLst.size();
         if(dLst.size() < 1 ){//手机号登录
-            LymsPcase pcase=new LymsPcase();
-            pcase.setMobile(patient.getIdno());
-            List<LymsPcase> cLst =lymsPcaseService.list(Wrappers.query(pcase));
-            if(cLst.size()>0){
+            if(pcaseSize>0){
                 Map<String,Object> param=new HashMap<>();
                 param.put("id",cLst.get(0).getPid());
                 param.put("ppasswd",patient.getPpasswd());
                 dLst=lymsPatientService.listByMap(param);
-            }else {
+            }else {//没有病例
                 //小程序自主注册用手机号登录验证
                 Map<String,Object> paramQuery=new HashMap<>();
                 paramQuery.put("enrolment_phone",patient.getIdno());
                 paramQuery.put("ppasswd",patient.getPpasswd());
-                dLst =lymsPatientService.listByMap(paramQuery);
+                if(patient.getId()!=null) {
+                    paramQuery.put("id", patient.getId());
+                }
+                List<LymsPatient> patients = lymsPatientService.listByMap(paramQuery);
+                if(patients.size()==1) {
+                    dLst= patients;
+                }
+                if(patients.size()>1){//一个手机号码注册多个身份证
+                    List<Map> listMap=new ArrayList<>();
+                    for (LymsPatient lymsPatient : patients) {
+                        Map map=new HashMap();
+                        map.put("name", lymsPatient.getPname());
+                        map.put("id", lymsPatient.getId());
+                        listMap.add(map);
+                    }
+                    baseResponse.setErrorcode(2);
+                    baseResponse.setObject(listMap);
+                }
             }
 
         }
@@ -339,6 +359,7 @@ public class PatientController {
             patient.setPpasswd(null);
             map.put("patient", patient2);
             map.put("token", jwt);
+            map.put("pcaseSize", pcaseSize);
             baseResponse.setErrorcode(0);
             baseResponse.setObject(map);
         }
diff --git a/talkonlineweb/src/main/resources/application-dev.yml b/talkonlineweb/src/main/resources/application-dev.yml
index af9ff72..881fbec 100644
--- a/talkonlineweb/src/main/resources/application-dev.yml
+++ b/talkonlineweb/src/main/resources/application-dev.yml
@@ -12,12 +12,21 @@ imgUrlPre: https://dev-talk-api.healthbaby.com.cn/art/showPic/
 #imgUrlPre: http://192.168.2.26:9090/art/showPic/
 
 
+##环信配置（原始开发环境，不用了）
+#hx.APPKEY: 1135210903239178#demo
+#hx.ClientID: YXA65kqQUy4pQaqHb3pwXwfnrA
+#hx.ClientSecret: YXA6RZaIr68MPPLcvqUnYxpqEkAEj6w
+#hx.org_name: 1135210903239178
+#hx.app_name: demo
+#hx.hxuser: test
+#hx.hxpasswd: passwd
+
 #环信配置
-hx.APPKEY: 1135210903239178#demo
-hx.ClientID: YXA65kqQUy4pQaqHb3pwXwfnrA
-hx.ClientSecret: YXA6RZaIr68MPPLcvqUnYxpqEkAEj6w
-hx.org_name: 1135210903239178
-hx.app_name: demo
+hx.APPKEY: 1123170414115195#talkonline
+hx.ClientID: YXA63Zp2DnLaTuyE0px-g4_8Cw
+hx.ClientSecret: YXA6Ml0jgv7w9PaN0WmTc8irMWX4dNg
+hx.org_name: 1123170414115195
+hx.app_name: talkonline
 hx.hxuser: test
 hx.hxpasswd: passwd
 
diff --git a/talkonlineweb/src/main/resources/application-prod.yml b/talkonlineweb/src/main/resources/application-prod.yml
index 92b6712..a8edddc 100644
--- a/talkonlineweb/src/main/resources/application-prod.yml
+++ b/talkonlineweb/src/main/resources/application-prod.yml
@@ -9,12 +9,21 @@ excludePath: login,test1,test2
 uploadPath: /data/talkonline/upload/
 imgUrlPre: https://talk-api.healthbaby.com.cn/art/showPic/
 
+##环信配置（原始开发环境，不用了）
+#hx.APPKEY: 1135210903239178#demo
+#hx.ClientID: YXA65kqQUy4pQaqHb3pwXwfnrA
+#hx.ClientSecret: YXA6RZaIr68MPPLcvqUnYxpqEkAEj6w
+#hx.org_name: 1135210903239178
+#hx.app_name: demo
+#hx.hxuser: test
+#hx.hxpasswd: passwd
+
 #环信配置
-hx.APPKEY: 1135210903239178#demo
-hx.ClientID: YXA65kqQUy4pQaqHb3pwXwfnrA
-hx.ClientSecret: YXA6RZaIr68MPPLcvqUnYxpqEkAEj6w
-hx.org_name: 1135210903239178
-hx.app_name: demo
+hx.APPKEY: 1123170414115195#talkonline
+hx.ClientID: YXA63Zp2DnLaTuyE0px-g4_8Cw
+hx.ClientSecret: YXA6Ml0jgv7w9PaN0WmTc8irMWX4dNg
+hx.org_name: 1123170414115195
+hx.app_name: talkonline
 hx.hxuser: test
 hx.hxpasswd: passwd
 
-- 
1.8.3.1