失能人员信息列表省市区、机构

apply/apply-service/src/main/java/com/hungraim/ism/controller/DisableController.java

@@ -109,52 +109,48 @@ public class DisableController {
     @RequestMapping("/addDisable")
     public Result addDisable(ChDisableApply chDisableApply) {
         //字段校验
-        String msg = "";
         //所在省市区
         if (StringUtils.isBlank(chDisableApply.getDistrictProvincial()) || StringUtils.isBlank(chDisableApply.getDistrictCity()) || StringUtils.isBlank(chDisableApply.getDistrictArea())) {
-            msg = "所在省市不能为空!";
+            return Result.failed("所在省市不能为空!");
         }
         if (StringUtils.isBlank(chDisableApply.getRealName())) {
-            msg = "申请人姓名不能为空!";
+            return Result.failed("申请人姓名不能为空!");
         }
         if (StringUtils.isBlank(chDisableApply.getCertiCode())) {
-            msg = "身份证号码不能为空!";
+            return Result.failed("身份证号码不能为空!");
         }
         if (chDisableApply.getBirthday() == null) {
-            msg = "出生年月日不能为空!";
+            return Result.failed("出生年月日不能为空!");
         }
         if (StringUtils.isBlank(chDisableApply.getGender())) {
-            msg = "性别不能为空!";
+            return Result.failed("性别不能为空!");
         }
         if (StringUtils.isBlank(chDisableApply.getTel())) {
-            msg = "手机号不能为空!";
+            return Result.failed("手机号不能为空!");
         }
         if (chDisableApply.getRegist() == null) {
-            msg = "所在户籍不能为空!";
+            return Result.failed("所在户籍不能为空!");
         }
         if (StringUtils.isBlank(chDisableApply.getAcptProvincial()) || StringUtils.isBlank(chDisableApply.getAcptCity()) || StringUtils.isBlank(chDisableApply.getAcptArea()) || StringUtils.isBlank(chDisableApply.getAcptStreet()) || StringUtils.isBlank(chDisableApply.getAcptAddress())) {
-            msg = "接受评定地址不能为空!";
+            return Result.failed("接受评定地址不能为空!");
         }
         if (StringUtils.isBlank(chDisableApply.getAcptSrvProvincial()) || StringUtils.isBlank(chDisableApply.getAcptSrvCity()) || StringUtils.isBlank(chDisableApply.getAcptSrvArea()) || StringUtils.isBlank(chDisableApply.getAcptSrvStreet()) || StringUtils.isBlank(chDisableApply.getAcptSrvAddress())) {
-            msg = "接受服务地址不能为空!";
+            return Result.failed("接受服务地址不能为空!");
         }
         if (StringUtils.isBlank(chDisableApply.getAdressDistrictProvincial()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCity()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCode()) || StringUtils.isBlank(chDisableApply.getAddressRoadDetail()) || StringUtils.isBlank(chDisableApply.getAddressNumberDetail())) {
-            msg = "现住址不能为空!";
+            return Result.failed("现住址不能为空!");
         }
         if (StringUtils.isBlank(chDisableApply.getDisease())) {
-            msg = "诊断疾病不能为空!";
+            return Result.failed("诊断疾病不能为空!");
         }
         if (chDisableApply.getSrvModeId() == null) {
-            msg = "申请服务方式不能为空!";
+            return Result.failed("申请服务方式不能为空!");
         }
         if (StringUtils.isBlank(chDisableApply.getDiseaseDesc())) {
-            msg = "疾病描述及诊断不能为空!";
+            return Result.failed("疾病描述及诊断不能为空!");
         }
         if (chDisableApply.getMedicalType() == null) {
-            msg = "医保类型不能为空!";
-        }
-        if (!"".equals(msg)) {
-            return Result.failed(msg);
+            return Result.failed("医保类型不能为空!");
         }
         disableService.addDisable(chDisableApply);
         return Result.success();

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -43,7 +43,7 @@
                 and a.DISTRICT_AREA = #{area}
             </if>
             <if test="name != null and name != ''">
-                and a.REAL_NAME like '%'#{name}'%'
+                and a.REAL_NAME like CONCAT('%',#{name},'%')
             </if>
             <if test="certiCode != null and certiCode != ''">
                 and h.CERTI_CODE = #{certiCode}