From 767834516b4f453575573966cb07dffad567d270 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 21 Mar 2018 15:13:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E5=BE=B7=E5=B0=B1=E8=AF=8A=E5=8D=A1?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BabyModel.java | 12 +++++++ .../main/java/com/lyms/platform/pojo/Patients.java | 11 +++++++ .../com/lyms/platform/query/PatientsQuery.java | 17 +++++++++- .../com/lyms/hospitalapi/Cdfy/CdfyHisService.java | 16 ++++----- .../web/controller/PregnantBuildController.java | 11 ------- .../operate/web/facade/BabyBookbuildingFacade.java | 1 + .../operate/web/facade/BookbuildingFacade.java | 38 +++++++++++++++++++--- .../platform/operate/web/facade/LisFacade.java | 4 +-- .../web/request/BabyBookbuildingAddRequest.java | 12 +++++++ .../operate/web/result/BabyPageResult.java | 12 ++++++- 10 files changed, 105 insertions(+), 29 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 6a4982d..19e7870 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -226,6 +226,18 @@ public class BabyModel extends BaseModel { //病历号(住院号) private String blNo; + + //档案编号 滦平需求 + private String fileCode; + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + public String getSource() { return source; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 020aeee..1983f9c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -338,6 +338,17 @@ public class Patients extends BaseModel { //建档天数 private Integer buildDays; + //承德 病人id + private String blNum; + + public String getBlNum() { + return blNum; + } + + public void setBlNum(String blNum) { + this.blNum = blNum; + } + public Integer getBuildDays() { return buildDays; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 443412f..552dde0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -535,6 +535,17 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //孕妇证件类型 private String pcerteTypeId; + + private String blNum; + + public String getBlNum() { + return blNum; + } + + public void setBlNum(String blNum) { + this.blNum = blNum; + } + public boolean isNullrFactor() { return isNullrFactor; } @@ -1207,6 +1218,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != pIds) { condition = condition.and("pid", pIds, MongoOper.IN); } + + if (null != blNum) { + condition = condition.and("blNum", blNum, MongoOper.IS); + } + Criteria c1 = null; if (null != queryNo) { @@ -1234,7 +1250,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { c1 = c.orCondition(new MongoCondition[]{con1, con3, con5}).getCriteria(); } } - if (null != phoneOrCert) { MongoCondition c = MongoCondition.newInstance(); MongoCondition con1 = MongoCondition.newInstance("phone", phoneOrCert, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdfyHisService.java index 7eb86f8..02116cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdfyHisService.java @@ -82,12 +82,10 @@ public class CdfyHisService { String url = "http://10.0.200.2:9090/his/getCdFyIdByVcCardNo?vcCardNo="+vcCardNo; DefaultHttpClient client = new DefaultHttpClient(new PoolingClientConnectionManager()); try { - HttpPost httpPost = new HttpPost(url); /*StringEntity se = new StringEntity(vcCardNo,"UTF-8"); se.setContentType("text/json"); httpPost.setEntity(se);*/ - //执行post请求 HttpResponse respon = client.execute(httpPost); if(respon != null && respon.getStatusLine().getStatusCode() == 200){ @@ -98,21 +96,19 @@ public class CdfyHisService { if(obj!=null){ id = obj.getString("id"); } - - return id; + return id == null ? vcCardNo : id; }else{ System.out.println("传输失败！"); } - - }catch (Exception e){ - e.printStackTrace(); + ExceptionUtils.catchException(e,"承德就诊卡号获取病人id异常"); + return vcCardNo; + } + finally { + client.close(); } - return vcCardNo; - - } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index 715e4a9..23a0235 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -39,23 +39,12 @@ import java.net.URLEncoder; @Controller public class PregnantBuildController extends BaseController{ - @Autowired - private YunBookbuildingService yunBookbuildingService; @Autowired private BookbuildingFacade bookbuildingFacade; @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; - - @Autowired - private CouponService couponService; - - @Autowired - private MongoTemplate mongoTemplate; - - @Autowired - private AutoMatchFacade autoMatchFacade; /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 9bc2d2b..b027fb9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1028,6 +1028,7 @@ public class BabyBookbuildingFacade { private BabyModel getBabyModel(BabyBookbuildingAddRequest b,boolean isAdd) { // hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段 BabyModel bm = new BabyModel(); + bm.setFileCode(b.getFileCode()); bm.setBabyHighRiskReason(b.getBabyHighRiskReason()); bm.setmHighRiskReason(b.getmHighRiskReason()); bm.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index f74cb8d..5758823 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.hospitalapi.Cdfy.CdfyHisService; import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.hospitalapi.fnfy.FnfyHisService; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; @@ -53,6 +54,7 @@ import java.util.*; public class BookbuildingFacade { private Logger logger = LoggerFactory.getLogger(BookbuildingFacade.class); + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); @Autowired @@ -114,9 +116,8 @@ public class BookbuildingFacade { private DeleteProcessHandler deleteProcessHandler; @Autowired - private SyncDataService syncDataService; - @Autowired private SieveService sieveService; + @Autowired private OrganizationGroupsFacade groupsFacade; @@ -149,7 +150,9 @@ public class BookbuildingFacade { private TrackDownRecordService trackDownRecordService; @Autowired - private ResidentsArchiveService residentsArchiveService; + private CdfyHisService cdfyHisService; + + /** * 根据患者的建档ID，查询还未使用的免费产检查券 @@ -258,6 +261,13 @@ public class BookbuildingFacade { Patients patient = getPatientsData(yunRequest); + + //承德市妇幼通过就诊卡号查询到病人id保存下来 + if ("2100001291".equals(patient.getHospitalId()) && StringUtils.isNotEmpty(yunRequest.getVcCardNo())) + { + patient.setBlNum(cdfyHisService.getIdByVcCardNo(yunRequest.getVcCardNo())); + } + patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date())); patient.setDueStatus(0); @@ -911,13 +921,33 @@ public class BookbuildingFacade { //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy if ("1000000114".equals(hospitalId)) { patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(bookbuildingQueryRequest.getVcCardNo())); - } else { + } + //承德通过就诊卡号查询查询到病人id 然后用病人id和就诊卡号查询建档记录 + else if ("2100001291".equals(hospitalId)) + { + String blNum = cdfyHisService.getIdByVcCardNo(bookbuildingQueryRequest.getVcCardNo()); + patientsQuery.setBlNum(blNum); + } + else + { patientsQuery.setVcCardNo(bookbuildingQueryRequest.getVcCardNo()); } patientsQuery.setHospitalId(hospitalId); //优先查询本院通过就诊卡 List localPatients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + + if ("2100001291".equals(hospitalId)) + { + patientsQuery.setBlNum(null); + if (CollectionUtils.isEmpty(localPatients)) + { + patientsQuery.setVcCardNo(bookbuildingQueryRequest.getVcCardNo()); + localPatients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + } + } + + patientsQuery.setHospitalId(null); if (CollectionUtils.isNotEmpty(localPatients)) { patients = localPatients; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index 769a5a9..f713313 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -386,7 +386,7 @@ public class LisFacade { model.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); } //承德查询lis - else if ("16".equals(HIS_VERSION)) + else if ("2100001291".equals(model.getHospitalId())) { //model.setVcCardNo(vcCardNo); model.setVcCardNo(cdfyHisService.getIdByVcCardNo(vcCardNo)); @@ -549,7 +549,7 @@ public class LisFacade { vcCardNos.addAll(dzfyHisService.getDzVcCardNos(pat.getVcCardNo())); } //承德查询lis - else if ("16".equals(HIS_VERSION)) + else if ("2100001291".equals(pat.getHospitalId())) { // vcCardNos.add(pat.getVcCardNo()); vcCardNos.add(cdfyHisService.getIdByVcCardNo(pat.getVcCardNo())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index ccd3368..faf86ee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -216,6 +216,18 @@ public class BabyBookbuildingAddRequest { private Integer couponType; + + //档案编号 滦平需求 + private String fileCode; + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + public String getCouponCode() { return couponCode; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index 4f8c589..9627c0c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -181,6 +181,16 @@ public class BabyPageResult implements IBasicResultConvert getPatientSerResults() { return patientSerResults; @@ -601,7 +611,7 @@ public class BabyPageResult implements IBasicResultConvert