diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 352ea1d..ffac7b3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -421,12 +421,20 @@ public class AntenatalExaminationController extends BaseController { } - @RequestMapping(method = RequestMethod.GET, value = "/getPatientRiskInfo") + /** + * 滦平获取高危信息 + * 定制需求开发 + * @param cardNo + * @param vcCardNo + * @param response + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getPatientRiskInfo",produces = "text/xml;charset=utf-8") @ResponseBody public String getPatientRiskInfo(@RequestParam(required = false)String cardNo,@RequestParam(required = false)String vcCardNo, - HttpServletResponse response){ - response.setHeader("Content-type", "text/xml;charset=utf-8"); - response.setCharacterEncoding("UTF-8"); + HttpServletResponse response) { + //response.setHeader("Content-type", "text/xml;charset=utf-8"); + //response.setCharacterEncoding("UTF-8"); return antenatalExaminationFacade.getPatientRiskInfo(cardNo, vcCardNo); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 0b3ac23..c686db5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -4543,7 +4543,7 @@ public class AntenatalExaminationFacade { document.setXMLEncoding("utf-8"); try { - Element riskElement = document.addElement("risk");// 建立根节点 + Element riskElement = document.addElement("patient");// 建立根节点 if (StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo) ) { @@ -4578,13 +4578,13 @@ public class AntenatalExaminationFacade { // 产检医生:VARCHAR2 // 产检孕周:VARCHAR2 - Element nameElement = riskElement.addElement("name"); + Element nameElement = riskElement.addElement("username"); nameElement.addText(patients.getUsername()); Element cardNoElement = riskElement.addElement("cardNo"); cardNoElement.addText(patients.getCardNo()); - Element vcCardNoElement = riskElement.addElement("cardNo"); + Element vcCardNoElement = riskElement.addElement("vcCardNo"); vcCardNoElement.addText(patients.getVcCardNo()); String checkDoctor = ""; @@ -4633,7 +4633,7 @@ public class AntenatalExaminationFacade { Element riskFactorElement = riskElement.addElement("riskFactor"); String name = rmap.get("name"); - Element nElement = riskFactorElement.addElement("name"); + Element nElement = riskFactorElement.addElement("riskName"); nElement.addText(name); Element colorElement = riskFactorElement.addElement("color"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index 5c61ea9..a1804ef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -538,6 +538,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga BloodSugarQuery buery = new BloodSugarQuery(); buery.setPid(pid); buery.setCreatedStart(queryDate); + buery.setCreatedEnd(DateUtil.formatDate(new Date())); List list = bloodSugarService.queryBloodSugarList(buery, Sort.Direction.DESC, "created"); int size = list == null ? 0 : list.size();