Commit 9a8a06f195cf4c4b645f450b6db9a5f03def007a
1 parent
10349be542
Exists in
master
and in
6 other branches
儿童检查月龄
Showing 1 changed file with 52 additions and 42 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
9a8a06f
| ... | ... | @@ -4847,10 +4847,9 @@ |
| 4847 | 4847 | public String getPatientRiskInfo(String cardNo, String vcCardNo) { |
| 4848 | 4848 | Document document = DocumentHelper.createDocument();// 建立document对象，用来操作xml文件 |
| 4849 | 4849 | document.setXMLEncoding("utf-8"); |
| 4850 | - try { | |
| 4850 | + Element root = document.addElement("root"); | |
| 4851 | 4851 | |
| 4852 | - Element riskElement = document.addElement("patient");// 建立根节点 | |
| 4853 | - | |
| 4852 | + try { | |
| 4854 | 4853 | if (StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo) ) |
| 4855 | 4854 | { |
| 4856 | 4855 | String xml = document.asXML().toString(); |
| 4857 | 4856 | |
| 4858 | 4857 | |
| ... | ... | @@ -4876,31 +4875,8 @@ |
| 4876 | 4875 | antExQuery.setPid(patients.getPid()); |
| 4877 | 4876 | antExQuery.setStart(DateUtil.addMonth(new Date(), -12)); |
| 4878 | 4877 | |
| 4879 | - Element baseElement = riskElement.addElement("baseInfo"); | |
| 4880 | 4878 | |
| 4881 | - Element nameElement = baseElement.addElement("username"); | |
| 4882 | - nameElement.addText(patients.getUsername()); | |
| 4883 | 4879 | |
| 4884 | - Element cardNoElement = baseElement.addElement("cardNo"); | |
| 4885 | - cardNoElement.addText(patients.getCardNo()); | |
| 4886 | - | |
| 4887 | - Element vcCardNoElement = baseElement.addElement("vcCardNo"); | |
| 4888 | - vcCardNoElement.addText(patients.getVcCardNo()); | |
| 4889 | - | |
| 4890 | - | |
| 4891 | - Element birthdayElement = baseElement.addElement("birthday"); | |
| 4892 | - birthdayElement.addText(DateUtil.getyyyy_MM_dd(patients.getBirth())); | |
| 4893 | - | |
| 4894 | - | |
| 4895 | - Element phoneElement = baseElement.addElement("phone"); | |
| 4896 | - phoneElement.addText(patients.getPhone()); | |
| 4897 | - | |
| 4898 | - Element ageElement = baseElement.addElement("age"); | |
| 4899 | - ageElement.addText(DateUtil.getAge(patients.getBirth(),new Date())+""); | |
| 4900 | - | |
| 4901 | - Element dueDateElement = baseElement.addElement("dueDate"); | |
| 4902 | - dueDateElement.addText(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
| 4903 | - | |
| 4904 | 4880 | //初诊记录 |
| 4905 | 4881 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 4906 | 4882 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 4907 | 4883 | |
| ... | ... | @@ -4909,8 +4885,9 @@ |
| 4909 | 4885 | if (CollectionUtils.isNotEmpty(antExChuModels)) { |
| 4910 | 4886 | AntExChuModel an = antExChuModels.get(0); |
| 4911 | 4887 | |
| 4912 | - Element checkElement = riskElement.addElement("check"); | |
| 4888 | + Element patientElement = createPatients( root, patients); | |
| 4913 | 4889 | |
| 4890 | + | |
| 4914 | 4891 | String checkDoctor = ""; |
| 4915 | 4892 | if (StringUtils.isNotEmpty(an.getProdDoctor()) && FunvCommonUtil.isNumeric(an.getProdDoctor())) { |
| 4916 | 4893 | Users users = usersService.getUsers(Integer.parseInt(an.getProdDoctor())); |
| 4917 | 4894 | |
| 4918 | 4895 | |
| 4919 | 4896 | |
| ... | ... | @@ -4919,17 +4896,17 @@ |
| 4919 | 4896 | } |
| 4920 | 4897 | } |
| 4921 | 4898 | |
| 4922 | - Element checkIdElement = checkElement.addElement("checkId"); | |
| 4899 | + Element checkIdElement = patientElement.addElement("checkId"); | |
| 4923 | 4900 | checkIdElement.addText(an.getId()); |
| 4924 | 4901 | |
| 4925 | - Element checkDoctorElement = checkElement.addElement("checkDoctor"); | |
| 4902 | + Element checkDoctorElement = patientElement.addElement("checkDoctor"); | |
| 4926 | 4903 | checkDoctorElement.addText(checkDoctor); |
| 4927 | 4904 | |
| 4928 | 4905 | |
| 4929 | - Element checkWeekElement = checkElement.addElement("checkWeek"); | |
| 4906 | + Element checkWeekElement = patientElement.addElement("checkWeek"); | |
| 4930 | 4907 | checkWeekElement.addText(an.getCheckTime() == null ? "" : DateUtil.getWeekDesc(patients.getLastMenses(), an.getCheckTime())); |
| 4931 | 4908 | |
| 4932 | - Element checkDateElement = checkElement.addElement("checkDate"); | |
| 4909 | + Element checkDateElement = patientElement.addElement("checkDate"); | |
| 4933 | 4910 | checkDateElement.addText(DateUtil.getyyyy_MM_dd(an.getCheckTime())); |
| 4934 | 4911 | |
| 4935 | 4912 | |
| 4936 | 4913 | |
| ... | ... | @@ -4940,10 +4917,10 @@ |
| 4940 | 4917 | hospital = organization.getName(); |
| 4941 | 4918 | } |
| 4942 | 4919 | } |
| 4943 | - Element checkHospitalElement = checkElement.addElement("checkHospital"); | |
| 4920 | + Element checkHospitalElement = patientElement.addElement("checkHospital"); | |
| 4944 | 4921 | checkHospitalElement.addText(hospital); |
| 4945 | 4922 | |
| 4946 | - Element nextCheckDateElement = checkElement.addElement("nextCheckDate"); | |
| 4923 | + Element nextCheckDateElement = patientElement.addElement("nextCheckDate"); | |
| 4947 | 4924 | nextCheckDateElement.addText(an.getNextCheckTime() == null ? "" : DateUtil.getyyyy_MM_dd(an.getNextCheckTime())); |
| 4948 | 4925 | |
| 4949 | 4926 | Map map = new HashMap(); |
| ... | ... | @@ -4953,7 +4930,7 @@ |
| 4953 | 4930 | //完善筛查结果 |
| 4954 | 4931 | getscreenResult(an.getScreenResult(), map); |
| 4955 | 4932 | |
| 4956 | - handleEle(map, checkElement, patients, an.getResultSupple(), an.getHighriskDesc()); | |
| 4933 | + handleEle(map, patientElement, patients, an.getResultSupple(), an.getHighriskDesc()); | |
| 4957 | 4934 | |
| 4958 | 4935 | |
| 4959 | 4936 | } |
| ... | ... | @@ -4968,7 +4945,7 @@ |
| 4968 | 4945 | for ( AntenatalExaminationModel ae : anmodels) |
| 4969 | 4946 | |
| 4970 | 4947 | { |
| 4971 | - Element checkElement = riskElement.addElement("check"); | |
| 4948 | + Element patientElement = createPatients(root, patients); | |
| 4972 | 4949 | |
| 4973 | 4950 | String checkDoctor = ""; |
| 4974 | 4951 | if (StringUtils.isNotEmpty(ae.getCheckDoctor()) && FunvCommonUtil.isNumeric(ae.getCheckDoctor())) { |
| 4975 | 4952 | |
| 4976 | 4953 | |
| 4977 | 4954 | |
| ... | ... | @@ -4978,17 +4955,17 @@ |
| 4978 | 4955 | } |
| 4979 | 4956 | } |
| 4980 | 4957 | |
| 4981 | - Element checkIdElement = checkElement.addElement("checkId"); | |
| 4958 | + Element checkIdElement = patientElement.addElement("checkId"); | |
| 4982 | 4959 | checkIdElement.addText(ae.getId()); |
| 4983 | 4960 | |
| 4984 | - Element checkDoctorElement = checkElement.addElement("checkDoctor"); | |
| 4961 | + Element checkDoctorElement = patientElement.addElement("checkDoctor"); | |
| 4985 | 4962 | checkDoctorElement.addText(checkDoctor); |
| 4986 | 4963 | |
| 4987 | 4964 | |
| 4988 | - Element checkWeekElement = checkElement.addElement("checkWeek"); | |
| 4965 | + Element checkWeekElement = patientElement.addElement("checkWeek"); | |
| 4989 | 4966 | checkWeekElement.addText(ae.getCheckDate() == null ? "" : DateUtil.getWeekDesc(patients.getLastMenses(), ae.getCheckDate())); |
| 4990 | 4967 | |
| 4991 | - Element checkDateElement = checkElement.addElement("checkDate"); | |
| 4968 | + Element checkDateElement = patientElement.addElement("checkDate"); | |
| 4992 | 4969 | checkDateElement.addText(DateUtil.getyyyy_MM_dd(ae.getCheckDate())); |
| 4993 | 4970 | |
| 4994 | 4971 | |
| 4995 | 4972 | |
| ... | ... | @@ -4999,10 +4976,10 @@ |
| 4999 | 4976 | hospital = organization.getName(); |
| 5000 | 4977 | } |
| 5001 | 4978 | } |
| 5002 | - Element checkHospitalElement = checkElement.addElement("checkHospital"); | |
| 4979 | + Element checkHospitalElement = patientElement.addElement("checkHospital"); | |
| 5003 | 4980 | checkHospitalElement.addText(hospital); |
| 5004 | 4981 | |
| 5005 | - Element nextCheckDateElement = checkElement.addElement("nextCheckDate"); | |
| 4982 | + Element nextCheckDateElement = patientElement.addElement("nextCheckDate"); | |
| 5006 | 4983 | nextCheckDateElement.addText(ae.getNextCheckTime() == null ? "" : DateUtil.getyyyy_MM_dd(ae.getNextCheckTime())); |
| 5007 | 4984 | |
| 5008 | 4985 | |
| ... | ... | @@ -5012,7 +4989,7 @@ |
| 5012 | 4989 | |
| 5013 | 4990 | //完善筛查结果 |
| 5014 | 4991 | getscreenResult(ae.getScreenResult(), map); |
| 5015 | - handleEle( map, checkElement, patients, ae.getResultSupple(), ae.getHighriskDesc()); | |
| 4992 | + handleEle( map, patientElement, patients, ae.getResultSupple(), ae.getHighriskDesc()); | |
| 5016 | 4993 | |
| 5017 | 4994 | } |
| 5018 | 4995 | } |
| ... | ... | @@ -5023,6 +5000,39 @@ |
| 5023 | 5000 | } |
| 5024 | 5001 | } |
| 5025 | 5002 | |
| 5003 | + | |
| 5004 | + | |
| 5005 | + private Element createPatients(Element root,Patients patients) | |
| 5006 | + { | |
| 5007 | + | |
| 5008 | + Element patientElement = root.addElement("patient");// 建立根节点 | |
| 5009 | + | |
| 5010 | + | |
| 5011 | + Element nameElement = patientElement.addElement("username"); | |
| 5012 | + nameElement.addText(patients.getUsername()); | |
| 5013 | + | |
| 5014 | + Element cardNoElement = patientElement.addElement("cardNo"); | |
| 5015 | + cardNoElement.addText(patients.getCardNo()); | |
| 5016 | + | |
| 5017 | + Element vcCardNoElement = patientElement.addElement("vcCardNo"); | |
| 5018 | + vcCardNoElement.addText(patients.getVcCardNo()); | |
| 5019 | + | |
| 5020 | + | |
| 5021 | + Element birthdayElement = patientElement.addElement("birthday"); | |
| 5022 | + birthdayElement.addText(DateUtil.getyyyy_MM_dd(patients.getBirth())); | |
| 5023 | + | |
| 5024 | + | |
| 5025 | + Element phoneElement = patientElement.addElement("phone"); | |
| 5026 | + phoneElement.addText(patients.getPhone()); | |
| 5027 | + | |
| 5028 | + Element ageElement = patientElement.addElement("age"); | |
| 5029 | + ageElement.addText(DateUtil.getAge(patients.getBirth(),new Date())+""); | |
| 5030 | + | |
| 5031 | + Element dueDateElement = patientElement.addElement("dueDate"); | |
| 5032 | + dueDateElement.addText(DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
| 5033 | + | |
| 5034 | + return patientElement; | |
| 5035 | + } | |
| 5026 | 5036 | |
| 5027 | 5037 | private void handleEle(Map map,Element checkElement,Patients patients,String resultSupple,String highriskDesc) |
| 5028 | 5038 | { |