From 908f2a41f02c654da58f899cdd99e3ea54985ea6 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 4 Nov 2022 16:51:12 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7ID=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcBirthRecordDao.xml             | 3 +++
 .../src/main/resources/mapper/IcMoveInRecordDao.xml            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml
index 9f6ac1e550..b4b8b4894b 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml
@@ -68,6 +68,9 @@
             ibr.UPDATED_TIME
 		from ic_birth_record ibr
 		left join ic_resi_user iru on iru.ID_CARD = ibr.ID_CARD and iru.DEL_FLAG = 0
+        <if test='customerId != "" and customerId != null'>
+            and iru.CUSTOMER_ID=#{customerId}
+        </if>
 		where ibr.DEL_FLAG = 0
         <if test='customerId != "" and customerId != null'>
             AND ibr.CUSTOMER_ID = #{customerId}
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
index 03065d2e60..9aa41b001d 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
@@ -30,7 +30,7 @@
             mir.householder_name householderName,
             mir.householder_relation householderRelation
         FROM ic_move_in_record mir
-        left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0
+        left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0 and iru.CUSTOMER_ID=#{customerId}
         WHERE  mir.del_flag = '0'
         AND mir.customer_id=#{customerId}
         <if test="gridId != null and gridId != '' ">

From a454096f6a4a51dbf05c3a25773f94e63bb43b45 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Nov 2022 16:59:44 +0800
Subject: [PATCH 2/4] name

---
 .../src/main/resources/mapper/govorg/CustomerAgencyDao.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
index 90f40009c2..262b5435d9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
@@ -328,7 +328,7 @@
 
     <!-- 查询员工的证件号和手机号 -->
     <select id="getEmployeeRegisterMobileAndIdCard" resultType="java.util.Map">
-        select MOBILE,ID_CARD from ic_employee_register where id = #{registerId}
+        select MOBILE,ID_CARD,NAME from ic_employee_register where id = #{registerId}
     </select>
 
 </mapper>

From ad50c1ed5cd07729b6ae363d73ace8b15cff1795 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 7 Nov 2022 16:08:25 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=B8=8B=E5=B7=B2=E5=AD=98=E5=9C=A8=E7=9B=B8=E5=90=8C=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E7=9A=84=E6=A8=A1=E6=9D=BF!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcExportTemplateServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java
index 8151e9c0b2..4c30471bc4 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java
@@ -124,7 +124,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
                 //增加校验 同组织内模板名不能重复
                 templist.forEach(t -> {
                     if (formDTO.getName().equals(t.getName())) {
-                        throw new EpmetException(9999, "当前组织下已存在相同名称的模板!", "当前组织下已存在相同名称的模板!");
+                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的模板!", "当前组织下已存在相同名称的模板!");
                     }
                 });
                 sort = templist.get(NumConstant.ZERO).getSort() + NumConstant.ONE;

From b95631c2bc82e9befd8bb1e863ca955afdd24720 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 7 Nov 2022 16:16:48 +0800
Subject: [PATCH 4/4] epmetuser/icEpidemicSpecialAttention/vaccination-update

---
 .../IcEpidemicSpecialAttentionServiceImpl.java     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
index 0a76221ff0..31acd1ec00 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -349,6 +350,19 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
         e.setReason(formDTO.getReason());
         e.setRemark(formDTO.getRemark());
         e.setIsolatedState(formDTO.getIsolatedState());
+        //需求来源于磐石： http://zentao.elinkservice.cn/story-view-713.html
+        e.setGkStartTime(StringUtils.isNotBlank(formDTO.getGkStartTime()) ? formDTO.getGkStartTime() : StrConstant.EPMETY_STR);
+        e.setGkEndTime(StringUtils.isNotBlank(formDTO.getGkEndTime()) ? formDTO.getGkEndTime() : StrConstant.EPMETY_STR);
+        e.setGbName(StringUtils.isNotBlank(formDTO.getGbName()) ? formDTO.getGbName() : StrConstant.EPMETY_STR);
+        e.setGbMobile(StringUtils.isNotBlank(formDTO.getGbMobile()) ? formDTO.getGbMobile() : StrConstant.EPMETY_STR);
+        e.setGridManager(StringUtils.isNotBlank(formDTO.getGridManager()) ? formDTO.getGridManager() : StrConstant.EPMETY_STR);
+        e.setGridManagerMobile(StringUtils.isNotBlank(formDTO.getGridManagerMobile()) ? formDTO.getGridManagerMobile() : StrConstant.EPMETY_STR);
+        e.setHealthWorker(StringUtils.isNotBlank(formDTO.getHealthWorker()) ? formDTO.getHealthWorker() : StrConstant.EPMETY_STR);
+        e.setHealthWorkerMobile(StringUtils.isNotBlank(formDTO.getHealthWorkerMobile()) ? formDTO.getHealthWorkerMobile() : StrConstant.EPMETY_STR);
+        e.setPoliceName(StringUtils.isNotBlank(formDTO.getPoliceName()) ? formDTO.getPoliceName() : StrConstant.EPMETY_STR);
+        e.setPoliceMobile(StringUtils.isNotBlank(formDTO.getPoliceMobile()) ? formDTO.getPoliceMobile() : StrConstant.EPMETY_STR);
+        e.setVolunteerName(StringUtils.isNotBlank(formDTO.getVolunteerName()) ? formDTO.getVolunteerName() : StrConstant.EPMETY_STR);
+        e.setVolunteerMobile(StringUtils.isNotBlank(formDTO.getVolunteerMobile()) ? formDTO.getVolunteerMobile() : StrConstant.EPMETY_STR);
         update(e,w);
         if (CollectionUtils.isNotEmpty(formDTO.getChannel())){
             SendNoticeFormDTO dto = new SendNoticeFormDTO();