jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a06cb769c03fbf59c763b0883140950ecae7b5b7

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

秦皇岛需求4.18

Showing 6 changed files with 40 additions and 9 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java View file @ a06cb76
... ... @@ -45,7 +45,6 @@
45 45 if(StringUtils.isNotEmpty(babyQuery.getOrder())){
46 46 return iBabyDao.queryBabyWithQuery(query.addOrder(Direction.DESC, babyQuery.getOrder()));
47 47 }else {
48   -
49 48 return iBabyDao.queryBabyWithQuery(query.addOrder(Direction.DESC, "id"));
50 49 }
51 50 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ a06cb76
... ... @@ -456,17 +456,32 @@
456 456 add("秦皇岛北戴河新区西河南医院");
457 457 }
458 458 };
459   - if (maternityManagementList.contains(organization.getName())){
  459 +// if (maternityManagementList.contains(organization.getName())){
  460 +// continue;
  461 +// }
  462 + String hname = organization.getName();
  463 + if (!(hname.contains("医院"))) {
460 464 continue;
461 465 }
462 466 } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("2")) {
463 467 String hname = organization.getName();
464   - if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
  468 +// if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
  469 +// continue;
  470 +// }
  471 + if (!(hname.contains("医院"))) {
465 472 continue;
466 473 }
467 474 } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("3")) {
468 475 String hname = organization.getName();
469   - if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
  476 +// if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
  477 +// continue;
  478 +// }
  479 + if (!(hname.contains("医院"))) {
  480 + continue;
  481 + }
  482 + }else if (users.getOrgId()==216){
  483 + String hname = organization.getName();
  484 + if (!(hname.contains("医院"))) {
470 485 continue;
471 486 }
472 487 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java View file @ a06cb76
... ... @@ -87,6 +87,9 @@
87 87 //建档号
88 88 private String fileCode;
89 89  
  90 + //领卷社区
  91 + private String couponCommunity;
  92 +
90 93 //建档孕周
91 94 private String createdWeek;
92 95  
... ... @@ -96,6 +99,14 @@
96 99 private String firstCheckDoctor;
97 100 //初诊时间
98 101 private String firstCheckTime;
  102 +
  103 + public String getCouponCommunity() {
  104 + return couponCommunity;
  105 + }
  106 +
  107 + public void setCouponCommunity(String couponCommunity) {
  108 + this.couponCommunity = couponCommunity;
  109 + }
99 110  
100 111 public String getLiveType() {
101 112 return liveType;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java View file @ a06cb76
... ... @@ -246,7 +246,8 @@
246 246 chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName());
247 247 }
248 248 String hname = chanResult.getFirstBH();
249   - if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
  249 + if ((hname.contains("医院"))) {
  250 + /*if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/
250 251 chanResult.setFirstBH("");
251 252 chanResult.setCouponCommunity(hname);
252 253 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java View file @ a06cb76
... ... @@ -300,7 +300,7 @@
300 300 quanPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
301 301 try {
302 302 String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
303   - if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
  303 + if (!(hname.contains("医院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/
304 304 quanPatientsResult.setFirstBH(hname);
305 305 } else {
306 306 quanPatientsResult.setCouponCommunity(hname);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java View file @ a06cb76
... ... @@ -192,12 +192,17 @@
192 192 riskPatientsResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
193 193 riskPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
194 194 try {
195   - riskPatientsResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName());
  195 + String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
  196 + if (!(hname.contains("医院"))) {
  197 +// if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
  198 + riskPatientsResult.setFirstBH(hname);
  199 + } else {
  200 + riskPatientsResult.setCouponCommunity(hname);
  201 + }
196 202 } catch (Exception e) {
197 203 riskPatientsResult.setFirstBH("");
  204 + riskPatientsResult.setCouponCommunity("");
198 205 }
199   -
200   -
201 206  
202 207 riskPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType()));
203 208 riskPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus()));