Commit 8074389e4a7d52eaaf7eb84a01f2c4a1a8e49bcf
1 parent
53ace698cd
Exists in
master
and in
1 other branch
血糖报告
Showing 3 changed files with 17 additions and 8 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
View file @
8074389
| ... | ... | @@ -421,12 +421,20 @@ |
| 421 | 421 | } |
| 422 | 422 | |
| 423 | 423 | |
| 424 | - @RequestMapping(method = RequestMethod.GET, value = "/getPatientRiskInfo") | |
| 424 | + /** | |
| 425 | + * 滦平获取高危信息 | |
| 426 | + * 定制需求开发 | |
| 427 | + * @param cardNo | |
| 428 | + * @param vcCardNo | |
| 429 | + * @param response | |
| 430 | + * @return | |
| 431 | + */ | |
| 432 | + @RequestMapping(method = RequestMethod.GET, value = "/getPatientRiskInfo",produces = "text/xml;charset=utf-8") | |
| 425 | 433 | @ResponseBody |
| 426 | 434 | public String getPatientRiskInfo(@RequestParam(required = false)String cardNo,@RequestParam(required = false)String vcCardNo, |
| 427 | - HttpServletResponse response){ | |
| 428 | - response.setHeader("Content-type", "text/xml;charset=utf-8"); | |
| 429 | - response.setCharacterEncoding("UTF-8"); | |
| 435 | + HttpServletResponse response) { | |
| 436 | + //response.setHeader("Content-type", "text/xml;charset=utf-8"); | |
| 437 | + //response.setCharacterEncoding("UTF-8"); | |
| 430 | 438 | return antenatalExaminationFacade.getPatientRiskInfo(cardNo, vcCardNo); |
| 431 | 439 | } |
| 432 | 440 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
8074389
| ... | ... | @@ -4543,7 +4543,7 @@ |
| 4543 | 4543 | document.setXMLEncoding("utf-8"); |
| 4544 | 4544 | try { |
| 4545 | 4545 | |
| 4546 | - Element riskElement = document.addElement("risk");// 建立根节点 | |
| 4546 | + Element riskElement = document.addElement("patient");// 建立根节点 | |
| 4547 | 4547 | |
| 4548 | 4548 | if (StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo) ) |
| 4549 | 4549 | { |
| 4550 | 4550 | |
| ... | ... | @@ -4578,13 +4578,13 @@ |
| 4578 | 4578 | // 产检医生:VARCHAR2 |
| 4579 | 4579 | // 产检孕周:VARCHAR2 |
| 4580 | 4580 | |
| 4581 | - Element nameElement = riskElement.addElement("name"); | |
| 4581 | + Element nameElement = riskElement.addElement("username"); | |
| 4582 | 4582 | nameElement.addText(patients.getUsername()); |
| 4583 | 4583 | |
| 4584 | 4584 | Element cardNoElement = riskElement.addElement("cardNo"); |
| 4585 | 4585 | cardNoElement.addText(patients.getCardNo()); |
| 4586 | 4586 | |
| 4587 | - Element vcCardNoElement = riskElement.addElement("cardNo"); | |
| 4587 | + Element vcCardNoElement = riskElement.addElement("vcCardNo"); | |
| 4588 | 4588 | vcCardNoElement.addText(patients.getVcCardNo()); |
| 4589 | 4589 | |
| 4590 | 4590 | String checkDoctor = ""; |
| ... | ... | @@ -4633,7 +4633,7 @@ |
| 4633 | 4633 | Element riskFactorElement = riskElement.addElement("riskFactor"); |
| 4634 | 4634 | |
| 4635 | 4635 | String name = rmap.get("name"); |
| 4636 | - Element nElement = riskFactorElement.addElement("name"); | |
| 4636 | + Element nElement = riskFactorElement.addElement("riskName"); | |
| 4637 | 4637 | nElement.addText(name); |
| 4638 | 4638 | |
| 4639 | 4639 | Element colorElement = riskFactorElement.addElement("color"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
View file @
8074389
| ... | ... | @@ -538,6 +538,7 @@ |
| 538 | 538 | BloodSugarQuery buery = new BloodSugarQuery(); |
| 539 | 539 | buery.setPid(pid); |
| 540 | 540 | buery.setCreatedStart(queryDate); |
| 541 | + buery.setCreatedEnd(DateUtil.formatDate(new Date())); | |
| 541 | 542 | List<BloodSugar> list = bloodSugarService.queryBloodSugarList(buery, Sort.Direction.DESC, "created"); |
| 542 | 543 | |
| 543 | 544 | int size = list == null ? 0 : list.size(); |