From aec879578f0deba675fbe1405eece5b4bb36e238 Mon Sep 17 00:00:00 2001
From: "jesse.wang" <jesse.wang@cloudwise.com>
Date: Thu, 13 Apr 2023 20:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E7=97=87=E5=88=9D=E7=AD=9B?=
 =?UTF-8?q?=E5=A4=8D=E7=AD=9B=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../master/BabyAutismPrimaryScreeningMapper.java   |   6 +-
 .../master/BabyAutismPrimaryScreeningMapper.xml    | 242 ++++++++++-----------
 .../web/controller/PrimaryScreeningController.java |  31 ---
 .../operate/web/facade/PrimaryScreeningFacade.java |  71 +++---
 4 files changed, 162 insertions(+), 188 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismPrimaryScreeningMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismPrimaryScreeningMapper.java
index 541e03d..112ff3e 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismPrimaryScreeningMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismPrimaryScreeningMapper.java
@@ -29,7 +29,7 @@ public interface BabyAutismPrimaryScreeningMapper {
      * @param pageable         分页对象
      * @return 对象列表
      */
-    List<BabyAutismPrimaryScreening> queryAllByLimit(BabyAutismPrimaryScreening babyAutismPrimaryScreening, @Param("pageable") BaseQuery pageable);
+    List<BabyAutismPrimaryScreening> queryAllByLimit(@Param("babyAutismPrimaryScreening")BabyAutismPrimaryScreening babyAutismPrimaryScreening, @Param("pageable") BaseQuery pageable);
 
     /**
      * 统计总行数
@@ -37,7 +37,7 @@ public interface BabyAutismPrimaryScreeningMapper {
      * @param babyAutismPrimaryScreening 查询条件
      * @return 总行数
      */
-    long count(BabyAutismPrimaryScreening babyAutismPrimaryScreening);
+    long count(@Param("babyAutismPrimaryScreening") BabyAutismPrimaryScreening babyAutismPrimaryScreening);
 
     /**
      * 新增数据
@@ -82,7 +82,7 @@ public interface BabyAutismPrimaryScreeningMapper {
 
     /**
      * 根据儿童ID查询初筛记录
-     * @param babyId
+     * @param id
      * @return
      */
     List<BabyAutismPrimaryScreening> queryListByBabyId(String id);
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
index 99a52fa..f8a8e5f 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
@@ -73,7 +73,7 @@
     </select>
 
     <!--查询指定行数据-->
-    <select id="queryAllByLimit" resultMap="BabyAutismPrimaryScreeningMap">
+    <select id="queryAllByLimit" resultMap="BabyAutismPrimaryScreeningMap" parameterType="com.lyms.platform.pojo.BabyAutismPrimaryScreening">
         select
         id, created, modified, yn, operater_id, hospital_id, baby_id, baby_build_date, baby_name, baby_sex, baby_m_name,
         baby_f_name, baby_m_phone, baby_f_phone, baby_m_cert_no, baby_f_cert_no, pid, check_month_age, check_month_id,
@@ -81,194 +81,194 @@
         warning_signs, language_social, preliminary_screening_results
         from baby_autism_primary_screening
         <where>
-            <if test="id != null and id != ''">
+            <if test="babyAutismPrimaryScreening.id != null and babyAutismPrimaryScreening.id != ''">
                 and id = #{id}
             </if>
-            <if test="created != null and created != ''">
-                and created = #{created}
+            <if test="babyAutismPrimaryScreening.created != null ">
+                and created = #{babyAutismPrimaryScreening.created}
             </if>
-            <if test="modified != null and modified != ''">
-                and modified = #{modified}
+            <if test="babyAutismPrimaryScreening.modified != null ">
+                and modified = #{babyAutismPrimaryScreening.modified}
             </if>
-            <if test="yn != null">
-                and yn = #{yn}
+            <if test="babyAutismPrimaryScreening.yn != null">
+                and yn = #{babyAutismPrimaryScreening.yn}
             </if>
-            <if test="operaterId != null and operaterId != ''">
-                and operater_id = #{operaterId}
+            <if test="babyAutismPrimaryScreening.operaterId != null and babyAutismPrimaryScreening.operaterId != ''">
+                and operater_id = #{babyAutismPrimaryScreening.operaterId}
             </if>
-            <if test="hospitalId != null and hospitalId != ''">
-                and hospital_id = #{hospitalId}
+            <if test="babyAutismPrimaryScreening.hospitalId != null and babyAutismPrimaryScreening.hospitalId != ''">
+                and hospital_id = #{babyAutismPrimaryScreening.hospitalId}
             </if>
-            <if test="babyId != null and babyId != ''">
-                and baby_id = #{babyId}
+            <if test="babyAutismPrimaryScreening.babyId != null and babyAutismPrimaryScreening.babyId != ''">
+                and baby_id = #{babyAutismPrimaryScreening.babyId}
             </if>
-            <if test="babyBuildDate != null and babyBuildDate != ''">
-                and baby_build_date = #{babyBuildDate}
+            <if test="babyAutismPrimaryScreening.babyBuildDate != null and babyAutismPrimaryScreening.babyBuildDate != ''">
+                and baby_build_date = #{babyAutismPrimaryScreening.babyBuildDate}
             </if>
-            <if test="babyName != null and babyName != ''">
-                and baby_name = #{babyName}
+            <if test="babyAutismPrimaryScreening.babyName != null and babyAutismPrimaryScreening.babyName != ''">
+                and baby_name = #{babyAutismPrimaryScreening.babyName}
             </if>
-            <if test="babySex != null">
-                and baby_sex = #{babySex}
+            <if test="babyAutismPrimaryScreening.babySex != null">
+                and baby_sex = #{babyAutismPrimaryScreening.babySex}
             </if>
-            <if test="babyMName != null and babyMName != ''">
-                and baby_m_name = #{babyMName}
+            <if test="babyAutismPrimaryScreening.babyMName != null and babyAutismPrimaryScreening.babyMName != ''">
+                and baby_m_name = #{babyAutismPrimaryScreening.babyMName}
             </if>
-            <if test="babyFName != null and babyFName != ''">
-                and baby_f_name = #{babyFName}
+            <if test="babyAutismPrimaryScreening.babyFName != null and babyAutismPrimaryScreening.babyFName != ''">
+                and baby_f_name = #{babyAutismPrimaryScreening.babyFName}
             </if>
-            <if test="babyMPhone != null and babyMPhone != ''">
-                and baby_m_phone = #{babyMPhone}
+            <if test="babyAutismPrimaryScreening.babyMPhone != null and babyAutismPrimaryScreening.babyMPhone != ''">
+                and baby_m_phone = #{babyAutismPrimaryScreening.babyMPhone}
             </if>
-            <if test="babyFPhone != null and babyFPhone != ''">
-                and baby_f_phone = #{babyFPhone}
+            <if test="babyAutismPrimaryScreening.babyFPhone != null and babyAutismPrimaryScreening.babyFPhone != ''">
+                and baby_f_phone = #{babyAutismPrimaryScreening.babyFPhone}
             </if>
-            <if test="babyMCertNo != null and babyMCertNo != ''">
-                and baby_m_cert_no = #{babyMCertNo}
+            <if test="babyAutismPrimaryScreening.babyMCertNo != null and babyAutismPrimaryScreening.babyMCertNo != ''">
+                and baby_m_cert_no = #{babyAutismPrimaryScreening.babyMCertNo}
             </if>
-            <if test="babyFCertNo != null and babyFCertNo != ''">
-                and baby_f_cert_no = #{babyFCertNo}
+            <if test="babyAutismPrimaryScreening.babyFCertNo != null and babyAutismPrimaryScreening.babyFCertNo != ''">
+                and baby_f_cert_no = #{babyAutismPrimaryScreening.babyFCertNo}
             </if>
-            <if test="pid != null and pid != ''">
-                and pid = #{pid}
+            <if test="babyAutismPrimaryScreening.pid != null and babyAutismPrimaryScreening.pid != ''">
+                and pid = #{babyAutismPrimaryScreening.pid}
             </if>
-            <if test="checkMonthAge != null and checkMonthAge != ''">
-                and check_month_age = #{checkMonthAge}
+            <if test="babyAutismPrimaryScreening.checkMonthAge != null and babyAutismPrimaryScreening.checkMonthAge != ''">
+                and check_month_age = #{babyAutismPrimaryScreening.checkMonthAge}
             </if>
-            <if test="checkMonthId != null and checkMonthId != ''">
-                and check_month_id = #{checkMonthId}
+            <if test="babyAutismPrimaryScreening.checkMonthId != null and babyAutismPrimaryScreening.checkMonthId != ''">
+                and check_month_id = #{babyAutismPrimaryScreening.checkMonthId}
             </if>
-            <if test="birth != null and birth != ''">
-                and birth = #{birth}
+            <if test="babyAutismPrimaryScreening.birth != null ">
+                and birth = #{babyAutismPrimaryScreening.birth}
             </if>
-            <if test="checkTime != null and checkTime != ''">
-                and check_time = #{checkTime}
+            <if test="babyAutismPrimaryScreening.checkTime != null ">
+                and check_time = #{babyAutismPrimaryScreening.checkTime}
             </if>
-            <if test="nextCheckTime != null and nextCheckTime != ''">
-                and next_check_time = #{nextCheckTime}
+            <if test="babyAutismPrimaryScreening.nextCheckTime != null ">
+                and next_check_time = #{babyAutismPrimaryScreening.nextCheckTime}
             </if>
-            <if test="doctor != null and doctor != ''">
-                and check_doctor = #{doctor}
+            <if test="babyAutismPrimaryScreening.doctor != null and babyAutismPrimaryScreening.doctor != ''">
+                and check_doctor = #{babyAutismPrimaryScreening.doctor}
             </if>
-            <if test="doctorSign != null and doctorSign != ''">
-                and doctor_sign = #{doctorSign}
+            <if test="babyAutismPrimaryScreening.doctorSign != null and babyAutismPrimaryScreening.doctorSign != ''">
+                and doctor_sign = #{babyAutismPrimaryScreening.doctorSign}
             </if>
-            <if test="patientSign != null and patientSign != ''">
-                and patient_sign = #{patientSign}
+            <if test="babyAutismPrimaryScreening.patientSign != null and babyAutismPrimaryScreening.patientSign != ''">
+                and patient_sign = #{babyAutismPrimaryScreening.patientSign}
             </if>
-            <if test="guidanceOpinions != null and guidanceOpinions != ''">
-                and guidance_opinions = #{guidanceOpinions}
+            <if test="babyAutismPrimaryScreening.guidanceOpinions != null and babyAutismPrimaryScreening.guidanceOpinions != ''">
+                and guidance_opinions = #{babyAutismPrimaryScreening.guidanceOpinions}
             </if>
-            <if test="handleOpinions != null and handleOpinions != ''">
-                and handle_opinions = #{handleOpinions}
+            <if test="babyAutismPrimaryScreening.handleOpinions != null and babyAutismPrimaryScreening.handleOpinions != ''">
+                and handle_opinions = #{babyAutismPrimaryScreening.handleOpinions}
             </if>
-            <if test="warningSignstring != null and warningSignstring != ''">
-                and warning_signs = #{warningSignstring}
+            <if test="babyAutismPrimaryScreening.warningSignstring != null and babyAutismPrimaryScreening.warningSignstring != ''">
+                and warning_signs = #{babyAutismPrimaryScreening.warningSignstring}
             </if>
-            <if test="languageSocialstirng != null and languageSocialstirng != ''">
-                and language_social = #{languageSocialstirng}
+            <if test="babyAutismPrimaryScreening.languageSocialstirng != null and babyAutismPrimaryScreening.languageSocialstirng != ''">
+                and language_social = #{babyAutismPrimaryScreening.languageSocialstirng}
             </if>
-            <if test="global != null and global != ''">
-                and preliminary_screening_results = #{global}
+            <if test="babyAutismPrimaryScreening.global != null and babyAutismPrimaryScreening.global != ''">
+                and preliminary_screening_results = #{babyAutismPrimaryScreening.global}
             </if>
         </where>
-        limit #{pageable.offset}, #{pageable.pageSize}
+        limit #{pageable.offset}, #{pageable.limit}
     </select>
 
     <!--统计总行数-->
-    <select id="count" resultType="java.lang.Long">
+    <select id="count" resultType="java.lang.Long" parameterType="com.lyms.platform.pojo.BabyAutismPrimaryScreening">
         select count(1)
         from baby_autism_primary_screening
         <where>
-            <if test="id != null and id != ''">
+            <if test="babyAutismPrimaryScreening.id != null and babyAutismPrimaryScreening.id != ''">
                 and id = #{id}
             </if>
-            <if test="created != null and created != ''">
-                and created = #{created}
+            <if test="babyAutismPrimaryScreening.created != null ">
+                and created = #{babyAutismPrimaryScreening.created}
             </if>
-            <if test="modified != null and modified != ''">
-                and modified = #{modified}
+            <if test="babyAutismPrimaryScreening.modified != null ">
+                and modified = #{babyAutismPrimaryScreening.modified}
             </if>
-            <if test="yn != null">
-                and yn = #{yn}
+            <if test="babyAutismPrimaryScreening.yn != null">
+                and yn = #{babyAutismPrimaryScreening.yn}
             </if>
-            <if test="operaterId != null and operaterId != ''">
-                and operater_id = #{operaterId}
+            <if test="babyAutismPrimaryScreening.operaterId != null and babyAutismPrimaryScreening.operaterId != ''">
+                and operater_id = #{babyAutismPrimaryScreening.operaterId}
             </if>
-            <if test="hospitalId != null and hospitalId != ''">
-                and hospital_id = #{hospitalId}
+            <if test="babyAutismPrimaryScreening.hospitalId != null and babyAutismPrimaryScreening.hospitalId != ''">
+                and hospital_id = #{babyAutismPrimaryScreening.hospitalId}
             </if>
-            <if test="babyId != null and babyId != ''">
-                and baby_id = #{babyId}
+            <if test="babyAutismPrimaryScreening.babyId != null and babyAutismPrimaryScreening.babyId != ''">
+                and baby_id = #{babyAutismPrimaryScreening.babyId}
             </if>
-            <if test="babyBuildDate != null and babyBuildDate != ''">
-                and baby_build_date = #{babyBuildDate}
+            <if test="babyAutismPrimaryScreening.babyBuildDate != null and babyAutismPrimaryScreening.babyBuildDate != ''">
+                and baby_build_date = #{babyAutismPrimaryScreening.babyBuildDate}
             </if>
-            <if test="babyName != null and babyName != ''">
-                and baby_name = #{babyName}
+            <if test="babyAutismPrimaryScreening.babyName != null and babyAutismPrimaryScreening.babyName != ''">
+                and baby_name = #{babyAutismPrimaryScreening.babyName}
             </if>
-            <if test="babySex != null">
-                and baby_sex = #{babySex}
+            <if test="babyAutismPrimaryScreening.babySex != null">
+                and baby_sex = #{babyAutismPrimaryScreening.babySex}
             </if>
-            <if test="babyMName != null and babyMName != ''">
-                and baby_m_name = #{babyMName}
+            <if test="babyAutismPrimaryScreening.babyMName != null and babyAutismPrimaryScreening.babyMName != ''">
+                and baby_m_name = #{babyAutismPrimaryScreening.babyMName}
             </if>
-            <if test="babyFName != null and babyFName != ''">
-                and baby_f_name = #{babyFName}
+            <if test="babyAutismPrimaryScreening.babyFName != null and babyAutismPrimaryScreening.babyFName != ''">
+                and baby_f_name = #{babyAutismPrimaryScreening.babyFName}
             </if>
-            <if test="babyMPhone != null and babyMPhone != ''">
-                and baby_m_phone = #{babyMPhone}
+            <if test="babyAutismPrimaryScreening.babyMPhone != null and babyAutismPrimaryScreening.babyMPhone != ''">
+                and baby_m_phone = #{babyAutismPrimaryScreening.babyMPhone}
             </if>
-            <if test="babyFPhone != null and babyFPhone != ''">
-                and baby_f_phone = #{babyFPhone}
+            <if test="babyAutismPrimaryScreening.babyFPhone != null and babyAutismPrimaryScreening.babyFPhone != ''">
+                and baby_f_phone = #{babyAutismPrimaryScreening.babyFPhone}
             </if>
-            <if test="babyMCertNo != null and babyMCertNo != ''">
-                and baby_m_cert_no = #{babyMCertNo}
+            <if test="babyAutismPrimaryScreening.babyMCertNo != null and babyAutismPrimaryScreening.babyMCertNo != ''">
+                and baby_m_cert_no = #{babyAutismPrimaryScreening.babyMCertNo}
             </if>
-            <if test="babyFCertNo != null and babyFCertNo != ''">
-                and baby_f_cert_no = #{babyFCertNo}
+            <if test="babyAutismPrimaryScreening.babyFCertNo != null and babyAutismPrimaryScreening.babyFCertNo != ''">
+                and baby_f_cert_no = #{babyAutismPrimaryScreening.babyFCertNo}
             </if>
-            <if test="pid != null and pid != ''">
-                and pid = #{pid}
+            <if test="babyAutismPrimaryScreening.pid != null and babyAutismPrimaryScreening.pid != ''">
+                and pid = #{babyAutismPrimaryScreening.pid}
             </if>
-            <if test="checkMonthAge != null and checkMonthAge != ''">
-                and check_month_age = #{checkMonthAge}
+            <if test="babyAutismPrimaryScreening.checkMonthAge != null and babyAutismPrimaryScreening.checkMonthAge != ''">
+                and check_month_age = #{babyAutismPrimaryScreening.checkMonthAge}
             </if>
-            <if test="checkMonthId != null and checkMonthId != ''">
-                and check_month_id = #{checkMonthId}
+            <if test="babyAutismPrimaryScreening.checkMonthId != null and babyAutismPrimaryScreening.checkMonthId != ''">
+                and check_month_id = #{babyAutismPrimaryScreening.checkMonthId}
             </if>
-            <if test="birth != null and birth != ''">
-                and birth = #{birth}
+            <if test="babyAutismPrimaryScreening.birth != null ">
+                and birth = #{babyAutismPrimaryScreening.birth}
             </if>
-            <if test="checkTime != null and checkTime != ''">
-                and check_time = #{checkTime}
+            <if test="babyAutismPrimaryScreening.checkTime != null ">
+                and check_time = #{babyAutismPrimaryScreening.checkTime}
             </if>
-            <if test="nextCheckTime != null and nextCheckTime != ''">
-                and next_check_time = #{nextCheckTime}
+            <if test="babyAutismPrimaryScreening.nextCheckTime != null ">
+                and next_check_time = #{babyAutismPrimaryScreening.nextCheckTime}
             </if>
-            <if test="doctor != null and doctor != ''">
-                and check_doctor = #{doctor}
+            <if test="babyAutismPrimaryScreening.doctor != null and babyAutismPrimaryScreening.doctor != ''">
+                and check_doctor = #{babyAutismPrimaryScreening.doctor}
             </if>
-            <if test="doctorSign != null and doctorSign != ''">
-                and doctor_sign = #{doctorSign}
+            <if test="babyAutismPrimaryScreening.doctorSign != null and babyAutismPrimaryScreening.doctorSign != ''">
+                and doctor_sign = #{babyAutismPrimaryScreening.doctorSign}
             </if>
-            <if test="patientSign != null and patientSign != ''">
-                and patient_sign = #{patientSign}
+            <if test="babyAutismPrimaryScreening.patientSign != null and babyAutismPrimaryScreening.patientSign != ''">
+                and patient_sign = #{babyAutismPrimaryScreening.patientSign}
             </if>
-            <if test="guidanceOpinions != null and guidanceOpinions != ''">
-                and guidance_opinions = #{guidanceOpinions}
+            <if test="babyAutismPrimaryScreening.guidanceOpinions != null and babyAutismPrimaryScreening.guidanceOpinions != ''">
+                and guidance_opinions = #{babyAutismPrimaryScreening.guidanceOpinions}
             </if>
-            <if test="handleOpinions != null and handleOpinions != ''">
-                and handle_opinions = #{handleOpinions}
+            <if test="babyAutismPrimaryScreening.handleOpinions != null and babyAutismPrimaryScreening.handleOpinions != ''">
+                and handle_opinions = #{babyAutismPrimaryScreening.handleOpinions}
             </if>
-            <if test="warningSignstring != null and warningSignstring != ''">
-                and warning_signs = #{warningSignstring}
+            <if test="babyAutismPrimaryScreening.warningSignstring != null and babyAutismPrimaryScreening.warningSignstring != ''">
+                and warning_signs = #{babyAutismPrimaryScreening.warningSignstring}
             </if>
-            <if test="languageSocialstirng != null and languageSocialstirng != ''">
-                and language_social = #{languageSocialstirng}
+            <if test="babyAutismPrimaryScreening.languageSocialstirng != null and babyAutismPrimaryScreening.languageSocialstirng != ''">
+                and language_social = #{babyAutismPrimaryScreening.languageSocialstirng}
             </if>
-            <if test="global != null and global != ''">
-                and preliminary_screening_results = #{global}
+            <if test="babyAutismPrimaryScreening.global != null and babyAutismPrimaryScreening.global != ''">
+                and preliminary_screening_results = #{babyAutismPrimaryScreening.global}
             </if>
         </where>
     </select>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java
index 83cdb64..4634e55 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java
@@ -11,7 +11,6 @@ import com.lyms.platform.common.result.RespBuilder;
 import com.lyms.platform.operate.web.facade.PrimaryScreeningFacade;
 import com.lyms.platform.operate.web.inteceptor.InitDataConfig;
 import com.lyms.platform.pojo.BabyAutismPrimaryScreening;
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -111,35 +109,6 @@ public class PrimaryScreeningController extends BaseController {
     @RequestMapping(value = "/queryUpDate", method = RequestMethod.GET)
     public BaseResponse queryUpDate(String id) {
         BabyAutismPrimaryScreening primaryScreening = primaryScreeningFacade.queryUpDate(id);
-        String checkMonthId = primaryScreening.getCheckMonthId();
-        HashMap<String, List<BaseMap>> monthageInfo = InitDataConfig.MONTHAGEINFO.get(Integer.valueOf(checkMonthId));
-        String[] warningSignsId = primaryScreening.getWarningSignstring().split(",");
-        //预警征象筛查
-        List<BaseMap> warningSignsInfo = monthageInfo.get("warningSigns");
-        List<String> warningSigns = new ArrayList<>();
-        for (BaseMap baseMap : warningSignsInfo) {
-            for (String s : warningSignsId) {
-                if (s.equals(baseMap.getId())) {
-                    warningSigns.add(baseMap.getName());
-                }
-            }
-        }
-        //语言功能和社会交往能力询问
-        List<BaseMap> languageSocialInfo = monthageInfo.get("languageSocial");
-        String[] languageSocialstirngId = primaryScreening.getLanguageSocialstirng().split(",");
-        /**
-         * 语言功能和社会交往能力询问
-         */
-        List<String> languageSocial = new ArrayList<>();
-        for (BaseMap baseMap : languageSocialInfo) {
-            for (String s : languageSocialstirngId) {
-                if (s.equals(baseMap.getId())) {
-                    languageSocial.add(baseMap.getName());
-                }
-            }
-        }
-        primaryScreening.setWarningSignstringName(StringUtils.join(warningSigns,","));
-        primaryScreening.setLanguageSocialName(StringUtils.join(languageSocial,","));
         BaseObjectResponse br = new BaseObjectResponse();
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setData(primaryScreening);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java
index bc45609..65f422c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java
@@ -153,7 +153,7 @@ public class PrimaryScreeningFacade extends BaseServiceImpl {
 
     public BabyAutismPrimaryScreening queryUpDate(String id) {
         BabyAutismPrimaryScreening primaryScreening = babyAutismPrimaryScreeningService.queryById(id);
-
+        nameChange(primaryScreening);
         return primaryScreening;
     }
 
@@ -161,38 +161,8 @@ public class PrimaryScreeningFacade extends BaseServiceImpl {
         pageRequest.mysqlBuild(babyAutismPrimaryScreeningService.count(babyAutismPrimaryScreening, pageRequest).intValue());
         List<BabyAutismPrimaryScreening> primaryScreeningPage = babyAutismPrimaryScreeningService.queryByPage(babyAutismPrimaryScreening, pageRequest);
         for (BabyAutismPrimaryScreening primaryScreening : primaryScreeningPage) {
-            //查询医院
-            Organization org = organizationService.getOrganization(Integer.valueOf(primaryScreening.getHospitalId()));
-            primaryScreening.setCheckHospital(org.getName());
-            String checkMonthId = primaryScreening.getCheckMonthId();
-            HashMap<String, List<BaseMap>> monthageInfo = InitDataConfig.MONTHAGEINFO.get(Integer.valueOf(checkMonthId));
-            String[] warningSignsId = primaryScreening.getWarningSignstring().split(",");
-            //预警征象筛查
-            List<BaseMap> warningSignsInfo = monthageInfo.get("warningSigns");
-            List<String> warningSigns = new ArrayList<>();
-            for (BaseMap baseMap : warningSignsInfo) {
-                for (String s : warningSignsId) {
-                    if (s.equals(baseMap.getId())) {
-                        warningSigns.add(baseMap.getName());
-                    }
-                }
-            }
-            //语言功能和社会交往能力询问
-            List<BaseMap> languageSocialInfo = monthageInfo.get("languageSocial");
-            String[] languageSocialstirngId = primaryScreening.getLanguageSocialstirng().split(",");
-            /**
-             * 语言功能和社会交往能力询问
-             */
-            List<String> languageSocial = new ArrayList<>();
-            for (BaseMap baseMap : languageSocialInfo) {
-                for (String s : languageSocialstirngId) {
-                    if (s.equals(baseMap.getId())) {
-                        languageSocial.add(baseMap.getName());
-                    }
-                }
-            }
-            primaryScreening.setWarningSignstringName(StringUtils.join(warningSigns,","));
-            primaryScreening.setLanguageSocialName(StringUtils.join(languageSocial,","));
+
+            nameChange(primaryScreening);
 
         }
         BaseObjectResponse br = new BaseObjectResponse();
@@ -211,4 +181,39 @@ public class PrimaryScreeningFacade extends BaseServiceImpl {
         br.setErrormsg("成功");
         return br;
     }
+
+    public  void nameChange(BabyAutismPrimaryScreening primaryScreening) {
+        //查询医院
+        Organization org = organizationService.getOrganization(Integer.valueOf(primaryScreening.getHospitalId()));
+        primaryScreening.setCheckHospital(org.getName());
+        String checkMonthId = primaryScreening.getCheckMonthId();
+        HashMap<String, List<BaseMap>> monthageInfo = InitDataConfig.MONTHAGEINFO.get(Integer.valueOf(checkMonthId));
+        String[] warningSignsId = primaryScreening.getWarningSignstring().split(",");
+        //预警征象筛查
+        List<BaseMap> warningSignsInfo = monthageInfo.get("warningSigns");
+        List<String> warningSigns = new ArrayList<>();
+        for (BaseMap baseMap : warningSignsInfo) {
+            for (String s : warningSignsId) {
+                if (s.equals(baseMap.getId())) {
+                    warningSigns.add(baseMap.getName());
+                }
+            }
+        }
+        //语言功能和社会交往能力询问
+        List<BaseMap> languageSocialInfo = monthageInfo.get("languageSocial");
+        String[] languageSocialstirngId = primaryScreening.getLanguageSocialstirng().split(",");
+        /**
+         * 语言功能和社会交往能力询问
+         */
+        List<String> languageSocial = new ArrayList<>();
+        for (BaseMap baseMap : languageSocialInfo) {
+            for (String s : languageSocialstirngId) {
+                if (s.equals(baseMap.getId())) {
+                    languageSocial.add(baseMap.getName());
+                }
+            }
+        }
+        primaryScreening.setWarningSignstringName(StringUtils.join(warningSigns,","));
+        primaryScreening.setLanguageSocialName(StringUtils.join(languageSocial,","));
+    }
 }
-- 
1.8.3.1