jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e5989cea9ae85c0bdc08d9f04e5a2a442135a270

Authored by zhangchao
1 parent c8a74c34ee
Exists in dev

#fix:优化大同双胎妊娠疾病管理模块

Showing 2 changed files with 29 additions and 21 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ e5989ce
... ... @@ -1300,24 +1300,30 @@
1300 1300  
1301 1301  
1302 1302 Query yn = null;
1303   - //双绒双羊、单绒单羊、单绒双羊
1304   - if ("1".equals(riskPatientsQueryRequest.getTwinsType())) {
1305   - Criteria criteria2 = Criteria.where("name").is("双胎妊娠（双绒双羊）");
1306   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2));
  1303 + if (hospital.equals("2100002419")){
  1304 + Criteria criteria4 = Criteria.where("name").is("双胎妊娠");
  1305 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4));
  1306 + }else {
  1307 + //双绒双羊、单绒单羊、单绒双羊
  1308 + if ("1".equals(riskPatientsQueryRequest.getTwinsType())) {
  1309 + Criteria criteria2 = Criteria.where("name").is("双胎妊娠（双绒双羊）");
  1310 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2));
1307 1311  
1308   - } else if ("2".equals(riskPatientsQueryRequest.getTwinsType())) {
1309   - Criteria criteria2 = Criteria.where("name").is("双胎妊娠（单绒双羊）");
1310   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2));
  1312 + } else if ("2".equals(riskPatientsQueryRequest.getTwinsType())) {
  1313 + Criteria criteria2 = Criteria.where("name").is("双胎妊娠（单绒双羊）");
  1314 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2));
1311 1315  
1312   - } else if ("3".equals(riskPatientsQueryRequest.getTwinsType())) {
1313   - Criteria criteria3 = Criteria.where("name").is("双胎妊娠（单绒单羊）");
1314   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3));
1315   - } else {
1316   - Criteria criteria1 = Criteria.where("name").is("双胎妊娠（双绒双羊）");
1317   - Criteria criteria2 = Criteria.where("name").is("双胎妊娠（单绒双羊）");
1318   - Criteria criteria3 = Criteria.where("name").is("双胎妊娠（单绒单羊）");
1319   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3));
  1316 + } else if ("3".equals(riskPatientsQueryRequest.getTwinsType())) {
  1317 + Criteria criteria3 = Criteria.where("name").is("双胎妊娠（单绒单羊）");
  1318 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3));
  1319 + } else {
  1320 + Criteria criteria1 = Criteria.where("name").is("双胎妊娠（双绒双羊）");
  1321 + Criteria criteria2 = Criteria.where("name").is("双胎妊娠（单绒双羊）");
  1322 + Criteria criteria3 = Criteria.where("name").is("双胎妊娠（单绒单羊）");
  1323 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3));
  1324 + }
1320 1325 }
  1326 +
1321 1327 List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
1322 1328 List <String> rFactorList = new ArrayList <>();
1323 1329 if (models != null && models.size() > 0) {
... ... @@ -1741,6 +1747,7 @@
1741 1747 //组合请求
1742 1748 PatientsQuery patientsQuery = new PatientsQuery();//complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
1743 1749 patientsQuery.setHospitalId(hospital);
  1750 + patientsQuery.setNeed(needPage);
1744 1751 //查询符合条件的孕妇
1745 1752 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
1746 1753 stopWatch.start();
... ... @@ -1763,7 +1770,6 @@
1763 1770 Criteria criteria2 = Criteria.where("name").is("甲减（需药物治疗）");
1764 1771 Criteria criteria3 = Criteria.where("name").is("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%");
1765 1772 Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低（无需药物治疗）");
1766   -
1767 1773 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4));
1768 1774 }
1769 1775 List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
... ... @@ -1773,7 +1779,7 @@
1773 1779 rFactorList.add(models.get(i).getId());
1774 1780 }
1775 1781 }
1776   - //TODO 换查询方式，把in改成包含
  1782 +
1777 1783 patientsQuery.setjFactorList(rFactorList);
1778 1784 List <Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
1779 1785 stopWatch.stop();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/TwinsPatientWorker.java View file @ e5989ce
... ... @@ -267,7 +267,8 @@
267 267 if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) {
268 268 if(basicConfig.getName().contains("双绒双羊") ||
269 269 basicConfig.getName().contains("单绒双羊") ||
270   - basicConfig.getName().contains("单绒单羊")){
  270 + basicConfig.getName().contains("单绒单羊") ||
  271 + basicConfig.getName().equals("双胎妊娠")){
271 272 sb.append(basicConfig.getName()).append(',');
272 273 }
273 274 }
... ... @@ -331,7 +332,8 @@
331 332 }
332 333 } else if (twinsPatientsResult.getrFactor().contains("双绒双羊") ||
333 334 twinsPatientsResult.getrFactor().contains("单绒双羊") ||
334   - twinsPatientsResult.getrFactor().contains("单绒单羊")) {
  335 + twinsPatientsResult.getrFactor().contains("单绒单羊") ||
  336 + twinsPatientsResult.getrFactor().equals("双胎妊娠")) {
335 337 data.add(twinsPatientsResult);
336 338 }
337 339 }