From 9f218cb902870e26ece14b3fc9517063e0e307d4 Mon Sep 17 00:00:00 2001
From: shiyang <shiyang@lymsh.com>
Date: Sat, 14 May 2022 15:57:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BD=BF=E7=94=A8=E6=B5=8B=E8=AF=95demo/His=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=82=A3=E8=80=85=E9=BB=98=E8=AE=A4=E7=BB=9910?=
 =?UTF-8?q?=E5=BC=A0=E9=97=AE=E8=AF=8A=E5=8D=A1=EF=BC=8C=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BA=AB=E4=BB=BD=E8=AF=81=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=BB=A3=E6=9B=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LymsHisInfoServiceImpl.java       |  6 +++++-
 .../src/main/resources/application-prod.yml        | 24 +++++++++++-----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java
index 32da442..ac9d650 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java
@@ -149,6 +149,9 @@ public class LymsHisInfoServiceImpl extends ServiceImpl<LymsHisInfoMapper, LymsH
             }
             //患者(身份证)
             String idCard = lymsHisInfo.getIdcard();
+            if (StringUtil.isEmpty(idCard)) {
+                idCard=lymsHisInfo.getVccardno();
+            }
             //判断患者是否存在
             LymsPatient patientQuery = new LymsPatient();
             patientQuery.setIdno(idCard.toLowerCase());
@@ -266,7 +269,8 @@ public class LymsHisInfoServiceImpl extends ServiceImpl<LymsHisInfoMapper, LymsH
         }
 
         Date instDate = new Date();
-        //需要添加医院购买卡记录
+        //需要添加医院购买卡记录(his患者上传默认给10张问诊卡)
+        patient.setCcnt(10);
         for (int i = 0; i < patient.getCcnt() && Objects.nonNull(patient.getCcnt()); i++) {
             LymsTcard tcard = new LymsTcard();
             tcard.setCnt(1);
diff --git a/talkonlineweb/src/main/resources/application-prod.yml b/talkonlineweb/src/main/resources/application-prod.yml
index dc88fda..8fe24ce 100644
--- a/talkonlineweb/src/main/resources/application-prod.yml
+++ b/talkonlineweb/src/main/resources/application-prod.yml
@@ -9,21 +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.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
 
-#环信配置
-hx.APPKEY: 1123170414115195#talkonline
-hx.ClientID: YXA63Zp2DnLaTuyE0px-g4_8Cw
-hx.ClientSecret: YXA6Ml0jgv7w9PaN0WmTc8irMWX4dNg
-hx.org_name: 1123170414115195
-hx.app_name: talkonline
+#环信配置（测试demo）
+hx.APPKEY: 1123220513107089#demo
+hx.ClientID: YXA6IsD4iz8dT_OD3033c4ak9A
+hx.ClientSecret: YXA6X8ZXDXVIxyixnkeCa5Ep0jX-XMw
+hx.org_name: 1123220513107089
+hx.app_name: demo
 hx.hxuser: test
 hx.hxpasswd: passwd
 
-- 
1.8.3.1