jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a8b9506a7e473ccdad7f7d2f505b1596caeadcf6

Authored by landong2015
1 parent 1a57125881
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

修改初诊和建档的返回数据bug

Showing 3 changed files with 59 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java View file @ a8b9506
... ... @@ -168,7 +168,7 @@
168 168 content.put("jsjbs", "精神疾病史");
169 169 content.put("xtjx", "先天畸形");
170 170 content.put("xtyx", "先天愚型");
171   - content.put("ny", "聋哑");
  171 + content.put("ly", "聋哑");
172 172 content.put("mr", "盲人");
173 173 content.put("cel", "唇腭裂");
174 174 content.put("xyb", "血友病");
175 175  
176 176  
177 177  
178 178  
179 179  
180 180  
... ... @@ -177,27 +177,66 @@
177 177 content.put("st", "双胎");
178 178 content.put("gb", "肝病");
179 179 content.put("jh", "结核");
  180 + content.put("gxy", "高血压");
  181 + content.put("tnb", "糖尿病");
180 182  
181 183 content.put("xy", "吸烟");
182 184 content.put("yj", "饮酒");
183 185 content.put("fyyw", "服用药物");
184   - content.put("jcydyhwz", "接触有毒有害物质");
  186 + content.put("jcydwz", "接触有毒有害物质");
185 187 content.put("jcfsx", "接触放射线");
186 188  
  189 + content.put("fzym", "风疹疫苗");
  190 + content.put("ygym", "乙肝疫苗");
  191 + content.put("mzym", "麻疹疫苗");
  192 + content.put("psfym", "破伤风疫苗");
  193 +
187 194 content.put("qmsgm", "青霉素过敏");
188 195 content.put("xfmsgm", "先锋霉素过敏");
189   - content.put("halywgm", "磺胺类药物过敏");
  196 + content.put("halyw", "磺胺类药物过敏");
  197 + content.put("tb", "头孢");
190 198  
  199 + content.put("pgc", "剖宫产");
  200 + content.put("zgjlbc", "子宫肌瘤剥除");
  201 + content.put("lwqc", "阑尾切除");
  202 + content.put("ywrsss", "异位妊娠手术");
  203 +
  204 + content.put("yq1", "孕前1个月");
  205 + content.put("yq2", "孕前2个月");
  206 + content.put("yq3", "孕前3个月");
  207 + content.put("yzq1", "孕早期1个月");
  208 + content.put("yzq2", "孕早期2个月");
  209 + content.put("yzq3", "孕早期3个月");
  210 +
  211 + content.put("ex", "恶心");
  212 + content.put("ot", "呕吐");
  213 + content.put("yh", "眼花");
  214 + content.put("xm", "胸闷");
  215 + content.put("fz", "浮肿");
  216 + content.put("ydcx", "阴道出血");
  217 + content.put("ft", "腹痛");
  218 + content.put("tt", "头痛");
  219 + content.put("ft", "腹痛");
  220 +
191 221 jiwangshicontent.put("26cac65c-a040-4898-b7da-8deed3ba0ec3", "循环系统类");
192 222 jiwangshicontent.put("b26889c5-d2a7-4ae1-af32-84f92440e05f", "呼吸系统类");
193 223 jiwangshicontent.put("e6e5daab-5912-4465-91dc-030263c7f4c2", "泌尿系统类");
194 224 jiwangshicontent.put("7d0c5625-966b-46cc-8642-6567b18f65a0", "消化系统类");
195 225 jiwangshicontent.put("d5de523a-9243-4eeb-9849-15fcf7d55f15", "代谢营养类");
  226 + jiwangshicontent.put("fc5d5131-2fdc-4340-a26e-479efbca9e4d", "内分泌系统类");
  227 + jiwangshicontent.put("efeae2f4-13ea-4c7d-a7b5-5e50ef3a0978", "血液系统类");
196 228 jiwangshicontent.put("57e4bedbf0f0baa1bee496cd", "其他");
197 229 }
198 230  
199 231 private static final String YES_OR_NO = "yesOrNo";
200 232  
  233 + /**
  234 + * 解析病史方法(注意:逗号使用的是中文逗号)
  235 + * @param map
  236 + * @param sb
  237 + * @param basicConfigService
  238 + * @return
  239 + */
201 240 public static String replace(Map map, StringBuilder sb,BasicConfigService basicConfigService) {
202 241 if (null == map) {
203 242 return null;
... ... @@ -212,7 +251,7 @@
212 251 }
213 252 if ("true".equals(ma.getValue() + "")) {
214 253 if (content.containsKey(ma.getKey())) {
215   - sb.append(content.get(ma.getKey())).append(',');
  254 + sb.append(content.get(ma.getKey())).append('，');
216 255 }
217 256 }
218 257 if (jiwangshicontent.containsKey(ma.getKey())){
219 258  
... ... @@ -257,10 +296,10 @@
257 296 for (String id : ids){
258 297 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id);
259 298 if (basicConfig!=null){
260   - sb.append(basicConfig.getName()).append(",");
  299 + sb.append(basicConfig.getName()).append("，");
261 300 }
262 301 }
263   - if (sb.toString().endsWith(",")) {
  302 + if (sb.toString().endsWith("，")) {
264 303 String ss = sb.substring(0, sb.length() - 1);
265 304 sb = new StringBuilder(ss);
266 305 }
... ... @@ -277,7 +316,7 @@
277 316 if (map.containsKey("qtText")) {
278 317 sb.append(map.get("qtText"));
279 318 }
280   - if (sb.toString().endsWith(",")) {
  319 + if (sb.toString().endsWith("，")) {
281 320 return sb.substring(0, sb.length() - 1);
282 321 }
283 322 } else if ("no".equals(map.get(YES_OR_NO))) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java View file @ a8b9506
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.biz.service.BasicConfigService;
4 4 import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
  5 +import com.lyms.platform.common.utils.DateUtil;
5 6 import com.lyms.platform.common.utils.JsonUtil;
6 7 import com.lyms.platform.operate.web.result.HighScoreResult;
7 8 import com.lyms.platform.pojo.BasicConfig;
... ... @@ -334,6 +335,17 @@
334 335 return mapList;
335 336 }
336 337  
  338 + //返回孕周(需要计算)
  339 + public static String getPregnancyWeek(Date start,Date end){
  340 +
  341 + int day = DateUtil.daysBetween(start,end);
  342 +
  343 + if (day==-1){
  344 + return "";
  345 + }
  346 +
  347 + return com.lyms.platform.common.utils.StringUtils.dueWeek(day);
  348 + }
337 349  
338 350  
339 351  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java View file @ a8b9506
... ... @@ -16,7 +16,7 @@
16 16 public static final String MMOLL = " mmol/L";
17 17 public static final String CI = " 次";
18 18 public static final String UL = " U/L";
19   - public static final String TEN_LKG = " 10^9/Lkg";
  19 + public static final String TEN_LKG = " 10^9/L";
20 20 public static final String UMOLL = " umol/L";
21 21 public static final String ZHEN = " 针";
22 22 public static final String ML = " ml";