机构行政区域

postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java

@@ -61,6 +61,8 @@ public class AgencyServiceImpl implements IAgencyService {
             agency.setRegionName(StringUtils.isBlank(nurseStationAndAreaCode.getRegionName()) ? "" : nurseStationAndAreaCode.getRegionName());
             agency.setStreetCode(StringUtils.isBlank(nurseStationAndAreaCode.getStreetCode()) ? "" : nurseStationAndAreaCode.getStreetCode());
             agency.setStreetName(StringUtils.isBlank(nurseStationAndAreaCode.getStreetName()) ? "" : nurseStationAndAreaCode.getStreetName());
+            agency.setCommunityCode(StringUtils.isBlank(nurseStationAndAreaCode.getCommunityCode()) ? "" : nurseStationAndAreaCode.getCommunityCode());
+            agency.setCommunityName(StringUtils.isBlank(nurseStationAndAreaCode.getCommunityName()) ? "" : nurseStationAndAreaCode.getCommunityName());
         }
         return agency;
     }

postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java

@@ -59,6 +59,16 @@ public class AgencyVO extends Agency {
      */
     private String streetCode;
 
+    /**
+     * 社区名称
+     */
+    private String communityName;
+
+    /**
+     * 社区区域编码
+     */
+    private String communityCode;
+
     /**
      * 上级机构
      */

postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml

@@ -65,94 +65,64 @@
         <include refid="selectDepartmentVo"/>
         <where>
             <if test="parentDepartmentId != null ">
-                and parent_department_id =
-                #{parentDepartmentId}
+                and parent_department_id =#{parentDepartmentId}
             </if>
             <if test="agencyId != null ">
-                and agency_id =
-                #{agencyId}
+                and agency_id =#{agencyId}
             </if>
             <if test="agencyName != null  and agencyName != ''">
-                and agency_name like concat('%',
-                #{agencyName},
-                '%'
-                )
+                and agency_name like concat('%',#{agencyName},'%')
             </if>
             <if test="departmentName != null  and departmentName != ''">
-                and department_name like concat('%',
-                #{departmentName},
-                '%'
-                )
+                and department_name like concat('%',#{departmentName},'%')
             </if>
             <if test="departmentCode != null  and departmentCode != ''">
-                and department_code =
-                #{departmentCode}
+                and department_code =#{departmentCode}
             </if>
             <if test="departmentType != null  and departmentType != ''">
-                and department_type =
-                #{departmentType}
+                and department_type =#{departmentType}
             </if>
             <if test="departmentAbbreviation != null  and departmentAbbreviation != ''">
-                and department_abbreviation =
-                #{departmentAbbreviation}
+                and department_abbreviation =#{departmentAbbreviation}
             </if>
             <if test="departmentPersonId != null ">
-                and department_person_id =
-                #{departmentPersonId}
+                and department_person_id =#{departmentPersonId}
             </if>
             <if test="departmentPersonName != null  and departmentPersonName != ''">
-                and department_person_name like concat('%',
-                #{departmentPersonName},
-                '%'
-                )
+                and department_person_name like concat ('%',#{departmentPersonName},'%')
             </if>
             <if test="nodeType != null  and nodeType != ''">
-                and node_type =
-                #{nodeType}
+                and node_type =#{nodeType}
             </if>
             <if test="provideServiceCategory != null  and provideServiceCategory != ''">
-                and provide_service_category =
-                #{provideServiceCategory}
+                and provide_service_category =#{provideServiceCategory}
             </if>
             <if test="subdivisionCategoryId != null ">
-                and subdivision_category_id =
-                #{subdivisionCategoryId}
+                and subdivision_category_id =#{subdivisionCategoryId}
             </if>
             <if test="subdivisionCategoryName != null  and subdivisionCategoryName != ''">
-                and subdivision_category_name like concat('%',
-                #{subdivisionCategoryName},
-                '%'
-                )
+                and subdivision_category_name like concat('%',#{subdivisionCategoryName},'%')
             </if>
             <if test="normDepartmentCompareId != null ">
-                and norm_department_compare_id =
-                #{normDepartmentCompareId}
+                and norm_department_compare_id =#{normDepartmentCompareId}
             </if>
             <if test="normDepartmentCompareName != null  and normDepartmentCompareName != ''">
-                and norm_department_compare_name like concat('%',
-                #{normDepartmentCompareName},
-                '%'
-                )
+                and norm_department_compare_name like concat('%',#{normDepartmentCompareName},'%')
             </if>
             <if test="prepareBedsCount != null ">
-                and prepare_beds_count =
-                #{prepareBedsCount}
+                and prepare_beds_count =#{prepareBedsCount}
             </if>
             <if test="departmentPhone != null  and departmentPhone != ''">
-                and department_phone =
-                #{departmentPhone}
+                and department_phone =#{departmentPhone}
             </if>
             <if test="departmentMail != null  and departmentMail != ''">
-                and department_mail =
-                #{departmentMail}
+                and department_mail =#{departmentMail}
             </if>
             <if test="establishDate != null ">
-                and establish_date =
-                #{establishDate}
+                and establish_date =#{establishDate}
             </if>
             <if test="revokeDate != null ">
-                and revoke_date =
-                #{revokeDate}
+                and revoke_date =#{revokeDate}
             </if>
         </where>
     </select>