jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e86311f1c2ac0976aede098a966e6b9cbb7b20cd

Authored by jiangjiazhi
2 parents 1ca1d1f89a fdeaef6264
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java View file @ e86311f
... ... @@ -152,6 +152,10 @@
152 152 if (StringUtils.isNotBlank(areaId)) {
153 153 condition = condition.and("areaId", areaId, MongoOper.IS);
154 154 }
  155 + if (StringUtils.isNotBlank(streetId)) {
  156 + condition = condition.and("streetId", streetId, MongoOper.IS);
  157 + }
  158 +
155 159 if (StringUtils.isNotBlank(provinceRegisterId)) {
156 160 condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS);
157 161 }
... ... @@ -161,6 +165,11 @@
161 165 if (StringUtils.isNotBlank(areaRegisterId)) {
162 166 condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS);
163 167 }
  168 +
  169 + if (StringUtils.isNotBlank(streetRegisterId)) {
  170 + condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS);
  171 + }
  172 +
164 173 if (StringUtils.isNotBlank(vcCardNo)) {
165 174 condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS);
166 175 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ e86311f
... ... @@ -939,9 +939,14 @@
939 939 map.put("mremark", patients.getMremark());
940 940  
941 941 //高危因素
  942 +// HighScoreResult highScoreResult = null;
  943 +// if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
  944 +// highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService);
  945 +// }
  946 +
942 947 HighScoreResult highScoreResult = null;
943   - if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
944   - highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService);
  948 + if (patients.getDueDate() != null) {
  949 + highScoreResult = antenatalExaminationFacade.getPatLastRiskByDate(patients.getPid(), false, patients.getLastMenses(), patients.getDueDate());
945 950 }
946 951  
947 952 map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult));
948 953  
... ... @@ -1353,9 +1358,13 @@
1353 1358 map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
1354 1359 map.put("mremark", patients.getMremark());
1355 1360 //高危因素
  1361 +// HighScoreResult highScoreResult = null;
  1362 +// if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
  1363 +// highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService);
  1364 +// }
1356 1365 HighScoreResult highScoreResult = null;
1357   - if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
1358   - highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService);
  1366 + if (patients.getFmDate() != null) {
  1367 + highScoreResult = antenatalExaminationFacade.getPatLastRiskByDate(patients.getPid(), false, patients.getLastMenses(), patients.getFmDate());
1359 1368 }
1360 1369  
1361 1370 map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult));
1362 1371  
... ... @@ -1496,9 +1505,14 @@
1496 1505 map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));
1497 1506 map.put("mremark", patients.getMremark());
1498 1507 //高危因素
  1508 +// HighScoreResult highScoreResult = null;
  1509 +// if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
  1510 +// highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService);
  1511 +// }
  1512 +
1499 1513 HighScoreResult highScoreResult = null;
1500   - if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
1501   - highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService);
  1514 + if (patients.getFmDate() != null) {
  1515 + highScoreResult = antenatalExaminationFacade.getPatLastRiskByDate(patients.getPid(), false, patients.getLastMenses(), patients.getFmDate());
1502 1516 }
1503 1517 map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult));
1504 1518 map.put("riskScore", patients.getRiskScore() == null || patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(), UnitConstants.FEN));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ e86311f
... ... @@ -1236,7 +1236,7 @@
1236 1236 cnames.put("send_hospital", "发放机构");
1237 1237 cnames.put("doctoer_name", "发放医生");
1238 1238 cnames.put("residenceAddress", "居住地");
1239   - cnames.put("householdAddress", "户籍地");
  1239 +// cnames.put("householdAddress", "户籍地");
1240 1240 cnames.put("phone", "联系电话");
1241 1241  
1242 1242 List<Map<String,Object>> results = new ArrayList<>();
... ... @@ -1249,7 +1249,7 @@
1249 1249 result.put("send_hospital", m.get("send_hospital"));
1250 1250 result.put("doctoer_name", m.get("doctoer_name"));
1251 1251 result.put("residenceAddress", m.get("residenceAddress"));
1252   - result.put("householdAddress", m.get("householdAddress"));
  1252 +// result.put("householdAddress", m.get("householdAddress"));
1253 1253 result.put("phone", m.get("phone"));
1254 1254 results.add(result);
1255 1255 }