From 782bf6abca75a4e42a77225537cc4fae5835b62c Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 5 Dec 2018 16:18:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=AD=9B=E5=AE=9E=E9=AA=8C=E5=AE=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/dal/impl/NewSieveLabDaoImpl.java | 2 + .../platform/biz/service/BabySieveService.java | 14 +++ .../lyms/platform/query/NewSieveLabModelQuery.java | 16 +++ .../lyms/hospitalapi/qhdfy/QhdJbgwInterface.java | 12 +-- .../web/controller/BabySieveController.java | 11 ++ .../operate/web/controller/TestController.java | 16 ++- .../operate/web/facade/BabySieveFacede.java | 112 +++++++++++++++++++-- 7 files changed, 167 insertions(+), 16 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/NewSieveLabDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/NewSieveLabDaoImpl.java index e06faac..171faff 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/NewSieveLabDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/NewSieveLabDaoImpl.java @@ -5,12 +5,14 @@ import com.lyms.platform.common.dao.BaseMongoDAOImpl; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.BabySieveModel; import com.lyms.platform.pojo.NewSieveLabModel; +import org.springframework.stereotype.Repository; import java.util.List; /** * Created by Administrator on 2018/12/3. */ +@Repository("newSieveLabDao") public class NewSieveLabDaoImpl extends BaseMongoDAOImpl implements INewSieveLabDao { public List queryNewSieveLab(MongoQuery query){ return find(query.convertToMongoQuery()); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java index e425c4f..0e2fe36 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java @@ -1,9 +1,12 @@ package com.lyms.platform.biz.service; +import com.lyms.platform.biz.dal.INewSieveLabDao; import com.lyms.platform.biz.dal.IbabySieveDao; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.BabySieveModel; +import com.lyms.platform.pojo.NewSieveLabModel; import com.lyms.platform.query.BabySieveQuery; +import com.lyms.platform.query.NewSieveLabModelQuery; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -20,6 +23,8 @@ public class BabySieveService { @Autowired private IbabySieveDao babySieveDao; + @Autowired + private INewSieveLabDao newSieveLabDao; public List getBabySieveQuery(BabySieveQuery babySieveQuery){ MongoQuery query = babySieveQuery.convertToQuery(); @@ -51,5 +56,14 @@ public class BabySieveService { return babySieveDao.findOneBabySieveById(id); } + public List queryNewSieveLab(NewSieveLabModelQuery newSieveLabModelQuery){ + MongoQuery query = newSieveLabModelQuery.convertToQuery(); + return newSieveLabDao.queryNewSieveLab(query); + } + + public NewSieveLabModel addNewSieveLab(NewSieveLabModel newSieveLabModel){ + return newSieveLabDao.addNewSieveLab(newSieveLabModel); + } + } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/NewSieveLabModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/NewSieveLabModelQuery.java index de4fe2f..ce3d4e3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/NewSieveLabModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/NewSieveLabModelQuery.java @@ -14,6 +14,22 @@ public class NewSieveLabModelQuery extends BaseQuery implements IConvertToNative private String id; private String testNumber;//初筛试验号 + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTestNumber() { + return testNumber; + } + + public void setTestNumber(String testNumber) { + this.testNumber = testNumber; + } + public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); if(null != id){ diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java index 39350da..331b4e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java @@ -277,8 +277,8 @@ public class QhdJbgwInterface { map.put("MENSESLASTDATE",DateUtil.getyyyy_MM_dd(patients.getLastMenses())); map.put("EXPECTEDCHILDBIRTHDAY",DateUtil.getyyyy_MM_dd(patients.getDueDate())); String hospital = ""; - if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getHospitalId())) { - Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getHospitalId())); + if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getHospitalId())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(antExChuModel.getHospitalId())); if (organization != null && organization.getYn() == YnEnums.YES.getId()) { hospital = organization.getName(); } @@ -465,7 +465,7 @@ public class QhdJbgwInterface { ydfmw = ResolveUtils.replaceYDFMW(ydfmwMap, 1); } map.put("WVDEXAM",ydfmw); - map.put("ORGCODE",patients.getHospitalId()); + map.put("ORGCODE",antExChuModel.getHospitalId()); /*String hospital = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getHospitalId())) { Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getHospitalId())); @@ -600,10 +600,10 @@ public class QhdJbgwInterface { } } map.put("FOLLOWUPDOCTORNAME",checkDoctor); - map.put("ORGCODE",patients.getHospitalId()); + map.put("ORGCODE",data.getHospitalId()); String hospital = ""; - if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getHospitalId())) { - Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getHospitalId())); + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getHospitalId())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(data.getHospitalId())); if (organization != null && organization.getYn() == YnEnums.YES.getId()) { hospital = organization.getName(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java index 9cf489a..e9191ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySieveController.java @@ -146,4 +146,15 @@ public class BabySieveController extends BaseController{ } + /** + * 新生儿实验室结果查看接口 + * @param testNum + * @return + */ + @ResponseBody + @RequestMapping(value = "/newSieveLab",method = RequestMethod.GET) + public BaseResponse newSieveLabResult(String testNum) { + return babySieveFacede.newSieveLabResult(testNum); + } + } \ No newline at end of file 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 049d2cc..898c7ff 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 @@ -127,6 +127,8 @@ public class TestController extends BaseController { @Autowired private PersonService personService; + @Autowired + private BabySieveFacede babySieveFacede; @Autowired @Qualifier("commonThreadPool") @@ -2679,10 +2681,20 @@ public class TestController extends BaseController { @ResponseBody public String getZdy(@RequestParam("start") String start, @RequestParam("end") String end) { - cdGwInterface.test(start,end); + cdGwInterface.test(start, end); return "1"; } - + /** + * 承德新筛接口 + * @param date + * @return + */ + @RequestMapping(value = "/dr") + @ResponseBody + public String drCeshi(String date){ + babySieveFacede.newSieveLab(date); + return null; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 2df2765..6d32791 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -23,16 +23,11 @@ import com.lyms.platform.operate.web.utils.LisHandleTask; import com.lyms.platform.permission.model.LisReportModel; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.pojo.BabySieveModel; -import com.lyms.platform.pojo.MaternalDeliverModel; -import com.lyms.platform.pojo.Patients; -import com.lyms.platform.query.BabyModelQuery; -import com.lyms.platform.query.BabySieveQuery; -import com.lyms.platform.query.MatDeliverQuery; -import com.lyms.platform.query.PatientsQuery; +import com.lyms.platform.pojo.*; +import com.lyms.platform.query.*; import com.mchange.v1.util.ListUtils; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -40,6 +35,7 @@ import org.springframework.data.domain.Sort; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; +import java.io.File; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -891,4 +887,104 @@ public class BabySieveFacede { return babySieveManagerResult; } + /** + * 新筛实验室接口 + * @param date + */ + public void newSieveLab(String date){ + try{ + String nowDate=null; + String path = "E:\\temp"; + File file = new File(path); + File[] files = file.listFiles(); + System.out.println("该目录下文件个数:" + files.length); + if(StringUtils.isNotEmpty(date)){ + nowDate = date; + }else{ + nowDate = DateUtil.getymd(); + } + for(int i = 0;i list = FileUtils.readLines(new File(fileName)); + //文件的名称有两种一种是NTSHS.*，另一种是PKUH.*，判断名称分类字段数据保存 + if("NTSHS".equals(name)){ + if(list != null && list.size()>0){ + for(int j = 2;j=11){ + newSieveLabModel.setTestNumber(array[6]); + newSieveLabModel.setNtshsyingguang(array[11]); + newSieveLabModel.setNtshsnongdu(array[16]); + babySieveService.addNewSieveLab(newSieveLabModel); + }else if(j>=101){ + newSieveLabModel.setTestNumber(array[5]); + newSieveLabModel.setNtshsyingguang(array[10]); + newSieveLabModel.setNtshsnongdu(array[15]); + babySieveService.addNewSieveLab(newSieveLabModel); + }else{ + newSieveLabModel.setTestNumber(array[7]); + newSieveLabModel.setNtshsyingguang(array[12]); + newSieveLabModel.setNtshsnongdu(array[17]); + babySieveService.addNewSieveLab(newSieveLabModel); + } + + } + + } + }else{ + if(list != null && list.size()>0){ + for(int j = 2;j list = babySieveService.queryNewSieveLab(query); + if(list != null && list.size() > 0){ + br.setData(list); + br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + return br; + } + return br; + } + return br; + } + } -- 1.8.3.1