Commit 7f274391680834d240d880395095754656890878
1 parent
62ae7bd09e
Exists in
master
and in
6 other branches
删除最后一次顿号
Showing 1 changed file with 28 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
7f27439
| ... | ... | @@ -823,6 +823,14 @@ |
| 823 | 823 | //下次检查孕周 |
| 824 | 824 | map.put("nextCheckWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getNextCheckTime())); |
| 825 | 825 | /* 初诊信息 */ |
| 826 | + | |
| 827 | + | |
| 828 | + map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd())?"已检测":"未检测"); | |
| 829 | + map.put("ntjc", Boolean.valueOf(data.getNtjc())?"已检测":"未检测"); | |
| 830 | + map.put("cjsc", Boolean.valueOf(data.getCjsc())?"已检测":"未检测"); | |
| 831 | + map.put("textpjbc", Boolean.valueOf(data.getTextpjbc())?"已检测":"未检测"); | |
| 832 | + map.put("s75gdgtt",Boolean.valueOf( data.getS75gdgtt())?"已检测":"未检测"); | |
| 833 | + map.put("jzxgn", Boolean.valueOf(data.getJzxgn())?"已检测":"未检测"); | |
| 826 | 834 | //既往史 |
| 827 | 835 | String pastHistory = ""; |
| 828 | 836 | if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getPastHistory())) { |
| ... | ... | @@ -1255,6 +1263,26 @@ |
| 1255 | 1263 | //产检基本信息 |
| 1256 | 1264 | map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate())); |
| 1257 | 1265 | map.put("currentDueDate", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate())); |
| 1266 | + | |
| 1267 | + map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd())?"已检测":"未检测"); | |
| 1268 | + map.put("ntjc", Boolean.valueOf(data.getNtjc())?"已检测":"未检测"); | |
| 1269 | + map.put("cjsc", Boolean.valueOf(data.getCjsc())?"已检测":"未检测"); | |
| 1270 | + map.put("textpjbc", Boolean.valueOf(data.getTextpjbc())?"已检测":"未检测"); | |
| 1271 | + map.put("s75gdgtt",Boolean.valueOf( data.getS75gdgtt())?"已检测":"未检测"); | |
| 1272 | + map.put("jzxgn", Boolean.valueOf(data.getJzxgn())?"已检测":"未检测"); | |
| 1273 | + | |
| 1274 | + //早孕期病毒检测 | |
| 1275 | +// private String zyqbdjc; | |
| 1276 | + //nt检查 | |
| 1277 | +// private String ntjc; | |
| 1278 | + //产前筛查 | |
| 1279 | +// private String cjsc; | |
| 1280 | + //胎儿系统排畸b吵 | |
| 1281 | +// private String textpjbc; | |
| 1282 | + //75gODTT | |
| 1283 | +// private String s75gdgtt; | |
| 1284 | + //甲状腺功能 | |
| 1285 | +// private String jzxgn; | |
| 1258 | 1286 | |
| 1259 | 1287 | String checkDoctor = ""; |
| 1260 | 1288 |