From 947dc83c747c4eb8b5cd162e8555ec9f5a05f8cc Mon Sep 17 00:00:00 2001 From: baohanddd Date: Wed, 19 Oct 2016 20:33:09 +0800 Subject: [PATCH] update assconfig table name --- .../java/com/lyms/platform/pojo/LisCrisisItem.java | 65 ++++++++++++++++ .../lyms/platform/query/LisCrisisItemQuery.java | 88 +++++++++++++++++++++- .../lyms/hospitalapi/qhdfy/QhdfyHisService.java | 35 +++++---- 3 files changed, 172 insertions(+), 16 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java b/platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java index f544f5d..71c2bcf 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java @@ -29,6 +29,71 @@ public class LisCrisisItem { private Integer status; private String statusName; + private String patientName; + private String cardNo; + private String phone; + private Integer serviceType; + private Integer serviceStatus; + //末次月经 + private Date lastMenses; + private Integer week; + + public String getPatientName() { + return patientName; + } + + public void setPatientName(String patientName) { + this.patientName = patientName; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Integer getServiceType() { + return serviceType; + } + + public void setServiceType(Integer serviceType) { + this.serviceType = serviceType; + } + + public Integer getServiceStatus() { + return serviceStatus; + } + + public void setServiceStatus(Integer serviceStatus) { + this.serviceStatus = serviceStatus; + } + + public Date getLastMenses() { + return lastMenses; + } + + public void setLastMenses(Date lastMenses) { + this.lastMenses = lastMenses; + } + + public Integer getWeek() { + return week; + } + + public void setWeek(Integer week) { + this.week = week; + } + public String getHospitalId() { return hospitalId; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java index e24919e..fd8bcfc 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java @@ -26,6 +26,70 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue private String applyDoctorName; private Integer status; + private String patientName; + private String cardNo; + private String phone; + private Integer serviceType; + private Integer serviceStatus; + private Integer startWeek; + private Integer endWeek; + + public String getPatientName() { + return patientName; + } + + public void setPatientName(String patientName) { + this.patientName = patientName; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Integer getServiceType() { + return serviceType; + } + + public void setServiceType(Integer serviceType) { + this.serviceType = serviceType; + } + + public Integer getServiceStatus() { + return serviceStatus; + } + + public void setServiceStatus(Integer serviceStatus) { + this.serviceStatus = serviceStatus; + } + + public Integer getStartWeek() { + return startWeek; + } + + public void setStartWeek(Integer startWeek) { + this.startWeek = startWeek; + } + + public Integer getEndWeek() { + return endWeek; + } + + public void setEndWeek(Integer endWeek) { + this.endWeek = endWeek; + } + public String getId() { return id; } @@ -120,7 +184,6 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue if (null != id) { condition = condition.and("id", new ObjectId(id), MongoOper.IS); } - if (null != name) { condition = condition.and("name", name, MongoOper.IS); } @@ -133,7 +196,6 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue if(null!=classify){ condition=condition.and("classify",classify,MongoOper.IS); } - if(null!=classifyName){ condition=condition.and("classifyName",classifyName,MongoOper.IS); } @@ -150,6 +212,28 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue condition=condition.and("status",status,MongoOper.IS); } + if(null!=patientName){ + condition=condition.and("patientName",patientName,MongoOper.IS); + } + if(null!=cardNo){ + condition=condition.and("cardNo",cardNo,MongoOper.IS); + } + if(null!=phone){ + condition=condition.and("phone",phone,MongoOper.IS); + } + if(null!=serviceType){ + condition=condition.and("serviceType",serviceType,MongoOper.IS); + } + if(null!=serviceStatus){ + condition=condition.and("serviceStatus",serviceStatus,MongoOper.IS); + } + if(null!=startWeek){ + condition=condition.and("week",startWeek,MongoOper.GTE); + } + if(null!=endWeek){ + condition=condition.and("week",endWeek,MongoOper.LTE); + } + return condition.toMongoQuery(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java index c20a164..7ba2c23 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -5,10 +5,8 @@ import com.lyms.platform.biz.service.AssayConfigService; import com.lyms.platform.biz.service.LisCrisisItemService; import com.lyms.platform.biz.service.LisReportService; import com.lyms.platform.biz.service.PatientsService; -import com.lyms.platform.pojo.AssayConfig; -import com.lyms.platform.pojo.LisCrisisItem; -import com.lyms.platform.pojo.LisReport; -import com.lyms.platform.pojo.LisReportItem; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.LisReportQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.dbutils.DbUtils; @@ -72,13 +70,30 @@ public class QhdfyHisService { for (LisReport report:list) { patientsQuery.setVcCardNo(report.getVcCardNo()); - int count = patientsService.queryPatientCount(patientsQuery); + List patientsList = patientsService.queryPatient(patientsQuery); LisReportQuery lisReportQuery = new LisReportQuery(); lisReportQuery.setVcCardNo(report.getVcCardNo()); lisReportQuery.setHospitalId(""+hospitalId); int reportCount = lisReportService.queryLisReportCount(lisReportQuery); - if (count > 0 && reportCount == 0) { + if (patientsList != null && patientsList.size() > 0 && reportCount == 0) { + Patients patients = patientsList.get(0); + LisCrisisItem crisisItem = new LisCrisisItem(); + crisisItem.setPhone(patients.getPhone()); + crisisItem.setCardNo(patients.getCardNo()); + crisisItem.setPatientName(patients.getUsername()); + crisisItem.setServiceType(patients.getServiceType()); + crisisItem.setServiceStatus(patients.getServiceStatus()); + crisisItem.setLastMenses(patients.getLastMenses()); + crisisItem.setWeek(DateUtil.getWeek(patients.getLastMenses(), report.getPublishTime())); + crisisItem.setPublishTime(report.getPublishTime()); + crisisItem.setAge(report.getAge()); + crisisItem.setApplyDoctorCode(report.getApplyDoctorCode()); + crisisItem.setApplyDoctorName(report.getApplyDoctorName()); + crisisItem.setHospitalId(hospitalId + ""); + crisisItem.setStatus(1); + crisisItem.setStatusName("待处理"); + List itemList = queryRunner.query(conn, subSql+report.getHospitalId()+"'", new BeanListHandler(LisReportItem.class)); if (itemList.size() > 0) { report.setId(hospitalId + ":" + report.getHospitalId()); @@ -89,13 +104,7 @@ public class QhdfyHisService { // crisis init for (LisReportItem item:itemList) { if (item.getFlag() != null) { - LisCrisisItem crisisItem = new LisCrisisItem(); - crisisItem.setHospitalId(hospitalId + ""); crisisItem.setId(report.getId() + ":" + item.getCode()); - crisisItem.setPublishTime(report.getPublishTime()); - crisisItem.setAge(report.getAge()); - crisisItem.setApplyDoctorCode(report.getApplyDoctorCode()); - crisisItem.setApplyDoctorName(report.getApplyDoctorName()); AssayConfig assayConfig = assayConfigMap.get(item.getCode()); if (assayConfig != null) { crisisItem.setClassify(assayConfig.getClassify()); @@ -106,8 +115,6 @@ public class QhdfyHisService { crisisItem.setItemName(item.getName()); crisisItem.setRef(item.getRef()); crisisItem.setResult(item.getResult()); - crisisItem.setStatus(1); - crisisItem.setStatusName("待处理"); crisisItem.setUnit(item.getUnit()); lisCrisisItemService.addLisCrisisItem(crisisItem); } -- 1.8.3.1