jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3e2e76ede77d4db47ca1187947708edae845e159

Authored by jishenfei
1 parent ce307ffea6
Exists in master and in 3 other branches dev, fengning2023-06-06, luanping

4.23秦皇岛需求

Showing 7 changed files with 71 additions and 26 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 3e2e76e
... ... @@ -460,34 +460,34 @@
460 460 // continue;
461 461 // }
462 462 String hname = organization.getName();
463   - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) {
  463 + if (!(hname.contains("医院") ) || hname.equals("吉星里港口医院社区卫生服务站") || hname.equals("青龙满族自治县生殖保健医院")) {
464 464 if (!hname.equals("秦皇岛市妇幼保健院")){
465 465 continue;
466 466 }
467 467 }
468 468 } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("2")) {
469 469 String hname = organization.getName();
470   -// if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
471   -// continue;
472   -// }
473   - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) {
474   - if (!hname.equals("秦皇岛市妇幼保健院")){
475   - continue;
476   - }
  470 + if (!( hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
  471 + continue;
477 472 }
  473 +// if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) {
  474 +// if (!hname.equals("秦皇岛市妇幼保健院")){
  475 +// continue;
  476 +// }
  477 +// }
478 478 } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("3")) {
479 479 String hname = organization.getName();
480 480 // if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
481 481 // continue;
482   -// }
483   - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) {
  482 +// }|| hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")
  483 + if (!(hname.contains("医院") ) || hname.equals("青龙满族自治县生殖保健医院") || hname.equals("吉星里港口医院社区卫生服务站")) {
484 484 if (!hname.equals("秦皇岛市妇幼保健院")){
485 485 continue;
486 486 }
487 487 }
488 488 }else if (users.getOrgId()==216){
489 489 String hname = organization.getName();
490   - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) {
  490 + if (!(hname.contains("医院") ) || hname.equals("吉星里港口医院社区卫生服务站") || hname.equals("青龙满族自治县生殖保健医院") ) {
491 491 if (!hname.equals("秦皇岛市妇幼保健院")){
492 492 continue;
493 493 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 3e2e76e
... ... @@ -230,7 +230,9 @@
230 230 */
231 231 public BaseObjectResponse addPregnantBookbuilding(
232 232 YunBookbuildingAddRequest yunRequest, Integer uId, boolean isSync) {
233   - yunRequest.setBooksuifangDoctor(JSON.toJSONString(yunRequest.getBooksuifangDoctors()));
  233 + if (yunRequest.getBooksuifangDoctors()!=null){
  234 + yunRequest.setBooksuifangDoctor(JSON.toJSONString(yunRequest.getBooksuifangDoctors()));
  235 + }
234 236 if (StringUtils.isNotEmpty(yunRequest.getOrgName()))
235 237 {
236 238 OrganizationQuery organizationQuery = new OrganizationQuery();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 3e2e76e
... ... @@ -242,6 +242,8 @@
242 242 }
243 243 map.put("rxxtLevel", rxxtLevel);//乳腺X检查等级
244 244  
  245 + //预约下次检查时间
  246 + map.put("nextDate",DateUtil.getyyyy_MM_dd(model.getNextDate()));
245 247 map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期
246 248 map.put("breastAbnormity",RxaZdycEnums.getName(null!=model.getBreastAbnormity()?model.getBreastAbnormity().toString():null));
247 249 map.put("newRxCssj",LhUltrasoundContent.getName(StringUtils.isNotEmpty(model.getNewRxCssj())?model.getNewRxCssj():null));//超声所见
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java View file @ 3e2e76e
... ... @@ -49,7 +49,10 @@
49 49 private String cTime;
50 50 //服务类型
51 51 private String serviceType;
52   -
  52 + /**
  53 + * 高危因素
  54 + */
  55 + private String rFactor;
53 56 //服务状态
54 57 private String serviceStatus;
55 58  
... ... @@ -115,6 +118,14 @@
115 118  
116 119 //领劵社区
117 120 private String couponCommunity;
  121 +
  122 + public String getrFactor() {
  123 + return rFactor;
  124 + }
  125 +
  126 + public void setrFactor(String rFactor) {
  127 + this.rFactor = rFactor;
  128 + }
118 129  
119 130 public String getPliveTypeId() {
120 131 return pliveTypeId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java View file @ 3e2e76e
... ... @@ -82,7 +82,7 @@
82 82 List data = new ArrayList <>();
83 83 AntExQuery antExQuery = new AntExQuery();
84 84 AntExChuQuery antExChuQuery1 = new AntExChuQuery();//初诊
85   - antExChuQuery1.setYn(YnEnums.YES.getId());
  85 + antExChuQuery1.setYn(YnEnums.YES.getId());
86 86  
87 87 try {
88 88 for (Patients patients : patientses) {
89 89  
... ... @@ -238,15 +238,15 @@
238 238 chanResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
239 239 chanResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
240 240 try {
241   - if (StringUtils.isNotEmpty(patients.getSource())) {
242   - Patients pat = patientsService.findOnePatientById(patients.getSource());
243   - chanResult.setRemark(pat.getMremark());
244   - chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(pat.getHospitalId())).getName());
245   - } else {
246   - chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName());
247   - }
  241 +// if (StringUtils.isNotEmpty(patients.getSource())) {
  242 +// Patients pat = patientsService.findOnePatientById(patients.getSource());
  243 +// chanResult.setRemark(pat.getMremark());
  244 +// chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(pat.getHospitalId())).getName());
  245 +// } else {
  246 +// chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName());
  247 +// }
248 248 String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
249   - if ((hname.contains("医院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/
  249 + if ((hname.contains("医院")) || (hname.contains("秦皇岛市妇幼保健院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/
250 250 chanResult.setFirstBH(hname);
251 251 } else {
252 252 chanResult.setCouponCommunity(hname);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java View file @ 3e2e76e
... ... @@ -150,7 +150,6 @@
150 150 }
151 151 ant = antExService.queryAntenatalExamination(antExQuery.convertToQuery());
152 152 }
153   -
154 153 //唐山滦县判断复诊是否是本院
155 154 if(CollectionUtils.isNotEmpty(ant)){
156 155 for(int k = 0;k < ant.size();k++){
... ... @@ -236,7 +235,7 @@
236 235 List <Patients> patients1 = patientsService.queryPatient(patientsQuery);
237 236 if (CollectionUtils.isNotEmpty(patients1)) {
238 237 for (Patients ps : patients1) {
239   - patientIds.add(ps.getId());
  238 + patientIds.add(ps.getPid());
240 239 }
241 240 }
242 241 int chuzhen = 0;
... ... @@ -266,6 +265,7 @@
266 265 //本院复诊
267 266 int chb = capLocalHospital(hospital, ant);
268 267 quanPatientsResult.setcHTimes(chi + chb);
  268 + quanPatientsResult.setrFactor(patientsQuery.getrFactor());
269 269 stopWatch.stop();
270 270 String nextCheckTime = "";
271 271 stopWatch.start("query antex list");
... ... @@ -296,7 +296,7 @@
296 296 quanPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
297 297 try {
298 298 String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
299   - if ((hname.contains("医院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/
  299 + if ((hname.contains("医院")) || (hname.contains("秦皇岛市妇幼保健院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/
300 300 quanPatientsResult.setFirstBH(hname);
301 301 } else {
302 302 quanPatientsResult.setCouponCommunity(hname);
... ... @@ -304,6 +304,36 @@
304 304 } catch (Exception e) {
305 305 quanPatientsResult.setFirstBH("");
306 306 quanPatientsResult.setCouponCommunity("");
  307 + }
  308 + //高危因素
  309 + List<String> factor = patients.getRiskFactorId();
  310 +
  311 + if (CollectionUtils.isNotEmpty(factor)) {
  312 + StringBuilder sb = new StringBuilder(56);
  313 + for (String srt : factor) {
  314 + if (StringUtils.isNotEmpty(srt)) {
  315 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt);
  316 + if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) {
  317 + sb.append(basicConfig.getName()).append(',');
  318 + }
  319 + }
  320 + }
  321 + if (sb.toString().endsWith(",")) {
  322 + quanPatientsResult.setrFactor(sb.substring(0, sb.length() - 1));
  323 + } else {
  324 + quanPatientsResult.setrFactor(sb.toString());
  325 + }
  326 +
  327 + if (!"-".equals(quanPatientsResult.getrFactor()) && StringUtils.isNotEmpty(patients.getoRiskFactor())) {
  328 + quanPatientsResult.setrFactor(quanPatientsResult.getrFactor()+","+patients.getoRiskFactor());
  329 + }else if (StringUtils.isNotEmpty(patients.getoRiskFactor()))
  330 + {
  331 + quanPatientsResult.setrFactor(patients.getoRiskFactor());
  332 + }
  333 + }
  334 + else if (StringUtils.isNotEmpty(patients.getoRiskFactor()))
  335 + {
  336 + quanPatientsResult.setrFactor(patients.getoRiskFactor());
307 337 }
308 338  
309 339 quanPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java View file @ 3e2e76e
... ... @@ -193,7 +193,7 @@
193 193 riskPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
194 194 try {
195 195 String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
196   - if ((hname.contains("医院"))) {
  196 + if ((hname.contains("医院")) || (hname.contains("秦皇岛市妇幼保健院"))) {
197 197 // if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
198 198 riskPatientsResult.setFirstBH(hname);
199 199 } else {