Commit 0ec26d146dcfe8f8b5449c4b7839eb0ad9ba13a4
1 parent
f713ae1f34
Exists in
master
and in
6 other branches
婚检导出
Showing 1 changed file with 38 additions and 16 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
0ec26d1
| ... | ... | @@ -994,6 +994,7 @@ |
| 994 | 994 | try { |
| 995 | 995 | for (PremaritalCheckup checkup : data) { |
| 996 | 996 | Map<String, Object> map = new HashMap<>(); |
| 997 | + map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime())); | |
| 997 | 998 | if (checkup.getSexType() == one) { |
| 998 | 999 | |
| 999 | 1000 | String username = ""; |
| ... | ... | @@ -1002,6 +1003,7 @@ |
| 1002 | 1003 | String certificateTypeId = ""; |
| 1003 | 1004 | String certificateNum = ""; |
| 1004 | 1005 | String vcCardNo = ""; |
| 1006 | + String residence = ""; | |
| 1005 | 1007 | |
| 1006 | 1008 | if (StringUtils.isNotEmpty(checkup.getParentId())){ |
| 1007 | 1009 | ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(checkup.getParentId()); |
| 1008 | 1010 | |
| 1009 | 1011 | |
| 1010 | 1012 | |
| ... | ... | @@ -1011,15 +1013,44 @@ |
| 1011 | 1013 | certificateTypeId = archiveModel.getCertificateTypeId(); |
| 1012 | 1014 | certificateNum = archiveModel.getCertificateNum(); |
| 1013 | 1015 | vcCardNo = archiveModel.getVcCardNo(); |
| 1016 | + residence = CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(), | |
| 1017 | + archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), archiveModel.getAddressRegister(), basicConfigService); | |
| 1014 | 1018 | if (archiveModel.getBirthday()!=null){ |
| 1015 | 1019 | age = DateUtil.getAge(archiveModel.getBirthday()); |
| 1016 | 1020 | } |
| 1017 | 1021 | } |
| 1018 | 1022 | } |
| 1019 | 1023 | map.put("username", username); |
| 1024 | + map.put("certificateNum", FunvCommonUtil.getId(certificateNum)); | |
| 1020 | 1025 | map.put("phone", phone); |
| 1021 | - map.put("age", age); | |
| 1026 | + if(2 == checkup.getJianChaJieGuo()){ | |
| 1027 | + map.put("jianChaJieGuo","正常"); | |
| 1028 | + }else{ | |
| 1029 | + map.put("jianChaJieGuo",checkup.getJianChaDetails()); | |
| 1030 | + } | |
| 1031 | + if (1 == checkup.getYiXueYiJian() ){ | |
| 1032 | + map.put("yiXueYiJian", "未发现医学上不宜结婚的情形"); | |
| 1033 | + }else if(2 == checkup.getYiXueYiJian()){ | |
| 1034 | + map.put("yiXueYiJian", "建议暂缓结婚"); | |
| 1035 | + }else if(3 == checkup.getYiXueYiJian()){ | |
| 1036 | + map.put("yiXueYiJian", "建议不宜生育"); | |
| 1037 | + }else if(4 == checkup.getYiXueYiJian()){ | |
| 1038 | + map.put("yiXueYiJian", "建议不结婚"); | |
| 1039 | + }else if(5 == checkup.getYiXueYiJian()){ | |
| 1040 | + map.put("yiXueYiJian", "建议采取医学措施，尊重受检查者意愿"); | |
| 1041 | + } | |
| 1042 | + map.put("residence", residence); | |
| 1043 | + String hunJianDoctor = ""; | |
| 1044 | + if (checkup.getHunJianDoctor()!=null){ | |
| 1045 | + Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor())); | |
| 1046 | + if (users!=null && users.getYn()==YnEnums.YES.getId()){ | |
| 1047 | + hunJianDoctor = users.getName(); | |
| 1048 | + } | |
| 1049 | + } | |
| 1050 | + map.put("hunJianDoctor", hunJianDoctor); | |
| 1022 | 1051 | |
| 1052 | + /*map.put("age", age); | |
| 1053 | + | |
| 1023 | 1054 | //医院名称 |
| 1024 | 1055 | if (StringUtils.isNotEmpty(checkup.getHospitalId())) { |
| 1025 | 1056 | Organization organization = organizationService.getOrganization(Integer.valueOf(checkup.getHospitalId())); |
| 1026 | 1057 | |
| ... | ... | @@ -1027,9 +1058,9 @@ |
| 1027 | 1058 | map.put("hospital", organization.getName()); |
| 1028 | 1059 | } |
| 1029 | 1060 | } |
| 1030 | - map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime())); | |
| 1061 | + | |
| 1031 | 1062 | map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId)); |
| 1032 | - map.put("certificateNum", FunvCommonUtil.getId(certificateNum)); | |
| 1063 | + | |
| 1033 | 1064 | map.put("vcCardNo", vcCardNo); |
| 1034 | 1065 | map.put("sexType", "女"); |
| 1035 | 1066 | |
| 1036 | 1067 | |
| 1037 | 1068 | |
| ... | ... | @@ -1196,23 +1227,14 @@ |
| 1196 | 1227 | map.put("linBing", checkup.getLinBing()); |
| 1197 | 1228 | map.put("xiongTou", checkup.getXiongTou()); |
| 1198 | 1229 | |
| 1199 | - map.put("jianChaJieGuo", FunvCommonUtil.havaOrNOInteger(checkup.getJianChaJieGuo(), two)); | |
| 1230 | + | |
| 1200 | 1231 | map.put("jianChaDetails", checkup.getJianChaDetails()); |
| 1201 | 1232 | map.put("jiBingZhenDuan", checkup.getJiBingZhenDuan()); |
| 1202 | 1233 | |
| 1203 | - if (checkup.getYiXueYiJian()!=null){ | |
| 1204 | - map.put("yiXueYiJian", MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle()); | |
| 1205 | - } | |
| 1234 | + | |
| 1206 | 1235 | map.put("yiJianQiTaDetails", checkup.getYiJianQiTaDetails()); |
| 1207 | - map.put("zhiDaoYiJian", checkup.getZhiDaoYiJian()); | |
| 1208 | - String hunJianDoctor = ""; | |
| 1209 | - if (checkup.getHunJianDoctor()!=null){ | |
| 1210 | - Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor())); | |
| 1211 | - if (users!=null && users.getYn()==YnEnums.YES.getId()){ | |
| 1212 | - hunJianDoctor = users.getName(); | |
| 1213 | - } | |
| 1214 | - } | |
| 1215 | - map.put("hunJianDoctor", hunJianDoctor); | |
| 1236 | + map.put("zhiDaoYiJian", checkup.getZhiDaoYiJian());*/ | |
| 1237 | + | |
| 1216 | 1238 | list.add(map); |
| 1217 | 1239 | } |
| 1218 | 1240 | } |