jiangjiazhi / yimiao

Download as
Browse Code »

Commit fb5b5c8180c8078274b99f7ecadb51b28ebbc4c7

Authored by landong2015
1 parent dae24708f9
Exists in master

增加疫苗类型字段

Showing 5 changed files with 27 additions and 105 deletions

mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculaterecordQuery.java View file @ fb5b5c8
1   -package com.lymsh.yimiao.main.data.model;
2   -
3   -
4   -import java.util.Date;
5   -
6   -import com.lymsh.mommybaby.basecommon.base.BaseQuery;
7   -
8   -
9   -public class MedInoculaterecordQuery extends BaseQuery {
10   - private String icId;
11   - private String icKidId;
12   - private String icVaccineId;
13   - private String icInoculateTime;
14   - private String icDoctor;
15   - private String icPosition;
16   - private String icBatchNumber;
17   - private String icOrganizationId;
18   - private String icIsInoculate;
19   - private String icJiCi;
20   -
21   - public String getIcId() {
22   - return icId;
23   - }
24   -
25   - public void setIcId(String icId) {
26   - this.icId = icId;
27   - }
28   -
29   - public String getIcKidId() {
30   - return icKidId;
31   - }
32   -
33   - public void setIcKidId(String icKidId) {
34   - this.icKidId = icKidId;
35   - }
36   -
37   - public String getIcVaccineId() {
38   - return icVaccineId;
39   - }
40   -
41   - public void setIcVaccineId(String icVaccineId) {
42   - this.icVaccineId = icVaccineId;
43   - }
44   -
45   - public String getIcInoculateTime() {
46   - return icInoculateTime;
47   - }
48   -
49   - public void setIcInoculateTime(String icInoculateTime) {
50   - this.icInoculateTime = icInoculateTime;
51   - }
52   -
53   - public String getIcDoctor() {
54   - return icDoctor;
55   - }
56   -
57   - public void setIcDoctor(String icDoctor) {
58   - this.icDoctor = icDoctor;
59   - }
60   -
61   - public String getIcPosition() {
62   - return icPosition;
63   - }
64   -
65   - public void setIcPosition(String icPosition) {
66   - this.icPosition = icPosition;
67   - }
68   -
69   - public String getIcBatchNumber() {
70   - return icBatchNumber;
71   - }
72   -
73   - public void setIcBatchNumber(String icBatchNumber) {
74   - this.icBatchNumber = icBatchNumber;
75   - }
76   -
77   - public String getIcOrganizationId() {
78   - return icOrganizationId;
79   - }
80   -
81   - public void setIcOrganizationId(String icOrganizationId) {
82   - this.icOrganizationId = icOrganizationId;
83   - }
84   -
85   - public String getIcIsInoculate() {
86   - return icIsInoculate;
87   - }
88   -
89   - public void setIcIsInoculate(String icIsInoculate) {
90   - this.icIsInoculate = icIsInoculate;
91   - }
92   -
93   - public String getIcJiCi() {
94   - return icJiCi;
95   - }
96   -
97   - public void setIcJiCi(String icJiCi) {
98   - this.icJiCi = icJiCi;
99   - }
100   -}
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccinename.java View file @ fb5b5c8
... ... @@ -11,6 +11,15 @@
11 11 private String vnTaboo;
12 12 private String vnDescription;
13 13 private String vnIsValid;
  14 + private Integer vnVaccineType;
  15 +
  16 + public Integer getVnVaccineType() {
  17 + return vnVaccineType;
  18 + }
  19 +
  20 + public void setVnVaccineType(Integer vnVaccineType) {
  21 + this.vnVaccineType = vnVaccineType;
  22 + }
14 23  
15 24 public String getVnId() {
16 25 return vnId;
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccinenameQuery.java View file @ fb5b5c8
... ... @@ -15,6 +15,15 @@
15 15 private String vnTaboo;
16 16 private String vnDescription;
17 17 private String vnIsValid;
  18 + private Integer vnVaccineType;
  19 +
  20 + public Integer getVnVaccineType() {
  21 + return vnVaccineType;
  22 + }
  23 +
  24 + public void setVnVaccineType(Integer vnVaccineType) {
  25 + this.vnVaccineType = vnVaccineType;
  26 + }
18 27  
19 28 public String getVnId() {
20 29 return vnId;
mainData/src/main/resources/mainOrm/MedVaccinename.xml View file @ fb5b5c8
... ... @@ -11,10 +11,11 @@
11 11 <result column="vn_taboo" property="vnTaboo" jdbcType="VARCHAR" />
12 12 <result column="vn_description" property="vnDescription" jdbcType="VARCHAR" />
13 13 <result column="vn_isValid" property="vnIsValid" jdbcType="VARCHAR" />
  14 +<result column="vn_vaccineType" property="vnVaccineType" jdbcType="INTEGER" />
14 15 </resultMap>
15 16  
16 17 <select id="getMedVaccinename" resultMap="MedVaccinenameResultMap" parameterType="java.lang.String">
17   -select vn_id,vn_name,vn_preventDisease,vn_monthAge,vn_position,vn_taboo,vn_description,vn_isValid
  18 +select vn_id,vn_name,vn_preventDisease,vn_monthAge,vn_position,vn_taboo,vn_description,vn_isValid,vn_vaccineType
18 19 from med_vaccinename
19 20 WHERE vn_id = #{vnId,jdbcType=VARCHAR}
20 21 </select>
... ... @@ -58,6 +59,9 @@
58 59 <if test="vnIsValid != null and vnIsValid != ''">
59 60 and vn_isValid = #{vnIsValid,jdbcType=VARCHAR}
60 61 </if>
  62 + <if test="vnVaccineType != null and vnVaccineType != ''">
  63 + and vn_vaccineType = #{vnVaccineType,jdbcType=INTEGER}
  64 + </if>
61 65 </where>
62 66 </sql>
63 67  
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java View file @ fb5b5c8
... ... @@ -2,8 +2,8 @@
2 2  
3 3 import com.lymsh.mommybaby.basecommon.base.BaseController;
4 4 import com.lymsh.mommybaby.basecommon.util.ResultUtils;
5   -import com.lymsh.yimiao.main.data.model.MedVaccineName;
6   -import com.lymsh.yimiao.main.data.service.MedVaccineNameService;
  5 +import com.lymsh.yimiao.main.data.model.MedVaccinename;
  6 +import com.lymsh.yimiao.main.data.service.MedVaccinenameService;
7 7 import com.lymsh.yimiao.main.data.util.JsonUtil;
8 8 import org.springframework.beans.factory.annotation.Autowired;
9 9 import org.springframework.stereotype.Controller;
... ... @@ -23,7 +23,7 @@
23 23 public class VaccineNamesController extends BaseController{
24 24  
25 25 @Autowired
26   - private MedVaccineNameService medVaccineNameService;
  26 + private MedVaccinenameService medVaccineNameService;
27 27  
28 28 /**
29 29 *
... ... @@ -33,7 +33,7 @@
33 33 @RequestMapping(value = "/vaccineNames", method = RequestMethod.GET)
34 34 public void getVaccineNames(HttpServletResponse response,
35 35 @RequestParam("id") String id){
36   - MedVaccineName medVaccineName = medVaccineNameService.getMedVaccineName(id);
  36 + MedVaccinename medVaccineName = medVaccineNameService.getMedVaccinename(id);
37 37 if (medVaccineName==null){
38 38 ResultUtils.buildParameterErrorResultAndWrite(response,"疫苗名称信息不存在");
39 39 return;