Commit b3b9d26000f99a7450629e9c2cdb3ac89745639e
1 parent
4ccb1e43d0
Exists in
master
and in
1 other branch
自动生成追访信息
Showing 2 changed files with 11 additions and 14 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
View file @
b3b9d26
| ... | ... | @@ -158,17 +158,17 @@ |
| 158 | 158 | public static String encryCardNo(String id) { |
| 159 | 159 | if (org.apache.commons.lang.StringUtils.isEmpty(id)) { |
| 160 | 160 | return ""; |
| 161 | - } | |
| 162 | - if (id.length() == 11) { | |
| 161 | + }else if (id.length() == 11) { | |
| 163 | 162 | return id.substring(0, 3) + "****" + id.substring(7); |
| 164 | - } | |
| 165 | - if (id.length() == 15) { | |
| 163 | + }else if (id.length() == 15) { | |
| 166 | 164 | return id.substring(0, 6) + "****" + id.substring(10, 13) + "*" + id.substring(14); |
| 167 | - } | |
| 168 | - if (id.length() == 18) { | |
| 165 | + }else if (id.length() == 18) { | |
| 169 | 166 | return id.substring(0, 6) + "******" + id.substring(12, 15) + "**" + id.substring(17); |
| 167 | + }else if(id.length()<11){ | |
| 168 | + return id; | |
| 169 | + }else{ | |
| 170 | + return id.substring(0, 6) + "******" + id.substring(12, 15) + "**" + id.substring(id.length()); | |
| 170 | 171 | } |
| 171 | - return ""; | |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | public static Date getBirthDay(String idCard){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
View file @
b3b9d26
| ... | ... | @@ -146,10 +146,8 @@ |
| 146 | 146 | temp.put("fmType", patients.getFmType()); // 分娩方式 1： 顺产，2：剖宫产 |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - | |
| 150 | - AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); | |
| 151 | - antExRecordQuery.setParentId(patients.getId()); | |
| 152 | - temp.put("yjcount", recordService.count(antExRecordQuery)); // 孕检次数 | |
| 149 | + //孕检次数 | |
| 150 | + temp.put("yjcount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patients.getId()).and("hospitalId").and("yn").is(1)), AntenatalExaminationModel.class) + mongoTemplate.count(Query.query(Criteria.where("parentId").is(patients.getId()).and("yn").is(1)), AntExChuModel.class)); | |
| 153 | 151 | if (patients.getType() == 3) { |
| 154 | 152 | //产后复查 |
| 155 | 153 | PostReviewQuery postReviewQuery = new PostReviewQuery(); |
| ... | ... | @@ -228,9 +226,8 @@ |
| 228 | 226 | temp.put("fmType", patient.getFmType()); // 分娩方式 1： 顺产，2：剖宫产 |
| 229 | 227 | } |
| 230 | 228 | |
| 231 | - AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); | |
| 232 | - antExRecordQuery.setParentId(patient.getId()); | |
| 233 | - temp.put("yjcount", recordService.count(antExRecordQuery)); // 孕检次数 | |
| 229 | + //孕检次数 | |
| 230 | + temp.put("yjcount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("hospitalId").and("yn").is(1)), AntenatalExaminationModel.class) + mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("yn").is(1)), AntExChuModel.class)); | |
| 234 | 231 | |
| 235 | 232 | if(patient.getType() == 3){//分娩后 |
| 236 | 233 | //产后复查 |