Commit 3cf433bf6936020cd3eff6f47cb93adf258d0cc7
1 parent
4ee79cb9ae
Exists in
master
and in
6 other branches
update
Showing 5 changed files with 234 additions and 245 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/BabySpecialDiseaseClinicModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySpecialDiseaseClinicResult.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabySpecialDiseaseClinicModel.java
View file @
3cf433b
| ... | ... | @@ -65,6 +65,9 @@ |
| 65 | 65 | private String pastHistory; |
| 66 | 66 | //诊断 |
| 67 | 67 | private String diagnosis; |
| 68 | + //建议 | |
| 69 | + private String guideSuggest ; | |
| 70 | + | |
| 68 | 71 | //检查医生id |
| 69 | 72 | private String checkDoctor; |
| 70 | 73 | //下次预约 |
| ... | ... | @@ -77,6 +80,13 @@ |
| 77 | 80 | private String buildDoctorId; |
| 78 | 81 | private String buildDoctorName; |
| 79 | 82 | |
| 83 | + public String getGuideSuggest() { | |
| 84 | + return guideSuggest; | |
| 85 | + } | |
| 86 | + | |
| 87 | + public void setGuideSuggest(String guideSuggest) { | |
| 88 | + this.guideSuggest = guideSuggest; | |
| 89 | + } | |
| 80 | 90 | |
| 81 | 91 | public String getId() { |
| 82 | 92 | return id; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
View file @
3cf433b
| ... | ... | @@ -141,7 +141,21 @@ |
| 141 | 141 | currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, |
| 142 | 142 | bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,noPassIds); |
| 143 | 143 | } |
| 144 | - | |
| 144 | + /** | |
| 145 | + * 儿童眼保健管理,检查次数展示也就是以前的“眼保健管理” | |
| 146 | + * | |
| 147 | + * @Author: 武涛涛 | |
| 148 | + * @Date: 2020/8/3 14:09 | |
| 149 | + */ | |
| 150 | + @ResponseBody | |
| 151 | + @TokenRequired | |
| 152 | + @RequestMapping(value = "/checkList", method = RequestMethod.GET) | |
| 153 | + 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, | |
| 154 | + Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds) { | |
| 155 | + return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, | |
| 156 | + currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, | |
| 157 | + bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,noPassIds); | |
| 158 | + } | |
| 145 | 159 | @ResponseBody |
| 146 | 160 | @TokenRequired |
| 147 | 161 | @RequestMapping(value = "/export", method = RequestMethod.GET) |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java
View file @
3cf433b
| ... | ... | @@ -14,6 +14,8 @@ |
| 14 | 14 | import com.lyms.platform.operate.web.request.BabySpecialDiseaseClinicRequest; |
| 15 | 15 | import com.lyms.platform.operate.web.result.BabySpecialDiseaseClinicResult; |
| 16 | 16 | import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; |
| 17 | +import com.lyms.platform.operate.web.utils.CommonsHelper; | |
| 18 | +import com.lyms.platform.permission.service.OrganizationService; | |
| 17 | 19 | import com.lyms.platform.pojo.BabyModel; |
| 18 | 20 | import com.lyms.platform.pojo.BabySpecialDiseaseClinicModel; |
| 19 | 21 | import com.lyms.platform.query.BabySpecialDiseaseClinicModelQuery; |
| 20 | 22 | |
| ... | ... | @@ -47,8 +49,9 @@ |
| 47 | 49 | private BabyBookbuildingFacade babyBookbuildingFacade; |
| 48 | 50 | @Autowired |
| 49 | 51 | private OperateLogFacade operateLogFacade; |
| 50 | - | |
| 51 | 52 | @Autowired |
| 53 | + private OrganizationService organizationService; | |
| 54 | + @Autowired | |
| 52 | 55 | private BabyService babyService; |
| 53 | 56 | @Autowired |
| 54 | 57 | private BasicConfigFacade basicConfigFacade; |
| ... | ... | @@ -92,6 +95,7 @@ |
| 92 | 95 | |
| 93 | 96 | |
| 94 | 97 | model.setZbProject(request.getZbProject()); |
| 98 | + model.setGuideSuggest(request.getGuideSuggest()); | |
| 95 | 99 | model.setCheckDate(DateUtil.parseYMD(request.getCheckDate())); |
| 96 | 100 | model.setCheckMonth(request.getCheckMonth()); |
| 97 | 101 | model.setChiefComplaint(request.getChiefComplaint()); |
| ... | ... | @@ -195,6 +199,7 @@ |
| 195 | 199 | BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySDCService.queryBabySpecialDiseaseClinicById(id); |
| 196 | 200 | BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); |
| 197 | 201 | babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); |
| 202 | + babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService)); | |
| 198 | 203 | br.setData(babySpecialDiseaseClinicResult); |
| 199 | 204 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 200 | 205 | br.setErrormsg("成功"); |
| ... | ... | @@ -233,6 +238,7 @@ |
| 233 | 238 | BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); |
| 234 | 239 | if(babySpecialDiseaseClinicModel !=null ){ |
| 235 | 240 | babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); |
| 241 | + babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService)); | |
| 236 | 242 | babySpecialDiseaseClinicResults.add(babySpecialDiseaseClinicResult); |
| 237 | 243 | } |
| 238 | 244 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java
View file @
3cf433b
| ... | ... | @@ -69,6 +69,8 @@ |
| 69 | 69 | private String pastHistory; |
| 70 | 70 | //诊断 |
| 71 | 71 | private String diagnosis; |
| 72 | + //建议 | |
| 73 | + private String guideSuggest ; | |
| 72 | 74 | //检查医生id |
| 73 | 75 | @NotEmpty(message = "检查医生不能为空") |
| 74 | 76 | private String checkDoctor; |
| ... | ... | @@ -81,6 +83,14 @@ |
| 81 | 83 | //建档医生 |
| 82 | 84 | private String buildDoctorId; |
| 83 | 85 | private String buildDoctorName; |
| 86 | + | |
| 87 | + public String getGuideSuggest() { | |
| 88 | + return guideSuggest; | |
| 89 | + } | |
| 90 | + | |
| 91 | + public void setGuideSuggest(String guideSuggest) { | |
| 92 | + this.guideSuggest = guideSuggest; | |
| 93 | + } | |
| 84 | 94 | |
| 85 | 95 | public String getId() { |
| 86 | 96 | return id; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySpecialDiseaseClinicResult.java
View file @
3cf433b
| ... | ... | @@ -4,433 +4,382 @@ |
| 4 | 4 | import com.lyms.platform.common.base.IBasicResultConvert; |
| 5 | 5 | import com.lyms.platform.common.utils.DateUtil; |
| 6 | 6 | import com.lyms.platform.common.utils.StringUtils; |
| 7 | -import com.lyms.platform.pojo.AmniocentesisInfoModel; | |
| 8 | 7 | import com.lyms.platform.pojo.BabySpecialDiseaseClinicModel; |
| 9 | 8 | |
| 10 | 9 | import java.util.Date; |
| 11 | 10 | |
| 12 | -public class BabySpecialDiseaseClinicResult extends BabySpecialDiseaseClinicModel implements IBasicResultConvert<BabySpecialDiseaseClinicResult, BabySpecialDiseaseClinicModel> { | |
| 13 | - //儿童性别 | |
| 14 | - private String sexstr; | |
| 15 | - //儿童生日 | |
| 16 | - private String birthdaystr; | |
| 17 | - //检查日期 | |
| 18 | - private String checkDatestr; | |
| 19 | - //下次预约 | |
| 20 | - private String nextDatestr; | |
| 11 | +public class BabySpecialDiseaseClinicResult implements IBasicResultConvert<BabySpecialDiseaseClinicResult, BabySpecialDiseaseClinicModel> { | |
| 21 | 12 | |
| 22 | - //建档时间 | |
| 23 | - private String buildDatestr; | |
| 24 | 13 | |
| 25 | - public String getBirthdaystr() { | |
| 26 | - return birthdaystr; | |
| 27 | - } | |
| 14 | + /*基础信息*/ | |
| 15 | + private String id; | |
| 16 | + private Integer yn; | |
| 17 | + private String buildId; | |
| 18 | + private String pid; | |
| 19 | + private Date createDate; | |
| 20 | + private Date modifyDate; | |
| 21 | + private String hospitalId; | |
| 22 | + private String hospitalName; | |
| 28 | 23 | |
| 29 | - public String getSexstr() { | |
| 30 | - return sexstr; | |
| 31 | - } | |
| 24 | + /*母亲信息*/ | |
| 25 | + //母亲姓名 | |
| 26 | + private String mname; | |
| 27 | + //母亲证件号 | |
| 28 | + private String mcertNo; | |
| 29 | + //母亲手机号码 | |
| 30 | + private String mphone; | |
| 32 | 31 | |
| 33 | - public void setSexstr(String sexstr) { | |
| 34 | - this.sexstr = sexstr; | |
| 35 | - } | |
| 32 | + /*儿童信息*/ | |
| 33 | + //儿童姓名 | |
| 34 | + private String name; | |
| 35 | + // 儿童编码格式20200721001 | |
| 36 | + private String encoded; | |
| 37 | + //儿童证件号 | |
| 38 | + private String certNo; | |
| 39 | + //儿童性别 | |
| 40 | + private String sex; | |
| 41 | + //儿童就诊卡号 | |
| 42 | + private String vcCardNo; | |
| 43 | + //儿童社保卡 | |
| 44 | + private String sINCard; | |
| 45 | + //儿童生日 | |
| 46 | + private String birthday; | |
| 47 | + //儿童月龄 | |
| 48 | + private Integer month; | |
| 36 | 49 | |
| 37 | - public void setBirthdaystr(String birthdaystr) { | |
| 38 | - this.birthdaystr = birthdaystr; | |
| 39 | - } | |
| 50 | + /*新增页面内容*/ | |
| 51 | + //专病项目 ①上呼②肺炎③腹泻④矮小⑤早熟⑥黄疸⑦多动⑧抽动⑨智力低下⑩自闭 | |
| 52 | + private String zbProject; | |
| 53 | + //检查日期 | |
| 54 | + private String checkDate; | |
| 55 | + //检查月龄 2月龄28天 | |
| 56 | + private String checkMonth; | |
| 57 | + //主诉 | |
| 58 | + private String chiefComplaint; | |
| 59 | + //现病 | |
| 60 | + private String presentDisease; | |
| 61 | + //既往史 | |
| 62 | + private String pastHistory; | |
| 63 | + //诊断 | |
| 64 | + private String diagnosis; | |
| 40 | 65 | |
| 41 | - public String getCheckDatestr() { | |
| 42 | - return checkDatestr; | |
| 43 | - } | |
| 66 | + //建议 | |
| 67 | + private String guideSuggest ; | |
| 44 | 68 | |
| 45 | - public void setCheckDatestr(String checkDatestr) { | |
| 46 | - this.checkDatestr = checkDatestr; | |
| 47 | - } | |
| 69 | + //检查医生id | |
| 70 | + private String checkDoctor; | |
| 71 | + //下次预约 | |
| 72 | + private String nextDate; | |
| 48 | 73 | |
| 49 | - public String getNextDatestr() { | |
| 50 | - return nextDatestr; | |
| 51 | - } | |
| 74 | + /*儿童专病门诊检查列表冗余内容*/ | |
| 75 | + //建档时间 | |
| 76 | + private String buildDate; | |
| 77 | + //建档医生 | |
| 78 | + private String buildDoctorId; | |
| 79 | + private String buildDoctorName; | |
| 52 | 80 | |
| 53 | - public void setNextDatestr(String nextDatestr) { | |
| 54 | - this.nextDatestr = nextDatestr; | |
| 81 | + public String getHospitalName() { | |
| 82 | + return hospitalName; | |
| 55 | 83 | } |
| 56 | 84 | |
| 57 | - public String getBuildDatestr() { | |
| 58 | - return buildDatestr; | |
| 85 | + public void setHospitalName(String hospitalName) { | |
| 86 | + this.hospitalName = hospitalName; | |
| 59 | 87 | } |
| 60 | 88 | |
| 61 | - public void setBuildDatestr(String buildDatestr) { | |
| 62 | - this.buildDatestr = buildDatestr; | |
| 89 | + public String getGuideSuggest() { | |
| 90 | + return guideSuggest; | |
| 63 | 91 | } |
| 64 | 92 | |
| 65 | - @Override | |
| 66 | - public BabySpecialDiseaseClinicResult convertToResult(BabySpecialDiseaseClinicModel destModel) { | |
| 67 | - | |
| 68 | - setId(destModel.getId()); | |
| 69 | - setBuildId(destModel.getBuildId()); | |
| 70 | - setPid(destModel.getPid()); | |
| 71 | - setHospitalId(destModel.getHospitalId()); | |
| 72 | - setMcertNo(destModel.getMcertNo()); | |
| 73 | - setEncoded(destModel.getEncoded()); | |
| 74 | - setCertNo(destModel.getCertNo()); | |
| 75 | - setVcCardNo(destModel.getVcCardNo()); | |
| 76 | - setsINCard(destModel.getsINCard()); | |
| 77 | - setMonth(destModel.getMonth()); | |
| 78 | - setChiefComplaint(destModel.getChiefComplaint()); | |
| 79 | - setPresentDisease(destModel.getPresentDisease()); | |
| 80 | - setPastHistory(destModel.getPastHistory()); | |
| 81 | - setDiagnosis(destModel.getDiagnosis()); | |
| 82 | - setCheckDoctor(destModel.getCheckDoctor()); | |
| 83 | - setBuildDoctorId(destModel.getBuildDoctorId()); | |
| 84 | - setBuildDoctorName(destModel.getBuildDoctorName()); | |
| 85 | - | |
| 86 | - | |
| 87 | - setName(destModel.getName()); | |
| 88 | - if(destModel.getSex()==0){ | |
| 89 | - setSexstr("女"); | |
| 90 | - }else if(destModel.getSex()==1){ | |
| 91 | - setSexstr("男"); | |
| 92 | - }else { | |
| 93 | - setSexstr("_"); | |
| 94 | - } | |
| 95 | - setCheckMonth(destModel.getCheckMonth()); | |
| 96 | - setBirthdaystr(DateUtil.getYyyyMmDd(destModel.getBirthday())); | |
| 97 | - setBuildDatestr(DateUtil.getYyyyMmDd((destModel).getBuildDate())); | |
| 98 | - setMname(destModel.getMname()); | |
| 99 | - setNextDatestr(DateUtil.getYyyyMmDd((destModel).getNextDate())); | |
| 100 | - setZbProject(destModel.getZbProject()); | |
| 101 | - if(StringUtils.isNotEmpty(destModel.getMphone())){ | |
| 102 | - setMphone(StringUtils.encryPhone(destModel.getMphone())); | |
| 103 | - } | |
| 104 | - setCheckDatestr(DateUtil.getYyyyMmDd((destModel).getCheckDate())); | |
| 105 | - | |
| 106 | - | |
| 107 | - | |
| 108 | - return this; | |
| 93 | + public void setGuideSuggest(String guideSuggest) { | |
| 94 | + this.guideSuggest = guideSuggest; | |
| 109 | 95 | } |
| 110 | 96 | |
| 111 | - @Override | |
| 112 | 97 | public String getId() { |
| 113 | - return super.getId(); | |
| 98 | + return id; | |
| 114 | 99 | } |
| 115 | 100 | |
| 116 | - @Override | |
| 117 | 101 | public void setId(String id) { |
| 118 | - super.setId(id); | |
| 102 | + this.id = id; | |
| 119 | 103 | } |
| 120 | 104 | |
| 121 | - @Override | |
| 122 | 105 | public Integer getYn() { |
| 123 | - return super.getYn(); | |
| 106 | + return yn; | |
| 124 | 107 | } |
| 125 | 108 | |
| 126 | - @Override | |
| 127 | 109 | public void setYn(Integer yn) { |
| 128 | - super.setYn(yn); | |
| 110 | + this.yn = yn; | |
| 129 | 111 | } |
| 130 | 112 | |
| 131 | - @Override | |
| 132 | 113 | public String getBuildId() { |
| 133 | - return super.getBuildId(); | |
| 114 | + return buildId; | |
| 134 | 115 | } |
| 135 | 116 | |
| 136 | - @Override | |
| 137 | 117 | public void setBuildId(String buildId) { |
| 138 | - super.setBuildId(buildId); | |
| 118 | + this.buildId = buildId; | |
| 139 | 119 | } |
| 140 | 120 | |
| 141 | - @Override | |
| 121 | + public String getPid() { | |
| 122 | + return pid; | |
| 123 | + } | |
| 124 | + | |
| 125 | + public void setPid(String pid) { | |
| 126 | + this.pid = pid; | |
| 127 | + } | |
| 128 | + | |
| 142 | 129 | public Date getCreateDate() { |
| 143 | - return super.getCreateDate(); | |
| 130 | + return createDate; | |
| 144 | 131 | } |
| 145 | 132 | |
| 146 | - @Override | |
| 147 | 133 | public void setCreateDate(Date createDate) { |
| 148 | - super.setCreateDate(createDate); | |
| 134 | + this.createDate = createDate; | |
| 149 | 135 | } |
| 150 | 136 | |
| 151 | - @Override | |
| 152 | 137 | public Date getModifyDate() { |
| 153 | - return super.getModifyDate(); | |
| 138 | + return modifyDate; | |
| 154 | 139 | } |
| 155 | 140 | |
| 156 | - @Override | |
| 157 | 141 | public void setModifyDate(Date modifyDate) { |
| 158 | - super.setModifyDate(modifyDate); | |
| 142 | + this.modifyDate = modifyDate; | |
| 159 | 143 | } |
| 160 | 144 | |
| 161 | - @Override | |
| 145 | + public String getHospitalId() { | |
| 146 | + return hospitalId; | |
| 147 | + } | |
| 148 | + | |
| 149 | + public void setHospitalId(String hospitalId) { | |
| 150 | + this.hospitalId = hospitalId; | |
| 151 | + } | |
| 152 | + | |
| 162 | 153 | public String getMname() { |
| 163 | - return super.getMname(); | |
| 154 | + return mname; | |
| 164 | 155 | } |
| 165 | 156 | |
| 166 | - @Override | |
| 167 | 157 | public void setMname(String mname) { |
| 168 | - super.setMname(mname); | |
| 158 | + this.mname = mname; | |
| 169 | 159 | } |
| 170 | 160 | |
| 171 | - @Override | |
| 172 | 161 | public String getMcertNo() { |
| 173 | - return super.getMcertNo(); | |
| 162 | + return mcertNo; | |
| 174 | 163 | } |
| 175 | 164 | |
| 176 | - @Override | |
| 177 | 165 | public void setMcertNo(String mcertNo) { |
| 178 | - super.setMcertNo(mcertNo); | |
| 166 | + this.mcertNo = mcertNo; | |
| 179 | 167 | } |
| 180 | 168 | |
| 181 | - @Override | |
| 182 | 169 | public String getMphone() { |
| 183 | - return super.getMphone(); | |
| 170 | + return mphone; | |
| 184 | 171 | } |
| 185 | 172 | |
| 186 | - @Override | |
| 187 | 173 | public void setMphone(String mphone) { |
| 188 | - super.setMphone(mphone); | |
| 174 | + this.mphone = mphone; | |
| 189 | 175 | } |
| 190 | 176 | |
| 191 | - @Override | |
| 192 | 177 | public String getName() { |
| 193 | - return super.getName(); | |
| 178 | + return name; | |
| 194 | 179 | } |
| 195 | 180 | |
| 196 | - @Override | |
| 197 | 181 | public void setName(String name) { |
| 198 | - super.setName(name); | |
| 182 | + this.name = name; | |
| 199 | 183 | } |
| 200 | 184 | |
| 201 | - @Override | |
| 202 | 185 | public String getEncoded() { |
| 203 | - return super.getEncoded(); | |
| 186 | + return encoded; | |
| 204 | 187 | } |
| 205 | 188 | |
| 206 | - @Override | |
| 207 | 189 | public void setEncoded(String encoded) { |
| 208 | - super.setEncoded(encoded); | |
| 190 | + this.encoded = encoded; | |
| 209 | 191 | } |
| 210 | 192 | |
| 211 | - @Override | |
| 212 | 193 | public String getCertNo() { |
| 213 | - return super.getCertNo(); | |
| 194 | + return certNo; | |
| 214 | 195 | } |
| 215 | 196 | |
| 216 | - @Override | |
| 217 | 197 | public void setCertNo(String certNo) { |
| 218 | - super.setCertNo(certNo); | |
| 198 | + this.certNo = certNo; | |
| 219 | 199 | } |
| 220 | 200 | |
| 221 | - @Override | |
| 222 | - public Integer getSex() { | |
| 223 | - return super.getSex(); | |
| 201 | + public String getSex() { | |
| 202 | + return sex; | |
| 224 | 203 | } |
| 225 | 204 | |
| 226 | - @Override | |
| 227 | - public void setSex(Integer sex) { | |
| 228 | - super.setSex(sex); | |
| 205 | + public void setSex(String sex) { | |
| 206 | + this.sex = sex; | |
| 229 | 207 | } |
| 230 | 208 | |
| 231 | - @Override | |
| 232 | 209 | public String getVcCardNo() { |
| 233 | - return super.getVcCardNo(); | |
| 210 | + return vcCardNo; | |
| 234 | 211 | } |
| 235 | 212 | |
| 236 | - @Override | |
| 237 | 213 | public void setVcCardNo(String vcCardNo) { |
| 238 | - super.setVcCardNo(vcCardNo); | |
| 214 | + this.vcCardNo = vcCardNo; | |
| 239 | 215 | } |
| 240 | 216 | |
| 241 | - @Override | |
| 242 | 217 | public String getsINCard() { |
| 243 | - return super.getsINCard(); | |
| 218 | + return sINCard; | |
| 244 | 219 | } |
| 245 | 220 | |
| 246 | - @Override | |
| 247 | 221 | public void setsINCard(String sINCard) { |
| 248 | - super.setsINCard(sINCard); | |
| 222 | + this.sINCard = sINCard; | |
| 249 | 223 | } |
| 250 | 224 | |
| 251 | - @Override | |
| 252 | - public Date getBirthday() { | |
| 253 | - return super.getBirthday(); | |
| 225 | + public String getBirthday() { | |
| 226 | + return birthday; | |
| 254 | 227 | } |
| 255 | 228 | |
| 256 | - @Override | |
| 257 | - public void setBirthday(Date birthday) { | |
| 258 | - super.setBirthday(birthday); | |
| 229 | + public void setBirthday(String birthday) { | |
| 230 | + this.birthday = birthday; | |
| 259 | 231 | } |
| 260 | 232 | |
| 261 | - @Override | |
| 262 | 233 | public Integer getMonth() { |
| 263 | - return super.getMonth(); | |
| 234 | + return month; | |
| 264 | 235 | } |
| 265 | 236 | |
| 266 | - @Override | |
| 267 | 237 | public void setMonth(Integer month) { |
| 268 | - super.setMonth(month); | |
| 238 | + this.month = month; | |
| 269 | 239 | } |
| 270 | 240 | |
| 271 | - @Override | |
| 272 | 241 | public String getZbProject() { |
| 273 | - return super.getZbProject(); | |
| 242 | + return zbProject; | |
| 274 | 243 | } |
| 275 | 244 | |
| 276 | - @Override | |
| 277 | 245 | public void setZbProject(String zbProject) { |
| 278 | - super.setZbProject(zbProject); | |
| 246 | + this.zbProject = zbProject; | |
| 279 | 247 | } |
| 280 | 248 | |
| 281 | - @Override | |
| 282 | - public Date getCheckDate() { | |
| 283 | - return super.getCheckDate(); | |
| 249 | + public String getCheckDate() { | |
| 250 | + return checkDate; | |
| 284 | 251 | } |
| 285 | 252 | |
| 286 | - @Override | |
| 287 | - public void setCheckDate(Date checkDate) { | |
| 288 | - super.setCheckDate(checkDate); | |
| 253 | + public void setCheckDate(String checkDate) { | |
| 254 | + this.checkDate = checkDate; | |
| 289 | 255 | } |
| 290 | 256 | |
| 291 | - @Override | |
| 292 | 257 | public String getCheckMonth() { |
| 293 | - return super.getCheckMonth(); | |
| 258 | + return checkMonth; | |
| 294 | 259 | } |
| 295 | 260 | |
| 296 | - @Override | |
| 297 | 261 | public void setCheckMonth(String checkMonth) { |
| 298 | - super.setCheckMonth(checkMonth); | |
| 262 | + this.checkMonth = checkMonth; | |
| 299 | 263 | } |
| 300 | 264 | |
| 301 | - @Override | |
| 302 | 265 | public String getChiefComplaint() { |
| 303 | - return super.getChiefComplaint(); | |
| 266 | + return chiefComplaint; | |
| 304 | 267 | } |
| 305 | 268 | |
| 306 | - @Override | |
| 307 | 269 | public void setChiefComplaint(String chiefComplaint) { |
| 308 | - super.setChiefComplaint(chiefComplaint); | |
| 270 | + this.chiefComplaint = chiefComplaint; | |
| 309 | 271 | } |
| 310 | 272 | |
| 311 | - @Override | |
| 312 | 273 | public String getPresentDisease() { |
| 313 | - return super.getPresentDisease(); | |
| 274 | + return presentDisease; | |
| 314 | 275 | } |
| 315 | 276 | |
| 316 | - @Override | |
| 317 | 277 | public void setPresentDisease(String presentDisease) { |
| 318 | - super.setPresentDisease(presentDisease); | |
| 278 | + this.presentDisease = presentDisease; | |
| 319 | 279 | } |
| 320 | 280 | |
| 321 | - @Override | |
| 322 | 281 | public String getPastHistory() { |
| 323 | - return super.getPastHistory(); | |
| 282 | + return pastHistory; | |
| 324 | 283 | } |
| 325 | 284 | |
| 326 | - @Override | |
| 327 | 285 | public void setPastHistory(String pastHistory) { |
| 328 | - super.setPastHistory(pastHistory); | |
| 286 | + this.pastHistory = pastHistory; | |
| 329 | 287 | } |
| 330 | 288 | |
| 331 | - @Override | |
| 332 | 289 | public String getDiagnosis() { |
| 333 | - return super.getDiagnosis(); | |
| 290 | + return diagnosis; | |
| 334 | 291 | } |
| 335 | 292 | |
| 336 | - @Override | |
| 337 | 293 | public void setDiagnosis(String diagnosis) { |
| 338 | - super.setDiagnosis(diagnosis); | |
| 294 | + this.diagnosis = diagnosis; | |
| 339 | 295 | } |
| 340 | 296 | |
| 341 | - @Override | |
| 342 | - public String getPid() { | |
| 343 | - return super.getPid(); | |
| 344 | - } | |
| 345 | - | |
| 346 | - @Override | |
| 347 | - public void setPid(String pid) { | |
| 348 | - super.setPid(pid); | |
| 349 | - } | |
| 350 | - | |
| 351 | - @Override | |
| 352 | 297 | public String getCheckDoctor() { |
| 353 | - return super.getCheckDoctor(); | |
| 298 | + return checkDoctor; | |
| 354 | 299 | } |
| 355 | 300 | |
| 356 | - @Override | |
| 357 | 301 | public void setCheckDoctor(String checkDoctor) { |
| 358 | - super.setCheckDoctor(checkDoctor); | |
| 302 | + this.checkDoctor = checkDoctor; | |
| 359 | 303 | } |
| 360 | 304 | |
| 361 | - @Override | |
| 362 | - public Date getNextDate() { | |
| 363 | - return super.getNextDate(); | |
| 305 | + public String getNextDate() { | |
| 306 | + return nextDate; | |
| 364 | 307 | } |
| 365 | 308 | |
| 366 | - @Override | |
| 367 | - public void setNextDate(Date nextDate) { | |
| 368 | - super.setNextDate(nextDate); | |
| 309 | + public void setNextDate(String nextDate) { | |
| 310 | + this.nextDate = nextDate; | |
| 369 | 311 | } |
| 370 | 312 | |
| 371 | - @Override | |
| 372 | - public Date getBuildDate() { | |
| 373 | - return super.getBuildDate(); | |
| 313 | + public String getBuildDate() { | |
| 314 | + return buildDate; | |
| 374 | 315 | } |
| 375 | 316 | |
| 376 | - @Override | |
| 377 | - public void setBuildDate(Date buildDate) { | |
| 378 | - super.setBuildDate(buildDate); | |
| 317 | + public void setBuildDate(String buildDate) { | |
| 318 | + this.buildDate = buildDate; | |
| 379 | 319 | } |
| 380 | 320 | |
| 381 | - @Override | |
| 382 | 321 | public String getBuildDoctorId() { |
| 383 | - return super.getBuildDoctorId(); | |
| 322 | + return buildDoctorId; | |
| 384 | 323 | } |
| 385 | 324 | |
| 386 | - @Override | |
| 387 | 325 | public void setBuildDoctorId(String buildDoctorId) { |
| 388 | - super.setBuildDoctorId(buildDoctorId); | |
| 326 | + this.buildDoctorId = buildDoctorId; | |
| 389 | 327 | } |
| 390 | 328 | |
| 391 | - @Override | |
| 392 | 329 | public String getBuildDoctorName() { |
| 393 | - return super.getBuildDoctorName(); | |
| 330 | + return buildDoctorName; | |
| 394 | 331 | } |
| 395 | 332 | |
| 396 | - @Override | |
| 397 | 333 | public void setBuildDoctorName(String buildDoctorName) { |
| 398 | - super.setBuildDoctorName(buildDoctorName); | |
| 334 | + this.buildDoctorName = buildDoctorName; | |
| 399 | 335 | } |
| 400 | 336 | |
| 401 | 337 | @Override |
| 402 | - public String getHospitalId() { | |
| 403 | - return super.getHospitalId(); | |
| 404 | - } | |
| 338 | + public BabySpecialDiseaseClinicResult convertToResult(BabySpecialDiseaseClinicModel destModel) { | |
| 405 | 339 | |
| 406 | - @Override | |
| 407 | - public void setHospitalId(String hospitalId) { | |
| 408 | - super.setHospitalId(hospitalId); | |
| 409 | - } | |
| 340 | + setId(destModel.getId()); | |
| 341 | + setBuildId(destModel.getBuildId()); | |
| 342 | + setPid(destModel.getPid()); | |
| 343 | + setHospitalId(destModel.getHospitalId()); | |
| 344 | + setMcertNo(destModel.getMcertNo()); | |
| 345 | + setEncoded(destModel.getEncoded()); | |
| 346 | + setCertNo(destModel.getCertNo()); | |
| 347 | + setVcCardNo(destModel.getVcCardNo()); | |
| 348 | + setsINCard(destModel.getsINCard()); | |
| 349 | + setMonth(destModel.getMonth()); | |
| 350 | + setChiefComplaint(destModel.getChiefComplaint()); | |
| 351 | + setPresentDisease(destModel.getPresentDisease()); | |
| 352 | + setPastHistory(destModel.getPastHistory()); | |
| 353 | + setDiagnosis(destModel.getDiagnosis()); | |
| 354 | + setCheckDoctor(destModel.getCheckDoctor()); | |
| 355 | + setBuildDoctorId(destModel.getBuildDoctorId()); | |
| 356 | + setBuildDoctorName(destModel.getBuildDoctorName()); | |
| 357 | + setGuideSuggest(destModel.getGuideSuggest()); | |
| 410 | 358 | |
| 411 | - @Override | |
| 412 | - public int hashCode() { | |
| 413 | - return super.hashCode(); | |
| 414 | - } | |
| 359 | + setName(destModel.getName()); | |
| 360 | + if(destModel.getSex()==0){ | |
| 361 | + setSex("女"); | |
| 362 | + }else if(destModel.getSex()==1){ | |
| 363 | + setSex("男"); | |
| 364 | + }else { | |
| 365 | + setSex("_"); | |
| 366 | + } | |
| 367 | + setCheckMonth(destModel.getCheckMonth()); | |
| 368 | + setBirthday(DateUtil.getYyyyMmDd(destModel.getBirthday())); | |
| 369 | + setBuildDate(DateUtil.getYyyyMmDd((destModel).getBuildDate())); | |
| 370 | + setMname(destModel.getMname()); | |
| 371 | + setNextDate(DateUtil.getYyyyMmDd((destModel).getNextDate())); | |
| 372 | + setZbProject(destModel.getZbProject()); | |
| 373 | + if(StringUtils.isNotEmpty(destModel.getMphone())){ | |
| 374 | + setMphone(StringUtils.encryPhone(destModel.getMphone())); | |
| 375 | + } | |
| 376 | + setCheckDate(DateUtil.getYyyyMmDd((destModel).getCheckDate())); | |
| 415 | 377 | |
| 416 | - @Override | |
| 417 | - public boolean equals(Object obj) { | |
| 418 | - return super.equals(obj); | |
| 419 | - } | |
| 420 | 378 | |
| 421 | - @Override | |
| 422 | - protected Object clone() throws CloneNotSupportedException { | |
| 423 | - return super.clone(); | |
| 424 | - } | |
| 425 | 379 | |
| 426 | - @Override | |
| 427 | - public String toString() { | |
| 428 | - return super.toString(); | |
| 380 | + return this; | |
| 429 | 381 | } |
| 430 | 382 | |
| 431 | - @Override | |
| 432 | - protected void finalize() throws Throwable { | |
| 433 | - super.finalize(); | |
| 434 | - } | |
| 383 | + | |
| 435 | 384 | } |