jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9b3abe45b6cc168c90bb8c29e76321884ea6620d

Authored by cfl
1 parent f662d8409d
Exists in master and in 2 other branches dev, luanping

威县数据流转功能

Showing 10 changed files with 97 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/constant/OrganizationConstant.java View file @ 9b3abe4
  1 +package com.lyms.platform.operate.web.constant;
  2 +
  3 +public class OrganizationConstant {
  4 +
  5 + public static final String XT_WX = "2100002421";
  6 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java View file @ 9b3abe4
... ... @@ -10,6 +10,7 @@
10 10 import com.lyms.platform.common.result.BaseResponse;
11 11 import com.lyms.platform.common.result.CommonResult;
12 12 import com.lyms.platform.common.utils.*;
  13 +import com.lyms.platform.operate.web.constant.OrganizationConstant;
13 14 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
14 15 import com.lyms.platform.pojo.LisCrisisItem;
15 16 import com.lyms.platform.pojo.LisCrisisNotify;
... ... @@ -250,6 +251,8 @@
250 251 patientses = patientsService.queryPatient1(patientsQuery, "modified");
251 252 }
252 253  
  254 + Integer userId = getUserId(request);
  255 + String hospitalId = autoMatchFacade.getHospitalId(userId);
253 256  
254 257  
255 258 LisCrisisItemQuery query = new LisCrisisItemQuery();
256 259  
257 260  
... ... @@ -266,13 +269,13 @@
266 269 query.setStatus(status);
267 270 query.setItemName(refer);
268 271 query.setApplyDoctorName(doctor);
  272 + query.setHospitalId(hospitalId);
