Commit 82da93b8237a046efea085eedc0f2e5694c98c49
1 parent
f434484811
Exists in
master
and in
6 other branches
聊城妇幼产检增加字段
Showing 1 changed file with 18 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
82da93b
| ... | ... | @@ -1136,8 +1136,23 @@ |
| 1136 | 1136 | |
| 1137 | 1137 | //产检基本信息 |
| 1138 | 1138 | map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckTime())); |
| 1139 | + String cDueWeek = ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckTime()); | |
| 1139 | 1140 | //产检孕周 |
| 1140 | - map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckTime())); | |
| 1141 | + map.put("cDueWeek", cDueWeek); | |
| 1142 | + int week = Integer.parseInt(cDueWeek.substring(1,cDueWeek.indexOf("周"))); | |
| 1143 | + if(week>=20){ | |
| 1144 | + map.put("gongGaoText",UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM)); | |
| 1145 | + }else if(week<20){ | |
| 1146 | + if (StringUtils.isNotEmpty(data.getGonggaoSelect())) { | |
| 1147 | + if (StringUtils.isNotEmpty(data.getGonggaoType())) { | |
| 1148 | + map.put("gongGaoText", GongJingEnums.getGongGaoNameById(data.getGonggaoSelect())+"，"+GongJingEnums.getHengZhiNameById(data.getGonggaoType())); | |
| 1149 | + }else{ | |
| 1150 | + map.put("gongGaoText", GongJingEnums.getGongGaoNameById(data.getGonggaoSelect())); | |
| 1151 | + } | |
| 1152 | + } | |
| 1153 | + } | |
| 1154 | + | |
| 1155 | + | |
| 1141 | 1156 | String checkDoctor = ""; |
| 1142 | 1157 | |
| 1143 | 1158 | if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getProdDoctor())) { |
| ... | ... | @@ -1169,6 +1184,7 @@ |
| 1169 | 1184 | map.put("textpjbc", Boolean.valueOf(data.getTextpjbc()) ? "已检查" : "未检查"); |
| 1170 | 1185 | map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查"); |
| 1171 | 1186 | map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查"); |
| 1187 | + map.put("zdjcxm","早孕期病毒检测："+map.get("zyqbdjc")+"， NT检查："+map.get("ntjc")+"， 产前筛查："+map.get("cjsc")+"， 胎儿系统排畸B超："+map.get("textpjbc")+"， 75gOGTT："+map.get("s75gdgtt")+"， 甲状腺功能："+map.get("jzxgn")+"\n"); | |
| 1172 | 1188 | |
| 1173 | 1189 | //实验结果选择 |
| 1174 | 1190 | //hiv 抗体 |
| ... | ... | @@ -1758,7 +1774,7 @@ |
| 1758 | 1774 | map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查"); |
| 1759 | 1775 | |
| 1760 | 1776 | |
| 1761 | - map.put("zdjcxm","早孕期病毒检测："+map.get("zyqbdjc")+"， NT检查："+map.get("ntjc")+"， 产前筛查："+map.get("cjsc")+"， 胎儿系统排畸B超："+map.get("textpjbc")+"， 75gOGTT："+map.get("s75gdgtt")+"， 甲状腺功能："+map.get("jzxgn")+"\n"); | |
| 1777 | + | |
| 1762 | 1778 | |
| 1763 | 1779 | //早孕期病毒检测 |
| 1764 | 1780 | // private String zyqbdjc; |