jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f88a16ba57a4f6982e2e6fe3cbdc08aad7db0277

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

update code

Showing 2 changed files with 9 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java View file @ f88a16b
... ... @@ -229,7 +229,6 @@
229 229 fmfs = FmTypeEnums.O.getId();
230 230 }
231 231 deliveryMode.put("fmfs",fmfs);
232   - deliveryMode.put("scfs", "");
233 232 deliverAddRequest.setDeliveryMode(deliveryMode);
234 233 //胎盘信息
235 234 List<MaternalDeliverModel.ExtPlacenta> extPlacentas = new ArrayList<>();
... ... @@ -458,7 +457,6 @@
458 457 fmfs = FmTypeEnums.O.getId();
459 458 }
460 459 deliveryMode.put("fmfs",fmfs);
461   - deliveryMode.put("scfs", "");
462 460 deliverAddRequest.setDeliveryMode(deliveryMode);
463 461  
464 462 MaternalDeliverModel.ExtPlacenta extPlacenta = new MaternalDeliverModel.ExtPlacenta();
... ... @@ -469,6 +467,10 @@
469 467 tpmcType = TpmcTypeEnums.O.getId();
470 468 }
471 469 extPlacenta.setTpmcType(tpmcType);
  470 +
  471 +// Map map = new HashMap();
  472 +// extPlacenta.setTpSize(map);
  473 +
472 474 extPlacentas.add(extPlacenta);
473 475 deliverAddRequest.setExtPlacentas(extPlacentas);
474 476  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ f88a16b
... ... @@ -912,8 +912,8 @@
912 912 if (fmfs!=null){
913 913 if (fmfs.equals("1")){
914 914 String fmName = FmTypeEnums.getFmNameById(fmfs);
915   - sb.append(fmName).append(",");
916 915 if(null!=m.get("scfs")){
  916 + sb.append(fmName).append(",");
917 917 String scfs =m.get("scfs") .toString();
918 918 sb.append(FmTypeEnums.getFmScNameById(scfs));
919 919 }
... ... @@ -1035,7 +1035,10 @@
1035 1035  
1036 1036 extMap.put("mcType", FunvCommonUtil.checkMianChuFS(temp.getMcType()));
1037 1037 String tpSize = "";
1038   - tpSize += temp.getTpSize().get("c") + UnitConstants.CM + "*" + temp.getTpSize().get("k") + UnitConstants.CM + "*" + temp.getTpSize().get("g") + UnitConstants.CM;
  1038 + if (temp.getTpSize() != null && temp.getTpSize().size() > 0)
  1039 + {
  1040 + tpSize += temp.getTpSize().get("c") + UnitConstants.CM + "*" + temp.getTpSize().get("k") + UnitConstants.CM + "*" + temp.getTpSize().get("g") + UnitConstants.CM;
  1041 + }
1039 1042 extMap.put("tpSize",tpSize);
1040 1043 extMap.put("tpWeight",UnitUtils.unitSplice(temp.getTpWeight(),UnitConstants.G));
1041 1044 extMap.put("umbilicalCordLength",UnitUtils.unitSplice(temp.getUmbilicalCordLength(),UnitConstants.CM));