jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c4dbc0cd7b1ce9830176f692121621752df26416

Authored by liquanyu
1 parent 2e92298759
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

妇女建档增加配偶信息

Showing 2 changed files with 9 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java View file @ c4dbc0c
... ... @@ -234,11 +234,13 @@
234 234 MongoCondition con2 = MongoCondition.newInstance("username", "^"+queryNo, MongoOper.LIKE);
235 235 MongoCondition con3 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS);
236 236 MongoCondition con4 = MongoCondition.newInstance("certificateNum", queryNo, MongoOper.IS);
237   -
  237 + MongoCondition con5 = MongoCondition.newInstance("spouseCardNo", queryNo, MongoOper.IS);
  238 + MongoCondition con6 = MongoCondition.newInstance("spousePhone", queryNo, MongoOper.IS);
  239 + MongoCondition con7 = MongoCondition.newInstance("spouseName", "^"+queryNo, MongoOper.LIKE);
238 240 if(c1!=null) {
239   - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria());
  241 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3,con4,con5,con6,con7}).getCriteria());
240 242 }else {
241   - c1 = c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria();
  243 + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3,con4,con5,con6,con7}).getCriteria();
242 244 }
243 245 //condition = condition.and("id", id, MongoOper.IS).orCondition();
244 246 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ c4dbc0c
... ... @@ -636,6 +636,10 @@
636 636 map.put("isCheckup",queryPremaritalCheckup(model.getId(), model.getHospitalId()));
637 637 map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
638 638 map.put("buildDoctor",model.getPublishName());
  639 +
  640 + map.put("spouseName",model.getSpouseName());
  641 + map.put("spouseCardNo",model.getSpouseCardNo());
  642 + map.put("spousePhone",model.getSpousePhone());
639 643 data.add(map);
640 644 }
641 645 }