From 3598907a5f51b1f2b2fd021ffd3d018b006293ba Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Thu, 19 May 2022 15:06:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=82=A3=E8=80=85/=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E5=88=A0=E9=99=A4=E6=97=B6=E5=90=8C=E6=97=B6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=8E=AF=E4=BF=A1=E8=B4=A6=E6=88=B7=E3=80=82=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E8=AF=8A=E5=8D=A1=E9=BB=98=E8=AE=A4=E7=BB=99?=
 =?UTF-8?q?4=E5=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/talkonlineweb/controller/DoctorController.java  | 8 ++++++--
 .../java/com/lyms/talkonlineweb/controller/PatientController.java | 8 ++++++++
 .../lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java   | 6 +++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java
index 486cda1..14c7043 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java
@@ -168,8 +168,12 @@ public class DoctorController {
         BaseResponse baseResponse=new BaseResponse();
         boolean f=lymsDoctorService.removeById(doctor.getDid());
         if (f){
-            JSONObject rs=hxService.delUser(doctor.getDlogin());
-            log.info(rs);
+            final LymsDoctor lymsDoctor = lymsDoctorService.getById(doctor.getDid());
+            if (StringUtil.isNotEmpty(lymsDoctor.getHxid())) {
+                JSONObject rs=hxService.delUser(doctor.getDlogin());
+                log.info(rs);
+            }
+
         }
         //保存操作记录
         lymsLogsCrud(doctor,null);
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 550fe0f..52bcdae 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
@@ -292,6 +292,14 @@ public class PatientController {
     public BaseResponse delPatient(int id) {
         BaseResponse baseResponse = new BaseResponse();
         boolean f = lymsPatientService.removeById(id);
+        if (f){
+            final LymsPatient patient = lymsPatientService.getById(id);
+            if (StringUtil.isNotEmpty(patient.getHxid())) {
+                JSONObject rs=hxService.delUser(patient.getIdno());
+                log.info(rs);
+            }
+
+        }
         baseResponse.setErrorcode(f == true ? 0 : 1);
         return baseResponse;
     }
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 b27ff1d..9a4ff24 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
@@ -228,7 +228,8 @@ public class LymsHisInfoServiceImpl extends ServiceImpl<LymsHisInfoMapper, LymsH
         if (!StringUtil.isEmpty(patient.getCode())) {
             patient.setOpenid(WeiXinUtil.getWxOpenId(patient.getCode()));
         }
-
+        //his患者上传默认给4张问诊卡
+        patient.setCcnt(4);
         boolean f = lymsPatientService.saveOrUpdate(patient);
 
 //        添加病例
@@ -269,8 +270,7 @@ public class LymsHisInfoServiceImpl extends ServiceImpl<LymsHisInfoMapper, LymsH
         }
 
         Date instDate = new Date();
-        //需要添加医院购买卡记录(his患者上传默认给4张问诊卡)
-        patient.setCcnt(4);
+        //需要添问诊卡记录
         for (int i = 0; i < patient.getCcnt() && Objects.nonNull(patient.getCcnt()); i++) {
             LymsTcard tcard = new LymsTcard();
             tcard.setCnt(1);
-- 
1.8.3.1