diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySpecialDiseaseClinicModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySpecialDiseaseClinicModel.java index 7c4750d..3abe021 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySpecialDiseaseClinicModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySpecialDiseaseClinicModel.java @@ -65,6 +65,9 @@ public class BabySpecialDiseaseClinicModel extends BaseModel { private String pastHistory; //诊断 private String diagnosis; + //建议 + private String guideSuggest ; + //检查医生id private String checkDoctor; //下次预约 @@ -77,6 +80,13 @@ public class BabySpecialDiseaseClinicModel extends BaseModel { private String buildDoctorId; private String buildDoctorName; + public String getGuideSuggest() { + return guideSuggest; + } + + public void setGuideSuggest(String guideSuggest) { + this.guideSuggest = guideSuggest; + } public String getId() { return id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java index ea901df..d39abc3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java @@ -141,7 +141,21 @@ public class BabyEyeCheckController extends BaseController { currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,noPassIds); } - + /** + * 儿童眼保健管理,检查次数展示也就是以前的“眼保健管理” + * + * @Author: 武涛涛 + * @Date: 2020/8/3 14:09 + */ + @ResponseBody + @TokenRequired + @RequestMapping(value = "/checkList", method = RequestMethod.GET) + public BaseResponse checkList(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request, + Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds) { + return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, + currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, + bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,noPassIds); + } @ResponseBody @TokenRequired @RequestMapping(value = "/export", method = RequestMethod.GET) 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 9cfde59..e849f5a 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 @@ -14,6 +14,8 @@ 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.operate.web.utils.CommonsHelper; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BabySpecialDiseaseClinicModel; import com.lyms.platform.query.BabySpecialDiseaseClinicModelQuery; @@ -47,7 +49,8 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { private BabyBookbuildingFacade babyBookbuildingFacade; @Autowired private OperateLogFacade operateLogFacade; - + @Autowired + private OrganizationService organizationService; @Autowired private BabyService babyService; @Autowired @@ -92,6 +95,7 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { model.setZbProject(request.getZbProject()); + model.setGuideSuggest(request.getGuideSuggest()); model.setCheckDate(DateUtil.parseYMD(request.getCheckDate())); model.setCheckMonth(request.getCheckMonth()); model.setChiefComplaint(request.getChiefComplaint()); @@ -195,6 +199,7 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySDCService.queryBabySpecialDiseaseClinicById(id); BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); + babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService)); br.setData(babySpecialDiseaseClinicResult); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); @@ -233,6 +238,7 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); if(babySpecialDiseaseClinicModel !=null ){ babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); + babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService)); babySpecialDiseaseClinicResults.add(babySpecialDiseaseClinicResult); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java index 452ecbf..dfa8268 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java @@ -69,6 +69,8 @@ public class BabySpecialDiseaseClinicRequest { private String pastHistory; //诊断 private String diagnosis; + //建议 + private String guideSuggest ; //检查医生id @NotEmpty(message = "检查医生不能为空") private String checkDoctor; @@ -82,6 +84,14 @@ public class BabySpecialDiseaseClinicRequest { private String buildDoctorId; private String buildDoctorName; + public String getGuideSuggest() { + return guideSuggest; + } + + public void setGuideSuggest(String guideSuggest) { + this.guideSuggest = guideSuggest; + } + public String getId() { return id; } 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 index 4e0ee50..9f0246a 100644 --- 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 @@ -4,432 +4,381 @@ 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 { +public class BabySpecialDiseaseClinicResult implements IBasicResultConvert { + + + /*基础信息*/ + private String id; + private Integer yn; + private String buildId; + private String pid; + private Date createDate; + private Date modifyDate; + private String hospitalId; + private String hospitalName; + + /*母亲信息*/ + //母亲姓名 + private String mname; + //母亲证件号 + private String mcertNo; + //母亲手机号码 + private String mphone; + + /*儿童信息*/ + //儿童姓名 + private String name; + // 儿童编码格式20200721001 + private String encoded; + //儿童证件号 + private String certNo; //儿童性别 - private String sexstr; + private String sex; + //儿童就诊卡号 + private String vcCardNo; + //儿童社保卡 + private String sINCard; //儿童生日 - private String birthdaystr; + private String birthday; + //儿童月龄 + private Integer month; + + /*新增页面内容*/ + //专病项目 ①上呼②肺炎③腹泻④矮小⑤早熟⑥黄疸⑦多动⑧抽动⑨智力低下⑩自闭 + private String zbProject; //检查日期 - private String checkDatestr; + private String checkDate; + //检查月龄 2月龄28天 + private String checkMonth; + //主诉 + private String chiefComplaint; + //现病 + private String presentDisease; + //既往史 + private String pastHistory; + //诊断 + private String diagnosis; + + //建议 + private String guideSuggest ; + + //检查医生id + private String checkDoctor; //下次预约 - private String nextDatestr; + private String nextDate; + /*儿童专病门诊检查列表冗余内容*/ //建档时间 - 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; - } + private String buildDate; + //建档医生 + private String buildDoctorId; + private String buildDoctorName; - public void setCheckDatestr(String checkDatestr) { - this.checkDatestr = checkDatestr; + public String getHospitalName() { + return hospitalName; } - public String getNextDatestr() { - return nextDatestr; + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; } - public void setNextDatestr(String nextDatestr) { - this.nextDatestr = nextDatestr; + public String getGuideSuggest() { + return guideSuggest; } - public String getBuildDatestr() { - return buildDatestr; + public void setGuideSuggest(String guideSuggest) { + this.guideSuggest = guideSuggest; } - 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(); + return id; } - @Override public void setId(String id) { - super.setId(id); + this.id = id; } - @Override public Integer getYn() { - return super.getYn(); + return yn; } - @Override public void setYn(Integer yn) { - super.setYn(yn); + this.yn = yn; } - @Override public String getBuildId() { - return super.getBuildId(); + return buildId; } - @Override public void setBuildId(String buildId) { - super.setBuildId(buildId); + this.buildId = buildId; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; } - @Override public Date getCreateDate() { - return super.getCreateDate(); + return createDate; } - @Override public void setCreateDate(Date createDate) { - super.setCreateDate(createDate); + this.createDate = createDate; } - @Override public Date getModifyDate() { - return super.getModifyDate(); + return modifyDate; } - @Override public void setModifyDate(Date modifyDate) { - super.setModifyDate(modifyDate); + this.modifyDate = modifyDate; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; } - @Override public String getMname() { - return super.getMname(); + return mname; } - @Override public void setMname(String mname) { - super.setMname(mname); + this.mname = mname; } - @Override public String getMcertNo() { - return super.getMcertNo(); + return mcertNo; } - @Override public void setMcertNo(String mcertNo) { - super.setMcertNo(mcertNo); + this.mcertNo = mcertNo; } - @Override public String getMphone() { - return super.getMphone(); + return mphone; } - @Override public void setMphone(String mphone) { - super.setMphone(mphone); + this.mphone = mphone; } - @Override public String getName() { - return super.getName(); + return name; } - @Override public void setName(String name) { - super.setName(name); + this.name = name; } - @Override public String getEncoded() { - return super.getEncoded(); + return encoded; } - @Override public void setEncoded(String encoded) { - super.setEncoded(encoded); + this.encoded = encoded; } - @Override public String getCertNo() { - return super.getCertNo(); + return certNo; } - @Override public void setCertNo(String certNo) { - super.setCertNo(certNo); + this.certNo = certNo; } - @Override - public Integer getSex() { - return super.getSex(); + public String getSex() { + return sex; } - @Override - public void setSex(Integer sex) { - super.setSex(sex); + public void setSex(String sex) { + this.sex = sex; } - @Override public String getVcCardNo() { - return super.getVcCardNo(); + return vcCardNo; } - @Override public void setVcCardNo(String vcCardNo) { - super.setVcCardNo(vcCardNo); + this.vcCardNo = vcCardNo; } - @Override public String getsINCard() { - return super.getsINCard(); + return sINCard; } - @Override public void setsINCard(String sINCard) { - super.setsINCard(sINCard); + this.sINCard = sINCard; } - @Override - public Date getBirthday() { - return super.getBirthday(); + public String getBirthday() { + return birthday; } - @Override - public void setBirthday(Date birthday) { - super.setBirthday(birthday); + public void setBirthday(String birthday) { + this.birthday = birthday; } - @Override public Integer getMonth() { - return super.getMonth(); + return month; } - @Override public void setMonth(Integer month) { - super.setMonth(month); + this.month = month; } - @Override public String getZbProject() { - return super.getZbProject(); + return zbProject; } - @Override public void setZbProject(String zbProject) { - super.setZbProject(zbProject); + this.zbProject = zbProject; } - @Override - public Date getCheckDate() { - return super.getCheckDate(); + public String getCheckDate() { + return checkDate; } - @Override - public void setCheckDate(Date checkDate) { - super.setCheckDate(checkDate); + public void setCheckDate(String checkDate) { + this.checkDate = checkDate; } - @Override public String getCheckMonth() { - return super.getCheckMonth(); + return checkMonth; } - @Override public void setCheckMonth(String checkMonth) { - super.setCheckMonth(checkMonth); + this.checkMonth = checkMonth; } - @Override public String getChiefComplaint() { - return super.getChiefComplaint(); + return chiefComplaint; } - @Override public void setChiefComplaint(String chiefComplaint) { - super.setChiefComplaint(chiefComplaint); + this.chiefComplaint = chiefComplaint; } - @Override public String getPresentDisease() { - return super.getPresentDisease(); + return presentDisease; } - @Override public void setPresentDisease(String presentDisease) { - super.setPresentDisease(presentDisease); + this.presentDisease = presentDisease; } - @Override public String getPastHistory() { - return super.getPastHistory(); + return pastHistory; } - @Override public void setPastHistory(String pastHistory) { - super.setPastHistory(pastHistory); + this.pastHistory = pastHistory; } - @Override public String getDiagnosis() { - return super.getDiagnosis(); + return diagnosis; } - @Override public void setDiagnosis(String diagnosis) { - super.setDiagnosis(diagnosis); - } - - @Override - public String getPid() { - return super.getPid(); + this.diagnosis = diagnosis; } - @Override - public void setPid(String pid) { - super.setPid(pid); - } - - @Override public String getCheckDoctor() { - return super.getCheckDoctor(); + return checkDoctor; } - @Override public void setCheckDoctor(String checkDoctor) { - super.setCheckDoctor(checkDoctor); + this.checkDoctor = checkDoctor; } - @Override - public Date getNextDate() { - return super.getNextDate(); + public String getNextDate() { + return nextDate; } - @Override - public void setNextDate(Date nextDate) { - super.setNextDate(nextDate); + public void setNextDate(String nextDate) { + this.nextDate = nextDate; } - @Override - public Date getBuildDate() { - return super.getBuildDate(); + public String getBuildDate() { + return buildDate; } - @Override - public void setBuildDate(Date buildDate) { - super.setBuildDate(buildDate); + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; } - @Override public String getBuildDoctorId() { - return super.getBuildDoctorId(); + return buildDoctorId; } - @Override public void setBuildDoctorId(String buildDoctorId) { - super.setBuildDoctorId(buildDoctorId); + this.buildDoctorId = buildDoctorId; } - @Override public String getBuildDoctorName() { - return super.getBuildDoctorName(); + return buildDoctorName; } - @Override public void setBuildDoctorName(String buildDoctorName) { - super.setBuildDoctorName(buildDoctorName); + this.buildDoctorName = buildDoctorName; } @Override - public String getHospitalId() { - return super.getHospitalId(); - } + public BabySpecialDiseaseClinicResult convertToResult(BabySpecialDiseaseClinicModel destModel) { - @Override - public void setHospitalId(String hospitalId) { - super.setHospitalId(hospitalId); - } + 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()); + setGuideSuggest(destModel.getGuideSuggest()); - @Override - public int hashCode() { - return super.hashCode(); - } + setName(destModel.getName()); + if(destModel.getSex()==0){ + setSex("女"); + }else if(destModel.getSex()==1){ + setSex("男"); + }else { + setSex("_"); + } + setCheckMonth(destModel.getCheckMonth()); + setBirthday(DateUtil.getYyyyMmDd(destModel.getBirthday())); + setBuildDate(DateUtil.getYyyyMmDd((destModel).getBuildDate())); + setMname(destModel.getMname()); + setNextDate(DateUtil.getYyyyMmDd((destModel).getNextDate())); + setZbProject(destModel.getZbProject()); + if(StringUtils.isNotEmpty(destModel.getMphone())){ + setMphone(StringUtils.encryPhone(destModel.getMphone())); + } + setCheckDate(DateUtil.getYyyyMmDd((destModel).getCheckDate())); - @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(); + return this; } - @Override - protected void finalize() throws Throwable { - super.finalize(); - } + }