jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2defcdd610b12504e83c1f5926cc9439c9fde819

Authored by jesse.wang
1 parent 9627fa006c
Exists in master and in 4 other branches autism, dev, fengning2023-06-06, luanping

孤独症诊断初筛套餐内容4

Showing 5 changed files with 94 additions and 70 deletions

platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDiagnosisMapper.xml View file @ 2defcdd
... ... @@ -256,7 +256,7 @@
256 256 <!--统计总行数-->
257 257 <select id="count" resultType="java.lang.Long">
258 258 select count(1)
259   - from baby_autism_diagnosis
  259 + from (select id from baby_autism_diagnosis
260 260 <where>
261 261 <if test="diagnosis.id != null and diagnosis.id != ''">
262 262 and id = #{diagnosis.id}
... ... @@ -394,7 +394,7 @@
394 394 and rehabilitation_advice_res = #{diagnosis.rehabilitationAdviceRes}
395 395 </if>
396 396 </where>
397   - GROUP BY baby_id
  397 + GROUP BY baby_id) as ad
398 398 </select>
399 399 <select id="queryListByBabyId" resultMap="BabyAutismDiagnosisMap">
400 400 select
platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml View file @ 2defcdd
... ... @@ -215,7 +215,7 @@
215 215 <!--统计总行数-->
216 216 <select id="count" resultType="java.lang.Long">
217 217 select count(1)
218   - from baby_autism_double_sieving
  218 + from (select id from baby_autism_double_sieving
219 219 <where>
220 220 <if test="doubleSieving.id != null and doubleSieving.id != ''">
221 221 and id = #{doubleSieving.id}
... ... @@ -359,7 +359,7 @@
359 359 and rescreen_results = #{doubleSieving.rescreenResults}
360 360 </if>
361 361 </where>
362   - GROUP BY baby_id
  362 + GROUP BY baby_id) as d
363 363 </select>
364 364  
365 365 <!--新增所有列-->
platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml View file @ 2defcdd
... ... @@ -179,7 +179,8 @@
179 179 <!--统计总行数-->
180 180 <select id="count" resultType="java.lang.Long" parameterType="com.lyms.platform.pojo.BabyAutismPrimaryScreening">
181 181 select count(1)
182   - from baby_autism_primary_screening
  182 + from
  183 + (select id from baby_autism_primary_screening
183 184 <where>
184 185 <if test="babyAutismPrimaryScreening.id != null and babyAutismPrimaryScreening.id != ''">
185 186 and id = #{id}
... ... @@ -272,7 +273,7 @@
272 273 and preliminary_screening_results = #{babyAutismPrimaryScreening.global}
273 274 </if>
274 275 </where>
275   - GROUP BY baby_id
  276 + GROUP BY baby_id) as b
276 277 </select>
277 278  
278 279 <!--新增所有列-->
platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java View file @ 2defcdd
1 1 package com.lyms.platform.pojo;
2 2  
3 3 import com.lyms.platform.common.result.BaseModel;
  4 +import com.lyms.platform.common.utils.DateUtil;
4 5 import org.apache.commons.lang3.StringUtils;
5 6  
6 7 import java.util.Date;
7 8  
... ... @@ -17,11 +18,15 @@
17 18 * 创建时间
18 19 */
19 20 private Date created;
  21 +
  22 + private String createdStr;
20 23 /**
21 24 * 修改时间
22 25 */
23 26 private Date modified;
24 27  
  28 + private String modifiedStr;
  29 +
25 30 /**
26 31 * 记录删除状态0：删除 1：正常
27 32 */
... ... @@ -44,6 +49,8 @@
44 49 * 儿童建档日期
45 50 */
46 51 private Date babyBuildDate;
  52 +
  53 + private String babyBuildDateStr;
47 54 /**
48 55 * 儿童姓名
49 56 */
... ... @@ -52,6 +59,8 @@
52 59 * 儿童姓别
53 60 */
54 61 private Integer babySex;
  62 +
  63 + private String babySexStr;
55 64 /**
56 65 * 母亲姓名
57 66 */
58 67  
59 68  
... ... @@ -94,16 +103,22 @@
94 103 */
95 104 private Date birth;
96 105  
  106 + private String birthStr;
  107 +
97 108 /**
98 109 * 检查时间
99 110 */
100 111 private Date checkTime;
101 112  
  113 + private String checkTimeStr;
  114 +
102 115 /**
103 116 * 预约下次检查时间
104 117 */
105 118 private Date nextCheckTime;
106 119  
  120 + private String nextCheckTimeStr;
  121 +
