jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d1453f08e76c041cd57813883d5ee5d56fe29685

Authored by yangfei
2 parents 68f122d956 9160e38792
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ d1453f0
... ... @@ -4299,6 +4299,7 @@
4299 4299 PatientsQuery patientsQuery = new PatientsQuery();
4300 4300 patientsQuery.setYn(YnEnums.YES.getId());
4301 4301 patientsQuery.setCardNo(idCard);
  4302 + patientsQuery.setType(3);
4302 4303  
4303 4304 if (StringUtils.isNotEmpty(hospitalName)) {
4304 4305 OrganizationQuery query = new OrganizationQuery();
4305 4306  
4306 4307  
4307 4308  
4308 4309  
4309 4310  
4310 4311  
4311 4312  
4312 4313  
4313 4314  
4314 4315  
4315 4316  
4316 4317  
4317 4318  
4318 4319  
4319 4320  
4320 4321  
4321 4322  
4322 4323  
4323 4324  
4324 4325  
4325 4326  
4326 4327  
4327 4328  
4328 4329  
4329 4330  
4330 4331  
4331 4332  
4332 4333  
4333 4334  
4334 4335  
4335 4336  
4336 4337  
4337 4338  
4338 4339  
4339 4340  
4340 4341  
4341 4342  
4342 4343  
4343 4344  
4344 4345  
4345 4346  
4346 4347  
4347 4348  
4348 4349  
... ... @@ -4314,202 +4315,199 @@
4314 4315 List<Map<String, Object>> deliverList = new ArrayList<>();
4315 4316 List<Patients> list = patientsService.queryPatient1(patientsQuery, "created");
4316 4317 if (CollectionUtils.isNotEmpty(list)) {
4317   - Patients pat = list.get(0);
  4318 + for (Patients pat : list)
  4319 + {
  4320 + Map<String, Object> patientMap = new HashMap<>();
4318 4321  
4319   - Map<String, Object> patientMap = new HashMap<>();
  4322 + patientMap.put("mid",pat.getId());//
  4323 + patientMap.put("mbuilddate",DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));// 建档时间
4320 4324  
4321   - patientMap.put("mid",pat.getId());//
4322   - patientMap.put("mbuilddate",DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));// 建档时间
4323 4325  
4324   -
4325   - String buildHospital = "";
4326   - if (StringUtils.isNotEmpty(pat.getHospitalId())) {
4327   - Organization organization = organizationService.getOrganization(Integer.parseInt(pat.getHospitalId()));
4328   - if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
4329   - buildHospital = organization.getName();
  4326 + String buildHospital = "";
  4327 + if (StringUtils.isNotEmpty(pat.getHospitalId())) {
  4328 + Organization organization = organizationService.getOrganization(Integer.parseInt(pat.getHospitalId()));
  4329 + if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
  4330 + buildHospital = organization.getName();
  4331 + }
4330 4332 }
4331   - }
4332   - patientMap.put("mbuildhospital",buildHospital);//建档单位
  4333 + patientMap.put("mbuildhospital",buildHospital);//建档单位
4333 4334  
4334   - patientMap.put("mname",pat.getUsername());//母亲姓名
4335   - patientMap.put("mcountry",getBasicConfig(pat.getPcountryId()));//母亲国籍
4336   - patientMap.put("mnation",getBasicConfig(pat.getPnationId()));//母亲民族
4337   - patientMap.put("mbirthday",DateUtil.getyyyy_MM_dd(pat.getBirth()));//母亲出生日期
4338   - patientMap.put("mcardtype",getBasicConfig(pat.getPcerteTypeId()));//母亲证件类型
4339   - patientMap.put("mcardnum", pat.getCardNo());//母亲证件号码
4340   - patientMap.put("maddress",CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(),
4341   - pat.getAreaId(), pat.getStreetId(), pat.getAddress(), basicConfigService));//母亲户籍地址
  4335 + patientMap.put("mname",pat.getUsername());//母亲姓名
  4336 + patientMap.put("mcountry",getBasicConfig(pat.getPcountryId()));//母亲国籍
  4337 + patientMap.put("mnation",getBasicConfig(pat.getPnationId()));//母亲民族
  4338 + patientMap.put("mbirthday",DateUtil.getyyyy_MM_dd(pat.getBirth()));//母亲出生日期
  4339 + patientMap.put("mcardtype",getBasicConfig(pat.getPcerteTypeId()));//母亲证件类型
  4340 + patientMap.put("mcardnum", pat.getCardNo());//母亲证件号码
  4341 + patientMap.put("maddress",CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(),
  4342 + pat.getAreaId(), pat.getStreetId(), pat.getAddress(), basicConfigService));//母亲户籍地址