269 273  
270   - Integer userId = getUserId(request);
271   - if (userId != null)
272   - {
273   - String hospitalId = autoMatchFacade.getHospitalId(userId);
274   - query.setHospitalId(hospitalId);
  274 + //威县数据流转
  275 + if(OrganizationConstant.XT_WX.equals(hospitalId)){
  276 + query.setApplyDoctorCode(String.valueOf(userId));
275 277 }
  278 +
276 279  
277 280  
278 281 if (CollectionUtils.isNotEmpty(patientses)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ 9b3abe4
... ... @@ -14,6 +14,7 @@
14 14 import com.lyms.platform.common.result.BaseObjectResponse;
15 15 import com.lyms.platform.common.result.BaseResponse;
16 16 import com.lyms.platform.common.utils.*;
  17 +import com.lyms.platform.operate.web.constant.OrganizationConstant;
17 18 import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
18 19 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
19 20 import com.lyms.platform.operate.web.facade.MatDeliverFacade;
... ... @@ -192,6 +193,12 @@
192 193 BaseListResponse baseListResponse;
193 194 childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
194 195 String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId());
  196 +
  197 + //威县数据流转 根据接诊医生查询
  198 + if(OrganizationConstant.XT_WX.equals(hospitalId)){
  199 + childbirthManagerRequest.setDeliverDoctor(String.valueOf(childbirthManagerRequest.getOperatorId()));
  200 + }
  201 +
195 202 try {
196 203 Map<String, String> query;
197 204 if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ 9b3abe4
... ... @@ -12,6 +12,7 @@
12 12 import com.lyms.platform.common.result.BaseObjectResponse;
13 13 import com.lyms.platform.common.result.BaseResponse;
14 14 import com.lyms.platform.common.utils.*;
  15 +import com.lyms.platform.operate.web.constant.OrganizationConstant;
15 16 import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
16 17 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
17 18 import com.lyms.platform.operate.web.facade.BasicConfigFacade;
... ... @@ -667,6 +668,11 @@
667 668 }
668 669  
669 670 patientManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
  671 +
  672 + //威县数据流转
  673 + if(OrganizationConstant.XT_WX.equals(String.valueOf(organization.getId()))){
  674 + patientManagerRequest.setBookbuildingDoctor(String.valueOf(patientManagerRequest.getOperatorId()));
  675 + }
670 676 // PatientManagerResult patientManagerResult = patientFacade.patientManager(patientManagerRequest);
671 677 PatientManagerResult patientManagerResult = patientFacade.patientManager(patientManagerRequest);
672 678 if (patientManagerResult.getErrorcode() != ErrorCodeConstants.SUCCESS) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 9b3abe4
... ... @@ -9,6 +9,7 @@
9 9 import com.lyms.platform.common.result.BaseResponse;
10 10 import com.lyms.platform.common.utils.*;
11 11 import com.lyms.platform.common.utils.StringUtils;
  12 +import com.lyms.platform.operate.web.constant.OrganizationConstant;
12 13 import com.lyms.platform.operate.web.request.AntExAddRequest;
13 14 import com.lyms.platform.operate.web.request.AntExManagerQueryRequest;
14 15 import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest;
... ... @@ -387,6 +388,7 @@
387 388 * @return
388 389 */
389 390 public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage, boolean isCurrent) {
  391 + String hospitalId = autoMatchFacade.getHospitalId(userId);
390 392 PatientsQuery patientsQuery = new PatientsQuery();
391 393 List<Patients> patientses = null;
392 394 if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) {
... ... @@ -394,7 +396,7 @@
394 396 patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified");
395 397  
396 398 if (CollectionUtils.isEmpty(patientses)) {
397   - String hospitalId = autoMatchFacade.getHospitalId(userId);
  399 +
398 400 if ("1000000114".equals(hospitalId)) {
399 401 List<String> list = dzfyHisService.getDzVcCardNos(antExManagerQueryRequest.getQueryNo());
400 402 if (CollectionUtils.isNotEmpty(list)) {
... ... @@ -406,6 +408,11 @@
406 408 }
407 409 }
408 410  
  411 + //威县数据流转
  412 + if(OrganizationConstant.XT_WX.equals(hospitalId)){
  413 + antExManagerQueryRequest.setCheckDoctor(String.valueOf(userId));
  414 + }
  415 +
409 416 AntExRecordQuery antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion, isPage);
410 417 if (CollectionUtils.isNotEmpty(patientses)) {
411 418 List<String> parentIds = new LinkedList<>();
... ... @@ -1209,6 +1216,11 @@
1209 1216 if (dates.length == 2) {
1210 1217 antExRecordQuery.setCheckTimeEnd(DateUtil.parseYMD(dates[1]));
1211 1218 }
  1219 + }
  1220 +
  1221 + //威县数据流转
  1222 + if(OrganizationConstant.XT_WX.equals(hospitalId)){
  1223 + antExRecordQuery.setcId(String.valueOf(userId));
1212 1224 }
1213 1225  
1214 1226 antExRecordQuery.setHospitalId(hospitalId);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 9b3abe4
... ... @@ -2712,7 +2712,8 @@
2712 2712 patientsQuery.setDesc("fmDate");
2713 2713 patientsQuery.setSort("fmDate");
2714 2714 //隆化需求按接诊医生查询
2715   - if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(hid)) {
  2715 + //&&"2100001605".equals(hid) 去掉，前台入参有这个参数
  2716 + if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) {
2716 2717 patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor());
2717 2718 }
2718 2719  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 9b3abe4
... ... @@ -13,6 +13,7 @@
13 13 import com.lyms.platform.common.result.BaseResponse;
14 14 import com.lyms.platform.common.result.PageResult;
15 15 import com.lyms.platform.common.utils.*;
  16 +import com.lyms.platform.operate.web.constant.OrganizationConstant;
16 17 import com.lyms.platform.operate.web.request.*;
17 18 import com.lyms.platform.operate.web.result.*;
18 19 import com.lyms.platform.operate.web.service.IPreEugenicsService;
19 20  
... ... @@ -1282,10 +1283,13 @@
1282 1283 * @return
1283 1284 */
1284 1285 public BaseResponse queryTwinsAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
  1286 +
  1287 + String hospital = autoMatchFacade.getHospitalId(userId);
  1288 +
