Commit c9013672a68a6a4ea242c2c0e6e1517271a30ba6
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 7 changed files
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientWeightDao.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientWeightDaoImpl.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientWeightService2.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NutritionInfoRequest.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientWeightDao.java
View file @
c901367
| ... | ... | @@ -3,6 +3,8 @@ |
| 3 | 3 | import com.lyms.platform.pojo.PatientWeight; |
| 4 | 4 | import org.springframework.data.mongodb.core.query.Query; |
| 5 | 5 | |
| 6 | +import java.util.List; | |
| 7 | + | |
| 6 | 8 | /** |
| 7 | 9 | * 体重管理 |
| 8 | 10 | */ |
| ... | ... | @@ -11,6 +13,8 @@ |
| 11 | 13 | void add(PatientWeight patientWeight); |
| 12 | 14 | |
| 13 | 15 | void updatePatient(Query query, PatientWeight patientWeight); |
| 16 | + | |
| 17 | + List<PatientWeight> queryPatientWeight(Query query); | |
| 14 | 18 | |
| 15 | 19 | } |
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientWeightDaoImpl.java
View file @
c901367
| ... | ... | @@ -6,6 +6,8 @@ |
| 6 | 6 | import org.springframework.data.mongodb.core.query.Query; |
| 7 | 7 | import org.springframework.stereotype.Repository; |
| 8 | 8 | |
| 9 | +import java.util.List; | |
| 10 | + | |
| 9 | 11 | /** |
| 10 | 12 | * 产前检查 初诊记录 |
| 11 | 13 | */ |
| ... | ... | @@ -22,5 +24,10 @@ |
| 22 | 24 | update(query, patientWeight); |
| 23 | 25 | } |
| 24 | 26 | |
| 27 | + | |
| 28 | + @Override | |
| 29 | + public List<PatientWeight> queryPatientWeight(Query query) { | |
| 30 | + return find(query); | |
| 31 | + } | |
| 25 | 32 | } |
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientWeightService2.java
View file @
c901367
| ... | ... | @@ -7,6 +7,8 @@ |
| 7 | 7 | import org.springframework.data.mongodb.core.query.Query; |
| 8 | 8 | import org.springframework.stereotype.Service; |
| 9 | 9 | |
| 10 | +import java.util.List; | |
| 11 | + | |
| 10 | 12 | @Service |
| 11 | 13 | public class PatientWeightService2 { |
| 12 | 14 | |
| ... | ... | @@ -20,5 +22,11 @@ |
| 20 | 22 | public void update(Query query, PatientWeight patientWeight) { |
| 21 | 23 | patientWeightDao.updatePatient(query, patientWeight); |
| 22 | 24 | } |
| 25 | + | |
| 26 | + | |
| 27 | + public List<PatientWeight> queryPatientWeight(Query query) { | |
| 28 | + return patientWeightDao.queryPatientWeight(query); | |
| 29 | + } | |
| 30 | + | |
| 23 | 31 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
View file @
c901367
| ... | ... | @@ -7,6 +7,7 @@ |
| 7 | 7 | import com.lyms.platform.common.result.BaseResponse; |
| 8 | 8 | import com.lyms.platform.operate.web.facade.MeasureInfoFacade; |
| 9 | 9 | import com.lyms.platform.operate.web.request.MeasureInfoRequest; |
| 10 | +import com.lyms.platform.operate.web.request.NutritionInfoRequest; | |
| 10 | 11 | import com.lyms.platform.operate.web.request.SmsTemplateRequest; |
| 11 | 12 | import org.springframework.beans.factory.annotation.Autowired; |
| 12 | 13 | import org.springframework.stereotype.Controller; |
| ... | ... | @@ -112,5 +113,44 @@ |
| 112 | 113 | { |
| 113 | 114 | return measureInfoFacade.getMeasurePatientInfo(certType, certNo, hospitalId); |
| 114 | 115 | } |
| 116 | + | |
| 117 | + | |
| 118 | + /** | |
| 119 | + * 体重与营养管理,获取孕妇基本信息 | |
| 120 | + * @param certType 1身份证 2就诊卡 | |
| 121 | + * @param certNo | |
| 122 | + * @param hospitalId | |
| 123 | + * @param request | |
| 124 | + * @return | |
| 125 | + */ | |
| 126 | + @RequestMapping(method = RequestMethod.GET, value = "/getNutritionPatientInfo") | |
| 127 | + @ResponseBody | |
| 128 | + public BaseObjectResponse getNutritionPatientInfo(@RequestParam(value = "certType", required = true) Integer certType, | |
| 129 | + @RequestParam(value = "certNo", required = true) String certNo, | |
| 130 | + @RequestParam(value = "hospitalId", required = true) String hospitalId, | |
| 131 | + HttpServletRequest request | |
| 132 | + ) | |
| 133 | + { | |
| 134 | + return measureInfoFacade.getNutritionPatientInfo(certType, certNo, hospitalId); | |
| 135 | + } | |
| 136 | + | |
| 137 | + | |
| 138 | + /** | |
| 139 | + * 体重与营养管理 保存体重测量数据 | |
| 140 | + * @param request | |
| 141 | + * @return | |
| 142 | + */ | |
| 143 | + @RequestMapping(method = RequestMethod.POST, value = "/addtNutritionInfo") | |
| 144 | + @ResponseBody | |
| 145 | + public BaseObjectResponse addtNutritionInfo(@RequestBody NutritionInfoRequest nutritionInfoRequest, | |
| 146 | + HttpServletRequest request | |
| 147 | + ) | |
| 148 | + { | |
| 149 | + return measureInfoFacade.addtNutritionInfo(nutritionInfoRequest); | |
| 150 | + } | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 115 | 155 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
c901367
| 1 | 1 | package com.lyms.platform.operate.web.facade; |
| 2 | 2 | |
| 3 | 3 | import com.lyms.hospitalapi.qhdfy.MeasurePatientInfo; |
| 4 | -import com.lyms.platform.biz.service.BasicConfigService; | |
| 5 | -import com.lyms.platform.biz.service.DataPermissionService; | |
| 6 | -import com.lyms.platform.biz.service.PatientsService; | |
| 4 | +import com.lyms.platform.biz.service.*; | |
| 7 | 5 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 8 | 6 | import com.lyms.platform.common.enums.SexEnum; |
| 9 | 7 | import com.lyms.platform.common.enums.YnEnums; |
| ... | ... | @@ -13,6 +11,7 @@ |
| 13 | 11 | import com.lyms.platform.common.utils.DateUtil; |
| 14 | 12 | import com.lyms.platform.common.utils.ExceptionUtils; |
| 15 | 13 | import com.lyms.platform.operate.web.request.MeasureInfoRequest; |
| 14 | +import com.lyms.platform.operate.web.request.NutritionInfoRequest; | |
| 16 | 15 | import com.lyms.platform.operate.web.result.MeasureBaseInfoResult; |
| 17 | 16 | import com.lyms.platform.operate.web.result.MeasureInfoResult; |
| 18 | 17 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
| ... | ... | @@ -28,6 +27,8 @@ |
| 28 | 27 | import org.apache.commons.dbutils.handlers.BeanListHandler; |
| 29 | 28 | import org.apache.commons.lang.StringUtils; |
| 30 | 29 | import org.springframework.beans.factory.annotation.Autowired; |
| 30 | +import org.springframework.data.mongodb.core.query.Criteria; | |
| 31 | +import org.springframework.data.mongodb.core.query.Query; | |
| 31 | 32 | import org.springframework.stereotype.Component; |
| 32 | 33 | |
| 33 | 34 | import java.sql.Connection; |
| ... | ... | @@ -52,6 +53,13 @@ |
| 52 | 53 | private OrganizationService organizationService; |
| 53 | 54 | |
| 54 | 55 | @Autowired |
| 56 | + private PatientWeightService2 patientWeightService2; | |
| 57 | + | |
| 58 | + @Autowired | |
| 59 | + private AntenatalExaminationService antenatalExaminationService; | |
| 60 | + | |
| 61 | + | |
| 62 | + @Autowired | |
| 55 | 63 | private BasicConfigService basicConfigService; |
| 56 | 64 | |
| 57 | 65 | private static String[] blood_item = new String[]{"--","--","--","--","--","--","--","--","--"}; |
| ... | ... | @@ -631,7 +639,7 @@ |
| 631 | 639 | { |
| 632 | 640 | MeasureDataInfoQuery query = new MeasureDataInfoQuery(); |
| 633 | 641 | query.setModifiedTimeEnd(DateUtil.parseYMD(DateUtil.getymd())); |
| 634 | - query.setModifiedTimeStart(DateUtil.addDay(new Date(),-2)); | |
| 642 | + query.setModifiedTimeStart(DateUtil.addDay(new Date(), -2)); | |
| 635 | 643 | List<MeasureDataInfoModel> list = mysqlMeasureDataInfoService.queryMeasureList(query); |
| 636 | 644 | if (CollectionUtils.isNotEmpty(list)) |
| 637 | 645 | { |
| ... | ... | @@ -645,5 +653,91 @@ |
| 645 | 653 | } |
| 646 | 654 | |
| 647 | 655 | |
| 656 | + /** | |
| 657 | + * 1身份证 2就诊卡 | |
| 658 | + * @param certType | |
| 659 | + * @param certNo | |
| 660 | + * @param hospitalId | |
| 661 | + * @return | |
| 662 | + */ | |
| 663 | + public BaseObjectResponse getNutritionPatientInfo(Integer certType, String certNo, String hospitalId) { | |
| 664 | + | |
| 665 | + System.out.println("getNutritionPatientInfo:certType" + certType + ";certNo="+certNo+";hospitalId="+hospitalId); | |
| 666 | + | |
| 667 | + BaseObjectResponse objectResponse = new BaseObjectResponse(); | |
| 668 | + PatientsQuery patientsQuery = new PatientsQuery(); | |
| 669 | + if (1 == certType) | |
| 670 | + { | |
| 671 | + patientsQuery.setCardNo(certNo); | |
| 672 | + } | |
| 673 | + else if (2 == certType) | |
| 674 | + { | |
| 675 | + patientsQuery.setVcCardNo(certNo); | |
| 676 | + } | |
| 677 | + | |
| 678 | + patientsQuery.setHospitalId(hospitalId); | |
| 679 | + patientsQuery.setYn(YnEnums.YES.getId()); | |
| 680 | + List<Patients> patientses = patientsService.queryPatient(patientsQuery); | |
| 681 | + if (CollectionUtils.isEmpty(patientses)) | |
| 682 | + { | |
| 683 | + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); | |
| 684 | + objectResponse.setErrormsg("测量用户还未建档"); | |
| 685 | + return objectResponse; | |
| 686 | + } | |
| 687 | + Patients pat = patientses.get(0); | |
| 688 | + Map<String,String> patInfo = new HashMap<>(); | |
| 689 | + patInfo.put("userName",pat.getUsername()); | |
| 690 | + patInfo.put("age",DateUtil.getAge(pat.getBirth())+"岁"); | |
| 691 | + patInfo.put("week",DateUtil.getWeekDesc(pat.getLastMenses(), new Date())); | |
| 692 | + patInfo.put("dueDate",DateUtil.getyyyy_MM_dd(DateUtil.addDay(pat.getLastMenses(), 280))); | |
| 693 | + patInfo.put("phone",pat.getPhone()); | |
| 694 | + patInfo.put("vcCardNo",pat.getVcCardNo()); | |
| 695 | + | |
| 696 | + String beforeWeight = ""; | |
| 697 | + String beforeHeight = ""; | |
| 698 | + String tireNumber = ""; | |
| 699 | + String bmi = ""; | |
| 700 | + String currentWeight = ""; | |
| 701 | + | |
| 702 | + List<PatientWeight> patientWeights = patientWeightService2.queryPatientWeight(Query.query(Criteria.where("patientId").is(pat.getId()))); | |
| 703 | + if (CollectionUtils.isNotEmpty(patientWeights)) | |
| 704 | + { | |
| 705 | + PatientWeight weight = patientWeights.get(0); | |
| 706 | + bmi = weight.getBmi() == null ? "" : weight.getBmi(); | |
| 707 | + beforeWeight = weight.getBeforeWeight() == null ? "" : weight.getBeforeWeight(); | |
| 708 | + beforeHeight = weight.getBeforeHeight() == null ? "" : weight.getBeforeHeight(); | |
| 709 | + } | |
| 710 | + else | |
| 711 | + { | |
| 712 | + AntExChuQuery antExChuQuery = new AntExChuQuery(); | |
| 713 | + antExChuQuery.setHospitalId(hospitalId); | |
| 714 | + antExChuQuery.setParentId(pat.getId()); | |
| 715 | + antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 716 | + List<AntExChuModel> chuModelList = antenatalExaminationService.queryAntExChu(antExChuQuery); | |
| 717 | + if (CollectionUtils.isNotEmpty(chuModelList)) { | |
| 718 | + AntExChuModel chuModel = chuModelList.get(0); | |
| 719 | + beforeWeight = chuModel.getYqWeight() == null ? "" : chuModel.getYqWeight(); | |
| 720 | + beforeHeight = chuModel.getHeight() == null ? "" : chuModel.getHeight(); | |
| 721 | + tireNumber = chuModel.getTireNumber() == null ? "" : chuModel.getTireNumber(); | |
| 722 | + bmi = chuModel.getBaricIndex() == null ? "" : chuModel.getBaricIndex(); | |
| 723 | + } | |
| 724 | + } | |
| 725 | + | |
| 726 | + patInfo.put("beforeWeight",beforeWeight); | |
| 727 | + patInfo.put("beforeHeight",beforeHeight); | |
| 728 | + patInfo.put("tireNumber",tireNumber); | |
| 729 | + patInfo.put("bmi",bmi); | |
| 730 | + patInfo.put("currentWeight",currentWeight); | |
| 731 | + patInfo.put("patientId",pat.getId()); | |
| 732 | + | |
| 733 | + objectResponse.setData(patInfo); | |
| 734 | + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
| 735 | + objectResponse.setErrormsg("成功"); | |
| 736 | + return objectResponse; | |
| 737 | + } | |
| 738 | + | |
| 739 | + public BaseObjectResponse addtNutritionInfo(NutritionInfoRequest nutritionInfoRequest) { | |
| 740 | + return null; | |
| 741 | + } | |
| 648 | 742 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
c901367
| ... | ... | @@ -4294,66 +4294,6 @@ |
| 4294 | 4294 | } |
| 4295 | 4295 | |
| 4296 | 4296 | public Map<String, Object> getMatDeliverData(String idCard, String hospitalName) { |
| 4297 | - | |
| 4298 | - | |
| 4299 | - Map<String,String> hospitals = new HashMap<>(); | |
| 4300 | - hospitals.put("秦皇岛市妇幼保健院","秦皇岛市妇幼保健院"); | |
| 4301 | - hospitals.put("秦皇岛市海港医院","秦皇岛市海港医院"); | |
| 4302 | - hospitals.put("秦皇岛军工医院","秦皇岛市军工医院"); | |
| 4303 | - hospitals.put("河北港口集团有限公司港口医院","秦皇岛港口医院"); | |
| 4304 | - hospitals.put("秦皇岛柳江医院","秦皇岛市柳江医院"); | |
| 4305 | - hospitals.put("秦皇岛市第一医院","秦皇岛市第一医院"); | |
| 4306 | - hospitals.put("秦皇岛经济技术开发区医院","秦皇岛市经济技术开发区医院"); | |
| 4307 | - hospitals.put("秦皇岛北戴河新区卫生和计划生育局","北戴河新区卫计局"); | |
| 4308 | - hospitals.put("秦皇岛北戴河新区南戴河医院","北戴河新区南戴河社区卫生服务中心"); | |
| 4309 | - hospitals.put("秦皇岛北戴河新区顺德医院","北戴河新区顺德医院"); | |
| 4310 | - hospitals.put("秦皇岛市山海关区妇幼保健计划生育服务中心","秦皇岛山海关区妇幼保健站"); | |
| 4311 | - hospitals.put("秦皇岛市工人医院","秦皇岛市工人医院"); | |
| 4312 | - hospitals.put("秦皇岛市山海关人民医院","山海关区人民医院"); | |
| 4313 | - hospitals.put("秦皇岛市北戴河区妇幼保健计划生育服务中心","秦皇岛北戴河区妇幼保健站"); | |
| 4314 | - hospitals.put("秦皇岛市北戴河医院","北戴河医院"); | |
| 4315 | - hospitals.put("秦皇岛市北戴河区牛头崖镇中心卫生院","北戴河区牛头崖镇卫生院"); | |
| 4316 | - hospitals.put("秦皇岛市抚宁区卫生和计划生育局","抚宁区卫计局"); | |
| 4317 | - hospitals.put("秦皇岛市抚宁区妇幼保健院","抚宁县妇幼保健院"); | |
| 4318 | - hospitals.put("秦皇岛天马湖医院","秦皇岛天马湖医院"); | |
| 4319 | - hospitals.put("秦皇岛市抚宁区榆关镇中心卫生院","抚宁区榆关镇中心卫生院"); | |
| 4320 | - hospitals.put("秦皇岛市抚宁紫金山医院","抚宁紫金山医院"); | |
| 4321 | - hospitals.put("秦皇岛市抚宁区中医医院","抚宁县中医院"); | |
| 4322 | - hospitals.put("秦皇岛市抚宁区人民医院","抚宁区人民医院"); | |
| 4323 | - hospitals.put("卢龙县妇幼保健院","卢龙县妇幼保健院"); | |
| 4324 | - hospitals.put("卢龙县中医院","卢龙县中医院"); | |
| 4325 | - hospitals.put("卢龙县刘田各庄中心卫生院","卢龙县刘田各庄中心卫生院"); | |
| 4326 | - hospitals.put("卢龙县医院","卢龙县医院"); | |
| 4327 | - hospitals.put("昌黎县妇幼保健院","昌黎妇幼保健院"); | |
| 4328 | - hospitals.put("秦皇岛市第二医院","秦皇岛市第二医院"); | |
| 4329 | - hospitals.put("昌黎县人民医院","昌黎县人民医院"); | |
| 4330 | - hospitals.put("昌黎县中医院","昌黎县中医院"); | |
| 4331 | - hospitals.put("青龙满族自治县生殖保健医院","青龙满族自治县生殖保健医院"); | |
| 4332 | - hospitals.put("青龙满族自治县医院","青龙满族自治县医院"); | |
| 4333 | - hospitals.put("青龙满族自治县中医院","青龙满族自治县中医院"); | |
| 4334 | - hospitals.put("青龙满族自治县龙王庙中心卫生院","青龙满族自治县龙王庙中心卫生院"); | |
| 4335 | - hospitals.put("青龙满族自治县祖山镇卫生院","青龙满族自治县祖山镇卫生院"); | |
| 4336 | - hospitals.put("青龙满族自治县隔河头中心卫生院","青龙满族自治县隔河头中心卫生院"); | |
| 4337 | - hospitals.put("青龙满族自治县董丈子卫生院","青龙满族自治县董杖子村卫生院"); | |
| 4338 | - hospitals.put("青龙满族自治县双山子中心卫生院","青龙满族自治县双山子中心卫生院"); | |
| 4339 | - hospitals.put("青龙满族自治县木头凳中心卫生院","青龙满族自治县木头凳中心卫生院"); | |
| 4340 | - hospitals.put("青龙满族自治县八道河中心卫生院","青龙满族自治县八道河中心卫生院"); | |
| 4341 | - hospitals.put("青龙满族自治县妇幼保健计划生育服务中心","青龙满族自治县妇幼保健计划生育服务中心"); | |
| 4342 | - hospitals.put("秦皇岛玛丽妇产医院","秦皇岛玛丽妇产医院"); | |
| 4343 | - hospitals.put("秦皇岛海港友谊医院","秦皇岛海港友谊医院"); | |
| 4344 | - | |
| 4345 | - hospitals.put("秦皇岛市卫生和计划生育委员会","秦皇岛市卫计委"); | |
| 4346 | - hospitals.put("秦皇岛市海港区卫生和计划生育局","秦皇岛市海港区卫生和计划生育局"); | |
| 4347 | - hospitals.put("秦皇岛市海港区妇幼保健计划生育服务中心","秦皇岛海港区妇幼保健站"); | |
| 4348 | - hospitals.put("秦皇岛经济技术开发区卫计局","秦皇岛经济技术开发区卫计局"); | |
| 4349 | - hospitals.put("秦皇岛市山海关区卫生和计划生育局","秦皇岛市山海关区卫生和计划生育局"); | |
| 4350 | - hospitals.put("中铁山桥集团医院","中铁山桥集团医院"); | |
| 4351 | - hospitals.put("秦皇岛市北戴河区卫生和计划生育局","秦皇岛市北戴河区卫生和计划生育局"); | |
| 4352 | - hospitals.put("秦皇岛市卢龙县卫生和计划生育局","秦皇岛市卢龙县卫生和计划生育局"); | |
| 4353 | - hospitals.put("秦皇岛市昌黎县卫生和计划生育局","秦皇岛市昌黎县卫生和计划生育局"); | |
| 4354 | - hospitals.put("秦皇岛市青龙满族自治县卫生和计划生育局","秦皇岛市青龙满族自治县卫生和计划生育局"); | |
| 4355 | - hospitals.put("青龙满族自治县博爱医院","青龙满族自治县博爱医院"); | |
| 4356 | - | |
| 4357 | 4297 | Map<String, Object> deliverMap = new HashMap<>(); |
| 4358 | 4298 | try { |
| 4359 | 4299 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 4360 | 4300 | |
| 4361 | 4301 | |
| 4362 | 4302 | |
| ... | ... | @@ -4361,26 +4301,22 @@ |
| 4361 | 4301 | patientsQuery.setCardNo(idCard); |
| 4362 | 4302 | patientsQuery.setType(3); |
| 4363 | 4303 | |
| 4364 | - if (StringUtils.isNotEmpty(hospitalName)) { | |
| 4365 | - hospitalName = hospitals.get(hospitalName.trim()); | |
| 4366 | - if (StringUtils.isNotEmpty(hospitalName)) | |
| 4367 | - { | |
| 4368 | - OrganizationQuery query = new OrganizationQuery(); | |
| 4369 | - query.setName(hospitalName); | |
| 4370 | - query.setYn(YnEnums.YES.getId()); | |
| 4371 | - List<Organization> organizations = organizationService.queryOrganization(query); | |
| 4372 | - if (CollectionUtils.isNotEmpty(organizations)) { | |
| 4373 | - patientsQuery.setHospitalId(String.valueOf(organizations.get(0).getId())); | |
| 4374 | - } | |
| 4304 | + if (StringUtils.isNotEmpty(hospitalName)) | |
| 4305 | + { | |
| 4306 | + OrganizationQuery query = new OrganizationQuery(); | |
| 4307 | + query.setName(hospitalName.trim()); | |
| 4308 | + query.setYn(YnEnums.YES.getId()); | |
| 4309 | + List<Organization> organizations = organizationService.queryOrganization(query); | |
| 4310 | + if (CollectionUtils.isNotEmpty(organizations)) { | |
| 4311 | + patientsQuery.setHospitalId(String.valueOf(organizations.get(0).getId())); | |
| 4375 | 4312 | } |
| 4376 | - else | |
| 4377 | - { | |
| 4378 | - deliverMap.put("motherinfo",new ArrayList<>()); | |
| 4379 | - return deliverMap; | |
| 4380 | - } | |
| 4381 | 4313 | } |
| 4314 | + else | |
| 4315 | + { | |
| 4316 | + deliverMap.put("motherinfo",new ArrayList<>()); | |
| 4317 | + return deliverMap; | |
| 4318 | + } | |
| 4382 | 4319 | |
| 4383 | - | |
| 4384 | 4320 | List<Map<String, Object>> deliverList = new ArrayList<>(); |
| 4385 | 4321 | List<Patients> list = patientsService.queryPatient1(patientsQuery, "created"); |
| 4386 | 4322 | if (CollectionUtils.isNotEmpty(list)) { |
| ... | ... | @@ -4401,7 +4337,6 @@ |
| 4401 | 4337 | patientMap.put("mid",pat.getId());// |
| 4402 | 4338 | patientMap.put("mbuilddate",DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));// 建档时间 |
| 4403 | 4339 | |
| 4404 | - | |
| 4405 | 4340 | String buildHospital = ""; |
| 4406 | 4341 | if (StringUtils.isNotEmpty(pat.getHospitalId())) { |
| 4407 | 4342 | Organization organization = organizationService.getOrganization(Integer.parseInt(pat.getHospitalId())); |
| ... | ... | @@ -4454,17 +4389,7 @@ |
| 4454 | 4389 | } else { |
| 4455 | 4390 | fmHospital = pat.getFmHospital(); |
| 4456 | 4391 | } |
| 4457 | - if (StringUtils.isNotEmpty(fmHospital)) | |
| 4458 | - { | |
| 4459 | - for (String key : hospitals.keySet()) | |
| 4460 | - { | |
| 4461 | - if (fmHospital.equals(hospitals.get(key))) | |
| 4462 | - { | |
| 4463 | - fmHospital = key; | |
| 4464 | - break; | |
| 4465 | - } | |
| 4466 | - } | |
| 4467 | - } | |
| 4392 | + | |
| 4468 | 4393 | } |
| 4469 | 4394 | patientMap.put("hospital", fmHospital);//接生单位 |
| 4470 | 4395 |