jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 023b61d482a393eb514040d93eb9e54b8ab04793

Authored by liquanyu
1 parent 9e22fdcf38
Exists in master and in 3 other branches dev, fengning2023-06-06, luanping

区域档案管理

Showing 3 changed files with 20 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 023b61d
... ... @@ -1913,7 +1913,7 @@
1913 1913 if (end > patientses.size()) {
1914 1914 end = patientses.size();
1915 1915 }
1916   - listFuture.add(commonThreadPool.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService, organizationService)));
  1916 + listFuture.add(commonThreadPool.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService, organizationService,couponService)));
1917 1917 }
1918 1918 for (Future f : listFuture) {
1919 1919 try {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 023b61d
... ... @@ -867,8 +867,11 @@
867 867 result.put("vcCardNo", p.getVcCardNo());
868 868 result.put("username", p.getUsername());
869 869 result.put("birth", DateUtil.getyyyy_MM_dd(p.getBirth()));
870   - result.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(p.getPhone()));
871   - result.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(p.getCardNo()));
  870 + result.put("phone",p.getPhone());
  871 + result.put("cardNo", p.getCardNo());
  872 +
  873 +// result.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(p.getPhone()));
  874 +// result.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(p.getCardNo()));
872 875 result.put("age", DateUtil.getAge(p.getBirth()));
873 876 String residenceAddress = findName(p.getProvinceRegisterId()) + findName(p.getCityRegisterId()) + findName(p.getAreaRegisterId()) + findName(p.getStreetRegisterId()) + p.getAddressRegister();
874 877 result.put("juzhu", residenceAddress.replace("null", ""));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java View file @ 023b61d
... ... @@ -15,6 +15,7 @@
15 15 import com.lyms.platform.operate.web.utils.CommonsHelper;
16 16 import com.lyms.platform.permission.model.Organization;
17 17 import com.lyms.platform.permission.model.Users;
  18 +import com.lyms.platform.permission.service.CouponService;
18 19 import com.lyms.platform.permission.service.OrganizationService;
19 20 import com.lyms.platform.permission.service.UsersService;
20 21 import com.lyms.platform.pojo.AntExChuModel;
21 22  
... ... @@ -51,12 +52,15 @@
51 52 private UsersService usersService;
52 53 private String hospital;
53 54 private PatientsService patientsService;
54   -
  55 + private CouponService couponService;
55 56 private OrganizationService organizationService;
56 57  
57 58 public WorkHR(List<Patients> patientses, UsersService usersService, String hospital,
58 59 BasicConfigService basicConfigService,
59   - AntenatalExaminationService antExService, PatientsService patientsService, OrganizationService organizationService) {
  60 + AntenatalExaminationService antExService, PatientsService patientsService,
  61 + OrganizationService organizationService,
  62 + CouponService couponService) {
  63 + this.couponService = couponService;
60 64 this.patientses = patientses;
61 65 this.usersService = usersService;
62 66 this.hospital = hospital;
63 67  
... ... @@ -199,13 +203,15 @@
199 203 riskPatientsResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
200 204 riskPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
201 205 try {
202   - String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
203   - if ((hname.contains("医院")) || (hname.contains("秦皇岛市妇幼保健院"))) {
204   -// if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
205   - riskPatientsResult.setFirstBH(hname);
206   - } else {
207   - riskPatientsResult.setCouponCommunity(hname);
  206 + if (CollectionUtils.isNotEmpty(chu))
  207 + {
  208 + AntExChuModel antExChuModel = chu.get(0);
  209 + Organization org = organizationService.getOrganization(Integer.parseInt( antExChuModel.getHospitalId()));
  210 + riskPatientsResult.setFirstBH(org.getName());
208 211 }
  212 + //优惠券发放医院
  213 + String coupHospital = couponService.getCouponHospital(patients.getPid());
  214 + riskPatientsResult.setCouponCommunity(coupHospital);
209 215 } catch (Exception e) {
210 216 riskPatientsResult.setFirstBH("");
211 217 riskPatientsResult.setCouponCommunity("");