jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 306d3f3ef6c6a9abe2046a75d9ccd25f64f492e3

Authored by liquanyu
1 parent 1fa8c76c53
Exists in dev

fix:新增儿童、产妇转诊相关逻辑

Showing 5 changed files with 16 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java View file @ 306d3f3
... ... @@ -135,7 +135,7 @@
135 135 }
136 136 }
137 137 String id = "";
138   - if (2 == type) {
  138 + if (2 == type || type==3) {
139 139 //查询产妇信息
140 140 List<Patients> patientses = patientsService.queryPatient(patientsQuery);
141 141 Patients patients = null;
... ... @@ -659,7 +659,7 @@
659 659 ReferralApplyScreeningModel referralApplyScreeningModel = applyScreeningService.findByIdReferralApplyOrder(id);
660 660  
661 661 ReferralApplyScreeningModel archiveModel = new ReferralApplyScreeningModel();
662   - String hospital = autoMatchFacade.getHospitalId(userId);
  662 + // String hospital = autoMatchFacade.getHospitalId(userId);
663 663 if (null != referralApplyScreeningModel) {
664 664 ReferralApplyScreeningQuery referralApplyScreeningQuery = new ReferralApplyScreeningQuery();
665 665 //如果是接受修改建立档案
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java View file @ 306d3f3
... ... @@ -20,7 +20,6 @@
20 20 import com.lyms.platform.query.BabyCheckModelQuery;
21 21 import com.lyms.platform.query.BabyModelQuery;
22 22 import com.lyms.platform.query.LhBabyEyelCheckQuery;
23   -import com.sun.tools.javac.util.Convert;
24 23 import org.apache.commons.collections.MapUtils;
25 24 import org.springframework.beans.factory.annotation.Autowired;
26 25 import org.springframework.data.domain.Sort;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 306d3f3
... ... @@ -1724,8 +1724,10 @@
1724 1724 Criteria criteria10 = Criteria.where("name").is("丙肝阳性");
1725 1725 Criteria criteria11 = Criteria.where("name").is("乙肝大三阳");
1726 1726 Criteria criteria12 = Criteria.where("name").is("乙肝小三阳");
  1727 + Criteria criteria14 = Criteria.where("name").is("大三阳");
  1728 + Criteria criteria15 = Criteria.where("name").is("小三阳");
1727 1729 Criteria criteria13=Criteria.where("name").is("所有妊娠合井传染性疾病--如病毒性肝炎、梅毒、HV感染及艾滋病、结核病、重症盛染性肺炎、特殊病毒感染(H1N7、寨卡等)");
1728   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4,criteria5,criteria6,criteria7,criteria8,criteria9,criteria10,criteria11,criteria12,criteria13));
  1730 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4,criteria5,criteria6,criteria7,criteria8,criteria9,criteria10,criteria11,criteria12,criteria13,criteria14,criteria15));
1729 1731 }
1730 1732 List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
1731 1733 List <String> rFactorList = new ArrayList <>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyScreeningQueryRequest.java View file @ 306d3f3
... ... @@ -47,7 +47,7 @@
47 47 */
48 48 private String action;
49 49 /**
50   - * 1 儿童 2 孕妇
  50 + * 1 儿童 2 孕妇 3产妇
51 51 */
52 52 private Integer type;
53 53  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/InfectiousWorker.java View file @ 306d3f3
... ... @@ -272,7 +272,9 @@
272 272 basicConfig.getName().contains("淋病")||
273 273 basicConfig.getName().contains("丙肝阳性")||
274 274 basicConfig.getName().contains("乙肝大三阳")||
275   - basicConfig.getName().contains("乙肝小三阳")){
  275 + basicConfig.getName().contains("乙肝小三阳")||
  276 + basicConfig.getName().contains("大三阳")||
  277 + basicConfig.getName().contains("小三阳")){
276 278 sb.append(basicConfig.getName()).append(',');
277 279 }
278 280 }
279 281  
... ... @@ -363,11 +365,13 @@
363 365 data.add(twinsPatientsResult);
364 366 }
365 367 }else if ("11".equals(twinsType)) {
366   - if (twinsPatientsResult.getrFactor().contains("乙肝大三阳")) {
  368 + if (twinsPatientsResult.getrFactor().contains("乙肝大三阳")||
  369 + twinsPatientsResult.getrFactor().contains("大三阳")) {
367 370 data.add(twinsPatientsResult);
368 371 }
369 372 }else if ("12".equals(twinsType)) {
370   - if (twinsPatientsResult.getrFactor().contains("乙肝小三阳")) {
  373 + if (twinsPatientsResult.getrFactor().contains("乙肝小三阳")||
  374 + twinsPatientsResult.getrFactor().contains("小三阳")) {
371 375 data.add(twinsPatientsResult);
372 376 }
373 377 }else if (twinsPatientsResult.getrFactor().contains("梅毒") ||
... ... @@ -381,7 +385,9 @@
381 385 twinsPatientsResult.getrFactor().contains("淋病")||
382 386 twinsPatientsResult.getrFactor().contains("丙肝阳性")||
383 387 twinsPatientsResult.getrFactor().contains("乙肝大三阳")||
384   - twinsPatientsResult.getrFactor().contains("乙肝小三阳")) {
  388 + twinsPatientsResult.getrFactor().contains("乙肝小三阳")||
  389 + twinsPatientsResult.getrFactor().contains("大三阳")||
  390 + twinsPatientsResult.getrFactor().contains("小三阳")) {
385 391 data.add(twinsPatientsResult);
386 392 }
387 393 }