Commit 228e55a297448a41035d82a79b920115d3227ad5
1 parent
51d5ab99d9
Exists in
master
and in
4 other branches
去除军工医院
Showing 1 changed file with 8 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
228e55a
| ... | ... | @@ -3,12 +3,9 @@ |
| 3 | 3 | import com.alibaba.fastjson.JSON; |
| 4 | 4 | import com.alibaba.fastjson.JSONObject; |
| 5 | 5 | import com.lyms.hospitalapi.pojo.ReportModel; |
| 6 | -import com.lyms.platform.biz.AntExChuModelTemp; | |
| 7 | 6 | import com.lyms.platform.biz.dal.IAntExChuDao; |
| 8 | 7 | import com.lyms.platform.biz.service.*; |
| 9 | -import com.lyms.platform.common.base.PageInfo; | |
| 10 | 8 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 11 | -import com.lyms.platform.common.dao.BaseQuery; | |
| 12 | 9 | import com.lyms.platform.common.enums.*; |
| 13 | 10 | import com.lyms.platform.common.result.*; |
| 14 | 11 | import com.lyms.platform.common.utils.*; |
| ... | ... | @@ -19,8 +16,6 @@ |
| 19 | 16 | import com.lyms.platform.operate.web.service.IReportService; |
| 20 | 17 | import com.lyms.platform.operate.web.service.PatientWeightService; |
| 21 | 18 | import com.lyms.platform.operate.web.utils.*; |
| 22 | -import com.lyms.platform.operate.web.utils.CollectionUtils; | |
| 23 | -import com.lyms.platform.operate.web.worker.AntExRecordWorker; | |
| 24 | 19 | import com.lyms.platform.permission.dao.master.CouponMapper; |
| 25 | 20 | import com.lyms.platform.permission.model.BookbuildingCouponQuery; |
| 26 | 21 | import com.lyms.platform.permission.model.Organization; |
| 27 | 22 | |
| ... | ... | @@ -28,9 +23,12 @@ |
| 28 | 23 | import com.lyms.platform.permission.service.OrganizationService; |
| 29 | 24 | import com.lyms.platform.permission.service.UsersService; |
| 30 | 25 | import com.lyms.platform.pojo.*; |
| 31 | -import com.lyms.platform.query.*; | |
| 26 | +import com.lyms.platform.query.AntExChuQuery; | |
| 27 | +import com.lyms.platform.query.AntExRecordQuery; | |
| 28 | +import com.lyms.platform.query.PatientsQuery; | |
| 29 | +import com.lyms.platform.query.SieveApplyOrderQuery; | |
| 32 | 30 | import com.lymsh.platform.reportdata.model.echarts.Series; |
| 33 | -import org.apache.commons.collections.*; | |
| 31 | +import org.apache.commons.collections.MapUtils; | |
| 34 | 32 | import org.apache.commons.collections.map.HashedMap; |
| 35 | 33 | import org.apache.commons.lang.StringUtils; |
| 36 | 34 | import org.bson.types.ObjectId; |
| ... | ... | @@ -53,7 +51,6 @@ |
| 53 | 51 | import java.sql.ResultSet; |
| 54 | 52 | import java.sql.SQLException; |
| 55 | 53 | import java.text.DecimalFormat; |
| 56 | -import java.text.SimpleDateFormat; | |
| 57 | 54 | import java.util.*; |
| 58 | 55 | import java.util.concurrent.*; |
| 59 | 56 | |
| ... | ... | @@ -5469,6 +5466,9 @@ |
| 5469 | 5466 | map.put("address", address); |
| 5470 | 5467 | map.put("hospitalName", bookbuildingCoupon.get("hospitalname")); |
| 5471 | 5468 | String yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId()); |
| 5469 | + if (StringUtils.isNotEmpty(yyzyfmHospitalId_name)&&yyzyfmHospitalId_name.equals("秦皇岛军工医院")) { | |
| 5470 | + continue; | |
| 5471 | + } | |
| 5472 | 5472 | map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:""); |
| 5473 | 5473 | //初诊医院 |
| 5474 | 5474 | String firstVisitHospital=""; |