jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 800e504e6d8d2e9eb64ce19d260f4062afa6e722

Authored by Administrator
1 parent 2947e6a869
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿童诊断管理bug 修改

Showing 7 changed files with 282 additions and 32 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 800e504
... ... @@ -34,6 +34,8 @@
34 34 public static final int DAY_SECONDS = 86399;
35 35 public static final int DAY_FULL_SECONDS = 86400;
36 36  
  37 + public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
  38 +
37 39 public static String getymd() {
38 40 return y_m_d.format(new Date());
39 41 }
platform-dal/pom.xml View file @ 800e504
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3   - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4   - <parent>
5   - <groupId>com.lyms.core</groupId>
6   - <artifactId>regional-platform</artifactId>
7   - <version>1.0.1</version>
8   - </parent>
9   - <modelVersion>4.0.0</modelVersion>
10   - <packaging>jar</packaging>
11   - <artifactId>platform-dal</artifactId>
  3 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  4 + <parent>
  5 + <groupId>com.lyms.core</groupId>
  6 + <artifactId>regional-platform</artifactId>
  7 + <version>1.0.1</version>
  8 + </parent>
  9 + <modelVersion>4.0.0</modelVersion>
  10 + <packaging>jar</packaging>
  11 + <artifactId>platform-dal</artifactId>
12 12  
13   - <dependencies>
14   - <dependency>
15   - <groupId>com.lyms.core</groupId>
16   - <artifactId>platform-common</artifactId>
17   - <version>1.0.1</version>
18   - </dependency>
  13 + <dependencies>
19 14 <dependency>
  15 + <groupId>com.lyms.core</groupId>
  16 + <artifactId>platform-common</artifactId>
  17 + <version>1.0.1</version>
  18 + </dependency>
  19 + <dependency>
20 20 <groupId>com.fasterxml.jackson.core</groupId>
21 21 <artifactId>jackson-annotations</artifactId>
22 22 <version>2.9.0</version>
23 23 <scope>compile</scope>
24 24 </dependency>
  25 + <dependency>
  26 + <groupId>org.projectlombok</groupId>
  27 + <artifactId>lombok</artifactId>
  28 + <version>1.18.8</version>
  29 + <scope>provided</scope>
  30 + </dependency>
25 31 </dependencies>
26   - <build>
27   - <plugins>
28   - <plugin>
29   - <groupId>org.apache.maven.plugins</groupId>
30   - <artifactId>maven-compiler-plugin</artifactId>
31   - <configuration>
32   - <source>1.7</source>
33   - <target>1.7</target>
34   - </configuration>
35   - </plugin>
36   - </plugins>
37   - <finalName>platform-dal</finalName>
38   - </build>
  32 + <build>
  33 + <plugins>
  34 + <plugin>
  35 + <groupId>org.apache.maven.plugins</groupId>
  36 + <artifactId>maven-compiler-plugin</artifactId>
  37 + <configuration>
  38 + <source>1.7</source>
  39 + <target>1.7</target>
  40 + </configuration>
  41 + </plugin>
  42 + </plugins>
  43 + <finalName>platform-dal</finalName>
  44 + </build>
