Commit 875cecb65180d061a560d86154923f68c8c196b4
1 parent
6a8ce32ebc
Exists in
dev
大同 建档管理、产检管理、分娩管理查询当前医生的数据
Showing 2 changed files with 17 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
875cecb
| ... | ... | @@ -8,7 +8,6 @@ |
| 8 | 8 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 9 | 9 | import com.lyms.platform.common.result.BaseResponse; |
| 10 | 10 | import com.lyms.platform.common.utils.*; |
| 11 | -import com.lyms.platform.common.utils.StringUtils; | |
| 12 | 11 | import com.lyms.platform.operate.web.constant.OrganizationConstant; |
| 13 | 12 | import com.lyms.platform.operate.web.request.AntExAddRequest; |
| 14 | 13 | import com.lyms.platform.operate.web.request.AntExManagerQueryRequest; |
| 15 | 14 | |
| ... | ... | @@ -25,13 +24,11 @@ |
| 25 | 24 | import com.lyms.platform.permission.service.CheckItemService; |
| 26 | 25 | import com.lyms.platform.permission.service.OrganizationService; |
| 27 | 26 | import com.lyms.platform.permission.service.UsersService; |
| 28 | -import com.lyms.platform.permission.service.impl.MeasureDataInfoServiceImpl; | |
| 29 | 27 | import com.lyms.platform.pojo.*; |
| 30 | 28 | import com.lyms.platform.query.*; |
| 31 | 29 | import com.mongodb.BasicDBObject; |
| 32 | 30 | import net.sourceforge.pinyin4j.PinyinHelper; |
| 33 | 31 | import org.apache.commons.collections.CollectionUtils; |
| 34 | -import org.apache.commons.lang.*; | |
| 35 | 32 | import org.apache.commons.lang.math.NumberUtils; |
| 36 | 33 | import org.springframework.beans.factory.annotation.Autowired; |
| 37 | 34 | import org.springframework.beans.factory.annotation.Qualifier; |
| ... | ... | @@ -48,7 +45,6 @@ |
| 48 | 45 | import javax.servlet.http.HttpServletResponse; |
| 49 | 46 | import java.io.IOException; |
| 50 | 47 | import java.io.OutputStream; |
| 51 | -import java.text.SimpleDateFormat; | |
| 52 | 48 | import java.util.*; |
| 53 | 49 | import java.util.concurrent.Callable; |
| 54 | 50 | import java.util.concurrent.Future; |
| ... | ... | @@ -137,7 +133,7 @@ |
| 137 | 133 | * @param isRegion |
| 138 | 134 | */ |
| 139 | 135 | private AntExRecordQuery complayRequest(Integer userId, AntExManagerQueryRequest antExManagerQueryRequest, boolean isRegion, String isPage) { |
| 140 | - | |
| 136 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 141 | 137 | AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); |
| 142 | 138 | antExRecordQuery.setSieveType(antExManagerQueryRequest.getSieveType()); |
| 143 | 139 | |
| ... | ... | @@ -221,8 +217,12 @@ |
| 221 | 217 | antExRecordQuery.setType(2); |
| 222 | 218 | } |
| 223 | 219 | //产检医生 |
| 224 | - if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCheckDoctor())){ | |
| 225 | - antExRecordQuery.setcId(antExManagerQueryRequest.getCheckDoctor()); | |
| 220 | + if("2100002419".equals(hospitalId)){//大同 | |
| 221 | + antExRecordQuery.setcId(userId == null ? "" : userId.toString()); | |
| 222 | + }else{ | |
| 223 | + if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCheckDoctor())){ | |
| 224 | + antExRecordQuery.setcId(antExManagerQueryRequest.getCheckDoctor()); | |
| 225 | + } | |
| 226 | 226 | } |
| 227 | 227 | /*滦平 end */ |
| 228 | 228 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
875cecb
| ... | ... | @@ -7,7 +7,6 @@ |
| 7 | 7 | import com.lyms.hospitalapi.lcdcf.LcdcfHisService; |
| 8 | 8 | import com.lyms.hospitalapi.pojo.WhfyHisModel; |
| 9 | 9 | import com.lyms.hospitalapi.whfy.WhfyHisService; |
| 10 | -import com.lyms.platform.beans.MsgRequest; | |
| 11 | 10 | import com.lyms.platform.biz.service.*; |
| 12 | 11 | import com.lyms.platform.common.base.PageInfo; |
| 13 | 12 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| ... | ... | @@ -21,7 +20,6 @@ |
| 21 | 20 | import com.lyms.platform.operate.web.service.BabyAfterVisitService; |
| 22 | 21 | import com.lyms.platform.operate.web.service.ITrackDownService; |
| 23 | 22 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
| 24 | -import com.lyms.platform.operate.web.utils.ResolveUtils; | |
| 25 | 23 | import com.lyms.platform.operate.web.utils.UnitConstants; |
| 26 | 24 | import com.lyms.platform.operate.web.worker.*; |
| 27 | 25 | import com.lyms.platform.permission.model.*; |
| 28 | 26 | |
| ... | ... | @@ -53,12 +51,14 @@ |
| 53 | 51 | import javax.servlet.http.HttpServletResponse; |
| 54 | 52 | import java.io.IOException; |
| 55 | 53 | import java.math.BigDecimal; |
| 56 | -import java.sql.*; | |
| 54 | +import java.sql.Connection; | |
| 55 | +import java.sql.PreparedStatement; | |
| 56 | +import java.sql.ResultSet; | |
| 57 | +import java.sql.SQLException; | |
| 57 | 58 | import java.text.DecimalFormat; |
| 58 | 59 | import java.text.ParseException; |
| 59 | 60 | import java.text.SimpleDateFormat; |
| 60 | 61 | import java.util.*; |
| 61 | -import java.util.Date; | |
| 62 | 62 | import java.util.concurrent.*; |
| 63 | 63 | import java.util.concurrent.atomic.AtomicInteger; |
| 64 | 64 | import java.util.concurrent.locks.Lock; |
| ... | ... | @@ -2703,8 +2703,12 @@ |
| 2703 | 2703 | patientsQuery.setSort("fmDate"); |
| 2704 | 2704 | //隆化需求按接诊医生查询 |
| 2705 | 2705 | //&&"2100001605".equals(hid) 去掉，前台入参有这个参数 |
| 2706 | - if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) { | |
| 2707 | - patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); | |
| 2706 | + if("2100002419".equals(hid)){//大同 | |
| 2707 | + patientsQuery.setDeliverDoctor(childbirthManagerRequest.getOperatorId() == null ? "" : childbirthManagerRequest.getOperatorId().toString()); | |
| 2708 | + }else{ | |
| 2709 | + if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) { | |
| 2710 | + patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); | |
| 2711 | + } | |
| 2708 | 2712 | } |
| 2709 | 2713 | |
| 2710 | 2714 | patientsQuery.setYyzyfmHospitalId(childbirthManagerRequest.getYyzyfmHospitalId()); |