4342 4343  
4343 4344  
4344   - patientMap.put("fname",StringUtils.isNotEmpty(pat.getHusbandName()) ? pat.getHusbandName() : "");//父亲姓名
  4345 + patientMap.put("fname",StringUtils.isNotEmpty(pat.getHusbandName()) ? pat.getHusbandName() : "");//父亲姓名
4345 4346  
4346   - patientMap.put("fcountry",getBasicConfig(pat.getHcountryId()));//父亲国籍
4347   - patientMap.put("fnation",getBasicConfig(pat.getHnationId()));//父亲民族
4348   - String fage = "";
4349   - if (StringUtils.isNotEmpty(pat.getHcertificateTypeId()) && StringUtils.isNotEmpty(pat.getHcertificateNum()) &&
4350   - pat.getHcertificateNum().length() == 18 &&
4351   - "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(pat.getHcertificateTypeId())) {
4352   - String cardNo = pat.getHcertificateNum().substring(6, 14);
4353   - Date date = DateUtil.parseYYYYMMDD(cardNo);
4354   - Integer age = DateUtil.getAge(date);
4355   - fage = String.valueOf(age);
4356   - }
  4347 + patientMap.put("fcountry",getBasicConfig(pat.getHcountryId()));//父亲国籍
  4348 + patientMap.put("fnation",getBasicConfig(pat.getHnationId()));//父亲民族
  4349 + String fbirthday = "";
  4350 + if (StringUtils.isNotEmpty(pat.getHcertificateTypeId()) && StringUtils.isNotEmpty(pat.getHcertificateNum()) &&
  4351 + pat.getHcertificateNum().length() == 18 &&
  4352 + "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(pat.getHcertificateTypeId())) {
  4353 + String cardNo = pat.getHcertificateNum().substring(6, 14);
  4354 + Date date = DateUtil.parseYYYYMMDD(cardNo);
  4355 + fbirthday = DateUtil.getyyyy_MM_dd(date);
  4356 + }
4357 4357  
4358   - patientMap.put("fbirthday",fage);//父亲出生日期
4359   - patientMap.put("fcardtype",getBasicConfig(pat.getHcertificateTypeId()));//父亲证件类型
  4358 + patientMap.put("fbirthday",fbirthday);//父亲出生日期
  4359 + patientMap.put("fcardtype",getBasicConfig(pat.getHcertificateTypeId()));//父亲证件类型
4360 4360  
4361 4361  
4362   - patientMap.put("fcardnum",StringUtils.isNotEmpty(pat.getHcertificateNum()) ? pat.getHcertificateNum() : "");//父亲证件号码
4363   - patientMap.put("faddress",CommonsHelper.getResidence(pat.getHprovinceRegisterId(), pat.getHcityRegisterId(),
4364   - pat.getHareaRegisterId(), pat.getHstreetRegisterId(), pat.getHaddressRegister(),
4365   - basicConfigService));//父亲户籍地址
  4362 + patientMap.put("fcardnum",StringUtils.isNotEmpty(pat.getHcertificateNum()) ? pat.getHcertificateNum() : "");//父亲证件号码
  4363 + patientMap.put("faddress",CommonsHelper.getResidence(pat.getHprovinceRegisterId(), pat.getHcityRegisterId(),
  4364 + pat.getHareaRegisterId(), pat.getHstreetRegisterId(), pat.getHaddressRegister(),
  4365 + basicConfigService));//父亲户籍地址
