Commit 561a2d7f9cb76dfdc9345ae7c50ff3e407e95158
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 6 changed files
- platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.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/PatientFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureAllInfoRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
561a2d7
... | ... | @@ -149,6 +149,9 @@ |
149 | 149 | //区域来源 |
150 | 150 | private String source; |
151 | 151 | |
152 | + //区域来源 | |
153 | + private Boolean extSource; | |
154 | + | |
152 | 155 | private String desc; |
153 | 156 | //查询号 |
154 | 157 | private String queryNo; |
... | ... | @@ -163,6 +166,14 @@ |
163 | 166 | private Integer buildDaysStart; |
164 | 167 | private Integer buildDaysEnd; |
165 | 168 | |
169 | + public Boolean isExtSource() { | |
170 | + return extSource; | |
171 | + } | |
172 | + | |
173 | + public void setExtSource(Boolean extSource) { | |
174 | + this.extSource = extSource; | |
175 | + } | |
176 | + | |
166 | 177 | public boolean isFace() { |
167 | 178 | return isFace; |
168 | 179 | } |
... | ... | @@ -1181,6 +1192,13 @@ |
1181 | 1192 | if (isFace) { |
1182 | 1193 | condition = condition.and("face", true, MongoOper.EXISTS); |
1183 | 1194 | } |
1195 | + | |
1196 | + | |
1197 | + if (extSource != null) { | |
1198 | + condition = condition.and("source", extSource, MongoOper.EXISTS); | |
1199 | + } | |
1200 | + | |
1201 | + | |
1184 | 1202 | |
1185 | 1203 | if (isScreenResult) { |
1186 | 1204 | condition = condition.and("screenResult", true, MongoOper.EXISTS); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
View file @
561a2d7
... | ... | @@ -7,10 +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.facade.TempFacade; |
10 | -import com.lyms.platform.operate.web.request.MeasureInfoRequest; | |
11 | -import com.lyms.platform.operate.web.request.NutritionInfoRequest; | |
12 | -import com.lyms.platform.operate.web.request.SmsTemplateRequest; | |
13 | -import com.lyms.platform.operate.web.request.TempAddRequest; | |
10 | +import com.lyms.platform.operate.web.request.*; | |
14 | 11 | import com.lyms.platform.pojo.BloodSugar; |
15 | 12 | import org.springframework.beans.factory.annotation.Autowired; |
16 | 13 | import org.springframework.stereotype.Controller; |
... | ... | @@ -51,7 +48,7 @@ |
51 | 48 | @RequestParam(value = "age", required = false) String age, |
52 | 49 | HttpServletRequest request |
53 | 50 | ) { |
54 | - return measureInfoFacade.queryMeasureInfoList(queryNo,valueType,vcCardNo,recordTime,age,page,limit,getUserId(request)); | |
51 | + return measureInfoFacade.queryMeasureInfoList(queryNo, valueType, vcCardNo, recordTime, age, page, limit, getUserId(request)); | |
55 | 52 | } |
56 | 53 | |
57 | 54 | |
... | ... | @@ -68,6 +65,7 @@ |
68 | 65 | } |
69 | 66 | |
70 | 67 | |
68 | + | |
71 | 69 | /** |
72 | 70 | * 添加测量用户的基本信息(面部识别,指纹识别,证件类型) |
73 | 71 | * @param measureInfoRequest |
... | ... | @@ -82,6 +80,8 @@ |
82 | 80 | |
83 | 81 | |
84 | 82 | |
83 | + | |
84 | + | |
85 | 85 | /** |
86 | 86 | * 查询录入测量用户基本信息 |
87 | 87 | * @param certType |
88 | 88 | |
89 | 89 | |
... | ... | @@ -279,8 +279,48 @@ |
279 | 279 | } |
280 | 280 | |
281 | 281 | |
282 | + /**------start-------秦皇岛改版快速测量接口---------------**/ | |
282 | 283 | |
283 | 284 | |
285 | + /** | |
286 | + * 住院号类型 : certType:1 | |
287 | + * 其他类型根据院内系统类型传 | |
288 | + * | |
289 | + * 查询测量用户,如果用户在随心测没有建档就 建档并返回结果 | |
290 | + * @param measureAllInfoRequest | |
291 | + * @return | |
292 | + */ | |
293 | + @RequestMapping(method = RequestMethod.POST, value = "/queryMeasureUserInfo") | |
294 | + @ResponseBody | |
295 | + public BaseResponse queryMeasureUserInfo(@RequestBody MeasureAllInfoRequest measureAllInfoRequest) { | |
296 | + return measureInfoFacade.queryMeasureUserInfo(measureAllInfoRequest); | |
297 | + } | |
284 | 298 | |
299 | + /** | |
300 | + * 添加指纹信息 | |
301 | + * @param measureInfoRequest hospitalId finger certNo | |
302 | + * @param request | |
303 | + * @return | |
304 | + */ | |
305 | + @RequestMapping(method = RequestMethod.POST, value = "/updateMeasureFingerInfo") | |
306 | + @ResponseBody | |
307 | + public BaseResponse updateMeasureFingerInfo(@RequestBody MeasureInfoRequest measureInfoRequest, HttpServletRequest request) { | |
308 | + return measureInfoFacade.updateMeasureFingerInfo(measureInfoRequest); | |
309 | + } | |
310 | + | |
311 | + | |
312 | + /** | |
313 | + * 秦皇岛添加所有测量接口 | |
314 | + * @param measureAllInfoRequest | |
315 | + * @return | |
316 | + */ | |
317 | + @RequestMapping(method = RequestMethod.POST, value = "/addAllMeasureDataInfo") | |
318 | + @ResponseBody | |
319 | + public BaseResponse addAllMeasureDataInfo(@RequestBody MeasureAllInfoRequest measureAllInfoRequest) { | |
320 | + return measureInfoFacade.addAllMeasureDataInfo(measureAllInfoRequest); | |
321 | + } | |
322 | + | |
323 | + | |
324 | + /**------end-------秦皇岛改版快速测量接口---------------**/ | |
285 | 325 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
561a2d7
... | ... | @@ -11,6 +11,7 @@ |
11 | 11 | import com.lyms.platform.common.result.RespBuilder; |
12 | 12 | import com.lyms.platform.common.utils.DateUtil; |
13 | 13 | import com.lyms.platform.common.utils.ExceptionUtils; |
14 | +import com.lyms.platform.operate.web.request.MeasureAllInfoRequest; | |
14 | 15 | import com.lyms.platform.operate.web.request.MeasureInfoRequest; |
15 | 16 | import com.lyms.platform.operate.web.request.NutritionInfoRequest; |
16 | 17 | import com.lyms.platform.operate.web.result.MeasureBaseInfoResult; |
... | ... | @@ -541,6 +542,70 @@ |
541 | 542 | } |
542 | 543 | |
543 | 544 | |
545 | + | |
546 | + public BaseResponse addAllMeasureDataInfo(MeasureAllInfoRequest request) { | |
547 | + BaseObjectResponse baseResponse = new BaseObjectResponse(); | |
548 | + | |
549 | + if (StringUtils.isNotEmpty(request.getCertType()) && StringUtils.isNotEmpty(request.getCertNo())) | |
550 | + { | |
551 | + | |
552 | + MeasureUserInfoQuery queryUser = new MeasureUserInfoQuery(); | |
553 | + queryUser.setCertNo(request.getCertNo()); | |
554 | + queryUser.setCertType(request.getCertType()); | |
555 | + if (StringUtils.isNotEmpty(request.getHospitalId())) | |
556 | + { | |
557 | + queryUser.setHospitalId(request.getHospitalId()); | |
558 | + } | |
559 | + | |
560 | + List<MeasureUserInfoModel> listUsers = mysqlMeasureUserInfoService.queryMeasureUserInfoList(queryUser); | |
561 | + if (!CollectionUtils.isNotEmpty(listUsers)) | |
562 | + { | |
563 | + baseResponse.setErrorcode(ErrorCodeConstants.USER_NOT_EXISTS); | |
564 | + baseResponse.setErrormsg("您还没有录入基本信息,暂时不能测量"); | |
565 | + return baseResponse; | |
566 | + } | |
567 | + | |
568 | + if (StringUtils.isNotEmpty(request.getWeight()) && StringUtils.isNotEmpty(request.getHeight())) | |
569 | + { | |
570 | + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); | |
571 | + measureInfoRequest.setHospitalId(request.getHospitalId()); | |
572 | + measureInfoRequest.setCertType(request.getCertType()); | |
573 | + measureInfoRequest.setCertNo(request.getCertNo()); | |
574 | + measureInfoRequest.setValueType(1); | |
575 | + measureInfoRequest.setValueOne(request.getWeight()); | |
576 | + measureInfoRequest.setValueTwo(request.getHeight()); | |
577 | + addMeasureDataInfo(measureInfoRequest); | |
578 | + } | |
579 | + if (StringUtils.isNotEmpty(request.getBloodPressure()) && StringUtils.isNotEmpty(request.getPulse())) | |
580 | + { | |
581 | + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); | |
582 | + measureInfoRequest.setHospitalId(request.getHospitalId()); | |
583 | + measureInfoRequest.setCertType(request.getCertType()); | |
584 | + measureInfoRequest.setCertNo(request.getCertNo()); | |
585 | + measureInfoRequest.setValueType(2); | |
586 | + measureInfoRequest.setValueOne(request.getBloodPressure()); | |
587 | + measureInfoRequest.setValueTwo(request.getPulse()); | |
588 | + addMeasureDataInfo(measureInfoRequest); | |
589 | + } | |
590 | + | |
591 | + if (StringUtils.isNotEmpty(request.getTemperature())) | |
592 | + { | |
593 | + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); | |
594 | + measureInfoRequest.setHospitalId(request.getHospitalId()); | |
595 | + measureInfoRequest.setCertType(request.getCertType()); | |
596 | + measureInfoRequest.setCertNo(request.getCertNo()); | |
597 | + measureInfoRequest.setValueType(3); | |
598 | + measureInfoRequest.setValueOne(request.getTemperature()); | |
599 | + addMeasureDataInfo(measureInfoRequest); | |
600 | + } | |
601 | + } | |
602 | + | |
603 | + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
604 | + baseResponse.setErrormsg("保存成功"); | |
605 | + return baseResponse; | |
606 | + } | |
607 | + | |
608 | + | |
544 | 609 | private MeasureDataInfoModel getDataModel(MeasureInfoRequest measureInfoRequest) |
545 | 610 | { |
546 | 611 | MeasureDataInfoModel model = new MeasureDataInfoModel(); |
... | ... | @@ -1267,5 +1332,186 @@ |
1267 | 1332 | } |
1268 | 1333 | |
1269 | 1334 | |
1335 | + public BaseResponse updateMeasureFingerInfo(MeasureInfoRequest measureInfoRequest) { | |
1336 | + | |
1337 | + BaseResponse baseResponse = new BaseResponse(); | |
1338 | + try | |
1339 | + { | |
1340 | + MeasureUserInfoQuery queryUser = new MeasureUserInfoQuery(); | |
1341 | + queryUser.setCertNo(measureInfoRequest.getCertNo()); | |
1342 | + queryUser.setHospitalId(measureInfoRequest.getHospitalId()); | |
1343 | + List<MeasureUserInfoModel> listUsers = mysqlMeasureUserInfoService.queryMeasureUserInfoList(queryUser); | |
1344 | + if (CollectionUtils.isNotEmpty(listUsers)) { | |
1345 | + MeasureUserInfoModel modelUser = listUsers.get(0); | |
1346 | + MeasureUserInfoModel userModel = new MeasureUserInfoModel(); | |
1347 | + userModel.setId(modelUser.getId()); | |
1348 | + userModel.setFinger(measureInfoRequest.getFinger()); | |
1349 | + userModel.setModified(new Date()); | |
1350 | + mysqlMeasureUserInfoService.updateMeasureUserInfo(userModel); | |
1351 | + } | |
1352 | + } | |
1353 | + catch (Exception e) | |
1354 | + { | |
1355 | + baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); | |
1356 | + baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); | |
1357 | + return baseResponse; | |
1358 | + } | |
1359 | + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
1360 | + baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); | |
1361 | + return baseResponse; | |
1362 | + } | |
1363 | + | |
1364 | + public BaseResponse queryMeasureUserInfo(MeasureAllInfoRequest measureAllInfoRequest) { | |
1365 | + MeasureUserInfoQuery query = new MeasureUserInfoQuery(); | |
1366 | + query.setSort(" created desc "); | |
1367 | + query.setHospitalId(measureAllInfoRequest.getHospitalId()); | |
1368 | + | |
1369 | + MeasureBaseInfoResult result = new MeasureBaseInfoResult(); | |
1370 | + | |
1371 | + BaseObjectResponse objectResponse = new BaseObjectResponse(); | |
1372 | + | |
1373 | + //表示传递的是住院号 | |
1374 | + if ("1".equals(measureAllInfoRequest.getCertType())) | |
1375 | + { | |
1376 | + query.setZyNo(measureAllInfoRequest.getCertNo()); | |
1377 | + List<MeasureUserInfoModel> models = mysqlMeasureUserInfoService.queryMeasureUserInfoList(query); | |
1378 | + if (CollectionUtils.isNotEmpty(models)) | |
1379 | + { | |
1380 | + MeasureUserInfoModel userInfoModel = models.get(0); | |
1381 | + result.setUserName(userInfoModel.getUserName()); | |
1382 | + result.setCertNo(userInfoModel.getCertNo()); | |
1383 | + result.setCertType(userInfoModel.getCertType()); | |
1384 | + result.setFinger(userInfoModel.getFinger()); | |
1385 | + result.setPhone(userInfoModel.getPhone()); | |
1386 | + result.setVcCardNo(userInfoModel.getVcCardNo()); | |
1387 | + result.setZyNo(userInfoModel.getZyNo()); | |
1388 | + } | |
1389 | + else | |
1390 | + { | |
1391 | + //住院号查询 住院的基本信息 | |
1392 | + if ("216".equals(measureAllInfoRequest.getHospitalId())) | |
1393 | + { | |
1394 | + result = getPatientZyInfo(" and INP_NO = '" + measureAllInfoRequest.getCertNo() + "'", "1", measureAllInfoRequest.getHospitalId()); | |
1395 | + } | |
1396 | + query.setZyNo(null); | |
1397 | + if (result != null && StringUtils.isNotEmpty(result.getCertNo())) | |
1398 | + { | |
1399 | + query.setCertNo(result.getCertNo()); | |
1400 | + List<MeasureUserInfoModel> userInfoModels = mysqlMeasureUserInfoService.queryMeasureUserInfoList(query); | |
1401 | + if (CollectionUtils.isNotEmpty(userInfoModels)) | |
1402 | + { | |
1403 | + MeasureUserInfoModel userInfoModel = userInfoModels.get(0); | |
1404 | + result.setUserName(userInfoModel.getUserName()); | |
1405 | + result.setCertNo(userInfoModel.getCertNo()); | |
1406 | + result.setCertType(userInfoModel.getCertType()); | |
1407 | + result.setFinger(userInfoModel.getFinger()); | |
1408 | + result.setPhone(userInfoModel.getPhone()); | |
1409 | + result.setVcCardNo(userInfoModel.getVcCardNo()); | |
1410 | + result.setZyNo(userInfoModel.getZyNo()); | |
1411 | + } | |
1412 | + else | |
1413 | + { | |
1414 | + //创建随心测用户 | |
1415 | + MeasureUserInfoModel model = new MeasureUserInfoModel(); | |
1416 | + model.setUserName(result.getUserName()); | |
1417 | + model.setCertType(result.getCertType()); | |
1418 | + model.setCertNo(result.getCertNo()); | |
1419 | + model.setHospitalId(result.getHospitalId()); | |
1420 | + model.setAge(result.getAge()); | |
1421 | + model.setVcCardNo(result.getVcCardNo()); | |
1422 | + model.setPhone(result.getPhone()); | |
1423 | + model.setZyNo(result.getZyNo()); | |
1424 | + model.setCreated(new Date()); | |
1425 | + model.setModified(new Date()); | |
1426 | + mysqlMeasureUserInfoService.addMeasureUserInfo(model); | |
1427 | + | |
1428 | + } | |
1429 | + } | |
1430 | + else | |
1431 | + { | |
1432 | + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); | |
1433 | + objectResponse.setErrormsg("没有建档数据,建档后测量"); | |
1434 | + return objectResponse; | |
1435 | + } | |
1436 | + } | |
1437 | + } | |
1438 | + else { | |
1439 | + query.setCertType(measureAllInfoRequest.getCertType()); | |
1440 | + query.setCertNo(measureAllInfoRequest.getCertNo()); | |
1441 | + List<MeasureUserInfoModel> models = mysqlMeasureUserInfoService.queryMeasureUserInfoList(query); | |
1442 | + if (CollectionUtils.isNotEmpty(models)) { | |
1443 | + MeasureUserInfoModel userInfoModel = models.get(0); | |
1444 | + result.setUserName(userInfoModel.getUserName()); | |
1445 | + result.setCertNo(userInfoModel.getCertNo()); | |
1446 | + result.setCertType(userInfoModel.getCertType()); | |
1447 | + result.setFinger(userInfoModel.getFinger()); | |
1448 | + result.setPhone(userInfoModel.getPhone()); | |
1449 | + result.setVcCardNo(userInfoModel.getVcCardNo()); | |
1450 | + result.setZyNo(userInfoModel.getZyNo()); | |
1451 | + } | |
1452 | + else | |
1453 | + { | |
1454 | + //查询院内系统信息 创建随心测用户 | |
1455 | + PatientsQuery patientsQuery = new PatientsQuery(); | |
1456 | + patientsQuery.setHospitalId(measureAllInfoRequest.getHospitalId()); | |
1457 | + patientsQuery.setYn(YnEnums.YES.getId()); | |
1458 | + patientsQuery.setCardNo(measureAllInfoRequest.getCertNo()); | |
1459 | + | |
1460 | + List<Patients> patientsList = patientsService.queryPatient(patientsQuery); | |
1461 | + if (CollectionUtils.isNotEmpty(patientsList)) { | |
1462 | + Patients patients = patientsList.get(0); | |
1463 | + MeasureUserInfoModel model = new MeasureUserInfoModel(); | |
1464 | + model.setUserName(patients.getUsername()); | |
1465 | + model.setCertType(patients.getPcerteTypeId()); | |
1466 | + model.setCertNo(patients.getCardNo()); | |
1467 | + model.setHospitalId(patients.getHospitalId()); | |
1468 | + model.setPhone(patients.getPhone()); | |
1469 | + model.setSex(0); | |
1470 | + if (patients.getBirth() != null) { | |
1471 | + model.setAge(DateUtil.getAge(patients.getBirth(), new Date()) + ""); | |
1472 | + } | |
1473 | + model.setVcCardNo(patients.getVcCardNo()); | |
1474 | + model.setCreated(new Date()); | |
1475 | + model.setModified(new Date()); | |
1476 | + mysqlMeasureUserInfoService.addMeasureUserInfo(model); | |
1477 | + } | |
1478 | + else | |
1479 | + { | |
1480 | + | |
1481 | + if ("216".equals(measureAllInfoRequest.getHospitalId())) | |
1482 | + { | |
1483 | + result = getPatientZyInfo(" and ZJH='"+measureAllInfoRequest.getCertNo()+"'",measureAllInfoRequest.getCertType(),measureAllInfoRequest.getHospitalId()); | |
1484 | + } | |
1485 | + if (result != null && StringUtils.isNotEmpty(result.getCertNo())) | |
1486 | + { | |
1487 | + //创建随心测用户 | |
1488 | + MeasureUserInfoModel model = new MeasureUserInfoModel(); | |
1489 | + model.setUserName(result.getUserName()); | |
1490 | + model.setCertType(result.getCertType()); | |
1491 | + model.setCertNo(result.getCertNo()); | |
1492 | + model.setHospitalId(result.getHospitalId()); | |
1493 | + model.setAge(result.getAge()); | |
1494 | + model.setVcCardNo(result.getVcCardNo()); | |
1495 | + model.setPhone(result.getPhone()); | |
1496 | + model.setZyNo(result.getZyNo()); | |
1497 | + model.setCreated(new Date()); | |
1498 | + model.setModified(new Date()); | |
1499 | + mysqlMeasureUserInfoService.addMeasureUserInfo(model); | |
1500 | + } | |
1501 | + else | |
1502 | + { | |
1503 | + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); | |
1504 | + objectResponse.setErrormsg("没有建档数据,建档后测量"); | |
1505 | + return objectResponse; | |
1506 | + } | |
1507 | + } | |
1508 | + } | |
1509 | + } | |
1510 | + | |
1511 | + objectResponse.setData(result); | |
1512 | + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
1513 | + objectResponse.setErrormsg("成功"); | |
1514 | + return objectResponse; | |
1515 | + } | |
1270 | 1516 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
561a2d7
... | ... | @@ -382,7 +382,14 @@ |
382 | 382 | List<String> fmHospitalList = null; |
383 | 383 | //区域范围内孕妇 |
384 | 384 | if (isRegion) { |
385 | - patientsQuery.setExtEnable(false); | |
385 | + | |
386 | + //徐倩说的额改成只查询分娩医院记录 不管是否隐藏建档 20180703 10:01 | |
387 | + //http://jira.healthbaby.com.cn/browse/WEB-2711 | |
388 | + if (type != 3) | |
389 | + { | |
390 | + patientsQuery.setExtEnable(false); | |
391 | + } | |
392 | + | |
386 | 393 | //王平说的 必须要给区域医院权限,不然他就是蠢逼 201611124 16:41 |
387 | 394 | hospitalList = new ArrayList<>(); |
388 | 395 | fmHospitalList = new ArrayList<>(); |
... | ... | @@ -462,6 +469,16 @@ |
462 | 469 | fmHospitalList.retainAll(orgId); |
463 | 470 | } |
464 | 471 | } |
472 | + else | |
473 | + { | |
474 | + //没有选择分娩医院 并且未产妇查询的时候 就只查询主档案 | |
475 | + if (type == 3) | |
476 | + { | |
477 | + patientsQuery.setExtSource(false); | |
478 | + } | |
479 | + } | |
480 | + | |
481 | + | |
465 | 482 | if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFmHospital())) { |
466 | 483 | patientsQuery.setFmHospital(riskPatientsQueryRequest.getFmHospital()); |
467 | 484 | } else { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureAllInfoRequest.java
View file @
561a2d7
1 | +package com.lyms.platform.operate.web.request; | |
2 | + | |
3 | + | |
4 | +/** | |
5 | + * Created by Administrator on 2018-01-10. | |
6 | + */ | |
7 | +public class MeasureAllInfoRequest { | |
8 | + | |
9 | + //证件类型 | |
10 | + private String certType; | |
11 | + //证件号 | |
12 | + private String certNo; | |
13 | + | |
14 | + //身高 | |
15 | + private String height; | |
16 | + | |
17 | + //体重 | |
18 | + private String weight; | |
19 | + | |
20 | + //血压 | |
21 | + private String bloodPressure; | |
22 | + | |
23 | + //脉搏 | |
24 | + private String pulse; | |
25 | + | |
26 | + //体温 | |
27 | + private String temperature; | |
28 | + | |
29 | + private String hospitalId; | |
30 | + | |
31 | + public String getHospitalId() { | |
32 | + return hospitalId; | |
33 | + } | |
34 | + | |
35 | + public void setHospitalId(String hospitalId) { | |
36 | + this.hospitalId = hospitalId; | |
37 | + } | |
38 | + | |
39 | + public String getTemperature() { | |
40 | + return temperature; | |
41 | + } | |
42 | + | |
43 | + public void setTemperature(String temperature) { | |
44 | + this.temperature = temperature; | |
45 | + } | |
46 | + | |
47 | + public String getPulse() { | |
48 | + return pulse; | |
49 | + } | |
50 | + | |
51 | + public void setPulse(String pulse) { | |
52 | + this.pulse = pulse; | |
53 | + } | |
54 | + | |
55 | + public String getCertType() { | |
56 | + return certType; | |
57 | + } | |
58 | + | |
59 | + public void setCertType(String certType) { | |
60 | + this.certType = certType; | |
61 | + } | |
62 | + | |
63 | + public String getCertNo() { | |
64 | + return certNo; | |
65 | + } | |
66 | + | |
67 | + public void setCertNo(String certNo) { | |
68 | + this.certNo = certNo; | |
69 | + } | |
70 | + | |
71 | + public String getHeight() { | |
72 | + return height; | |
73 | + } | |
74 | + | |
75 | + public void setHeight(String height) { | |
76 | + this.height = height; | |
77 | + } | |
78 | + | |
79 | + public String getWeight() { | |
80 | + return weight; | |
81 | + } | |
82 | + | |
83 | + public void setWeight(String weight) { | |
84 | + this.weight = weight; | |
85 | + } | |
86 | + | |
87 | + public String getBloodPressure() { | |
88 | + return bloodPressure; | |
89 | + } | |
90 | + | |
91 | + public void setBloodPressure(String bloodPressure) { | |
92 | + this.bloodPressure = bloodPressure; | |
93 | + } | |
94 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
View file @
561a2d7
... | ... | @@ -97,7 +97,15 @@ |
97 | 97 | chanResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); |
98 | 98 | chanResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); |
99 | 99 | try { |
100 | - chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName()); | |
100 | + if (StringUtils.isNotEmpty(patients.getSource())) | |
101 | + { | |
102 | + Patients pat = patientsService.findOnePatientById(patients.getSource()); | |
103 | + chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(pat.getHospitalId())).getName()); | |
104 | + } | |
105 | + else | |
106 | + { | |
107 | + chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName()); | |
108 | + } | |
101 | 109 | } catch (Exception e) { |
102 | 110 | chanResult.setFirstBH(""); |
103 | 111 | } |