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 98908bb..51c26d1 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 @@ -823,6 +823,14 @@ public class ViewFacade { //下次检查孕周 map.put("nextCheckWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getNextCheckTime())); /* 初诊信息 */ + + + map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd())?"已检测":"未检测"); + map.put("ntjc", Boolean.valueOf(data.getNtjc())?"已检测":"未检测"); + map.put("cjsc", Boolean.valueOf(data.getCjsc())?"已检测":"未检测"); + map.put("textpjbc", Boolean.valueOf(data.getTextpjbc())?"已检测":"未检测"); + map.put("s75gdgtt",Boolean.valueOf( data.getS75gdgtt())?"已检测":"未检测"); + map.put("jzxgn", Boolean.valueOf(data.getJzxgn())?"已检测":"未检测"); //既往史 String pastHistory = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getPastHistory())) { @@ -1256,6 +1264,26 @@ public class ViewFacade { map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate())); map.put("currentDueDate", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate())); + map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd())?"已检测":"未检测"); + map.put("ntjc", Boolean.valueOf(data.getNtjc())?"已检测":"未检测"); + map.put("cjsc", Boolean.valueOf(data.getCjsc())?"已检测":"未检测"); + map.put("textpjbc", Boolean.valueOf(data.getTextpjbc())?"已检测":"未检测"); + map.put("s75gdgtt",Boolean.valueOf( data.getS75gdgtt())?"已检测":"未检测"); + map.put("jzxgn", Boolean.valueOf(data.getJzxgn())?"已检测":"未检测"); + + //早孕期病毒检测 +// private String zyqbdjc; + //nt检查 +// private String ntjc; + //产前筛查 +// private String cjsc; + //胎儿系统排畸b吵 +// private String textpjbc; + //75gODTT +// private String s75gdgtt; + //甲状腺功能 +// private String jzxgn; + String checkDoctor = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getCheckDoctor())) {