diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index c0b0b5f..e95b648 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -161,6 +161,26 @@ public class Test { // double tzzs = Double.parseDouble("47.36") / db; // System.out.println(tzzs); // System.out.println(df.format(tzzs)); + + + double kulStart = 1611; + int k1 = ((int)kulStart/100)*100; + double k2 = kulStart - k1; + if (k2 > 50) + { + k1+=100; + } + + if (k1 < 1500) + { + k1 = 1500; + } + else if (k1 > 2800) + { + k1 = 2800; + } + System.out.print(k1); + } public static void configData(BasicConfig bs, List basicConfigList,Map> slaveBasicConfigMap) { 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 ffac7b3..a787e77 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,24 +421,6 @@ public class AntenatalExaminationController extends BaseController { } - /** - * 滦平获取高危信息 - * 定制需求开发 - * @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"); - return antenatalExaminationFacade.getPatientRiskInfo(cardNo, vcCardNo); - } - - } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 4258e10..5df8cab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -811,7 +811,24 @@ public class ViewController extends BaseController { @ResponseBody public Object getMatDeliverData(@RequestParam(required = true) String id, @RequestParam(required = false) String hospital) { - return viewFacade.getMatDeliverData(id,hospital); + return viewFacade.getMatDeliverData(id, hospital); } + + /** + * 滦平获取高危信息 + * 定制需求开发 + * @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) { + return viewFacade.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 c686db5..25b225e 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 @@ -4538,113 +4538,4 @@ public class AntenatalExaminationFacade { } - public String getPatientRiskInfo(String cardNo, String vcCardNo) { - Document document = DocumentHelper.createDocument();// 建立document对象，用来操作xml文件 - document.setXMLEncoding("utf-8"); - try { - - Element riskElement = document.addElement("patient");// 建立根节点 - - if (StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo) ) - { - String xml = document.asXML().toString(); - return xml; - } - - PatientsQuery patientsQuery = new PatientsQuery(); - if (StringUtils.isNotEmpty(cardNo)) - { - patientsQuery.setCardNo(cardNo); - } - else if (StringUtils.isNotEmpty(vcCardNo)) - { - patientsQuery.setVcCardNo(vcCardNo); - } - patientsQuery.setYn(YnEnums.YES.getId()); - - List list = patientsService.queryPatient(patientsQuery); - if (CollectionUtils.isNotEmpty(list)) { - Patients patients = list.get(0); - - HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false); - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setPid(patients.getPid()); - antExQuery.setStart(DateUtil.addMonth(new Date(), -12)); - // 姓名： VARCHAR2 - // 证件号： VARCHAR2 - // 就诊卡号：VARCHAR2 - // 高危因素：VARCHAR2 - // 产检医生：VARCHAR2 - // 产检孕周：VARCHAR2 - - Element nameElement = riskElement.addElement("username"); - nameElement.addText(patients.getUsername()); - - Element cardNoElement = riskElement.addElement("cardNo"); - cardNoElement.addText(patients.getCardNo()); - - Element vcCardNoElement = riskElement.addElement("vcCardNo"); - vcCardNoElement.addText(patients.getVcCardNo()); - - String checkDoctor = ""; - if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId()) && FunvCommonUtil.isNumeric(patients.getLastCheckEmployeeId())) { - Users users = usersService.getUsers(Integer.parseInt(patients.getLastCheckEmployeeId())); - if (users != null && users.getYn() == YnEnums.YES.getId()) { - checkDoctor = users.getName(); - } - } - - Element checkDoctorElement = riskElement.addElement("checkDoctor"); - checkDoctorElement.addText(checkDoctor); - - - Element checkWeekElement = riskElement.addElement("checkWeek"); - checkWeekElement.addText(patients.getLastCTime() == null ? "" : DateUtil.getWeekDesc(patients.getLastMenses(), patients.getLastCTime())); - - - List riskList = highScoreResult.getHighRisk(); - if (CollectionUtils.isNotEmpty(riskList)) - { - for (int i = 0 ;i < riskList.size() ; i++) - { - Map rmap = (Map) riskList.get(i); - String color = rmap.get("color"); - if ("risk_green".equals(color)) - { - color = "绿色"; - } - else if ("risk_orange".equals(color)) - { - color = "橙色"; - } - else if ("risk_yellow".equals(color)) - { - color = "黄色"; - } - else if ("risk_red".equals(color)) - { - color = "红色"; - } - else if ("risk_purple".equals(color)) - { - color = "紫色"; - } - Element riskFactorElement = riskElement.addElement("riskFactor"); - - String name = rmap.get("name"); - Element nElement = riskFactorElement.addElement("riskName"); - nElement.addText(name); - - Element colorElement = riskFactorElement.addElement("color"); - colorElement.addText(color); - } - } - } - return document.asXML(); - } catch (Exception e) { - return document.asXML(); - } - - } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 92439a0..66c22d0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -29,6 +29,9 @@ import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; @@ -4834,4 +4837,116 @@ public class ViewFacade { return deliverMap; } + + + + public String getPatientRiskInfo(String cardNo, String vcCardNo) { + Document document = DocumentHelper.createDocument();// 建立document对象，用来操作xml文件 + document.setXMLEncoding("utf-8"); + try { + + Element riskElement = document.addElement("patient");// 建立根节点 + + if (StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo) ) + { + String xml = document.asXML().toString(); + return xml; + } + + PatientsQuery patientsQuery = new PatientsQuery(); + if (StringUtils.isNotEmpty(cardNo)) + { + patientsQuery.setCardNo(cardNo); + } + else if (StringUtils.isNotEmpty(vcCardNo)) + { + patientsQuery.setVcCardNo(vcCardNo); + } + patientsQuery.setYn(YnEnums.YES.getId()); + + List list = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(list)) { + Patients patients = list.get(0); + + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setPid(patients.getPid()); + antExQuery.setStart(DateUtil.addMonth(new Date(), -12)); + // 姓名： VARCHAR2 + // 证件号： VARCHAR2 + // 就诊卡号：VARCHAR2 + // 高危因素：VARCHAR2 + // 产检医生：VARCHAR2 + // 产检孕周：VARCHAR2 + + Element nameElement = riskElement.addElement("username"); + nameElement.addText(patients.getUsername()); + + Element cardNoElement = riskElement.addElement("cardNo"); + cardNoElement.addText(patients.getCardNo()); + + Element vcCardNoElement = riskElement.addElement("vcCardNo"); + vcCardNoElement.addText(patients.getVcCardNo()); + + String checkDoctor = ""; + if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId()) && FunvCommonUtil.isNumeric(patients.getLastCheckEmployeeId())) { + Users users = usersService.getUsers(Integer.parseInt(patients.getLastCheckEmployeeId())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + checkDoctor = users.getName(); + } + } + + Element checkDoctorElement = riskElement.addElement("checkDoctor"); + checkDoctorElement.addText(checkDoctor); + + + Element checkWeekElement = riskElement.addElement("checkWeek"); + checkWeekElement.addText(patients.getLastCTime() == null ? "" : DateUtil.getWeekDesc(patients.getLastMenses(), patients.getLastCTime())); + + + List riskList = highScoreResult.getHighRisk(); + if (CollectionUtils.isNotEmpty(riskList)) + { + for (int i = 0 ;i < riskList.size() ; i++) + { + Map rmap = (Map) riskList.get(i); + String color = rmap.get("color"); + if ("risk_green".equals(color)) + { + color = "绿色"; + } + else if ("risk_orange".equals(color)) + { + color = "橙色"; + } + else if ("risk_yellow".equals(color)) + { + color = "黄色"; + } + else if ("risk_red".equals(color)) + { + color = "红色"; + } + else if ("risk_purple".equals(color)) + { + color = "紫色"; + } + Element riskFactorElement = riskElement.addElement("riskFactor"); + + String name = rmap.get("name"); + Element nElement = riskFactorElement.addElement("riskName"); + nElement.addText(name); + + Element colorElement = riskFactorElement.addElement("color"); + colorElement.addText(color); + } + } + } + return document.asXML(); + } catch (Exception e) { + return document.asXML(); + } + + } }