diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java index b4310af..9cfde59 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java @@ -12,6 +12,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.BabySpecialDiseaseClinicRequest; +import com.lyms.platform.operate.web.result.BabySpecialDiseaseClinicResult; import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BabySpecialDiseaseClinicModel; @@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.stereotype.Component; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -191,7 +193,9 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { BaseObjectResponse br = new BaseObjectResponse(); if(StringUtils.isNotEmpty(id)){ BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySDCService.queryBabySpecialDiseaseClinicById(id); - br.setData(babySpecialDiseaseClinicModel); + BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); + babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); + br.setData(babySpecialDiseaseClinicResult); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); } @@ -209,30 +213,35 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { BaseObjectResponse br = new BaseObjectResponse(); String hospitalId = autoMatchFacade.getHospitalId(userId); - List babySpecialDiseaseClinicModels = null; + List babySpecialDiseaseClinicResults = new ArrayList<>(); //单人多条专病记录 if( StringUtils.isNotEmpty(babyQuery.getBuildId()) ){ babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); - babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); - + List babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); + br.setData(babySpecialDiseaseClinicModels); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + return br; }else if(StringUtils.isEmpty(babyQuery.getBuildId()) ){ babyQuery.setNeed("true"); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); - babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); + List babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); for (int i = 0; i < babySpecialDiseaseClinicModels.size(); i++) { BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySpecialDiseaseClinicModels.get(i); - if(babySpecialDiseaseClinicModel !=null && StringUtils.isNotEmpty(babySpecialDiseaseClinicModel.getMphone())){ - babySpecialDiseaseClinicModel.setMphone(StringUtils.encryPhone(babySpecialDiseaseClinicModel.getMphone())); + BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); + if(babySpecialDiseaseClinicModel !=null ){ + babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); + babySpecialDiseaseClinicResults.add(babySpecialDiseaseClinicResult); } } } - - br.setData(babySpecialDiseaseClinicModels); + br.setData(babySpecialDiseaseClinicResults); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); return br; + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySpecialDiseaseClinicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySpecialDiseaseClinicResult.java new file mode 100644 index 0000000..4e0ee50 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySpecialDiseaseClinicResult.java @@ -0,0 +1,435 @@ +package com.lyms.platform.operate.web.result; + + +import com.lyms.platform.common.base.IBasicResultConvert; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.pojo.AmniocentesisInfoModel; +import com.lyms.platform.pojo.BabySpecialDiseaseClinicModel; + +import java.util.Date; + +public class BabySpecialDiseaseClinicResult extends BabySpecialDiseaseClinicModel implements IBasicResultConvert { + //儿童性别 + private String sexstr; + //儿童生日 + private String birthdaystr; + //检查日期 + private String checkDatestr; + //下次预约 + private String nextDatestr; + + //建档时间 + private String buildDatestr; + + public String getBirthdaystr() { + return birthdaystr; + } + + public String getSexstr() { + return sexstr; + } + + public void setSexstr(String sexstr) { + this.sexstr = sexstr; + } + + public void setBirthdaystr(String birthdaystr) { + this.birthdaystr = birthdaystr; + } + + public String getCheckDatestr() { + return checkDatestr; + } + + public void setCheckDatestr(String checkDatestr) { + this.checkDatestr = checkDatestr; + } + + public String getNextDatestr() { + return nextDatestr; + } + + public void setNextDatestr(String nextDatestr) { + this.nextDatestr = nextDatestr; + } + + public String getBuildDatestr() { + return buildDatestr; + } + + public void setBuildDatestr(String buildDatestr) { + this.buildDatestr = buildDatestr; + } + + @Override + public BabySpecialDiseaseClinicResult convertToResult(BabySpecialDiseaseClinicModel destModel) { + + setId(destModel.getId()); + setBuildId(destModel.getBuildId()); + setPid(destModel.getPid()); + setHospitalId(destModel.getHospitalId()); + setMcertNo(destModel.getMcertNo()); + setEncoded(destModel.getEncoded()); + setCertNo(destModel.getCertNo()); + setVcCardNo(destModel.getVcCardNo()); + setsINCard(destModel.getsINCard()); + setMonth(destModel.getMonth()); + setChiefComplaint(destModel.getChiefComplaint()); + setPresentDisease(destModel.getPresentDisease()); + setPastHistory(destModel.getPastHistory()); + setDiagnosis(destModel.getDiagnosis()); + setCheckDoctor(destModel.getCheckDoctor()); + setBuildDoctorId(destModel.getBuildDoctorId()); + setBuildDoctorName(destModel.getBuildDoctorName()); + + + setName(destModel.getName()); + if(destModel.getSex()==0){ + setSexstr("女"); + }else if(destModel.getSex()==1){ + setSexstr("男"); + }else { + setSexstr("_"); + } + setCheckMonth(destModel.getCheckMonth()); + setBirthdaystr(DateUtil.getYyyyMmDd(destModel.getBirthday())); + setBuildDatestr(DateUtil.getYyyyMmDd((destModel).getBuildDate())); + setMname(destModel.getMname()); + setNextDatestr(DateUtil.getYyyyMmDd((destModel).getNextDate())); + setZbProject(destModel.getZbProject()); + if(StringUtils.isNotEmpty(destModel.getMphone())){ + setMphone(StringUtils.encryPhone(destModel.getMphone())); + } + setCheckDatestr(DateUtil.getYyyyMmDd((destModel).getCheckDate())); + + + + return this; + } + + @Override + public String getId() { + return super.getId(); + } + + @Override + public void setId(String id) { + super.setId(id); + } + + @Override + public Integer getYn() { + return super.getYn(); + } + + @Override + public void setYn(Integer yn) { + super.setYn(yn); + } + + @Override + public String getBuildId() { + return super.getBuildId(); + } + + @Override + public void setBuildId(String buildId) { + super.setBuildId(buildId); + } + + @Override + public Date getCreateDate() { + return super.getCreateDate(); + } + + @Override + public void setCreateDate(Date createDate) { + super.setCreateDate(createDate); + } + + @Override + public Date getModifyDate() { + return super.getModifyDate(); + } + + @Override + public void setModifyDate(Date modifyDate) { + super.setModifyDate(modifyDate); + } + + @Override + public String getMname() { + return super.getMname(); + } + + @Override + public void setMname(String mname) { + super.setMname(mname); + } + + @Override + public String getMcertNo() { + return super.getMcertNo(); + } + + @Override + public void setMcertNo(String mcertNo) { + super.setMcertNo(mcertNo); + } + + @Override + public String getMphone() { + return super.getMphone(); + } + + @Override + public void setMphone(String mphone) { + super.setMphone(mphone); + } + + @Override + public String getName() { + return super.getName(); + } + + @Override + public void setName(String name) { + super.setName(name); + } + + @Override + public String getEncoded() { + return super.getEncoded(); + } + + @Override + public void setEncoded(String encoded) { + super.setEncoded(encoded); + } + + @Override + public String getCertNo() { + return super.getCertNo(); + } + + @Override + public void setCertNo(String certNo) { + super.setCertNo(certNo); + } + + @Override + public Integer getSex() { + return super.getSex(); + } + + @Override + public void setSex(Integer sex) { + super.setSex(sex); + } + + @Override + public String getVcCardNo() { + return super.getVcCardNo(); + } + + @Override + public void setVcCardNo(String vcCardNo) { + super.setVcCardNo(vcCardNo); + } + + @Override + public String getsINCard() { + return super.getsINCard(); + } + + @Override + public void setsINCard(String sINCard) { + super.setsINCard(sINCard); + } + + @Override + public Date getBirthday() { + return super.getBirthday(); + } + + @Override + public void setBirthday(Date birthday) { + super.setBirthday(birthday); + } + + @Override + public Integer getMonth() { + return super.getMonth(); + } + + @Override + public void setMonth(Integer month) { + super.setMonth(month); + } + + @Override + public String getZbProject() { + return super.getZbProject(); + } + + @Override + public void setZbProject(String zbProject) { + super.setZbProject(zbProject); + } + + @Override + public Date getCheckDate() { + return super.getCheckDate(); + } + + @Override + public void setCheckDate(Date checkDate) { + super.setCheckDate(checkDate); + } + + @Override + public String getCheckMonth() { + return super.getCheckMonth(); + } + + @Override + public void setCheckMonth(String checkMonth) { + super.setCheckMonth(checkMonth); + } + + @Override + public String getChiefComplaint() { + return super.getChiefComplaint(); + } + + @Override + public void setChiefComplaint(String chiefComplaint) { + super.setChiefComplaint(chiefComplaint); + } + + @Override + public String getPresentDisease() { + return super.getPresentDisease(); + } + + @Override + public void setPresentDisease(String presentDisease) { + super.setPresentDisease(presentDisease); + } + + @Override + public String getPastHistory() { + return super.getPastHistory(); + } + + @Override + public void setPastHistory(String pastHistory) { + super.setPastHistory(pastHistory); + } + + @Override + public String getDiagnosis() { + return super.getDiagnosis(); + } + + @Override + public void setDiagnosis(String diagnosis) { + super.setDiagnosis(diagnosis); + } + + @Override + public String getPid() { + return super.getPid(); + } + + @Override + public void setPid(String pid) { + super.setPid(pid); + } + + @Override + public String getCheckDoctor() { + return super.getCheckDoctor(); + } + + @Override + public void setCheckDoctor(String checkDoctor) { + super.setCheckDoctor(checkDoctor); + } + + @Override + public Date getNextDate() { + return super.getNextDate(); + } + + @Override + public void setNextDate(Date nextDate) { + super.setNextDate(nextDate); + } + + @Override + public Date getBuildDate() { + return super.getBuildDate(); + } + + @Override + public void setBuildDate(Date buildDate) { + super.setBuildDate(buildDate); + } + + @Override + public String getBuildDoctorId() { + return super.getBuildDoctorId(); + } + + @Override + public void setBuildDoctorId(String buildDoctorId) { + super.setBuildDoctorId(buildDoctorId); + } + + @Override + public String getBuildDoctorName() { + return super.getBuildDoctorName(); + } + + @Override + public void setBuildDoctorName(String buildDoctorName) { + super.setBuildDoctorName(buildDoctorName); + } + + @Override + public String getHospitalId() { + return super.getHospitalId(); + } + + @Override + public void setHospitalId(String hospitalId) { + super.setHospitalId(hospitalId); + } + + @Override + public int hashCode() { + return super.hashCode(); + } + + @Override + public boolean equals(Object obj) { + return super.equals(obj); + } + + @Override + protected Object clone() throws CloneNotSupportedException { + return super.clone(); + } + + @Override + public String toString() { + return super.toString(); + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + } +}