From 9ff472c3cd8b9f6d52d3afbf53f481768ab999d8 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Fri, 22 Jun 2018 16:15:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B8=E5=9F=8E=E5=88=9D=E8=AF=8A=EF=BC=8C?= =?UTF-8?q?=E5=A4=8D=E8=AF=8A=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/query/AntExQuery.java | 18 +++++++ .../lyms/hospitalapi/zcfy/ZcPrenatalService.java | 59 ++++++++++++++++------ .../operate/web/controller/TestController.java | 7 +++ 3 files changed, 68 insertions(+), 16 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java index 58c971c..40b61ca 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java @@ -43,6 +43,23 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { private boolean isOpinion; private Date createdTimeStart; + + public Date getCreatedTimeStart() { + return createdTimeStart; + } + + public void setCreatedTimeStart(Date createdTimeStart) { + this.createdTimeStart = createdTimeStart; + } + + public Date getCreatedTimeEnd() { + return createdTimeEnd; + } + + public void setCreatedTimeEnd(Date createdTimeEnd) { + this.createdTimeEnd = createdTimeEnd; + } + private Date createdTimeEnd; public boolean isOpinion() { @@ -204,6 +221,7 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { } else { c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd); } + isAddStart = Boolean.TRUE; } if (null != end) { diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java index bfd6f2c..65b1e1c 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java @@ -1,14 +1,22 @@ package com.lyms.hospitalapi.zcfy; +import com.lyms.platform.biz.dal.IAntExChuDao; +import com.lyms.platform.biz.dal.impl.AntExChuDaoImpl; +import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.dao.BaseMongoDAO; +import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.ViewFacade; import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.AntExChuQuery; +import com.lyms.platform.query.AntExQuery; import org.apache.commons.lang.StringUtils; +import org.springframework.data.domain.Sort; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Criteria; @@ -31,8 +39,8 @@ public class ZcPrenatalService { private PatientsService patientsService; @Autowired private ViewFacade viewFacade; -// @Autowired -// private BaseMongoDAO baseMongoDAO; + @Autowired + private AntenatalExaminationService antExService; //初诊 public BaseObjectResponse saveAntexChu(AntExChuModel antExChuModel) { @@ -146,10 +154,10 @@ public class ZcPrenatalService { "yghxkt,xqjq,xnsd,hivkt,ydfmw,ydqjd,\n" + "bChao,heartRate,fetalPosition,fetalPresentation,join1,checkDate,\n" + "cDueWeek,checkDoctor,hospital,dirOpinion,infectDiseases,screenResult,highRisk,highriskDesc," + - "nextCheckTime,yinchan,gongwaiyun,syjg,diagnosis,diagnosisOther) " + + "sieveStatus,nextCheckTime,yinchan,gongwaiyun,syjg,diagnosis,diagnosisOther) " + "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," + - "?,?,?,?,?,?)"; + "?,?,?,?,?,?,?)"; @@ -951,18 +959,37 @@ public class ZcPrenatalService { * @param endDate * @return */ -// public BaseObjectResponse saveChuZhen(String startDate,String endDate){ -// Criteria criteria = Criteria.where("created").gte(startDate).lte(endDate); -// Query query = new Query(criteria); -// List list = baseMongoDAO.find(query); -// if(list != null && list.size()>0){ -// for(AntExChuModel antExChuModel : list){ -// System.out.print(antExChuModel.getId()); -// } -// } -// -// return null; -// } + public BaseObjectResponse saveChuZhen(String startDate,String endDate){ + BaseObjectResponse br = null; + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); + antExChuQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); + List list = antExService.queryAntExChu(antExChuQuery); + if(list != null && list.size()>0){ + for(AntExChuModel antExChuModel : list){ + br = saveAntexChu(antExChuModel); + } + } + return br; + } + + + + public BaseObjectResponse saveFuZhen(String startDate,String endDate){ + BaseObjectResponse br = null; + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); + antExQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); + //antExQuery.setId("5b2b4a760cf24b66d2c0af28"); + List list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + if(list != null && list.size()>0){ + for(AntenatalExaminationModel antenatalExaminationModel : list){ + br = saveAntexFu(antenatalExaminationModel); + } + } + + return br; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 7f6213b..809c1eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -1968,6 +1968,13 @@ public class TestController extends BaseController { return br; } + @RequestMapping(value="/zc/cs") + @ResponseBody + public BaseObjectResponse getCs(@RequestParam("startDate")String startDate,@RequestParam("endDate")String endDate){ + BaseObjectResponse br = zcPrenatalService.saveFuZhen(startDate,endDate); + return br; + } + } -- 1.8.3.1