1285 1289 //组合请求
1286 1290 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
1287 1291  
1288   - String hospital = autoMatchFacade.getHospitalId(userId);
  1292 +
1289 1293 //查询符合条件的孕妇
1290 1294 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
1291 1295 stopWatch.start();
1292 1296  
... ... @@ -1345,10 +1349,14 @@
1345 1349 * @return
1346 1350 */
1347 1351 public BaseResponse queryBloodPressureAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
  1352 + String hospital = autoMatchFacade.getHospitalId(userId);
  1353 + //威县数据流转
  1354 + /*if(OrganizationConstant.XT_WX.equals(hospital)){
  1355 + riskPatientsQueryRequest.setLastCheckDoctorId(String.valueOf(userId));
  1356 + }*/
1348 1357 //组合请求
1349 1358 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
1350 1359  
1351   - String hospital = autoMatchFacade.getHospitalId(userId);
1352 1360 //查询符合条件的孕妇
1353 1361 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
1354 1362 stopWatch.start();
1355 1363  
... ... @@ -1420,10 +1428,16 @@
1420 1428 * @return
1421 1429 */
1422 1430 public BaseResponse queryBloodSugarAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
  1431 + String hospital = autoMatchFacade.getHospitalId(userId);
  1432 + //威县数据流转
  1433 + /*if(OrganizationConstant.XT_WX.equals(hospital)){
  1434 + riskPatientsQueryRequest.setLastCheckDoctorId(String.valueOf(userId));
  1435 + }*/
  1436 +
1423 1437 //组合请求
1424 1438 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
1425 1439  
1426   - String hospital = autoMatchFacade.getHospitalId(userId);
  1440 +
1427 1441 //查询符合条件的孕妇
1428 1442 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
1429 1443 stopWatch.start();
1430 1444  
... ... @@ -1492,10 +1506,15 @@
1492 1506 }
1493 1507  
1494 1508 public BaseResponse queryScarUterusAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
  1509 + String hospital = autoMatchFacade.getHospitalId(userId);
  1510 + //威县数据流转
  1511 + /*if(OrganizationConstant.XT_WX.equals(hospital)){
  1512 + riskPatientsQueryRequest.setLastCheckDoctorId(String.valueOf(userId));
  1513 + }*/
  1514 +
1495 1515 //组合请求
1496 1516 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
1497   -
1498   - String hospital = autoMatchFacade.getHospitalId(userId);
  1517 +
