From 4b271d0d7efcfe6269118abe96281159ca8d9dd1 Mon Sep 17 00:00:00 2001 From: baohanddd Date: Wed, 19 Oct 2016 19:48:38 +0800 Subject: [PATCH] update assconfig table name --- .../lyms/platform/biz/dal/LisCrisisItemDao.java | 3 + .../biz/dal/impl/LisCrisisItemDaoImpl.java | 7 +++ .../platform/biz/service/LisCrisisItemService.java | 4 ++ .../java/com/lyms/platform/pojo/LisReport.java | 73 ++++++++++++++++++---- .../java/com/lyms/platform/pojo/LisReportItem.java | 62 +++++++++++++++--- .../lyms/hospitalapi/qhdfy/QhdfyHisService.java | 5 -- 6 files changed, 127 insertions(+), 27 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/LisCrisisItemDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/LisCrisisItemDao.java index ec1d746..e1dbf0e 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/LisCrisisItemDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/LisCrisisItemDao.java @@ -1,6 +1,7 @@ package com.lyms.platform.biz.dal; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.Guidelines; import com.lyms.platform.pojo.LisCrisisItem; import java.util.List; @@ -18,4 +19,6 @@ public interface LisCrisisItemDao { public List queryLisCrisisItem(MongoQuery query); + public void updateLisCrisisItem(LisCrisisItem obj, String id); + } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/LisCrisisItemDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/LisCrisisItemDaoImpl.java index 5a62687..daf9829 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/LisCrisisItemDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/LisCrisisItemDaoImpl.java @@ -3,6 +3,8 @@ package com.lyms.platform.biz.dal.impl; import com.lyms.platform.biz.dal.LisCrisisItemDao; import com.lyms.platform.biz.dal.LisReportDao; import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.LisCrisisItem; import com.lyms.platform.pojo.LisReport; @@ -35,4 +37,9 @@ public class LisCrisisItemDaoImpl extends BaseMongoDAOImpl implem public List queryLisCrisisItem(MongoQuery query) { return find(query.convertToMongoQuery()); } + + @Override + public void updateLisCrisisItem(LisCrisisItem obj, String id) { + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj); + } } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java index 54c3590..3567f4b 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java @@ -21,4 +21,8 @@ public class LisCrisisItemService { return lisCrisisItemDao.queryLisCrisisItem(query.convertToQuery()); } + public void updateLisCrisisItem(LisCrisisItem obj, String id) { + lisCrisisItemDao.updateLisCrisisItem(obj, id); + } + } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java index ffb2e8d..1ea5b5d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java @@ -1,5 +1,6 @@ package com.lyms.platform.pojo; +import org.apache.commons.lang.StringUtils; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; @@ -41,7 +42,11 @@ public class LisReport { } public void setHospitalId(String hospitalId) { - this.hospitalId = hospitalId; + if (StringUtils.isBlank(hospitalId)) { + this.hospitalId = hospitalId; + } else { + this.hospitalId = null; + } } private List itemList; @@ -67,7 +72,11 @@ public class LisReport { } public void setPatientFid(String patientFid) { - this.patientFid = patientFid; + if (StringUtils.isBlank(patientFid)) { + this.patientFid = hospitalId; + } else { + this.patientFid = null; + } } public String getPatientHid() { @@ -75,7 +84,11 @@ public class LisReport { } public void setPatientHid(String patientHid) { - this.patientHid = patientHid; + if (StringUtils.isBlank(patientHid)) { + this.patientHid = patientHid; + } else { + this.patientHid = null; + } } public String getVcCardNo() { @@ -83,7 +96,11 @@ public class LisReport { } public void setVcCardNo(String vcCardNo) { - this.vcCardNo = vcCardNo; + if (StringUtils.isBlank(vcCardNo)) { + this.vcCardNo = vcCardNo; + } else { + this.vcCardNo = null; + } } public String getName() { @@ -91,7 +108,11 @@ public class LisReport { } public void setName(String name) { - this.name = name; + if (StringUtils.isBlank(name)) { + this.name = name; + } else { + this.name = null; + } } public String getSex() { @@ -99,7 +120,11 @@ public class LisReport { } public void setSex(String sex) { - this.sex = sex; + if (StringUtils.isBlank(sex)) { + this.sex = sex; + } else { + this.sex = null; + } } public Integer getAge() { @@ -115,7 +140,11 @@ public class LisReport { } public void setDeptCode(String deptCode) { - this.deptCode = deptCode; + if (StringUtils.isBlank(deptCode)) { + this.deptCode = deptCode; + } else { + this.deptCode = null; + } } public String getDeptName() { @@ -123,7 +152,11 @@ public class LisReport { } public void setDeptName(String deptName) { - this.deptName = deptName; + if (StringUtils.isBlank(deptName)) { + this.deptName = deptName; + } else { + this.deptName = null; + } } public String getApplyDoctorCode() { @@ -131,7 +164,11 @@ public class LisReport { } public void setApplyDoctorCode(String applyDoctorCode) { - this.applyDoctorCode = applyDoctorCode; + if (StringUtils.isBlank(applyDoctorCode)) { + this.applyDoctorCode = applyDoctorCode; + } else { + this.applyDoctorCode = null; + } } public String getApplyDoctorName() { @@ -139,7 +176,11 @@ public class LisReport { } public void setApplyDoctorName(String applyDoctorName) { - this.applyDoctorName = applyDoctorName; + if (StringUtils.isBlank(applyDoctorName)) { + this.applyDoctorName = applyDoctorName; + } else { + this.applyDoctorName = null; + } } public String getCheckDoctorCode() { @@ -147,7 +188,11 @@ public class LisReport { } public void setCheckDoctorCode(String checkDoctorCode) { - this.checkDoctorCode = checkDoctorCode; + if (StringUtils.isBlank(checkDoctorCode)) { + this.checkDoctorCode = checkDoctorCode; + } else { + this.checkDoctorCode = null; + } } public String getCheckDoctorName() { @@ -155,7 +200,11 @@ public class LisReport { } public void setCheckDoctorName(String checkDoctorName) { - this.checkDoctorName = checkDoctorName; + if (StringUtils.isBlank(checkDoctorName)) { + this.checkDoctorName = checkDoctorName; + } else { + this.checkDoctorName = null; + } } public Date getPublishTime() { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java index 7610526..19589c3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java @@ -1,5 +1,7 @@ package com.lyms.platform.pojo; +import org.apache.commons.lang.StringUtils; + /** * Created by Administrator on 2016/10/19 0019. */ @@ -21,7 +23,11 @@ public class LisReportItem { } public void setId(String id) { - this.id = id; + if (StringUtils.isBlank(id)) { + this.id = id; + } else { + this.id = null; + } } public String getCode() { @@ -29,7 +35,11 @@ public class LisReportItem { } public void setCode(String code) { - this.code = code; + if (StringUtils.isBlank(code)) { + this.code = code; + } else { + this.code = null; + } } public String getName() { @@ -37,7 +47,11 @@ public class LisReportItem { } public void setName(String name) { - this.name = name; + if (StringUtils.isBlank(name)) { + this.name = name; + } else { + this.name = null; + } } public String getResult() { @@ -45,7 +59,11 @@ public class LisReportItem { } public void setResult(String result) { - this.result = result; + if (StringUtils.isBlank(result)) { + this.result = result; + } else { + this.result = null; + } } public String getCharResult() { @@ -53,7 +71,11 @@ public class LisReportItem { } public void setCharResult(String charResult) { - this.charResult = charResult; + if (StringUtils.isBlank(charResult)) { + this.charResult = charResult; + } else { + this.charResult = null; + } } public String getNumberResult() { @@ -61,7 +83,11 @@ public class LisReportItem { } public void setNumberResult(String numberResult) { - this.numberResult = numberResult; + if (StringUtils.isBlank(numberResult)) { + this.numberResult = numberResult; + } else { + this.numberResult = null; + } } public String getFlag() { @@ -69,7 +95,11 @@ public class LisReportItem { } public void setFlag(String flag) { - this.flag = flag; + if (StringUtils.isBlank(flag)) { + this.flag = flag; + } else { + this.flag = null; + } } public String getRef() { @@ -77,7 +107,11 @@ public class LisReportItem { } public void setRef(String ref) { - this.ref = ref; + if (StringUtils.isBlank(ref)) { + this.ref = ref; + } else { + this.ref = null; + } } public String getUnit() { @@ -85,7 +119,11 @@ public class LisReportItem { } public void setUnit(String unit) { - this.unit = unit; + if (StringUtils.isBlank(unit)) { + this.unit = unit; + } else { + this.unit = null; + } } public String getResultType() { @@ -93,6 +131,10 @@ public class LisReportItem { } public void setResultType(String resultType) { - this.resultType = resultType; + if (StringUtils.isBlank(resultType)) { + this.resultType = resultType; + } else { + this.resultType = null; + } } } 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 595d714..49a3fe2 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 @@ -1,11 +1,7 @@ package com.lyms.hospitalapi.qhdfy; -import com.lyms.hospitalapi.pojo.CheckResponse; -import com.lyms.hospitalapi.pojo.RisCheckInfo; -import com.lyms.hospitalapi.v1.*; import com.lyms.platform.biz.service.LisReportService; import com.lyms.platform.biz.service.PatientsService; -import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.LisReport; import com.lyms.platform.pojo.LisReportItem; import com.lyms.platform.query.LisReportQuery; @@ -13,7 +9,6 @@ import com.lyms.platform.query.PatientsQuery; import org.apache.commons.dbutils.DbUtils; import org.apache.commons.dbutils.QueryRunner; import org.apache.commons.dbutils.handlers.BeanListHandler; -import org.apache.commons.lang.StringUtils; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -- 1.8.3.1