From e1147d735fb20b2a84b5b049da0e0209fc1853e0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 23 Feb 2017 15:59:26 +0800 Subject: [PATCH] update code --- .../main/java/com/lyms/platform/biz/JdbcUtil.java | 4 +- .../platform/biz/dal/IBabyBookBuildingDao.java | 3 + .../biz/dal/impl/BabyBookbuildingDaoImpl.java | 6 + .../biz/service/BabyBookbuildingService.java | 9 +- .../java/com/lyms/platform/pojo/FmRecordModel.java | 33 ++ .../com/lyms/platform/query/PatientsQuery.java | 20 + .../job/index/service/SyncDataService.java | 4 +- .../java/com/lyms/hospitalapi/qhdfy/FmPatInfo.java | 401 ++------------------- .../com/lyms/hospitalapi/qhdfy/QhdfyFmService.java | 115 ++++-- .../operate/web/controller/TestController.java | 7 + .../operate/web/facade/BabyBookbuildingFacade.java | 5 + 11 files changed, 206 insertions(+), 401 deletions(-) create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/FmRecordModel.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java index b287908..a9c9166 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java @@ -476,7 +476,7 @@ public class JdbcUtil { patients.setCardNo(getString(map.get("P_CARDNO"))); //证件号码 } else { patients.setCardNo(getString(map.get("P_MOBILEPHONE"))); //证件号码 - patients.setPcerteTypeId("57e0a21c0cf209b410a82cda"); + patients.setPcerteTypeId("57e1dcd3f0f02e7ca519d6c6"); } //---------------------居住地址 @@ -1224,7 +1224,7 @@ public class JdbcUtil { } model.setMcertNo(getString(map.get("PI_MOTHERPHONE"))); - model.setMcertTypeId("57e0a21c0cf209b410a82cda"); + model.setMcertTypeId("57e1dcd3f0f02e7ca519d6c6"); String mLevelId = getString(map.get("PI_MMCULTURE")); if (mLevelId != null && !"".equals(mLevelId)) { diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyBookBuildingDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyBookBuildingDao.java index 9129b97..3d3b0c4 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyBookBuildingDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyBookBuildingDao.java @@ -3,6 +3,7 @@ package com.lyms.platform.biz.dal; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.BabyCheckModel; import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.FmRecordModel; import com.lyms.platform.pojo.PostReviewModel; import java.util.Date; @@ -25,4 +26,6 @@ public interface IBabyBookBuildingDao { List getBirthBabies(String dateStr); void updateBabyLastGrowth(BabyCheckModel model); + + void saveFmrecord(FmRecordModel fmRecordModel); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyBookbuildingDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyBookbuildingDaoImpl.java index a01eeb0..1a90656 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyBookbuildingDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyBookbuildingDaoImpl.java @@ -3,6 +3,7 @@ package com.lyms.platform.biz.dal.impl; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.BabyCheckModel; +import com.lyms.platform.pojo.FmRecordModel; import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.mongodb.MapReduceCommand; @@ -116,4 +117,9 @@ public class BabyBookbuildingDaoImpl extends BaseMongoDAOImpl impleme model.getHeadEvaluate()).set("headEvaluate",model.getHeadEvaluate()).set("heightWeight",model.getHeightWeight()), BabyModel.class); } + @Override + public void saveFmrecord(FmRecordModel fmRecordModel) { + this.mongoTemplate.save(fmRecordModel,"lyms_fmrecord"); + } + } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java index fcce578..c5683c8 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java @@ -1,9 +1,7 @@ package com.lyms.platform.biz.service; import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.pojo.BabyCheckModel; -import com.lyms.platform.pojo.Patients; -import com.lyms.platform.pojo.PostReviewModel; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; @@ -14,7 +12,6 @@ import org.springframework.stereotype.Service; import com.lyms.platform.biz.dal.IBabyBookBuildingDao; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.pojo.BabyModel; import java.util.Date; import java.util.List; @@ -128,4 +125,8 @@ public class BabyBookbuildingService { public void updateBabyLastGrowth(BabyCheckModel model) { babyBookBuildingDao.updateBabyLastGrowth(model); } + + public void saveFmrecord(FmRecordModel fmRecordModel) { + babyBookBuildingDao.saveFmrecord(fmRecordModel); + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/FmRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/FmRecordModel.java new file mode 100644 index 0000000..33f0490 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/FmRecordModel.java @@ -0,0 +1,33 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + + +/** + * 记录秦皇岛分娩记录没有在系统中匹配到的记录 + * + * Created by lqy + */ +@Document(collection = "lyms_fmrecord") +public class FmRecordModel extends BaseModel { + + private String id; + private String syxh; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSyxh() { + return syxh; + } + + public void setSyxh(String syxh) { + this.syxh = syxh; + } +} 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 fef7d65..9ec336f 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 @@ -210,6 +210,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //查询号 private String queryNo; + private String phoneOrCert; + + public String getPhoneOrCert() { + return phoneOrCert; + } + + public void setPhoneOrCert(String phoneOrCert) { + this.phoneOrCert = phoneOrCert; + } + public String getQueryNo() { return queryNo; } @@ -997,6 +1007,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); } } + if (null != phoneOrCert) { + MongoCondition c = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("phone", phoneOrCert, MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("cardNo", phoneOrCert, MongoOper.IS); + if(c1!=null) { + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); + }else { + c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + } + } if (CollectionUtils.isNotEmpty(fmHospitalQueryList)) { MongoCondition c = MongoCondition.newInstance(); diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java index 5cc64b7..43a4921 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java @@ -356,7 +356,7 @@ public class SyncDataService { patients.setCardNo(DataUtil.getString(map.get("P_CARDNO"))); //证件号码 } else { patients.setCardNo(DataUtil.getString(map.get("P_MOBILEPHONE"))); //证件号码 - patients.setPcerteTypeId("57e0a21c0cf209b410a82cda"); + patients.setPcerteTypeId("57e1dcd3f0f02e7ca519d6c6"); } //---------------------居住地址 @@ -926,7 +926,7 @@ public class SyncDataService { } model.setMcertNo(DataUtil.getString(map.get("PI_MOTHERPHONE"))); - model.setMcertTypeId("57e0a21c0cf209b410a82cda"); + model.setMcertTypeId("57e1dcd3f0f02e7ca519d6c6"); String mLevelId = DataUtil.getString(map.get("PI_MMCULTURE")); if (mLevelId != null && !"".equals(mLevelId)) { diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmPatInfo.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmPatInfo.java index d989643..ed5aabf 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmPatInfo.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmPatInfo.java @@ -6,401 +6,72 @@ package com.lyms.hospitalapi.qhdfy; */ public class FmPatInfo { - private String SYXH; - private String YYDM; - private String BAHM; - private String ZYHM; - private String BRXM; - private String BRXB; - private String CSNY; - private String DWDZ; - private String DWDH; - private String DWYB; - private String HKDZ; - private String HKDH; - private String LXRM; - private String LXDZ; - private String LXDH; - private String RYKS; - private String RYBQ; - private String RYCH; - private String RYRQ; - private String CYKS; - private String CYBQ; - private String CYCH; - private String CYRQ; - private String ZYTS; - private String ZYYS; - private String ZZYS; - private String ZRYS; - private String KZR; + private String syxh; + private String name; + private String cardNo; + private String sex; + private String birth; + private String phone; - private String HIS_SYXH; - private String QJCS; - private String CGCS; - private String LYFSDM; - private String LYFSMC; - private String JSYLJG; - private String MZZDBM; - private String MZZD; - private String ZYZDBM; - private String RYZD; - private String ZYZD; - - public String getSYXH() { - return SYXH; - } - - public void setSYXH(String SYXH) { - this.SYXH = SYXH; - } - - public String getYYDM() { - return YYDM; - } - - public void setYYDM(String YYDM) { - this.YYDM = YYDM; - } - - public String getBAHM() { - return BAHM; - } - - public void setBAHM(String BAHM) { - this.BAHM = BAHM; - } - - public String getZYHM() { - return ZYHM; - } - - public void setZYHM(String ZYHM) { - this.ZYHM = ZYHM; - } - - public String getBRXM() { - return BRXM; - } - - public void setBRXM(String BRXM) { - this.BRXM = BRXM; - } - - public String getBRXB() { - return BRXB; - } - - public void setBRXB(String BRXB) { - this.BRXB = BRXB; - } - - public String getCSNY() { - return CSNY; - } - - public void setCSNY(String CSNY) { - this.CSNY = CSNY; - } - - public String getDWDZ() { - return DWDZ; - } - - public void setDWDZ(String DWDZ) { - this.DWDZ = DWDZ; - } - - public String getDWDH() { - return DWDH; + public String getSyxh() { + return syxh; } - public void setDWDH(String DWDH) { - this.DWDH = DWDH; + public void setSyxh(String syxh) { + this.syxh = syxh; } - public String getDWYB() { - return DWYB; + public String getName() { + return name; } - public void setDWYB(String DWYB) { - this.DWYB = DWYB; + public void setName(String name) { + this.name = name; } - public String getHKDZ() { - return HKDZ; + public String getCardNo() { + return cardNo; } - public void setHKDZ(String HKDZ) { - this.HKDZ = HKDZ; + public void setCardNo(String cardNo) { + this.cardNo = cardNo; } - public String getHKDH() { - return HKDH; + public String getSex() { + return sex; } - public void setHKDH(String HKDH) { - this.HKDH = HKDH; + public void setSex(String sex) { + this.sex = sex; } - public String getLXRM() { - return LXRM; + public String getBirth() { + return birth; } - public void setLXRM(String LXRM) { - this.LXRM = LXRM; + public void setBirth(String birth) { + this.birth = birth; } - public String getLXDZ() { - return LXDZ; - } - - public void setLXDZ(String LXDZ) { - this.LXDZ = LXDZ; - } - - public String getLXDH() { - return LXDH; - } - - public void setLXDH(String LXDH) { - this.LXDH = LXDH; - } - - public String getRYKS() { - return RYKS; - } - - public void setRYKS(String RYKS) { - this.RYKS = RYKS; - } - - public String getRYBQ() { - return RYBQ; - } - - public void setRYBQ(String RYBQ) { - this.RYBQ = RYBQ; - } - - public String getRYCH() { - return RYCH; - } - - public void setRYCH(String RYCH) { - this.RYCH = RYCH; - } - - public String getRYRQ() { - return RYRQ; - } - - public void setRYRQ(String RYRQ) { - this.RYRQ = RYRQ; - } - - public String getCYKS() { - return CYKS; - } - - public void setCYKS(String CYKS) { - this.CYKS = CYKS; - } - - public String getCYBQ() { - return CYBQ; - } - - public void setCYBQ(String CYBQ) { - this.CYBQ = CYBQ; - } - - public String getCYCH() { - return CYCH; - } - public void setCYCH(String CYCH) { - this.CYCH = CYCH; - } - - public String getCYRQ() { - return CYRQ; - } - - public void setCYRQ(String CYRQ) { - this.CYRQ = CYRQ; - } - - public String getZYTS() { - return ZYTS; - } - - public void setZYTS(String ZYTS) { - this.ZYTS = ZYTS; - } - - public String getZYYS() { - return ZYYS; - } - - public void setZYYS(String ZYYS) { - this.ZYYS = ZYYS; - } - - public String getZZYS() { - return ZZYS; - } - - public void setZZYS(String ZZYS) { - this.ZZYS = ZZYS; - } - - public String getZRYS() { - return ZRYS; - } - - public void setZRYS(String ZRYS) { - this.ZRYS = ZRYS; - } - - public String getKZR() { - return KZR; - } - - public void setKZR(String KZR) { - this.KZR = KZR; - } - - public String getHIS_SYXH() { - return HIS_SYXH; - } - - public void setHIS_SYXH(String HIS_SYXH) { - this.HIS_SYXH = HIS_SYXH; - } - - public String getQJCS() { - return QJCS; - } - - public void setQJCS(String QJCS) { - this.QJCS = QJCS; - } - - public String getCGCS() { - return CGCS; - } - - public void setCGCS(String CGCS) { - this.CGCS = CGCS; - } - - public String getLYFSDM() { - return LYFSDM; - } - - public void setLYFSDM(String LYFSDM) { - this.LYFSDM = LYFSDM; - } - - public String getLYFSMC() { - return LYFSMC; - } - - public void setLYFSMC(String LYFSMC) { - this.LYFSMC = LYFSMC; - } - - public String getJSYLJG() { - return JSYLJG; - } - - public void setJSYLJG(String JSYLJG) { - this.JSYLJG = JSYLJG; - } - - public String getMZZDBM() { - return MZZDBM; - } - - public void setMZZDBM(String MZZDBM) { - this.MZZDBM = MZZDBM; - } - - public String getMZZD() { - return MZZD; - } - - public void setMZZD(String MZZD) { - this.MZZD = MZZD; - } - - public String getZYZDBM() { - return ZYZDBM; - } - - public void setZYZDBM(String ZYZDBM) { - this.ZYZDBM = ZYZDBM; - } - - public String getRYZD() { - return RYZD; - } - - public void setRYZD(String RYZD) { - this.RYZD = RYZD; - } - public String getZYZD() { - return ZYZD; + public String getPhone() { + return phone; } - public void setZYZD(String ZYZD) { - this.ZYZD = ZYZD; + public void setPhone(String phone) { + this.phone = phone; } @Override public String toString() { return "FmPatInfo{" + - "SYXH='" + SYXH + '\'' + - ", YYDM='" + YYDM + '\'' + - ", BAHM='" + BAHM + '\'' + - ", ZYHM='" + ZYHM + '\'' + - ", BRXM='" + BRXM + '\'' + - ", BRXB='" + BRXB + '\'' + - ", CSNY='" + CSNY + '\'' + - ", DWDZ='" + DWDZ + '\'' + - ", DWDH='" + DWDH + '\'' + - ", DWYB='" + DWYB + '\'' + - ", HKDZ='" + HKDZ + '\'' + - ", HKDH='" + HKDH + '\'' + - ", LXRM='" + LXRM + '\'' + - ", LXDZ='" + LXDZ + '\'' + - ", LXDH='" + LXDH + '\'' + - ", RYKS='" + RYKS + '\'' + - ", RYBQ='" + RYBQ + '\'' + - ", RYCH='" + RYCH + '\'' + - ", RYRQ='" + RYRQ + '\'' + - ", CYKS='" + CYKS + '\'' + - ", CYBQ='" + CYBQ + '\'' + - ", CYCH='" + CYCH + '\'' + - ", CYRQ='" + CYRQ + '\'' + - ", ZYTS='" + ZYTS + '\'' + - ", ZYYS='" + ZYYS + '\'' + - ", ZZYS='" + ZZYS + '\'' + - ", ZRYS='" + ZRYS + '\'' + - ", KZR='" + KZR + '\'' + - ", HIS_SYXH='" + HIS_SYXH + '\'' + - ", QJCS='" + QJCS + '\'' + - ", CGCS='" + CGCS + '\'' + - ", LYFSDM='" + LYFSDM + '\'' + - ", LYFSMC='" + LYFSMC + '\'' + - ", JSYLJG='" + JSYLJG + '\'' + - ", MZZDBM='" + MZZDBM + '\'' + - ", MZZD='" + MZZD + '\'' + - ", ZYZDBM='" + ZYZDBM + '\'' + - ", RYZD='" + RYZD + '\'' + - ", ZYZD='" + ZYZD + '\'' + + "syxh='" + syxh + '\'' + + ", name='" + name + '\'' + + ", cardNo='" + cardNo + '\'' + + ", sex='" + sex + '\'' + + ", birth='" + birth + '\'' + + ", phone='" + phone + '\'' + '}'; } } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java index 8ed179a..d7e6ea3 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java @@ -54,17 +54,21 @@ public class QhdfyFmService { String endStr = fmt.format(end); System.out.println("start="+startStr+"end="+endStr); ExceptionUtils.catchException("start="+startStr+"end="+endStr); - queryFmPatient(startStr, endStr); + queryFmPatient(startStr, endStr,null); } public void syncWorker(String startStr,String endStr) { System.out.println("sync start="+startStr+"end="+endStr); ExceptionUtils.catchException("start="+startStr+"end="+endStr); - queryFmPatient(startStr, endStr); + queryFmPatient(startStr, endStr,null); + } + + public void syncByPhone(String startStr,String endStr,String syxh) { + queryFmPatient(startStr, endStr,syxh); } - public void queryFmPatient(String start,String end) { + public void queryFmPatient(String start,String end,String syxh) { String cloumns = " SYXH as syxh,\n" + " YEXH as yexh,\n" + @@ -110,7 +114,13 @@ public class QhdfyFmService { String sql ="select "+cloumns+" from JHMK_FMJL where " + " CONVERT(DATETIME,left(SSRQ,8)+' '+RIGHT(SSRQ,8),20) > CONVERT(DATETIME,'"+start+"', 120) and CONVERT(DATETIME,left(SSRQ,8)+' '+RIGHT(SSRQ,8),20) <= CONVERT(DATETIME,'"+end+"', 120)" + " and SYXH not in (select SYXH from JHMK_FMJL where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and SH is not null" + - " and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 '))"; + " and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 ')) "; + + if (StringUtils.isNotEmpty(syxh)) + { + sql+= " SYXH='"+syxh+"'"; + } + List list = queryRunner.query(conn, sql, new BeanListHandler(FmItem.class)); ExceptionUtils.catchException("size====" + list.size()); if (CollectionUtils.isNotEmpty(list)) { @@ -123,12 +133,12 @@ public class QhdfyFmService { } Date dueDate = fmt.parse(dueDateStr); FmPatInfo patInfo = getFmPatInfoById(item.getSyxh()); - if (patInfo != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(patInfo.getLXDH())) { + if (patInfo != null && (StringUtils.isNotEmpty(patInfo.getPhone()) || StringUtils.isNotEmpty(patInfo.getCardNo())) ) { PatientsQuery query = new PatientsQuery(); query.setYn(YnEnums.YES.getId()); query.setType(1); //孕妇 query.setDueStatus(0); //未终止妊娠 - query.setPhone(patInfo.getLXDH()); + query.setPhoneOrCert(StringUtils.isNotEmpty(patInfo.getPhone()) ? patInfo.getPhone() : patInfo.getCardNo()); List patientses = patientsService.queryPatient(query); if (CollectionUtils.isNotEmpty(patientses)) { Patients patient = patientses.get(0); @@ -220,14 +230,19 @@ public class QhdfyFmService { } } + else + { //秦皇岛服务器有分娩记录，但是在这边系统没有对于孕妇 取分娩信息建档儿童数据 + buildBaby( item, patInfo, dueDateStr, dueDate); + } } else - //秦皇岛服务器有分娩记录，但是在这边系统没有对于孕妇 取分娩信息建档儿童数据 { - buildBaby( item, patInfo, dueDateStr, dueDate); + //没有找到孕妇建档的基本信息 记录下来 + saveFmrecord(item.getSfz()); } + } catch (Exception e) { ExceptionUtils.catchException(e, "数据异常"); @@ -269,13 +284,13 @@ public class QhdfyFmService { } Date dueDate = fmt.parse(dueDateStr); FmPatInfo patInfo = getFmPatInfoById(item.getSyxh()); - if (patInfo != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(patInfo.getLXDH())) + if (patInfo != null && (StringUtils.isNotEmpty(patInfo.getPhone()) || StringUtils.isNotEmpty(patInfo.getCardNo()))) { PatientsQuery query = new PatientsQuery(); query.setYn(YnEnums.YES.getId()); query.setType(1); //孕妇 query.setDueStatus(0); //未终止妊娠 - query.setPhone(patInfo.getLXDH()); + query.setPhoneOrCert(StringUtils.isNotEmpty(patInfo.getPhone()) ? patInfo.getPhone() : patInfo.getCardNo()); List patientses = patientsService.queryPatient(query); if (CollectionUtils.isNotEmpty(patientses)) { @@ -401,22 +416,26 @@ public class QhdfyFmService { } } - } - else - { - for (FmItem i : items) + else { - String dueDateStr1 = i.getSsrq(); - if (!StringUtils.isNotEmpty(dueDateStr1)) + for (FmItem i : items) { - continue; + String dueDateStr1 = i.getSsrq(); + if (!StringUtils.isNotEmpty(dueDateStr1)) + { + continue; + } + Date dueDate1 = fmt.parse(dueDateStr1); + buildBaby( i,patInfo, dueDateStr1, dueDate1); } - Date dueDate1 = fmt.parse(dueDateStr1); - buildBaby( i,patInfo, dueDateStr1, dueDate1); - } + } + } + else + { + //没有找到孕妇建档的基本信息 记录下来 + saveFmrecord(item.getSfz()); } - } } } @@ -437,6 +456,14 @@ public class QhdfyFmService { } + private void saveFmrecord(String syxh) + { + FmRecordModel fmRecordModel = new FmRecordModel(); + fmRecordModel.setSyxh(syxh); + babyBookbuildingFacade.saveFmrecord(fmRecordModel); + } + + public void buildBaby(FmItem item,FmPatInfo patInfo, String dueDateStr,Date dueDate) { try{ @@ -448,11 +475,36 @@ public class QhdfyFmService { BabyBookbuildingAddRequest request = new BabyBookbuildingAddRequest(); request.setHospitalId("216"); - request.setMommyName(patInfo.getBRXM()); //母亲姓名 - request.setMommyCertificateTypeId("57e0a21c0cf209b410a82cda"); //证件类型 (手机号码) - request.setMommyCertificateNum(patInfo.getLXDH()); //证件号 - request.setMommyPhone(patInfo.getLXDH()); - String babyName = patInfo.getBRXM()+("男".equals(item.getYexb()) ? "之子" : "之女"); + request.setMommyName(patInfo.getName()); //母亲姓名 + + if (StringUtils.isNotEmpty(patInfo.getBirth())) + { + try { + SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); + Date birth = format.parse(patInfo.getBirth()); + format = new SimpleDateFormat("yyyy-MM-dd"); + request.setMommyBirthday(format.format(birth)); + }catch (ParseException e) + { + ExceptionUtils.catchException(e,"孕妇生日解析异常"); + } + + } + + + if (StringUtils.isNotEmpty(patInfo.getCardNo())) + { + request.setMommyCertificateTypeId("70ae1d93-2964-46bc-83fa-bec9ff605b1c"); //证件类型 (身份证号码) + request.setMommyCertificateNum(patInfo.getCardNo()); //证件号 + } + else if (StringUtils.isNotEmpty(patInfo.getPhone())) + { + request.setMommyCertificateTypeId("57e1dcd3f0f02e7ca519d6c6"); //证件类型 (手机号码) + request.setMommyCertificateNum(patInfo.getPhone()); //证件号 + } + + request.setMommyPhone(patInfo.getPhone()); + String babyName = item.getYexb()+("男".equals(item.getYexb()) ? "之子" : "之女"); request.setBabyName(babyName); request.setSex("男".equals(item.getYexb()) ? 1 : 0); @@ -499,7 +551,6 @@ public class QhdfyFmService { request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 - babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId()); }catch (Exception e) { @@ -521,10 +572,18 @@ public class QhdfyFmService { Connection conn = ConnTools.makeFmConnection(); QueryRunner queryRunner = new QueryRunner(); try { - List list = queryRunner.query(conn, "SELECT * FROM JHMK_BASY WHERE SYXH = '"+syxh+"'", new BeanListHandler(FmPatInfo.class)); + + List list = queryRunner.query(conn, "SELECT syxh,hzxm as name,sfzh as cardNo,sex as sex,birth,lxrdh as phone FROM THIS4_BASY WHERE lxrdh <> '' and hzxm is not null and hzxm <> '' and len(lxrdh) = 11 and syxh = '"+syxh+"'", new BeanListHandler(FmPatInfo.class)); if (CollectionUtils.isNotEmpty(list)) { return list.get(0); } + else + { + List list1 = queryRunner.query(conn, "SELECT SYXH as syxh, BRXM as name,'' as cardNo,BRXB as sex,'' as birth,LXDH as phone FROM JHMK_BASY WHERE len(LXDH) = 11 and SYXH = '"+syxh+"'", new BeanListHandler(FmPatInfo.class)); + if (CollectionUtils.isNotEmpty(list1)) { + return list.get(0); + } + } DbUtils.closeQuietly(conn); } catch (SQLException e) { DbUtils.closeQuietly(conn); 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 8a5ad7f..1370825 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 @@ -997,6 +997,13 @@ public class TestController { return "syncFmData finish"; } + @RequestMapping(value = "/syncFmBySyxh", method = RequestMethod.GET) + @ResponseBody + public String syncFmBySyxh(@RequestParam(required = true) String start,@RequestParam(required = true) String end,@RequestParam(required = true) String syxh) { + qhdfyFmService.syncByPhone(start,end,syxh); + return "syncFmBySyxh finish"; + } + public static void main(String[] a) { try { List list = FileUtils.readLines(new File("D:\\QHD.csv"), "gbk"); 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 d1b14ce..9b12505 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 @@ -2621,4 +2621,9 @@ public class BabyBookbuildingFacade { ExceptionUtils.catchException(e,"儿童生长发育统计异常"); } } + + public void saveFmrecord(FmRecordModel fmRecordModel) { + + babyBookbuildingService.saveFmrecord(fmRecordModel); + } } \ No newline at end of file -- 1.8.3.1