1499 1518 //查询符合条件的孕妇
1500 1519 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
1501 1520 stopWatch.start();
1502 1521  
... ... @@ -1589,10 +1608,15 @@
1589 1608 * @return
1590 1609 */
1591 1610 public BaseResponse queryRareList(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
  1611 + String hospital = autoMatchFacade.getHospitalId(userId);
  1612 + /*//威县数据流转
  1613 + if(OrganizationConstant.XT_WX.equals(hospital)){
  1614 + riskPatientsQueryRequest.setLastCheckDoctorId(String.valueOf(userId));
  1615 + }*/
1592 1616 //组合请求
1593 1617 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
1594 1618 patientsQuery.setRareType("1");
1595   - String hospital = autoMatchFacade.getHospitalId(userId);
  1619 +
1596 1620 //查询符合条件的孕妇
1597 1621 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
1598 1622 stopWatch.start();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 9b3abe4
... ... @@ -15,6 +15,7 @@
15 15 import com.lyms.platform.common.result.RespBuilder;
16 16 import com.lyms.platform.common.utils.DateUtil;
17 17 import com.lyms.platform.common.utils.StringUtils;
  18 +import com.lyms.platform.operate.web.constant.OrganizationConstant;
18 19 import com.lyms.platform.operate.web.facade.*;
19 20 import com.lyms.platform.operate.web.service.IBloodPressureService;
20 21 import com.lyms.platform.operate.web.service.PatientWeightService;
21 22  
... ... @@ -216,10 +217,11 @@
216 217 weekEnd, Integer age, Integer page, Integer limit,Integer isPrint, Integer userId,String isAll) {
217 218 boolean flag = false;
218 219 List<String> hospitalIds = groupsFacade.findGroupHospital(userId, false);
  220 + String hospitalId = autoMatchFacade.getHospitalId(userId);
219 221 List<String> hids = new ArrayList<>();
220 222 if (!StringUtils.isNotEmpty(isAll) || "1".equals(isAll))
221 223 {
222   - String hospitalId = autoMatchFacade.getHospitalId(userId);
  224 +
223 225 hids.add(hospitalId);
224 226 }
225 227 else
... ... @@ -260,6 +262,13 @@
260 262 }
261 263 // criteria.and("parentId").in(ids);
262 264 criteria.and("pid").in(ids);
  265 + }
  266 +
  267 + //威县数据流转
  268 + if ((!StringUtils.isNotEmpty(isAll) || "1".equals(isAll)) && OrganizationConstant.XT_WX.equals(hospitalId))
  269 + {
  270 +
  271 + criteria.and("operaterId").is(userId);
263 272 }
264 273  
265 274 if(null!=isPrint){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 9b3abe4
... ... @@ -11,6 +11,7 @@
11 11 import com.lyms.platform.common.utils.DateUtil;
12 12 import com.lyms.platform.common.utils.EnumUtil;
13 13 import com.lyms.platform.common.utils.StringUtils;
  14 +import com.lyms.platform.operate.web.constant.OrganizationConstant;
14 15 import com.lyms.platform.operate.web.facade.*;
15 16 import com.lyms.platform.operate.web.result.DiabetesRecordResult;
16 17 import com.lyms.platform.operate.web.service.IBloodSugarService;
17 18  
... ... @@ -138,10 +139,10 @@
138 139 flag = true;
139 140 }
140 141 List<String> hospitalIds = groupsFacade.findGroupHospital(userId, false);
  142 + String hospitalId = autoMatchFacade.getHospitalId(userId);
141 143 List<String> hids = new ArrayList<>();
142 144 if (!StringUtils.isNotEmpty(isAll) || "1".equals(isAll))
143 145 {
144   - String hospitalId = autoMatchFacade.getHospitalId(userId);
145 146 hids.add(hospitalId);
146 147 }
147 148 else
... ... @@ -158,6 +159,12 @@
158 159 if(null!=isPrint){
159 160 criteria.and("isPrint").is(isPrint);
160 161 }
  162 +
  163 + //威县数据流转
  164 + if((!StringUtils.isNotEmpty(isAll) || "1".equals(isAll)) && OrganizationConstant.XT_WX.equals(hospitalId)){
  165 + criteria.and("createUser").is(userId);
  166 + }
  167 +
161 168 // List<String> rids = new ArrayList<>();
162 169 // rids.add("5aab6d3d422b03d4ad2bf83e");
163 170 // rids.add("5aab6d3e422b03d4ad2bf83f");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java View file @ 9b3abe4
... ... @@ -7,6 +7,7 @@
7 7 import com.lyms.platform.common.result.RespBuilder;
8 8 import com.lyms.platform.common.utils.DateUtil;
9 9 import com.lyms.platform.common.utils.StringUtils;
  10 +import com.lyms.platform.operate.web.constant.OrganizationConstant;
10 11 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
11 12 import com.lyms.platform.operate.web.service.IPostReviewService;
12 13 import com.lyms.platform.operate.web.utils.CommonsHelper;
... ... @@ -83,6 +84,12 @@
83 84  
84 85  
85 86 String hospitalId = autoMatchFacade.getHospitalId(userId);
  87 +
  88 + //威县数据流转
  89 + if(OrganizationConstant.XT_WX.equals(hospitalId)){
  90 + doctorId = String.valueOf(userId);
  91 + }
  92 +
86 93 List<String> hids = new LinkedList<>();
87 94 hids.add(hospitalId);
88 95 if (StringUtils.isNotEmpty(area))