diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java index ee80423..8b0e7b6 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java @@ -2,7 +2,6 @@ package com.lyms.platform.biz.dal; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.ReferralApplyOrderModel; -import com.lyms.platform.query.ReferralApplyOrderQuery; import java.util.List; @@ -27,6 +26,12 @@ public interface IReferralApplyOrderDao { * @return */ List queryList(MongoQuery mongoQuery); + /** + * 根据id查询转账单 + * + * @return + */ + ReferralApplyOrderModel findById(String id); Integer count(MongoQuery mongoQuery); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java index 8d4c70c..e18b364 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java @@ -29,6 +29,11 @@ public class ReferralApplyOrderDaoImpl extends BaseMongoDAOImpl> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult()); referralApplyOrderResult.setScreenResult(screenList); @@ -589,7 +593,7 @@ public class ApplyOrderFacade { // List diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid()); - List diagnoseList = applyOrderModel.getrRisk(); + if (NumberUtils.isNumber(zhuanchu)) { try { Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); @@ -635,6 +639,7 @@ public class ApplyOrderFacade { } String diagnose = ""; + List diagnoseList = applyOrderModel.getrRisk(); if (CollectionUtils.isNotEmpty(diagnoseList)) { diagnose = ""; for (String obj : diagnoseList) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java index ba77a29..f4f573a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java @@ -1,8 +1,8 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; -import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.pojo.ReferralApplyOrderModel; /** @@ -32,7 +32,6 @@ public class ReferralApplyOrderAddRequest implements IBasicRequestConvert rRisk; + //目前诊断 + private String diagnosis; + //其他诊断 + private String otherDiagn; + //接收医生 + private String recDoctor; + + public String getRecDoctor() { + return recDoctor; + } + + public void setRecDoctor(String recDoctor) { + this.recDoctor = recDoctor; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public List getrRisk() { + return rRisk; + } + + public void setrRisk(List rRisk) { + this.rRisk = rRisk; + } + + public String getDiagnosis() { + return diagnosis; + } + + public void setDiagnosis(String diagnosis) { + this.diagnosis = diagnosis; + } + + public String getOtherDiagn() { + return otherDiagn; + } + + public void setOtherDiagn(String otherDiagn) { + this.otherDiagn = otherDiagn; + } + + /** + * 具体转换实现 + * + * @return 转换后的model + */ + public void convertToDataModel(ReferralApplyOrderModel referralApplyOrderModel) { + referralApplyOrderModel.setId(id); + referralApplyOrderModel.setrRisk(rRisk); + referralApplyOrderModel.setDiagnosis(diagnosis); + referralApplyOrderModel.setOtherDiagn(otherDiagn); + referralApplyOrderModel.setRecDoctor(recDoctor); + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java index 94873a2..d1a0ce8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java @@ -26,10 +26,11 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert> getScreenResult() { return screenResult; @@ -247,6 +267,8 @@ public class ReferralApplyOrderResult { public ReferralApplyOrderResult convertToResult(ReferralApplyOrderModel destModel,Patients patients,String zhuanCName ,String zhuanRname) { setId(destModel.getId()); + setDiagnosis(destModel.getDiagnosis()); + setDiseaseDesc(destModel.getDiseaseDesc()); setParentId(destModel.getParentId()); setName(destModel.getName()); setAge(destModel.getAge());