107 122 /**
108 123 * 检查医生
109 124 */
110 125  
... ... @@ -256,64 +271,62 @@
256 271 */
257 272 private String rescreenResults;
258 273  
259   - @Override
260   - public String toString() {
261   - return "BabyAutismDoubleSieving{" +
262   - "id='" + id + '\'' +
263   - ", created=" + created +
264   - ", modified=" + modified +
265   - ", yn=" + yn +
266   - ", operaterId='" + operaterId + '\'' +
267   - ", hospitalId='" + hospitalId + '\'' +
268   - ", babyId='" + babyId + '\'' +
269   - ", babyBuildDate=" + babyBuildDate +
270   - ", babyName='" + babyName + '\'' +
271   - ", babySex=" + babySex +
272   - ", babyMName='" + babyMName + '\'' +
273   - ", babyFName='" + babyFName + '\'' +
274   - ", babyMPhone='" + babyMPhone + '\'' +
275   - ", babyFPhone='" + babyFPhone + '\'' +
276   - ", babyMCertNo='" + babyMCertNo + '\'' +
277   - ", babyFCertNo='" + babyFCertNo + '\'' +
278   - ", pid='" + pid + '\'' +
279   - ", checkMonthAge='" + checkMonthAge + '\'' +
280   - ", checkMonthId='" + checkMonthId + '\'' +
281   - ", birth=" + birth +
282   - ", checkTime=" + checkTime +
283   - ", nextCheckTime=" + nextCheckTime +
284   - ", checkDoctor='" + checkDoctor + '\'' +
285   - ", doctor='" + doctor + '\'' +
286   - ", displayState='" + displayState + '\'' +
287   - ", errormsg='" + errormsg + '\'' +
288   - ", checkHospital='" + checkHospital + '\'' +
289   - ", doctorSign='" + doctorSign + '\'' +
290   - ", patientSign='" + patientSign + '\'' +
291   - ", preliminaryScreeningResults='" + preliminaryScreeningResults + '\'' +
292   - ", preliminaryScreeningResultsFailedProject='" + preliminaryScreeningResultsFailedProject + '\'' +
293   - ", medicalHistory=" + medicalHistory +
294   - ", medicalHistoryName='" + medicalHistoryName + '\'' +
295   - ", medicalHistoryRemark='" + medicalHistoryRemark + '\'' +
296   - ", developerQuotient='" + developerQuotient + '\'' +
297   - ", bigMovement='" + bigMovement + '\'' +
298   - ", fineMotion='" + fineMotion + '\'' +
299   - ", adaptability='" + adaptability + '\'' +
300   - ", languageNum='" + languageNum + '\'' +
301   - ", socialBehavior='" + socialBehavior + '\'' +
302   - ", pediatricHeartScaleAssessMentresults='" + pediatricHeartScaleAssessMentresults + '\'' +
303   - ", coreProjectNum='" + coreProjectNum + '\'' +
304   - ", positivetNum='" + positivetNum + '\'' +
305   - ", screeningScaleMentresults='" + screeningScaleMentresults + '\'' +
306   - ", behaviorRatingScaleTotal='" + behaviorRatingScaleTotal + '\'' +
307   - ", feelNum='" + feelNum + '\'' +
308   - ", socialInteractionNum='" + socialInteractionNum + '\'' +
309   - ", bodyMovementNum='" + bodyMovementNum + '\'' +
310   - ", behaviorRatingLanguageNum='" + behaviorRatingLanguageNum + '\'' +
311   - ", selfCareInDailyLifeNum='" + selfCareInDailyLifeNum + '\'' +
312   - ", behaviorRatingScaleAssessMentresults='" + behaviorRatingScaleAssessMentresults + '\'' +
313   - ", rescreenResults='" + rescreenResults + '\'' +
314   - '}';
  274 + public String getCreatedStr() {
  275 + return createdStr;
315 276 }
316 277  
  278 + public void setCreatedStr(String createdStr) {
  279 + this.createdStr = createdStr;
  280 + }
  281 +
  282 + public String getModifiedStr() {
  283 + return modifiedStr;
  284 + }
  285 +
  286 + public void setModifiedStr(String modifiedStr) {
  287 + this.modifiedStr = modifiedStr;
  288 + }
  289 +
  290 + public String getBabyBuildDateStr() {
  291 + return babyBuildDateStr;
  292 + }
  293 +
  294 + public void setBabyBuildDateStr(String babyBuildDateStr) {
  295 + this.babyBuildDateStr = babyBuildDateStr;
  296 + }
  297 +
  298 + public String getBabySexStr() {
  299 + return babySexStr;
  300 + }
  301 +
  302 + public void setBabySexStr(String babySexStr) {
  303 + this.babySexStr = babySexStr;
  304 + }
  305 +
  306 + public String getBirthStr() {
  307 + return birthStr;
  308 + }
  309 +
  310 + public void setBirthStr(String birthStr) {
  311 + this.birthStr = birthStr;
  312 + }
  313 +
  314 + public String getCheckTimeStr() {
  315 + return checkTimeStr;
  316 + }
  317 +
  318 + public void setCheckTimeStr(String checkTimeStr) {
  319 + this.checkTimeStr = checkTimeStr;
  320 + }
  321 +
  322 + public String getNextCheckTimeStr() {
  323 + return nextCheckTimeStr;
  324 + }
  325 +
  326 + public void setNextCheckTimeStr(String nextCheckTimeStr) {
  327 + this.nextCheckTimeStr = nextCheckTimeStr;
  328 + }
  329 +
317 330 public String getMedicalHistoryName() {
318 331 return medicalHistoryName;
319 332 }
... ... @@ -377,6 +390,7 @@
377 390  
378 391 public void setCreated(Date created) {
379 392 this.created = created;
  393 + setCreatedStr(DateUtil.getyyyy_MM_dd(created));
380 394 }
381 395  
382 396 public Date getModified() {
... ... @@ -385,6 +399,7 @@
385 399  
386 400 public void setModified(Date modified) {
387 401 this.modified = modified;
  402 + setModifiedStr(DateUtil.getyyyy_MM_dd(modified));
388 403 }
389 404  
390 405 public Integer getYn() {
... ... @@ -425,6 +440,7 @@
425 440  
426 441 public void setBabyBuildDate(Date babyBuildDate) {
427 442 this.babyBuildDate = babyBuildDate;
  443 + setBabyBuildDateStr(DateUtil.getyyyy_MM_dd(babyBuildDate));
428 444 }
429 445  
430 446 public String getBabyName() {
431 447  
432 448  
... ... @@ -521,22 +537,15 @@
521 537  
522 538 public void setBirth(Date birth) {
523 539 this.birth = birth;
  540 + setBirthStr(DateUtil.getyyyy_MM_dd(birth));
524 541 }
525 542  
526 543 public Date getCheckTime() {
527 544 return checkTime;
528 545 }
529 546  
530   - public void setCheckTime(Date checkTime) {
531   - this.checkTime = checkTime;
532   - }
533   -
534 547 public Date getNextCheckTime() {
535 548 return nextCheckTime;
536   - }
537   -
538   - public void setNextCheckTime(Date nextCheckTime) {
539   - this.nextCheckTime = nextCheckTime;
540 549 }
541 550  
542 551 public String getCheckDoctor() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DoubleSievingFacade.java View file @ 2defcdd
... ... @@ -143,6 +143,9 @@
143 143 public BaseResponse queryDateListPage(BabyAutismDoubleSieving babyAutismDoubleSieving, BaseQuery pageRequest, Integer id) {
144 144 pageRequest.mysqlBuild(babyAutismDoubleSievingService.count(babyAutismDoubleSieving, pageRequest).intValue());
145 145 List<BabyAutismDoubleSieving> primaryScreeningPage = babyAutismDoubleSievingService.queryByPage(babyAutismDoubleSieving, pageRequest);
  146 + for (BabyAutismDoubleSieving autismDoubleSieving : primaryScreeningPage) {
  147 + nameChange(autismDoubleSieving);
  148 + }
146 149 BaseObjectResponse br = new BaseObjectResponse();
147 150 br.setErrorcode(ErrorCodeConstants.SUCCESS);
148 151 br.setData(primaryScreeningPage);
... ... @@ -158,6 +161,17 @@
158 161 br.setErrorcode(ErrorCodeConstants.SUCCESS);
159 162 br.setErrormsg("成功");
160 163 return br;
  164 + }
  165 +
  166 + public void nameChange(BabyAutismDoubleSieving primaryScreening) {
  167 + //查询医院
  168 + try {
  169 + Organization org = organizationService.getOrganization(Integer.valueOf(primaryScreening.getHospitalId()));
  170 + primaryScreening.setCheckHospital(org.getName());
  171 + primaryScreening.setBabySexStr(SexEnum.getTextById(primaryScreening.getBabySex()));
  172 + } catch (Exception e) {
  173 + e.printStackTrace();
  174 + }
161 175 }
162 176 }