From 1d23b71a0d433d62516fbbecfa960eb5218aa634 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 29 Mar 2018 20:51:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=84=BF=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=95=B8=E5=BD=A2=E8=BF=9B=E8=A1=8C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 77 +++++++++++----------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 2902374..8c8352f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -612,44 +612,44 @@ public class MatDeliverFacade { babyModel1.setContactStartM(baby.getContactStartM()); babyModel1.setEarlySuck(baby.getEarlySuck()); babyModel1.setNbnaNum(baby.getNbnaNum()); - babyModel.setJxWn(baby.isJxWn()); - babyModel.setJxJzl(baby.isJxJzl()); - babyModel.setJxNpc(baby.isJxNpc()); - babyModel.setJxNjs(baby.isJxNjs()); - babyModel.setJxEl(baby.isJxEl()); - babyModel.setJxelSele(baby.getJxelSele()); - babyModel.setJxCl(baby.isJxCl()); - babyModel.setJxClSele(baby.getJxClSele()); - babyModel.setJxClhb(baby.isJxClhb()); - babyModel.setJxClhbSele(baby.getJxClhbSele()); - babyModel.setJxXe(baby.isJxXe()); - babyModel.setJxXeSele(baby.getJxXeSele()); - babyModel.setJxWe(baby.isJxWe()); - babyModel.setJxWeSele(baby.getJxWeSele()); - babyModel.setJxSdbs(baby.isJxSdbs()); - babyModel.setJxZcgm(baby.isJxZcgm()); - babyModel.setJxNdxl(baby.isJxNdxl()); - babyModel.setJxPwwf(baby.isJxPwwf()); - babyModel.setJxMtn(baby.isJxMtn()); - babyModel.setJxMtnSele(baby.getJxMtnSele()); - babyModel.setJxDz(baby.isJxDz()); - babyModel.setJxDzSele(baby.getJxDzSele()); - babyModel.setJxDc(baby.isJxDc()); - babyModel.setJxDcSele(baby.getJxDcSele()); - babyModel.setJxBz(baby.isJxBz()); - babyModel.setJxBzSele(baby.getJxBzSele()); - babyModel.setJxBc(baby.isJxBc()); - babyModel.setJxBcSele(baby.getJxBcSele()); - babyModel.setJxZtds(baby.isJxZtds()); - babyModel.setJxZtdsTopSele(baby.getJxZtdsTopSele()); - babyModel.setJxZtdsBottomSele(baby.getJxZtdsBottomSele()); - babyModel.setJxXtxe(baby.isJxXtxe()); - babyModel.setJxQpc(baby.isJxQpc()); - babyModel.setJxFl(baby.isJxFl()); - babyModel.setJxLtst(baby.isJxLtst()); - babyModel.setJxTszh(baby.isJxTszh()); - babyModel.setJxXtx(baby.isJxXtx()); - babyModel.setJxOther(baby.getJxOther()); + babyModel1.setJxWn(baby.isJxWn()); + babyModel1.setJxJzl(baby.isJxJzl()); + babyModel1.setJxNpc(baby.isJxNpc()); + babyModel1.setJxNjs(baby.isJxNjs()); + babyModel1.setJxEl(baby.isJxEl()); + babyModel1.setJxelSele(baby.getJxelSele()); + babyModel1.setJxCl(baby.isJxCl()); + babyModel1.setJxClSele(baby.getJxClSele()); + babyModel1.setJxClhb(baby.isJxClhb()); + babyModel1.setJxClhbSele(baby.getJxClhbSele()); + babyModel1.setJxXe(baby.isJxXe()); + babyModel1.setJxXeSele(baby.getJxXeSele()); + babyModel1.setJxWe(baby.isJxWe()); + babyModel1.setJxWeSele(baby.getJxWeSele()); + babyModel1.setJxSdbs(baby.isJxSdbs()); + babyModel1.setJxZcgm(baby.isJxZcgm()); + babyModel1.setJxNdxl(baby.isJxNdxl()); + babyModel1.setJxPwwf(baby.isJxPwwf()); + babyModel1.setJxMtn(baby.isJxMtn()); + babyModel1.setJxMtnSele(baby.getJxMtnSele()); + babyModel1.setJxDz(baby.isJxDz()); + babyModel1.setJxDzSele(baby.getJxDzSele()); + babyModel1.setJxDc(baby.isJxDc()); + babyModel1.setJxDcSele(baby.getJxDcSele()); + babyModel1.setJxBz(baby.isJxBz()); + babyModel1.setJxBzSele(baby.getJxBzSele()); + babyModel1.setJxBc(baby.isJxBc()); + babyModel1.setJxBcSele(baby.getJxBcSele()); + babyModel1.setJxZtds(baby.isJxZtds()); + babyModel1.setJxZtdsTopSele(baby.getJxZtdsTopSele()); + babyModel1.setJxZtdsBottomSele(baby.getJxZtdsBottomSele()); + babyModel1.setJxXtxe(baby.isJxXtxe()); + babyModel1.setJxQpc(baby.isJxQpc()); + babyModel1.setJxFl(baby.isJxFl()); + babyModel1.setJxLtst(baby.isJxLtst()); + babyModel1.setJxTszh(baby.isJxTszh()); + babyModel1.setJxXtx(baby.isJxXtx()); + babyModel1.setJxOther(baby.getJxOther()); babyService.findAndModify(query.convertToQuery(), babyModel1); } babyList.add(babyModel); @@ -2101,6 +2101,7 @@ public class MatDeliverFacade { babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId())); babyModelQuery.setBuildType(2); babyModelQuery.setOrder("birth"); + System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery()); List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); if (CollectionUtils.isEmpty(babyModelList)) { newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo()); -- 1.8.3.1