39 45 </project>
platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java View file @ 800e504
  1 +package com.lyms.platform.pojo;
  2 +
  3 +import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import com.lyms.platform.common.result.BaseModel;
  5 +import com.lyms.platform.common.utils.DateUtil;
  6 +import lombok.Data;
  7 +import org.springframework.data.mongodb.core.mapping.Document;
  8 +
  9 +import java.util.Date;
  10 +
  11 +/**
  12 + * 孕前优生基础信息 实体类
  13 + *
  14 + * @author: shuai-Bo
  15 + * @Date: 2019/11/20 0020
  16 + * @Time: 9:40
  17 + */
  18 +@Document(collection = "lyms_preeugenics_base")
  19 +@Data
  20 +public class PreEugenicsBaseModel extends BaseModel {
  21 + //id
  22 + private String id;
  23 + /******************丈夫信息****************************/
  24 + //丈夫姓名
  25 + private String husbandName;
  26 + //民族
  27 + private String husbandNation;
  28 +
  29 + /**
  30 + * 出生日期
  31 + */
  32 + @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
  33 + private Date husbandBirthday;
  34 +
  35 + //年龄
  36 + private String husbandAge;
  37 +
  38 + //文化程度
  39 + private String husbandEducational;
  40 +
  41 + //身份证号码
  42 + private String husbandCardNo;
  43 +
  44 + /**
  45 + * 职业 : 1农民 2工人 3服务业 4经商 5家务 6教师/公务员/职员 7其他
  46 + */
  47 + private String husbandCareer;
  48 +
  49 + /**
  50 + * 户口所在地 省
  51 + */
  52 + private String husbandAccountProvince;
  53 +
  54 + /**
  55 + * 户口所在地 市
  56 + */
  57 + private String husbandAccountCity;
  58 +
  59 + /**
  60 + * 户口所在地 县
  61 + */
  62 + private String husbandAccountCounty;
  63 +
  64 + /**
  65 + * 户口所在地 详细地址
  66 + */
  67 + private String husbandAccountAddress;
  68 +
  69 + /**
  70 + * 户口性质:
  71 + * 1农业户口 (含界定为农村居民者) 2.非农业
  72 + */
  73 + private String husbandAccountNature;
  74 +
  75 + /******************妻子信息**********************/
  76 + /**
  77 + * 妻子姓名
  78 + */
  79 + private String wifeName;
  80 +
  81 + //民族
  82 + private String wifeNation;
  83 + /**
  84 + * 出生日期
  85 + */
  86 + @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
  87 + private Date wifeBirthday;
  88 +
  89 + //年龄
  90 + private String wifeAge;
  91 +
  92 + //文化程度
  93 + private String wifeEducational;
  94 +
  95 + //身份证号码
  96 + private String wifeCardNo;
  97 +
  98 + /**
  99 + * 职业 : 1农民 2工人 3服务业 4经商 5家务 6教师/公务员/职员 7其他
  100 + */
  101 + private String wifeCareer;
  102 +
  103 + /**
  104 + * 户口所在地 省
  105 + */
  106 + private String wifeAccountProvince;
  107 +
  108 + /**
  109 + * 户口所在地 市
  110 + */
  111 + private String wifeAccountCity;
  112 +
  113 + /**
  114 + * 户口所在地 县
  115 + */
  116 + private String wifeAccountCounty;
  117 +
  118 + /**
  119 + * 户口所在地 详细地址
  120 + */
  121 + private String wifeAccountAddress;
  122 +
  123 + /**
  124 + * 户口性质:
  125 + * 1农业户口 (含界定为农村居民者) 2.非农业
  126 + */
  127 + private String wifeAccountNature;
  128 +
  129 + /**
  130 + * 妻子现住地址 省
  131 + */
  132 + private String wifeCurrentProvince;
  133 +
  134 + /**
  135 + * 妻子现住地址 市
  136 + */
  137 + private String wifeCurrentCity;
  138 +
  139 + /**
  140 + * 妻子现住地址 县
  141 + */
  142 + private String wifeCurrentCounty;
  143 +
  144 + /**
  145 + * 妻子现住地址 详细地址
  146 + */
  147 + private String wifeCurrentAddress;
  148 +
  149 + /**
  150 + * 结婚时间
  151 + */
  152 + @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
  153 + private Date marriageTime;
  154 +
  155 + /**
  156 + * 联系电话
  157 + */
  158 + private String phone;
  159 +
  160 + /**
  161 + * 填写日期
  162 + */
  163 + @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
  164 + private Date fillDate;
  165 +
  166 + /**
  167 + * 医生签名
  168 + */
  169 + private String doctor;
  170 +
  171 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java View file @ 800e504
... ... @@ -655,11 +655,13 @@
655 655 result.setData(resList);
656 656 pageInfo.setCount(confiList.size());
657 657 } else if (hdReq.getEnalble() == 2) {
658   - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) {
659   - resList.add(waitConfiList.get(i));
  658 + if (CollectionUtils.isNotEmpty(waitConfiList)) {
  659 + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) {
  660 + resList.add(waitConfiList.get(i));
  661 + }
  662 + pageInfo.setCount(waitConfiList.size());
  663 + result.setData(resList);
660 664 }
661   - pageInfo.setCount(waitConfiList.size());
662   - result.setData(resList);
663 665 } else if (hdReq.getEnalble() == 3) {
664 666 for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) {
665 667 resList.add(hdrList.get(i));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java View file @ 800e504
  1 +package com.lyms.platform.operate.web.controller;
  2 +
  3 +import com.lyms.platform.common.base.BaseController;
  4 +import com.lyms.platform.common.result.BaseResponse;
  5 +import com.lyms.platform.operate.web.service.IPreEugenicsService;
  6 +import org.springframework.beans.factory.annotation.Autowired;
  7 +import org.springframework.stereotype.Controller;
  8 +import org.springframework.web.bind.annotation.RequestMapping;
  9 +import org.springframework.web.bind.annotation.RequestParam;
  10 +import org.springframework.web.bind.annotation.ResponseBody;
  11 +
  12 +import javax.servlet.http.HttpServletRequest;
  13 +
  14 +/**
  15 + * @author: shuai-Bo
  16 + * @Date: 2019/11/20 0020
  17 + * @Time: 11:06
  18 + */
  19 +@Controller
  20 +public class PreEugenicsBaseController extends BaseController {
  21 + @Autowired
  22 + private IPreEugenicsService iPreEugenicsService;
  23 +
  24 + @RequestMapping(value = "getPreEugenicsBase")
  25 + @ResponseBody
  26 + public BaseResponse getPreEugenicsBaseInfo(@RequestParam(value = "cardNo") String cardNo,
  27 + @RequestParam(value = "vcCardNo") String vcCardNo, HttpServletRequest request) {
  28 +
  29 + return iPreEugenicsService.getPreEugenicsBaseInfo(cardNo, vcCardNo, getUserId(request));
  30 + }
  31 +
  32 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java View file @ 800e504
  1 +package com.lyms.platform.operate.web.service;
  2 +
  3 +import com.lyms.platform.common.result.BaseResponse;
  4 +
  5 +public interface IPreEugenicsService extends IBaseService {
  6 + /**
  7 + * 通过身份证就诊卡查询 孕前优生基本信息
  8 + *
  9 + * @param cardNo
  10 + * @param vcCardNo
  11 + * @return
  12 + */
  13 + BaseResponse getPreEugenicsBaseInfo(String cardNo, String vcCardNo, Integer userId);
  14 +
  15 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ 800e504
  1 +package com.lyms.platform.operate.web.service.impl;
  2 +
  3 +import com.lyms.platform.common.result.BaseResponse;
  4 +import com.lyms.platform.operate.web.service.IPreEugenicsService;
  5 +import org.springframework.stereotype.Service;
  6 +
  7 +/**
  8 + * 孕前优生实现类
  9 + *
  10 + * @author: shuai-Bo
  11 + * @Date: 2019/11/20 0020
  12 + * @Time: 11:28
  13 + */
  14 +@Service
  15 +public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugenicsService {
  16 +
  17 +
  18 + @Override
  19 + public BaseResponse getPreEugenicsBaseInfo(String cardNo, String vcCardNo, Integer userId) {
  20 + return null;
  21 + }
  22 +}