jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b955f7e8e67134e5c81979f6ee1c3cd907a8559b

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

unpdate

Showing 2 changed files with 139 additions and 27 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java View file @ b955f7e
... ... @@ -345,11 +345,35 @@
345 345 if ("".equals(antExChuModel.getBld()) || antExChuModel.getBld() == null) {//尿潜血
346 346 antExChuModel1.setBld(getCodeValue(model, "BLD"));
347 347 }
348   - if ("".equals(antExChuModel.getAbo()) || antExChuModel.getAbo() == null) {//血型
349   - antExChuModel1.setAbo(getCodeValue(model, "ABO"));
  348 + if ("".equals(antExChuModel.getAbo()) || antExChuModel.getAbo() == null) {//血型 !!!
  349 +// antExChuModel1.setAbo(getCodeValue(model, "ABO"));
  350 + String result = getCodeValue(model, "ABO");
  351 + String value = "";
  352 + if ("A型".equals(result)) {
  353 + value= "5769ef240cf22c3157577423";//血型
  354 + } else if ("B型".equals(result)) {
  355 + value= "5769ef380cf22c3157577424";
  356 + } else if ("O型".equals(result)) {
  357 + value= "5769ef380cf22c3157577425";
  358 + } else if ("AB型".equals(result)) {
  359 + value= "5769ef380cf22c3157577426";
  360 + } else {
  361 + value = result;
  362 + }
  363 + antExChuModel1.setAbo(value);
350 364 }
351   - if ("".equals(antExChuModel.getRh()) || antExChuModel.getRh() == null) {//RH血型
352   - antExChuModel1.setRh(getCodeValue(model, "RH"));
  365 + if ("".equals(antExChuModel.getRh()) || antExChuModel.getRh() == null) {//RH血型 !!!
  366 +// antExChuModel1.setRh(getCodeValue(model, "RH"));
  367 + String result = getCodeValue(model, "RH");
  368 + String value = "";
  369 + if ("阳性".equals(result) || "+".equals(result)) {
  370 + value= "yang";
  371 + } else if ("阴性".equals(result) || "-".equals(result)){
  372 + value= "yin";//RH血型
  373 + }else {
  374 + value = result;
  375 + }
  376 + antExChuModel1.setRh(value);
353 377 }
354 378 if ("".equals(antExChuModel.getBloodSugar()) || antExChuModel.getBloodSugar() == null) {//血糖
355 379 antExChuModel1.setBloodSugar(getCodeValue(model, "GLU"));
356 380  
357 381  
358 382  
359 383  
360 384  
... ... @@ -370,23 +394,85 @@
370 394 if ("".equals(antExChuModel.getJhBilirubin()) || antExChuModel.getJhBilirubin() == null) {//结合胆红素
371 395 antExChuModel1.setJhBilirubin(getCodeValue(model, "DBIL"));
372 396 }
373   - if ("".equals(antExChuModel.getBg()) || antExChuModel.getBg() == null) {//丙肝
374   - antExChuModel1.setBg(getCodeValue(model, "HCV"));
  397 + if ("".equals(antExChuModel.getBg()) || antExChuModel.getBg() == null) {//丙肝 !!!
  398 +// antExChuModel1.setBg(getCodeValue(model, "HCV"));
  399 + String result = getCodeValue(model, "HCV");
  400 + String value = "";
  401 + if ("阳性".equals(result) || "+".equals(result)) {
  402 + value= "yang";
  403 + } else if ("阴性".equals(result) || "-".equals(result)){
  404 + value= "yin";
  405 + }else {
  406 + value= result;
  407 + }
  408 + antExChuModel1.setBg(value);
375 409 }
376   - if ("".equals(antExChuModel.getYgbmky()) || antExChuModel.getYgbmky() == null) {//乙肝表面抗原
377   - antExChuModel1.setYgbmky(getCodeValue(model, "HBsAg"));
  410 + if ("".equals(antExChuModel.getYgbmky()) || antExChuModel.getYgbmky() == null) {//乙肝表面抗原 !!!
  411 +// antExChuModel1.setYgbmky(getCodeValue(model, "HBsAg"));
  412 + String result = getCodeValue(model, "HBsAg");
  413 + String value = "";
  414 + if ("阳性".equals(result) || "+".equals(result)) {
  415 + value= "yang";
  416 + } else if ("阴性".equals(result) || "-".equals(result)){
  417 + value= "yin";
  418 + }else {
  419 + value= result;
  420 + }
  421 + antExChuModel1.setYgbmky(value);
  422 +
378 423 }
379   - if ("".equals(antExChuModel.getYgbmkt()) || antExChuModel.getYgbmkt() == null) {//乙肝表面抗体
380   - antExChuModel1.setYgbmkt(getCodeValue(model, "HBsAb"));
  424 + if ("".equals(antExChuModel.getYgbmkt()) || antExChuModel.getYgbmkt() == null) {//乙肝表面抗体 !!!
  425 +// antExChuModel1.setYgbmkt(getCodeValue(model, "HBsAb"));
  426 + String result = getCodeValue(model, "HBsAb");
  427 + String value = "";
  428 + if ("阳性".equals(result) || "+".equals(result)) {
  429 + value= "yang";
  430 + } else if ("阴性".equals(result) || "-".equals(result)){
  431 + value= "yin";
  432 + }else {
  433 + value= result;
  434 + }
  435 + antExChuModel1.setYgbmkt(value);
  436 +
381 437 }
382   - if ("".equals(antExChuModel.getYgeky()) || antExChuModel.getYgeky() == null) {//乙肝e抗原
383   - antExChuModel1.setYgeky(getCodeValue(model, "HBeAg"));
  438 + if ("".equals(antExChuModel.getYgeky()) || antExChuModel.getYgeky() == null) {//乙肝e抗原 !!!
  439 +// antExChuModel1.setYgeky(getCodeValue(model, "HBeAg"));
  440 + String result = getCodeValue(model, "HBeAg");
  441 + String value = "";
  442 + if ("阳性".equals(result) || "+".equals(result)) {
  443 + value= "yang";
  444 + } else if ("阴性".equals(result) || "-".equals(result)){
  445 + value= "yin";
  446 + }else {
  447 + value= result;
  448 + }
  449 + antExChuModel1.setYgeky(value);
384 450 }
385   - if ("".equals(antExChuModel.getYgekt()) || antExChuModel.getYgekt() == null) {//乙肝e抗体
386   - antExChuModel1.setYgekt(getCodeValue(model, "HBeAb"));
  451 + if ("".equals(antExChuModel.getYgekt()) || antExChuModel.getYgekt() == null) {//乙肝e抗体 !!!
  452 +// antExChuModel1.setYgekt(getCodeValue(model, "HBeAb"));
  453 + String result = getCodeValue(model, "HBeAb");
  454 + String value = "";
  455 + if ("阳性".equals(result) || "+".equals(result)) {
  456 + value= "yang";
  457 + } else if ("阴性".equals(result) || "-".equals(result)){
  458 + value= "yin";
  459 + }else {
  460 + value= result;
  461 + }
  462 + antExChuModel1.setYgekt(value);
387 463 }
388   - if ("".equals(antExChuModel.getYghxkt()) || antExChuModel.getYghxkt() == null) {//乙肝核心抗体
389   - antExChuModel1.setYghxkt(getCodeValue(model, "HBcAb"));
  464 + if ("".equals(antExChuModel.getYghxkt()) || antExChuModel.getYghxkt() == null) {//乙肝核心抗体 !!!
  465 +// antExChuModel1.setYghxkt(getCodeValue(model, "HBcAb"));
  466 + String result = getCodeValue(model, "HBcAb");
  467 + String value = "";
  468 + if ("阳性".equals(result) || "+".equals(result)) {
  469 + value= "yang";
  470 + } else if ("阴性".equals(result) || "-".equals(result)){
  471 + value= "yin";
  472 + }else {
  473 + value= result;
  474 + }
  475 + antExChuModel1.setYghxkt(value);
390 476 }
391 477 if ("".equals(antExChuModel.getXqjq()) || antExChuModel.getXqjq() == null) {//血清肌
392 478 antExChuModel1.setXqjq(getCodeValue(model, "CRE"));
393 479  
... ... @@ -394,11 +480,31 @@
394 480 if ("".equals(antExChuModel.getXnsd()) || antExChuModel.getXnsd() == null) {//血尿素氮
395 481 antExChuModel1.setXnsd(getCodeValue(model, "UREA"));
396 482 }
397   - if ("".equals(antExChuModel.getSyjg()) || antExChuModel.getSyjg() == null) {//实验结果
398   - antExChuModel1.setSyjg(getCodeValue(model, "TP1"));
  483 + if ("".equals(antExChuModel.getSyjg()) || antExChuModel.getSyjg() == null) {//实验结果 !!!
  484 +// antExChuModel1.setSyjg(getCodeValue(model, "TP1"));
  485 + String result = getCodeValue(model, "TP1");
  486 + String value = "";
  487 + if ("阳性".equals(result) || "+".equals(result)) {
  488 + value= "yang";
  489 + } else if ("阴性".equals(result) || "-".equals(result)){
  490 + value= "yin";
  491 + }else {
  492 + value= result;
  493 + }
  494 + antExChuModel1.setSyjg(value);
399 495 }
400   - if ("".equals(antExChuModel.getHivkt()) || antExChuModel.getHivkt() == null) {//hit抗体检测
401   - antExChuModel1.setHivkt(getCodeValue(model, "HIV1"));
  496 + if ("".equals(antExChuModel.getHivkt()) || antExChuModel.getHivkt() == null) {//hit抗体检测 !!!
  497 +// antExChuModel1.setHivkt(getCodeValue(model, "HIV1"));
  498 + String result = getCodeValue(model, "HIV1");
  499 + String value = "";
  500 + if ("阳性".equals(result) || "+".equals(result)) {
  501 + value= "yang";
  502 + } else if ("阴性".equals(result) || "-".equals(result)){
  503 + value= "yin";
  504 + }else {
  505 + value= result;
  506 + }
  507 + antExChuModel1.setHivkt(value);
402 508 }
403 509  
404 510 if ("".equals(antExChuModel.getYdqjd()) || antExChuModel.getYdqjd() == null) {//阴道清洁度
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ b955f7e
... ... @@ -320,6 +320,8 @@
320 320 childbirthManagerQueryModel.setHivkt("-");
321 321 }else if("yang".equals(childbirthManagerQueryModel.getHivkt())){
322 322 childbirthManagerQueryModel.setHivkt("+");
  323 + }else {
  324 + childbirthManagerQueryModel.setHivkt("");
323 325 }
324 326 }
325 327 if(StringUtils.isNotEmpty(childbirthManagerQueryModel.getSyjg())){
... ... @@ -327,6 +329,8 @@
327 329 childbirthManagerQueryModel.setSyjg("-");
328 330 }else if("yang".equals(childbirthManagerQueryModel.getSyjg())){
329 331 childbirthManagerQueryModel.setSyjg("+");
  332 + }else {
  333 + childbirthManagerQueryModel.setSyjg("");
330 334 }
331 335 }
332 336 if(StringUtils.isNotEmpty(childbirthManagerQueryModel.getYgbmky())){
... ... @@ -334,6 +338,8 @@
334 338 childbirthManagerQueryModel.setYgbmky("-");
335 339 }else if("yang".equals(childbirthManagerQueryModel.getYgbmky())){
336 340 childbirthManagerQueryModel.setYgbmky("+");
  341 + }else {
  342 + childbirthManagerQueryModel.setYgbmky("");
337 343 }
338 344 }
339 345 Map<String, Object> map = BeanUtils.objectToObjectMap(childbirthManagerQueryModel);