Commit a4b8f96a552b4c80d5132b092f5f1f4d0a56b3ed
1 parent
d1364b702c
Exists in
master
提交代码
Showing 11 changed files with 395 additions and 82 deletions
- mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedEmployeeMapper.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployee.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployeeQuery.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecord.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedEmployeeService.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedEmployeeServiceImpl.java
- mainData/src/main/resources/mainOrm/MedEmployee.xml
- webApi/src/main/java/com/lyms/yimiao/web/controller/v1/InoculateRecordController.java
- webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java
- webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm
- webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm
mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedEmployeeMapper.java
View file @
a4b8f96
1 | +package com.lymsh.yimiao.main.data.dao; | |
2 | + | |
3 | +import com.lymsh.yimiao.main.data.model.MedEmployee; | |
4 | +import com.lymsh.yimiao.main.data.model.MedEmployeeQuery; | |
5 | + | |
6 | +import java.util.List; | |
7 | + | |
8 | +public interface MedEmployeeMapper { | |
9 | + public void addMedEmployee(MedEmployee obj); | |
10 | + | |
11 | + public void updateMedEmployee(MedEmployee obj); | |
12 | + | |
13 | + public void deleteMedEmployee(Integer id); | |
14 | + | |
15 | + public MedEmployee getMedEmployee(String id); | |
16 | + | |
17 | + public int queryMedEmployeeCount(MedEmployeeQuery query); | |
18 | + | |
19 | + public List<MedEmployee> queryMedEmployee(MedEmployeeQuery query); | |
20 | + | |
21 | +} |
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployee.java
View file @
a4b8f96
1 | +package com.lymsh.yimiao.main.data.model; | |
2 | + | |
3 | +import java.util.Date; | |
4 | + | |
5 | +public class MedEmployee { | |
6 | + private String eId; | |
7 | + private String eName; | |
8 | + private String eSex; | |
9 | + | |
10 | + public String getEId() { | |
11 | + return eId; | |
12 | + } | |
13 | + | |
14 | + | |
15 | + public void setEId(String eId) { | |
16 | + this.eId = eId; | |
17 | + | |
18 | + } | |
19 | + | |
20 | + public String getEName() { | |
21 | + return eName; | |
22 | + } | |
23 | + | |
24 | + | |
25 | + public void setEName(String eName) { | |
26 | + this.eName = eName; | |
27 | + | |
28 | + } | |
29 | + | |
30 | + public String getESex() { | |
31 | + return eSex; | |
32 | + } | |
33 | + | |
34 | + | |
35 | + public void setESex(String eSex) { | |
36 | + this.eSex = eSex; | |
37 | + | |
38 | + } | |
39 | +} |
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployeeQuery.java
View file @
a4b8f96
1 | +package com.lymsh.yimiao.main.data.model; | |
2 | + | |
3 | + | |
4 | + | |
5 | +import java.util.Date; | |
6 | +import com.lymsh.mommybaby.basecommon.base.BaseQuery; | |
7 | + | |
8 | + | |
9 | + | |
10 | +public class MedEmployeeQuery extends BaseQuery {private String eId;private String eName;private String eSex; | |
11 | + | |
12 | +public String getEId() { | |
13 | + return eId; | |
14 | + } | |
15 | + | |
16 | + | |
17 | + | |
18 | + public void setEId(String eId) { | |
19 | + this.eId = eId; | |
20 | + | |
21 | + } | |
22 | + | |
23 | +public String getEName() { | |
24 | + return eName; | |
25 | + } | |
26 | + | |
27 | + | |
28 | + | |
29 | + public void setEName(String eName) { | |
30 | + this.eName = eName; | |
31 | + | |
32 | + } | |
33 | + | |
34 | +public String getESex() { | |
35 | + return eSex; | |
36 | + } | |
37 | + | |
38 | + | |
39 | + | |
40 | + public void setESex(String eSex) { | |
41 | + this.eSex = eSex; | |
42 | + | |
43 | + } | |
44 | +} |
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecord.java
View file @
a4b8f96
... | ... | @@ -14,6 +14,62 @@ |
14 | 14 | private String icIsInoculate; |
15 | 15 | private String icJiCi; |
16 | 16 | private String isDelete; |
17 | + private String icFactoryName; | |
18 | + | |
19 | + private String vnName; | |
20 | + private String mouthAge; | |
21 | + private String vnPosition; | |
22 | + | |
23 | + private String vnTaboo; | |
24 | + private String vnDescription; | |
25 | + | |
26 | + public String getVnName() { | |
27 | + return vnName; | |
28 | + } | |
29 | + | |
30 | + public void setVnName(String vnName) { | |
31 | + this.vnName = vnName; | |
32 | + } | |
33 | + | |
34 | + public String getMouthAge() { | |
35 | + return mouthAge; | |
36 | + } | |
37 | + | |
38 | + public void setMouthAge(String mouthAge) { | |
39 | + this.mouthAge = mouthAge; | |
40 | + } | |
41 | + | |
42 | + public String getVnPosition() { | |
43 | + return vnPosition; | |
44 | + } | |
45 | + | |
46 | + public void setVnPosition(String vnPosition) { | |
47 | + this.vnPosition = vnPosition; | |
48 | + } | |
49 | + | |
50 | + public String getVnTaboo() { | |
51 | + return vnTaboo; | |
52 | + } | |
53 | + | |
54 | + public void setVnTaboo(String vnTaboo) { | |
55 | + this.vnTaboo = vnTaboo; | |
56 | + } | |
57 | + | |
58 | + public String getVnDescription() { | |
59 | + return vnDescription; | |
60 | + } | |
61 | + | |
62 | + public void setVnDescription(String vnDescription) { | |
63 | + this.vnDescription = vnDescription; | |
64 | + } | |
65 | + | |
66 | + public String getIcFactoryName() { | |
67 | + return icFactoryName; | |
68 | + } | |
69 | + | |
70 | + public void setIcFactoryName(String icFactoryName) { | |
71 | + this.icFactoryName = icFactoryName; | |
72 | + } | |
17 | 73 | |
18 | 74 | public String getIsDelete() { |
19 | 75 | return isDelete; |
mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedEmployeeService.java
View file @
a4b8f96
1 | +package com.lymsh.yimiao.main.data.service; | |
2 | + | |
3 | +import com.lymsh.yimiao.main.data.model.MedEmployee; | |
4 | +import com.lymsh.yimiao.main.data.model.MedEmployeeQuery; | |
5 | + | |
6 | +import java.util.List; | |
7 | + | |
8 | +public interface MedEmployeeService { | |
9 | + public void addMedEmployee(MedEmployee obj); | |
10 | + | |
11 | + public void updateMedEmployee(MedEmployee obj); | |
12 | + | |
13 | + public void deleteMedEmployee(Integer id); | |
14 | + | |
15 | + public MedEmployee getMedEmployee(String id); | |
16 | + | |
17 | + public int queryMedEmployeeCount(MedEmployeeQuery query); | |
18 | + | |
19 | + public List<MedEmployee> queryMedEmployee(MedEmployeeQuery query); | |
20 | + | |
21 | +} |
mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedEmployeeServiceImpl.java
View file @
a4b8f96
1 | +package com.lymsh.yimiao.main.data.service.impl; | |
2 | + | |
3 | +import com.lymsh.yimiao.main.data.dao.MedEmployeeMapper; | |
4 | +import com.lymsh.yimiao.main.data.model.MedEmployee; | |
5 | +import com.lymsh.yimiao.main.data.model.MedEmployeeQuery; | |
6 | +import com.lymsh.yimiao.main.data.service.MedEmployeeService; | |
7 | +import org.springframework.beans.factory.annotation.Autowired; | |
8 | +import org.springframework.stereotype.Service; | |
9 | + | |
10 | +import java.util.Date; | |
11 | +import java.util.List; | |
12 | + | |
13 | +@Service | |
14 | +public class MedEmployeeServiceImpl implements MedEmployeeService { | |
15 | + | |
16 | + @Autowired | |
17 | + private MedEmployeeMapper medEmployeeMapper; | |
18 | + | |
19 | + @Override | |
20 | + public void addMedEmployee(MedEmployee obj) { | |
21 | + medEmployeeMapper.addMedEmployee(obj); | |
22 | + } | |
23 | + | |
24 | + @Override | |
25 | + public void updateMedEmployee(MedEmployee obj) { | |
26 | + medEmployeeMapper.updateMedEmployee(obj); | |
27 | + } | |
28 | + | |
29 | + @Override | |
30 | + public void deleteMedEmployee(Integer id) { | |
31 | + medEmployeeMapper.deleteMedEmployee(id); | |
32 | + } | |
33 | + | |
34 | + @Override | |
35 | + public MedEmployee getMedEmployee(String id) { | |
36 | + return medEmployeeMapper.getMedEmployee(id); | |
37 | + } | |
38 | + | |
39 | + @Override | |
40 | + public int queryMedEmployeeCount(MedEmployeeQuery query) { | |
41 | + return medEmployeeMapper.queryMedEmployeeCount(query); | |
42 | + } | |
43 | + | |
44 | + @Override | |
45 | + public List<MedEmployee> queryMedEmployee(MedEmployeeQuery query) { | |
46 | + if (query.getNeed() != null) { | |
47 | + query.mysqlBuild(medEmployeeMapper.queryMedEmployeeCount(query)); | |
48 | + } | |
49 | + return medEmployeeMapper.queryMedEmployee(query); | |
50 | + } | |
51 | + | |
52 | +} |
mainData/src/main/resources/mainOrm/MedEmployee.xml
View file @
a4b8f96
1 | +<?xml version="1.0" encoding="UTF-8" ?> | |
2 | +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > | |
3 | +<mapper namespace="com.lymsh.yimiao.main.data.dao.MedEmployeeMapper"> | |
4 | + | |
5 | +<resultMap id="MedEmployeeResultMap" type="com.lymsh.yimiao.main.data.model.MedEmployee"> | |
6 | +<result column="e_id" property="eId" jdbcType="VARCHAR" /> | |
7 | +<result column="e_name" property="eName" jdbcType="VARCHAR" /> | |
8 | +<result column="e_sex" property="eSex" jdbcType="VARCHAR" /> | |
9 | +</resultMap> | |
10 | + | |
11 | +<select id="getMedEmployee" resultMap="MedEmployeeResultMap" parameterType="java.lang.String"> | |
12 | +select e_id,e_name,e_sex | |
13 | +from med_employee | |
14 | +WHERE e_id = #{eId,jdbcType=VARCHAR} | |
15 | +</select> | |
16 | + | |
17 | + | |
18 | +<sql id="orderAndLimit"> | |
19 | +<if test="sort != null and sort != '' "> | |
20 | +order by ${sort} | |
21 | +<if test="need != null"> | |
22 | +limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} | |
23 | +</if> | |
24 | +</if> | |
25 | +</sql> | |
26 | + | |
27 | + | |
28 | + | |
29 | +<sql id="MedEmployeeCondition"> | |
30 | +<where> | |
31 | + 1 = 1 | |
32 | +<if test="eId != null and eId != ''"> | |
33 | +and e_id = #{eId,jdbcType=VARCHAR} | |
34 | +</if> | |
35 | +<if test="eName != null and eName != ''"> | |
36 | +and e_name = #{eName,jdbcType=VARCHAR} | |
37 | +</if> | |
38 | +<if test="eSex != null and eSex != ''"> | |
39 | +and e_sex = #{eSex,jdbcType=VARCHAR} | |
40 | +</if> | |
41 | +</where> | |
42 | +</sql> | |
43 | + | |
44 | + | |
45 | + | |
46 | +<select id="queryMedEmployee" resultMap="MedEmployeeResultMap" parameterType="com.lymsh.yimiao.main.data.model.MedEmployeeQuery"> | |
47 | +select e_id,e_name,e_sex | |
48 | + from med_employee | |
49 | +<include refid="MedEmployeeCondition" /> | |
50 | +<include refid="orderAndLimit" /> | |
51 | +</select> | |
52 | + | |
53 | + | |
54 | + | |
55 | +<select id="queryMedEmployeeCount" resultType="int" parameterType="com.lymsh.yimiao.main.data.model.MedEmployeeQuery"> | |
56 | +select count(1) from med_employee | |
57 | +<include refid="MedEmployeeCondition" /> | |
58 | +</select> | |
59 | + | |
60 | + | |
61 | + | |
62 | +</mapper> |
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/InoculateRecordController.java
View file @
a4b8f96
1 | 1 | package com.lyms.yimiao.web.controller.v1; |
2 | 2 | |
3 | 3 | import com.lymsh.mommybaby.basecommon.base.TokenRequired; |
4 | -import com.lymsh.mommybaby.basecommon.util.DateUtil; | |
5 | -import com.lymsh.mommybaby.basecommon.util.ResultUtils; | |
4 | +import com.lymsh.yimiao.main.data.enumdata.PositionEnum; | |
6 | 5 | import com.lymsh.yimiao.main.data.model.*; |
7 | -import com.lymsh.yimiao.main.data.service.MedFactoryService; | |
8 | -import com.lymsh.yimiao.main.data.service.MedInoculateRecordService; | |
9 | -import com.lymsh.yimiao.main.data.service.MedOrganizationService; | |
10 | -import com.lymsh.yimiao.main.data.service.MedVaccineInfoService; | |
11 | -import org.apache.commons.collections.CollectionUtils; | |
6 | +import com.lymsh.yimiao.main.data.service.*; | |
12 | 7 | import org.springframework.beans.factory.annotation.Autowired; |
13 | 8 | import org.springframework.stereotype.Controller; |
14 | 9 | import org.springframework.web.bind.annotation.RequestMapping; |
15 | -import org.springframework.web.bind.annotation.RequestMethod; | |
16 | 10 | import org.springframework.web.bind.annotation.RequestParam; |
17 | 11 | import org.springframework.web.servlet.ModelAndView; |
18 | 12 | |
19 | 13 | import javax.servlet.http.HttpServletResponse; |
20 | -import java.util.ArrayList; | |
21 | -import java.util.HashMap; | |
22 | -import java.util.List; | |
23 | -import java.util.Map; | |
14 | +import java.text.SimpleDateFormat; | |
15 | +import java.util.*; | |
24 | 16 | |
25 | 17 | /** |
26 | 18 | * Created by Administrator on 2016/5/13 0013. |
27 | 19 | |
... | ... | @@ -36,8 +28,11 @@ |
36 | 28 | private MedVaccineInfoService medVaccineinfoService; |
37 | 29 | @Autowired |
38 | 30 | private MedOrganizationService medOrganizationService; |
31 | + @Autowired | |
32 | + private MedEmployeeService medEmployeeService; | |
33 | + @Autowired | |
34 | + private MedVaccineNameService medVaccineNameService; | |
39 | 35 | |
40 | - | |
41 | 36 | private final static String isDelete = "1"; |
42 | 37 | |
43 | 38 | /** |
... | ... | @@ -45,8 +40,7 @@ |
45 | 40 | * |
46 | 41 | * @param response |
47 | 42 | */ |
48 | - @RequestMapping(value = "/inoculateRecord", method = RequestMethod.GET) | |
49 | - @TokenRequired | |
43 | + @RequestMapping(value = "/getInoculateRecord") | |
50 | 44 | public ModelAndView getKidVaccines(HttpServletResponse response, |
51 | 45 | @RequestParam("id") String icId) { |
52 | 46 | ModelAndView mv = new ModelAndView("error"); |
53 | 47 | |
54 | 48 | |
55 | 49 | |
56 | 50 | |
57 | 51 | |
58 | 52 | |
59 | 53 | |
60 | 54 | |
61 | 55 | |
62 | 56 | |
... | ... | @@ -54,64 +48,96 @@ |
54 | 48 | if (icId == null) { |
55 | 49 | mv.addObject("msg", "inoculateRecord id is null"); |
56 | 50 | } |
57 | - | |
58 | - | |
59 | 51 | MedInoculateRecordQuery recordQuery = new MedInoculateRecordQuery(); |
60 | 52 | recordQuery.setIcId(icId); |
61 | 53 | recordQuery.setIsDelete(isDelete); |
62 | 54 | List<MedInoculateRecord> recordList = medInoculateRecordService.queryMedInoculateRecord(recordQuery); |
63 | 55 | if (recordList.size()==0){ |
64 | 56 | mv.setViewName("empty"); |
65 | - mv.addObject("msg", "无疫苗详情信息"); | |
57 | + mv.addObject("msg", "无接种记录信息"); | |
66 | 58 | } |
67 | - MedInoculateRecord record = recordList.get(0); | |
59 | + MedInoculateRecord data = recordList.get(0); | |
60 | + //疫苗名称 | |
61 | + MedVaccineInfo info = medVaccineinfoService.getMedVaccineInfo(data.getIcVaccineId()); | |
62 | + data.setIcVaccineId(info==null ? "" : info.getViName()); | |
63 | + //生产企业 | |
64 | + if (info!=null){ | |
65 | + if (info.getViFactoryId()!= null){ | |
66 | + MedFactory medFactory = medFactoryService.getMedFactory(info.getViFactoryId()); | |
67 | + data.setIcFactoryName(medFactory == null ? "" : medFactory.getFName()); | |
68 | + } | |
68 | 69 | |
70 | + //疫苗详情 | |
69 | 71 | |
72 | + //疫苗名称 | |
73 | + if (info.getViVaccineNameId()!=null){ | |
74 | + MedVaccineName medVaccineName = medVaccineNameService.getMedVaccineName(info.getViVaccineNameId()); | |
75 | + data.setVnName(medVaccineName==null ? "" : medVaccineName.getVnName()); | |
76 | + //接种时间 | |
77 | + String[] ages = medVaccineName.getVnMonthAge().split(",");//1,2 | |
70 | 78 | |
71 | - mv.setViewName("recordList"); | |
72 | - mv.addObject("recordList", recordList); | |
79 | + //接种次数 | |
80 | + String jiCi = "第" + data.getIcJiCi() +"/" + ages.length +"剂"; | |
81 | + data.setIcJiCi(jiCi); | |
73 | 82 | |
83 | + String monthAgeStr = ""; | |
84 | + for (int j = 0; j < ages.length ; j++) { | |
85 | + String q = ages[j]+"月齡"+"("+ (j+1) +"/"+ages.length+")"; | |
86 | + monthAgeStr+=q; | |
87 | + if (ages.length-1 != j) | |
88 | + { | |
89 | + monthAgeStr+=","; | |
90 | + } | |
91 | + } | |
92 | + data.setMouthAge(monthAgeStr); | |
74 | 93 | |
94 | + //接种部位 | |
95 | + if (medVaccineName.getVnPosition().equals(PositionEnum.zero.getId())){ | |
96 | + data.setVnPosition(PositionEnum.getTitle(PositionEnum.zero.getId())); | |
97 | + }else if (medVaccineName.getVnPosition().equals(PositionEnum.two.getId())){ | |
98 | + data.setVnPosition(PositionEnum.getTitle(PositionEnum.two.getId())); | |
99 | + }else if (medVaccineName.getVnPosition().equals(PositionEnum.three.getId())){ | |
100 | + data.setVnPosition(PositionEnum.getTitle(PositionEnum.three.getId())); | |
101 | + }else if (medVaccineName.getVnPosition().equals(PositionEnum.four.getId())){ | |
102 | + data.setVnPosition(PositionEnum.getTitle(PositionEnum.four.getId())); | |
103 | + }else if (medVaccineName.getVnPosition().equals(PositionEnum.five.getId())){ | |
104 | + data.setVnPosition(PositionEnum.getTitle(PositionEnum.five.getId())); | |
105 | + } | |
106 | + //接种禁忌 | |
107 | + data.setVnTaboo(medVaccineName.getVnTaboo()); | |
108 | + //不良反应 | |
109 | + data.setVnDescription(medVaccineName.getVnDescription()); | |
110 | + } | |
111 | + } | |
112 | + //医生名字 | |
113 | + if (data.getIcDoctor()!=null){ | |
114 | + MedEmployee employee = medEmployeeService.getMedEmployee(data.getIcDoctor()); | |
115 | + data.setIcDoctor(employee==null ? "" : employee.getEName()); | |
116 | + } | |
75 | 117 | |
118 | + //接种日期 | |
119 | + try { | |
120 | + Date d1 = new SimpleDateFormat("yyyy-MM-dd").parse(data.getIcInoculateTime()); | |
121 | + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日"); | |
122 | + String icInoculateTime = simpleDateFormat.format(d1); | |
123 | + data.setIcInoculateTime(icInoculateTime); | |
124 | + }catch (Exception e){ | |
76 | 125 | |
126 | + } | |
127 | + //接种单位 | |
128 | + MedOrganization medOrganization = medOrganizationService.getMedOrganization(data.getIcOrganizationId()); | |
129 | + data.setIcOrganizationId(medOrganization==null ? "" : medOrganization.getoName()); | |
130 | + mv.setViewName("inoculateRecord"); | |
131 | + mv.addObject("recordObj", data); | |
132 | + | |
133 | + | |
134 | + | |
135 | + | |
136 | + | |
137 | + | |
138 | + | |
77 | 139 | return mv; |
78 | 140 | |
79 | -// if (CollectionUtils.isNotEmpty(recordList)) { | |
80 | -// MedInoculateRecord data = recordList.get(0); | |
81 | -// Map<String, Object> map = new HashMap<>(); | |
82 | -// //疫苗名称 | |
83 | -// MedVaccineInfo info = medVaccineinfoService.getMedVaccineInfo(data.getIcVaccineId()); | |
84 | -// if (info != null && isDelete.equals(info.getIsDelete())) { | |
85 | -// map.put("vaccineInfoName", info.getViName()); | |
86 | -// //生产企业 | |
87 | -// MedFactory medFactory = medFactoryService.getMedFactory(info.getViFactoryId()); | |
88 | -// if (medFactory != null && isDelete.equals(medFactory.getIsDelete())) { | |
89 | -// map.put("factoryName", medFactory.getFName()); | |
90 | -// } | |
91 | -// } else { | |
92 | -// map.put("vaccineInfoName", null); | |
93 | -// map.put("factoryName", null); | |
94 | -// | |
95 | -// } | |
96 | -// //接种日期 | |
97 | -// map.put("inoculateTime", DateUtil.getSecond(DateUtil.parseYMD(data.getIcInoculateTime()))); | |
98 | -// //接种医生 | |
99 | -// map.put("doctorName", data.getIcDoctor()); | |
100 | -// //接种部位 | |
101 | -// map.put("position", data.getIcPosition()); | |
102 | -// | |
103 | -// //接种单位 | |
104 | -// MedOrganization medOrganization = medOrganizationService.getMedOrganization(data.getIcOrganizationId()); | |
105 | -// if (medOrganization != null && isDelete.equals(medOrganization.getIsDelete())) { | |
106 | -// map.put("organizationName", medOrganization.getoName()); | |
107 | -// } else { | |
108 | -// map.put("organizationName", null); | |
109 | -// } | |
110 | -// //疫苗批号 | |
111 | -// map.put("batchNumber", data.getIcBatchNumber()); | |
112 | -// list.add(map); | |
113 | -// } | |
114 | -// ResultUtils.buildSuccessResultAndWrite(response, list); | |
115 | 141 | } |
116 | 142 | |
117 | 143 | } |
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java
View file @
a4b8f96
... | ... | @@ -15,6 +15,7 @@ |
15 | 15 | import org.springframework.web.servlet.ModelAndView; |
16 | 16 | |
17 | 17 | import javax.servlet.http.HttpServletResponse; |
18 | +import java.text.SimpleDateFormat; | |
18 | 19 | import java.util.ArrayList; |
19 | 20 | import java.util.HashMap; |
20 | 21 | import java.util.List; |
... | ... | @@ -161,6 +162,7 @@ |
161 | 162 | |
162 | 163 | return mv; |
163 | 164 | } |
165 | + | |
164 | 166 | |
165 | 167 | |
166 | 168 |
webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm
View file @
a4b8f96
... | ... | @@ -134,7 +134,7 @@ |
134 | 134 | |
135 | 135 | <div class="title"> |
136 | 136 | <div class="t_left"> |
137 | - 乙肝疫苗 | |
137 | + $!recordObj.icVaccineId | |
138 | 138 | </div> |
139 | 139 | </div> |
140 | 140 | <div class="body"> |
141 | 141 | |
142 | 142 | |
143 | 143 | |
... | ... | @@ -143,31 +143,31 @@ |
143 | 143 | <span>接种单位</span> |
144 | 144 | </li> |
145 | 145 | <li class="content"> |
146 | - <span>东半壁店卫生院</span> | |
146 | + <span>$!recordObj.icFactoryName</span> | |
147 | 147 | </li> |
148 | 148 | <li class="header"> |
149 | 149 | <span class="half">接种时间</span> |
150 | 150 | <span>接种医生</span> |
151 | 151 | </li> |
152 | 152 | <li class="content"> |
153 | - <span class="half">2016年5月12日</span> | |
154 | - <span>王医生</span> | |
153 | + <span class="half">$!recordObj.icInoculateTime</span> | |
154 | + <span>$!recordObj.icDoctor</span> | |
155 | 155 | </li> |
156 | 156 | <li class="header"> |
157 | 157 | <span class="half">接种部位</span> |
158 | 158 | <span>接种剂次</span> |
159 | 159 | </li> |
160 | 160 | <li class="content"> |
161 | - <span class="half">左上臂</span> | |
162 | - <span>第1/2次</span> | |
161 | + <span class="half">$!recordObj.icPosition</span> | |
162 | + <span>$!recordObj.icJiCi</span> | |
163 | 163 | </li> |
164 | 164 | <li class="header"> |
165 | 165 | <span class="half">疫苗生产企业</span> |
166 | 166 | <span>疫苗批号</span> |
167 | 167 | </li> |
168 | 168 | <li class="content"> |
169 | - <span class="half">华尔顿</span> | |
170 | - <span>1324235123</span> | |
169 | + <span class="half">$!recordObj.icFactoryName</span> | |
170 | + <span>$!recordObj.icBatchNumber</span> | |
171 | 171 | </li> |
172 | 172 | </ul> |
173 | 173 | <div class="lookMore" onclick="lookMore(this)"> |
174 | 174 | |
175 | 175 | |
176 | 176 | |
177 | 177 | |
178 | 178 | |
... | ... | @@ -179,42 +179,32 @@ |
179 | 179 | <span>接种预防疾病</span> |
180 | 180 | </li> |
181 | 181 | <li class="content"> |
182 | - <span>乙肝肝炎</span> | |
182 | + <span>$!recordObj.vnName</span> | |
183 | 183 | </li> |
184 | 184 | <li class="header"> |
185 | 185 | <span>接种时间</span> |
186 | 186 | </li> |
187 | 187 | <li class="content"> |
188 | - <span>3月龄(1/2), 6月龄(2/2)</span> | |
188 | + <span>$!recordObj.mouthAge</span> | |
189 | 189 | </li> |
190 | 190 | <li class="header"> |
191 | 191 | <span>接种部位</span> |
192 | 192 | </li> |
193 | 193 | <li class="content"> |
194 | - <span>上臂三角肌(注射)</span> | |
194 | + <span>$!recordObj.vnPosition</span> | |
195 | 195 | </li> |
196 | 196 | <li class="header"> |
197 | - <span>接种效果</span> | |
198 | - </li> | |
199 | - <li class="content"> | |
200 | - <span class="text"> | |
201 | - 凡按照规定程序注射3针乙肝疫苗的人,95%能产生保护作用,可以生产抗体乙肝病毒的抗体,但有5%的注射3针后任不产生抗体,出现免疫无应答或低应答状态。 | |
202 | - </span> | |
203 | - </li> | |
204 | - <li class="header"> | |
205 | 197 | <span>接种禁忌</span> |
206 | 198 | </li> |
207 | 199 | <li class="content"> |
208 | - <span class="line">1.发热或暂缓注射</span> | |
209 | - <span class="line">2.对疫苗已知的任何成分过敏者</span> | |
210 | - <span class="line">3.患有急性或慢性严重疾病者</span> | |
200 | + <span class="line">$!recordObj.vnTaboo</span> | |
211 | 201 | </li> |
212 | 202 | <li class="header"> |
213 | 203 | <span>不良反应</span> |
214 | 204 | </li> |
215 | 205 | <li class="content"> |
216 | 206 | <span class="text"> |
217 | - 注射部位局部反应-疼痛、红斑(皮肤发红)、硬结、中度、过敏性的发热。 | |
207 | + $!recordObj.vnDescription | |
218 | 208 | </span> |
219 | 209 | </li> |
220 | 210 | </ul> |
webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm
View file @
a4b8f96
... | ... | @@ -171,14 +171,14 @@ |
171 | 171 | <li class="content"> |
172 | 172 | <span>$!vaccineName.vnPositionName</span> |
173 | 173 | </li> |
174 | - <li class="header"> | |
174 | + <!--<li class="header"> | |
175 | 175 | <span>接种效果</span> |
176 | 176 | </li> |
177 | 177 | <li class="content"> |
178 | 178 | <span class="text"> |
179 | 179 | 效果 |
180 | 180 | </span> |
181 | - </li> | |
181 | + </li>--> | |
182 | 182 | <li class="header"> |
183 | 183 | <span>接种禁忌</span> |
184 | 184 | </li> |