From 27208e39605a665fc33dd897ebcad2ddf2475cfa Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 14 Apr 2022 21:45:34 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/worker/FmListWorker.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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 10f9826..f3f4fc5 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 @@ -58,7 +58,11 @@ public class FmListWorker implements Callable> { if (null==patient) { continue; } - result.put("MQXM", StringUtils.isEmpty(patient.getUsername())?"":patient.getUsername());//母亲姓名 + String MQXM=""; + if(StringUtils.isNotEmpty(patient.getUsername())){ + MQXM=patient.getUsername(); + } + result.put("MQXM", MQXM);//母亲姓名 int MQNL=0; if (null!= DateUtil.getAge(patient.getBirth(),model.getDueDate1())) { MQNL=DateUtil.getAge(patient.getBirth(),model.getDueDate1()).intValue(); @@ -140,7 +144,7 @@ public class FmListWorker implements Callable> { result.put("YLJGDZXQ", YLJGDZXQ);//医疗机构地址 - 县 result.put("YLJGDZQHDM", organizationService.getAreaCode(YLJGDZXQ));//医疗机构地址-行政区划代码 result.put("ZCJG", "T");//是否助产机构 - result.put("FMDDLB", StringUtils.isEmpty(model.getFmddlb())?"":model.getFmddlb());//分娩地点类别代码 + result.put("FMDDLB", StringUtils.isEmpty(model.getFmType())?"1":model.getFmType());//分娩地点类别代码 result.put("FMDDLX", StringUtils.isEmpty(model.getFmddlx())?"":model.getFmddlx());//分娩地点类型代码 result.put("CFJKDAH", "");//孕产妇健康档案编号(非必填) result.put("CFZYBAH", StringUtils.isEmpty(model.getInHospitalNo())?"":model.getInHospitalNo());//产妇住院病案号 @@ -229,18 +233,22 @@ public class FmListWorker implements Callable> { } result.put("FMJJ", FMJJ);//分娩结局代码 result.put("RKBM", StringUtils.isEmpty(baby.getBabySeq())?"":baby.getBabySeq());//出生人口编码 - result.put("XSEXM ", StringUtils.isEmpty(baby.getXsexm())?"":baby.getXsexm());//新生儿姓名 + String XSEXB="9"; + String XSEXM=""; if(StringUtils.isNotEmpty(baby.getBabyGender())) { switch (baby.getBabyGender()){ case "1": XSEXB="1";//男 + XSEXM=MQXM+"之子"; break; case "0": XSEXB="2";//女 + XSEXM=MQXM+"之女"; 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） -- 1.8.3.1