diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/FmListWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/FmListWorker.java index ccbe707..a7b478d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/FmListWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/FmListWorker.java @@ -236,13 +236,15 @@ public class FmListWorker implements Callable> { result.put("BSRQ", BSRQ);//报出日期 //新生儿(处理多胎) for (MaternalDeliverModel.Baby baby : model.getBaby()) { - result.put("XTBM", StringUtils.isEmpty(baby.getId())?"":baby.getId());//省级系统 ID(baby主键) + Map result2=new HashMap(); + result2.putAll(result); + result2.put("XTBM", StringUtils.isEmpty(baby.getId())?"":baby.getId());//省级系统 ID(baby主键) String XSECSRQ=""; if (StringUtils.isNotEmpty(baby.getDueTime())) { XSECSRQ=StringUtils.isEmpty(baby.getDueTime())?"/":baby.getDueTime(); } - result.put("XSECSRQ", XSECSRQ);//新生儿出生日期时间 - result.put("CFTC", StringUtils.isEmpty(baby.getCftc())?1:Integer.parseInt(baby.getCftc()));//胎次 + result2.put("XSECSRQ", XSECSRQ);//新生儿出生日期时间 + result2.put("CFTC", StringUtils.isEmpty(baby.getCftc())?1:Integer.parseInt(baby.getCftc()));//胎次 String FMJJ=""; if(StringUtils.isNotEmpty(baby.getPregnancyOut())) { switch (baby.getPregnancyOut()) { @@ -263,16 +265,16 @@ public class FmListWorker implements Callable> { break; } } - result.put("FMJJ", FMJJ);//分娩结局代码 -// result.put("RKBM", StringUtils.isEmpty(baby.getBabySeq())?"":baby.getBabySeq());//出生人口编码 + result2.put("FMJJ", FMJJ);//分娩结局代码 +// result2.put("RKBM", StringUtils.isEmpty(baby.getBabySeq())?"":baby.getBabySeq());//出生人口编码 if(StringUtils.isEmpty(baby.getBabySeq())) { if(StringUtils.isNotEmpty(baby.getDueTime())) { - result.put("RKBM", YLJGDZQHDM + usersService.getBabySeq(DateUtil.getYearStr(DateUtil.parseYMD(baby.getDueTime()))));//出生人口编码 + result2.put("RKBM", YLJGDZQHDM + usersService.getBabySeq(DateUtil.getYearStr(DateUtil.parseYMD(baby.getDueTime()))));//出生人口编码 }else { - result.put("RKBM", "/");//出生人口编码 + result2.put("RKBM", "/");//出生人口编码 } }else { - result.put("RKBM", baby.getBabySeq());//出生人口编码 + result2.put("RKBM", baby.getBabySeq());//出生人口编码 } String XSEXB="9"; String XSEXM=""; @@ -288,11 +290,11 @@ public class FmListWorker implements Callable> { break; } } - result.put("XSEXM", XSEXM);//新生儿姓名 - result.put("XSEXB", XSEXB);//新生儿性别代码 - result.put("XSESC", StringUtils.isEmpty(baby.getBabyHeight())?0:Integer.parseInt(baby.getBabyHeight()));//出生身长(cm) - result.put("XSETZ", StringUtils.isEmpty(baby.getBabyWeight())?0:Integer.parseInt(baby.getBabyWeight()));//出生体重(g) - result.put("APGARDM", "1");//Apgar 评分时间代码(默认1分钟代码) + result2.put("XSEXM", XSEXM);//新生儿姓名 + result2.put("XSEXB", XSEXB);//新生儿性别代码 + result2.put("XSESC", StringUtils.isEmpty(baby.getBabyHeight())?0:Integer.parseInt(baby.getBabyHeight()));//出生身长(cm) + result2.put("XSETZ", StringUtils.isEmpty(baby.getBabyWeight())?0:Integer.parseInt(baby.getBabyWeight()));//出生体重(g) + result2.put("APGARDM", "1");//Apgar 评分时间代码(默认1分钟代码) int APGAR=0; if (StringUtils.isNotEmpty(baby.getApgarScore())) { @@ -304,8 +306,8 @@ public class FmListWorker implements Callable> { } } } - result.put("APGAR", APGAR);//Apgar 评分值(分) - data.add(result); + result2.put("APGAR", APGAR);//Apgar 评分值(分) + data.add(result2); } } catch (Exception e) { logger.info(e.getMessage());