From cd82cc33aaa3585c336ad9c593aed49ca0b27085 Mon Sep 17 00:00:00 2001
From: mengkuiliang <1464081137@qq.com>
Date: Thu, 9 Nov 2023 08:36:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applet/pojo/body/ResidentServiceApplyBody.java          | 6 ++++--
 .../applet/service/impl/ResidentPatientInfoServiceImpl.java | 4 ++++
 .../service/impl/ResidentServiceApplyServiceImpl.java       | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/ResidentServiceApplyBody.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/ResidentServiceApplyBody.java
index 3b66212..b3fcb35 100644
--- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/ResidentServiceApplyBody.java
+++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/ResidentServiceApplyBody.java
@@ -1,5 +1,6 @@
 package com.xinelu.familydoctor.applet.pojo.body;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xinelu.familydoctor.applet.pojo.dto.ResidentServiceFormApplyDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -47,19 +48,20 @@ public class ResidentServiceApplyBody extends ResidentServiceFormApplyDto{
      * 预约时间
      */
     @ApiModelProperty(value = "预约时间", required = true)
+    @JsonFormat(pattern ="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date bookingTime;
 
     /**
      * 预约机构编号
      */
     @ApiModelProperty(value = "预约机构编号", required = true)
-    private String orgNo;
+    private String hospitalId;
 
     /**
      * 预约机构名称
      */
     @ApiModelProperty(value = "预约机构名称", required = true)
-    private String orgName;
+    private String hospitalName;
 
     /**
      * 预约团队编号
diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
index 70b2eba..15412c0 100644
--- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
+++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
@@ -229,6 +229,10 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
                 }
                 // 注册
             } else {
+                List<PatientInfo> list = residentPatientInfoMapper.getList(body.getOpenid(), null);
+                if(list != null && list.size() >= 8) {
+                    throw new ServiceException("同一个微信最多绑定8个居民");
+                }
                 PatientInfo entity = new PatientInfo();
                 BeanUtils.copyBeanProp(entity, body);
                 // 已绑定openid，将该值置空
diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java
index 27e4388..853c8e0 100644
--- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java
+++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java
@@ -88,6 +88,8 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe
         // 审批状态0:待批准 1:已同意 2:已拒绝
         entity.setApprovalStatus("0");
         entity.setBookingNo(IdUtils.simpleUUID());
+        entity.setOrgNo(body.getHospitalId());
+        entity.setOrgName(body.getHospitalName());
         if(StringUtils.isBlank(entity.getServiceWay())) {
             entity.setServiceWay("2");
         }
@@ -101,7 +103,7 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe
         messagePushBody.setBusType("10");
         messagePushBody.setOpenid(patientInfo.getBindOpenid());
         messagePushBody.setReceiveName(patientInfo.getPatientName());
-        messagePushBody.setText1(body.getOrgName());
+        messagePushBody.setText1(body.getHospitalName());
         messagePushBody.setText2(body.getFormName().length() >= 20? body.getFormName().substring(0,17) + "...": body.getFormName());
         messagePushBody.setText3(body.getFormName());
         messagePushBody.setSendTitle("服务预约");