From 00c23d96be57a0bca8317432fa260a6880d8dcf1 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 16 Jun 2016 15:15:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B1=85=E4=BD=8F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=92=8C=E6=88=B7=E7=B1=8D=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/common/utils/SystemConfig.java | 7 +++++++ .../src/main/java/com/lyms/platform/query/PatientsQuery.java | 3 --- .../lyms/platform/operate/web/facade/BookbuildingFacade.java | 11 ++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java index 9b847f6..1088f67 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java @@ -19,4 +19,11 @@ public class SystemConfig { //职业类型 public static final String PROFESSION_TYPE_ID = "7579024c-5932-4566-b48f-a3b23da33aa5"; + //户籍类型 + public static final String CENSUS_TYPE_ID = "57624ba30cf23d4631523e9d"; + + //居住类型 + public static final String LIVE_TYPE_ID = "57624c330cf23d4631523ea0"; + + } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 372ff82..ba0de88 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -253,9 +253,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ condition=condition.and("username", name, MongoOper.IS); } - if(null!=vcCardNo){ - condition=condition.and("vcCardNo", vcCardNo, MongoOper.IS); - } if(-1!=yn){ condition=condition.and("yn", yn, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index a2dd889..534cefc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -105,9 +105,6 @@ public class BookbuildingFacade { } Map mapProvince = new HashMap<>(); -// //省 -// List provincesResults = getBaseicConfigByParentId(SystemConfig.CHINA_BASIC_ID); -// mapProvince.put("provinces",provincesResults); //证件类型 List pcerteTypeResult = getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID); @@ -125,6 +122,14 @@ public class BookbuildingFacade { List professionTypeResults = getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); mapProvince.put("professionType",professionTypeResults); + // 户籍类别 + List censusType = getBaseicConfigByParentId(SystemConfig.CENSUS_TYPE_ID); + mapProvince.put("censusType",censusType); + + // 户籍类别 + List liveType = getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID); + mapProvince.put("liveType",liveType); + list.add(mapProvince); -- 1.8.3.1