4366 4366  
4367   - Organization organization = null;
4368   - String fmHospital = "";
4369   - if (StringUtils.isNotEmpty(pat.getFmHospital())) {
4370   - if (com.lyms.platform.common.utils.StringUtils.isNum(pat.getFmHospital())) {
4371   - organization = organizationService.getOrganization(Integer.parseInt(pat.getFmHospital()));
4372   - if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
4373   - fmHospital = organization.getName();
  4367 + Organization organization = null;
  4368 + String fmHospital = "";
  4369 + if (StringUtils.isNotEmpty(pat.getFmHospital())) {
  4370 + if (com.lyms.platform.common.utils.StringUtils.isNum(pat.getFmHospital())) {
  4371 + organization = organizationService.getOrganization(Integer.parseInt(pat.getFmHospital()));
  4372 + if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
  4373 + fmHospital = organization.getName();
  4374 + }
  4375 + } else {
  4376 + fmHospital = pat.getFmHospital();
4374 4377 }
4375   - } else {
4376   - fmHospital = pat.getFmHospital();
  4378 +
4377 4379 }
  4380 + patientMap.put("hospital",fmHospital);//接生单位
4378 4381  
4379   - }
4380   - patientMap.put("hospital",fmHospital);//接生单位
4381   -
4382   -
4383   - MatDeliverQuery deliverQuery = new MatDeliverQuery();
4384   - deliverQuery.setYn(YnEnums.YES.getId());
4385   - deliverQuery.setParentId(pat.getId());
4386   - List<MaternalDeliverModel> datas = matDeliverService.query(deliverQuery);
4387   - if (CollectionUtils.isNotEmpty(datas)) {
4388   - String deliverDoctor = "";
4389   - if (StringUtils.isNotEmpty(datas.get(0).getDeliverDoctor())) {
4390   - if (com.lyms.platform.common.utils.StringUtils.isNum(datas.get(0).getDeliverDoctor())) {
4391   - Users users = usersService.getUsers(Integer.parseInt(datas.get(0).getDeliverDoctor()));
4392   - if (users != null && users.getYn() == YnEnums.YES.getId()) {
4393   - deliverDoctor = users.getName();
  4382 + MatDeliverQuery deliverQuery = new MatDeliverQuery();
  4383 + deliverQuery.setYn(YnEnums.YES.getId());
  4384 + deliverQuery.setParentId(pat.getId());
  4385 + List<MaternalDeliverModel> datas = matDeliverService.query(deliverQuery);
  4386 + if (CollectionUtils.isNotEmpty(datas)) {
  4387 + String deliverDoctor = "";
  4388 + if (StringUtils.isNotEmpty(datas.get(0).getDeliverDoctor())) {
  4389 + if (com.lyms.platform.common.utils.StringUtils.isNum(datas.get(0).getDeliverDoctor())) {
  4390 + Users users = usersService.getUsers(Integer.parseInt(datas.get(0).getDeliverDoctor()));
  4391 + if (users != null && users.getYn() == YnEnums.YES.getId()) {
  4392 + deliverDoctor = users.getName();
  4393 + }
  4394 + } else {
  4395 + deliverDoctor = datas.get(0).getDeliverDoctor();
4394 4396 }
4395   - } else {
4396   - deliverDoctor = datas.get(0).getDeliverDoctor();
4397 4397 }
4398   - }
4399   - patientMap.put("doctor",deliverDoctor);//接生人
4400   - MaternalDeliverModel data = datas.get(0);
  4398 + patientMap.put("doctor",deliverDoctor);//接生人
  4399 + MaternalDeliverModel data = datas.get(0);
4401 4400  
4402   - String place = ""; //1 "住院" : "其他
4403   - if (data.getFmType() != null && "1".equals(data.getFmType()))
4404   - {
4405   - if (fmHospital.contains("妇幼"))
  4401 + String place = ""; //1 "住院" : "其他
  4402 + if (data.getFmType() != null && "1".equals(data.getFmType()))
4406 4403 {
4407   - place = "妇幼保健医院";
  4404 + if (fmHospital.contains("妇幼"))
  4405 + {
  4406 + place = "妇幼保健医院";
  4407 + }
  4408 + else
  4409 + {
  4410 + place = fmHospital;
  4411 + }
4408 4412 }
4409 4413 else
4410 4414 {
4411   - place = fmHospital;
  4415 + place = "其他";
4412 4416 }
4413   - }
4414   - else
4415   - {
4416   - place = "其他";
4417   - }
4418 4417  
4419   - patientMap.put("place",place);//出生地点分类
  4418 + patientMap.put("place",place);//出生地点分类
4420 4419  
  4420 + List babyList = new ArrayList();
4421 4421  
4422   - List babyList = new ArrayList();
  4422 + SimpleDateFormat hh = new SimpleDateFormat("HH");
  4423 + SimpleDateFormat mm = new SimpleDateFormat("mm");
4423 4424  
4424   - SimpleDateFormat hh = new SimpleDateFormat("HH");
4425   - SimpleDateFormat mm = new SimpleDateFormat("mm");
  4425 + List<MaternalDeliverModel.Baby> babies = data.getBaby();
  4426 + if (CollectionUtils.isNotEmpty(babies)) {
  4427 + for (MaternalDeliverModel.Baby baby : babies) {
  4428 + Map<String, Object> map = new HashMap<>();
4426 4429  
4427   - List<MaternalDeliverModel.Baby> babies = data.getBaby();
4428   - if (CollectionUtils.isNotEmpty(babies)) {
4429   - for (MaternalDeliverModel.Baby baby : babies) {
4430   - Map<String, Object> map = new HashMap<>();
  4430 + //新生儿性别
  4431 + map.put("babyid", baby.getId());
  4432 + //新生儿主键
  4433 + map.put("babysex", baby.getBabyGender() == null ? "" : SexEnum.getTextById(
  4434 + Integer.parseInt(baby.getBabyGender())));
4431 4435  
4432   - //新生儿性别
4433   - map.put("babyid", baby.getId());
4434   - //新生儿主键
4435   - map.put("babysex", baby.getBabyGender() == null ? "" : SexEnum.getTextById(
4436   - Integer.parseInt(baby.getBabyGender())));
4437 4436  
  4437 + Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1());
  4438 + Integer week = betweenDay / 7;
  4439 + Integer day = betweenDay % 7;
4438 4440  
4439   - Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1());
4440   - Integer week = betweenDay / 7;
4441   - Integer day = betweenDay % 7;
  4441 + Date fmDate = DateUtil.parseYMDHM(baby.getDueTime());
4442 4442  
4443   - Date fmDate = DateUtil.parseYMDHM(baby.getDueTime());
  4443 + //出生孕周(周)
  4444 + map.put("babyweek", String.valueOf(week));
4444 4445  
4445   - //出生孕周(周)
4446   - map.put("babyweek", String.valueOf(week));
  4446 + map.put("babyday", String.valueOf(day));
  4447 + //新生儿出生日期
  4448 + map.put("babybirthday", DateUtil.getyyyy_MM_dd(fmDate));
4447 4449  
4448   - map.put("babyday", String.valueOf(day));
4449   - //新生儿出生日期
4450   - map.put("babybirthday", DateUtil.getyyyy_MM_dd(fmDate));
  4450 + //新生儿出生日期 小时
  4451 + map.put("babybirthdayhour",hh.format(fmDate));
4451 4452  
4452   - //新生儿出生日期 小时
4453   - map.put("babybirthdayhour",hh.format(fmDate));
  4453 + //新生儿出生日期 分
  4454 + map.put("babybirthdayminute", mm.format(fmDate));
4454 4455  
4455   - //新生儿出生日期 分
4456   - map.put("babybirthdayminute", mm.format(fmDate));
4457 4456  
  4457 + if (StringUtils.isNotEmpty(data.getFmHospital()) && com.lyms.platform.common.utils.StringUtils.isNum(data.getFmHospital())) {
  4458 + organization = organizationService.getOrganization(Integer.parseInt(pat.getFmHospital()));
  4459 + }
4458 4460  
4459   - if (StringUtils.isNotEmpty(data.getFmHospital()) && com.lyms.platform.common.utils.StringUtils.isNum(data.getFmHospital())) {
4460   - organization = organizationService.getOrganization(Integer.parseInt(pat.getFmHospital()));
4461   - }
  4461 + String babyprovince = "";
  4462 + String babycity = "";
  4463 + String babydistrict = "";
  4464 + if (organization != null)
  4465 + {
  4466 + babyprovince = getBasicConfig(organization.getProvinceId());
  4467 + babycity = getBasicConfig(organization.getCityId());
  4468 + babydistrict = getBasicConfig(organization.getAreaId());
  4469 + }
4462 4470  
4463   - String babyprovince = "";
4464   - String babycity = "";
4465   - String babydistrict = "";
4466   - if (organization != null)
4467   - {
4468   - babyprovince = getBasicConfig(organization.getProvinceId());
4469   - babycity = getBasicConfig(organization.getCityId());
4470   - babydistrict = getBasicConfig(organization.getAreaId());
4471   - }
  4471 + //新生儿出生地(省)
  4472 + map.put("babyprovince", babyprovince);
4472 4473  
4473   - //新生儿出生地(省)
4474   - map.put("babyprovince", babyprovince);
  4474 + //新生儿出生地(市)
  4475 + map.put("babycity", babycity);
4475 4476  
4476   - //新生儿出生地(市)
4477   - map.put("babycity", babycity);
  4477 + //新生儿出生地(区县)
  4478 + map.put("babydistrict", babydistrict);
4478 4479  
4479   - //新生儿出生地(区县)
4480   - map.put("babydistrict", babydistrict);
  4480 + String babyState = "";
  4481 + if (baby.getDeformity() != null && baby.getDeformity() == 1)
  4482 + {
  4483 + babyState = "差";
  4484 + }
  4485 + else if (StringUtils.isNotEmpty(baby.getBabyHealthy()) && !"健康".equals(baby.getBabyHealthy()))
  4486 + {
  4487 + babyState = "一般";
  4488 + }
  4489 + else
  4490 + {
  4491 + babyState = "良好";
  4492 + }
4481 4493  
4482   - String babyState = "";
4483   - if (baby.getDeformity() != null && baby.getDeformity() == 1)
4484   - {
4485   - babyState = "差";
4486   - }
4487   - else if (StringUtils.isNotEmpty(baby.getBabyHealthy()) && !"健康".equals(baby.getBabyHealthy()))
4488   - {
4489   - babyState = "一般";
4490   - }
4491   - else
4492   - {
4493   - babyState = "良好";
4494   - }
  4494 + //新生儿健康状态
  4495 + map.put("babystate", babyState);
4495 4496  
4496   - //新生儿健康状态
4497   - map.put("babystate", babyState);
  4497 + //新生儿体重（克）
  4498 + map.put("babyweight", StringUtils.isNotEmpty(baby.getBabyWeight()) ? baby.getBabyWeight() : "");
  4499 + //新生儿身长（厘米）
  4500 + map.put("babylength", StringUtils.isNotEmpty(baby.getBabyHeight()) ? baby.getBabyHeight() : "");
4498 4501  
4499   - //新生儿体重（克）
4500   - map.put("weight", StringUtils.isNotEmpty(baby.getBabyWeight()) ? baby.getBabyWeight() : "");
4501   - //新生儿身长（厘米）
4502   - map.put("height", StringUtils.isNotEmpty(baby.getBabyHeight()) ? baby.getBabyHeight() : "");
4503   -
4504   - babyList.add(map);
  4502 + babyList.add(map);
  4503 + }
4505 4504 }
  4505 + patientMap.put("newborninfo", babyList);
4506 4506 }
4507   -
4508   - patientMap.put("newborninfo", babyList);
  4507 + patientMap.put("address", CommonsHelper.getResidence(pat.getProvincePostRestId(), pat.getCityPostRestId(),
  4508 + pat.getAreaPostRestId(), pat.getStreetPostRestId(), pat.getAddressPostRest(), basicConfigService));//母亲产后休养地
  4509 + deliverList.add(patientMap);
4509 4510 }
4510   - patientMap.put("address", CommonsHelper.getResidence(pat.getProvincePostRestId(), pat.getCityPostRestId(),
4511   - pat.getAreaPostRestId(), pat.getStreetPostRestId(), pat.getAddressPostRest(), basicConfigService));//母亲产后休养地
4512   - deliverList.add(patientMap);
4513 4511 }
4514 4512 deliverMap.put("motherinfo",deliverList);
4515 4513 }