From a4b8f96a552b4c80d5132b092f5f1f4d0a56b3ed Mon Sep 17 00:00:00 2001 From: landong2015 Date: Sat, 14 May 2016 12:45:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yimiao/main/data/dao/MedEmployeeMapper.java | 21 ++++ .../lymsh/yimiao/main/data/model/MedEmployee.java | 39 ++++++ .../yimiao/main/data/model/MedEmployeeQuery.java | 44 +++++++ .../yimiao/main/data/model/MedInoculateRecord.java | 56 +++++++++ .../main/data/service/MedEmployeeService.java | 21 ++++ .../data/service/impl/MedEmployeeServiceImpl.java | 52 ++++++++ .../src/main/resources/mainOrm/MedEmployee.xml | 62 +++++++++ .../controller/v1/InoculateRecordController.java | 140 ++++++++++++--------- .../web/controller/v1/VaccineNamesController.java | 2 + .../main/webapp/WEB-INF/html/inoculateRecord.vm | 36 ++---- .../main/webapp/WEB-INF/html/vaccineNameList.vm | 4 +- 11 files changed, 395 insertions(+), 82 deletions(-) create mode 100644 mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedEmployeeMapper.java create mode 100644 mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployee.java create mode 100644 mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployeeQuery.java create mode 100644 mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedEmployeeService.java create mode 100644 mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedEmployeeServiceImpl.java create mode 100644 mainData/src/main/resources/mainOrm/MedEmployee.xml diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedEmployeeMapper.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedEmployeeMapper.java new file mode 100644 index 0000000..9f40496 --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedEmployeeMapper.java @@ -0,0 +1,21 @@ +package com.lymsh.yimiao.main.data.dao; + +import com.lymsh.yimiao.main.data.model.MedEmployee; +import com.lymsh.yimiao.main.data.model.MedEmployeeQuery; + +import java.util.List; + +public interface MedEmployeeMapper { + public void addMedEmployee(MedEmployee obj); + + public void updateMedEmployee(MedEmployee obj); + + public void deleteMedEmployee(Integer id); + + public MedEmployee getMedEmployee(String id); + + public int queryMedEmployeeCount(MedEmployeeQuery query); + + public List queryMedEmployee(MedEmployeeQuery query); + +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployee.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployee.java new file mode 100644 index 0000000..6105387 --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployee.java @@ -0,0 +1,39 @@ +package com.lymsh.yimiao.main.data.model; + +import java.util.Date; + +public class MedEmployee { + private String eId; + private String eName; + private String eSex; + + public String getEId() { + return eId; + } + + + public void setEId(String eId) { + this.eId = eId; + + } + + public String getEName() { + return eName; + } + + + public void setEName(String eName) { + this.eName = eName; + + } + + public String getESex() { + return eSex; + } + + + public void setESex(String eSex) { + this.eSex = eSex; + + } +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployeeQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployeeQuery.java new file mode 100644 index 0000000..71fae06 --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedEmployeeQuery.java @@ -0,0 +1,44 @@ +package com.lymsh.yimiao.main.data.model; + + + +import java.util.Date; +import com.lymsh.mommybaby.basecommon.base.BaseQuery; + + + +public class MedEmployeeQuery extends BaseQuery {private String eId;private String eName;private String eSex; + +public String getEId() { + return eId; + } + + + + public void setEId(String eId) { + this.eId = eId; + + } + +public String getEName() { + return eName; + } + + + + public void setEName(String eName) { + this.eName = eName; + + } + +public String getESex() { + return eSex; + } + + + + public void setESex(String eSex) { + this.eSex = eSex; + + } +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecord.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecord.java index 2a0aca5..9f5273c 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecord.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecord.java @@ -14,6 +14,62 @@ public class MedInoculateRecord { private String icIsInoculate; private String icJiCi; private String isDelete; + private String icFactoryName; + + private String vnName; + private String mouthAge; + private String vnPosition; + + private String vnTaboo; + private String vnDescription; + + public String getVnName() { + return vnName; + } + + public void setVnName(String vnName) { + this.vnName = vnName; + } + + public String getMouthAge() { + return mouthAge; + } + + public void setMouthAge(String mouthAge) { + this.mouthAge = mouthAge; + } + + public String getVnPosition() { + return vnPosition; + } + + public void setVnPosition(String vnPosition) { + this.vnPosition = vnPosition; + } + + public String getVnTaboo() { + return vnTaboo; + } + + public void setVnTaboo(String vnTaboo) { + this.vnTaboo = vnTaboo; + } + + public String getVnDescription() { + return vnDescription; + } + + public void setVnDescription(String vnDescription) { + this.vnDescription = vnDescription; + } + + public String getIcFactoryName() { + return icFactoryName; + } + + public void setIcFactoryName(String icFactoryName) { + this.icFactoryName = icFactoryName; + } public String getIsDelete() { return isDelete; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedEmployeeService.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedEmployeeService.java new file mode 100644 index 0000000..2d81c6a --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedEmployeeService.java @@ -0,0 +1,21 @@ +package com.lymsh.yimiao.main.data.service; + +import com.lymsh.yimiao.main.data.model.MedEmployee; +import com.lymsh.yimiao.main.data.model.MedEmployeeQuery; + +import java.util.List; + +public interface MedEmployeeService { + public void addMedEmployee(MedEmployee obj); + + public void updateMedEmployee(MedEmployee obj); + + public void deleteMedEmployee(Integer id); + + public MedEmployee getMedEmployee(String id); + + public int queryMedEmployeeCount(MedEmployeeQuery query); + + public List queryMedEmployee(MedEmployeeQuery query); + +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedEmployeeServiceImpl.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedEmployeeServiceImpl.java new file mode 100644 index 0000000..5a7e2cd --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedEmployeeServiceImpl.java @@ -0,0 +1,52 @@ +package com.lymsh.yimiao.main.data.service.impl; + +import com.lymsh.yimiao.main.data.dao.MedEmployeeMapper; +import com.lymsh.yimiao.main.data.model.MedEmployee; +import com.lymsh.yimiao.main.data.model.MedEmployeeQuery; +import com.lymsh.yimiao.main.data.service.MedEmployeeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +@Service +public class MedEmployeeServiceImpl implements MedEmployeeService { + + @Autowired + private MedEmployeeMapper medEmployeeMapper; + + @Override + public void addMedEmployee(MedEmployee obj) { + medEmployeeMapper.addMedEmployee(obj); + } + + @Override + public void updateMedEmployee(MedEmployee obj) { + medEmployeeMapper.updateMedEmployee(obj); + } + + @Override + public void deleteMedEmployee(Integer id) { + medEmployeeMapper.deleteMedEmployee(id); + } + + @Override + public MedEmployee getMedEmployee(String id) { + return medEmployeeMapper.getMedEmployee(id); + } + + @Override + public int queryMedEmployeeCount(MedEmployeeQuery query) { + return medEmployeeMapper.queryMedEmployeeCount(query); + } + + @Override + public List queryMedEmployee(MedEmployeeQuery query) { + if (query.getNeed() != null) { + query.mysqlBuild(medEmployeeMapper.queryMedEmployeeCount(query)); + } + return medEmployeeMapper.queryMedEmployee(query); + } + +} \ No newline at end of file diff --git a/mainData/src/main/resources/mainOrm/MedEmployee.xml b/mainData/src/main/resources/mainOrm/MedEmployee.xml new file mode 100644 index 0000000..ca4606c --- /dev/null +++ b/mainData/src/main/resources/mainOrm/MedEmployee.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + +order by ${sort} + +limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + 1 = 1 + +and e_id = #{eId,jdbcType=VARCHAR} + + +and e_name = #{eName,jdbcType=VARCHAR} + + +and e_sex = #{eSex,jdbcType=VARCHAR} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/InoculateRecordController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/InoculateRecordController.java index c57448c..ebaa3c6 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/InoculateRecordController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/InoculateRecordController.java @@ -1,26 +1,18 @@ package com.lyms.yimiao.web.controller.v1; import com.lymsh.mommybaby.basecommon.base.TokenRequired; -import com.lymsh.mommybaby.basecommon.util.DateUtil; -import com.lymsh.mommybaby.basecommon.util.ResultUtils; +import com.lymsh.yimiao.main.data.enumdata.PositionEnum; import com.lymsh.yimiao.main.data.model.*; -import com.lymsh.yimiao.main.data.service.MedFactoryService; -import com.lymsh.yimiao.main.data.service.MedInoculateRecordService; -import com.lymsh.yimiao.main.data.service.MedOrganizationService; -import com.lymsh.yimiao.main.data.service.MedVaccineInfoService; -import org.apache.commons.collections.CollectionUtils; +import com.lymsh.yimiao.main.data.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; /** * Created by Administrator on 2016/5/13 0013. @@ -36,7 +28,10 @@ public class InoculateRecordController { private MedVaccineInfoService medVaccineinfoService; @Autowired private MedOrganizationService medOrganizationService; - + @Autowired + private MedEmployeeService medEmployeeService; + @Autowired + private MedVaccineNameService medVaccineNameService; private final static String isDelete = "1"; @@ -45,8 +40,7 @@ public class InoculateRecordController { * * @param response */ - @RequestMapping(value = "/inoculateRecord", method = RequestMethod.GET) - @TokenRequired + @RequestMapping(value = "/getInoculateRecord") public ModelAndView getKidVaccines(HttpServletResponse response, @RequestParam("id") String icId) { ModelAndView mv = new ModelAndView("error"); @@ -54,64 +48,96 @@ public class InoculateRecordController { if (icId == null) { mv.addObject("msg", "inoculateRecord id is null"); } - - MedInoculateRecordQuery recordQuery = new MedInoculateRecordQuery(); recordQuery.setIcId(icId); recordQuery.setIsDelete(isDelete); List recordList = medInoculateRecordService.queryMedInoculateRecord(recordQuery); if (recordList.size()==0){ mv.setViewName("empty"); - mv.addObject("msg", "无疫苗详情信息"); + mv.addObject("msg", "无接种记录信息"); + } + MedInoculateRecord data = recordList.get(0); + //疫苗名称 + MedVaccineInfo info = medVaccineinfoService.getMedVaccineInfo(data.getIcVaccineId()); + data.setIcVaccineId(info==null ? "" : info.getViName()); + //生产企业 + if (info!=null){ + if (info.getViFactoryId()!= null){ + MedFactory medFactory = medFactoryService.getMedFactory(info.getViFactoryId()); + data.setIcFactoryName(medFactory == null ? "" : medFactory.getFName()); + } + + //疫苗详情 + + //疫苗名称 + if (info.getViVaccineNameId()!=null){ + MedVaccineName medVaccineName = medVaccineNameService.getMedVaccineName(info.getViVaccineNameId()); + data.setVnName(medVaccineName==null ? "" : medVaccineName.getVnName()); + //接种时间 + String[] ages = medVaccineName.getVnMonthAge().split(",");//1,2 + + //接种次数 + String jiCi = "第" + data.getIcJiCi() +"/" + ages.length +"剂"; + data.setIcJiCi(jiCi); + + String monthAgeStr = ""; + for (int j = 0; j < ages.length ; j++) { + String q = ages[j]+"月齡"+"("+ (j+1) +"/"+ages.length+")"; + monthAgeStr+=q; + if (ages.length-1 != j) + { + monthAgeStr+=","; + } + } + data.setMouthAge(monthAgeStr); + + //接种部位 + if (medVaccineName.getVnPosition().equals(PositionEnum.zero.getId())){ + data.setVnPosition(PositionEnum.getTitle(PositionEnum.zero.getId())); + }else if (medVaccineName.getVnPosition().equals(PositionEnum.two.getId())){ + data.setVnPosition(PositionEnum.getTitle(PositionEnum.two.getId())); + }else if (medVaccineName.getVnPosition().equals(PositionEnum.three.getId())){ + data.setVnPosition(PositionEnum.getTitle(PositionEnum.three.getId())); + }else if (medVaccineName.getVnPosition().equals(PositionEnum.four.getId())){ + data.setVnPosition(PositionEnum.getTitle(PositionEnum.four.getId())); + }else if (medVaccineName.getVnPosition().equals(PositionEnum.five.getId())){ + data.setVnPosition(PositionEnum.getTitle(PositionEnum.five.getId())); + } + //接种禁忌 + data.setVnTaboo(medVaccineName.getVnTaboo()); + //不良反应 + data.setVnDescription(medVaccineName.getVnDescription()); + } + } + //医生名字 + if (data.getIcDoctor()!=null){ + MedEmployee employee = medEmployeeService.getMedEmployee(data.getIcDoctor()); + data.setIcDoctor(employee==null ? "" : employee.getEName()); + } + + //接种日期 + try { + Date d1 = new SimpleDateFormat("yyyy-MM-dd").parse(data.getIcInoculateTime()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日"); + String icInoculateTime = simpleDateFormat.format(d1); + data.setIcInoculateTime(icInoculateTime); + }catch (Exception e){ + } - MedInoculateRecord record = recordList.get(0); + //接种单位 + MedOrganization medOrganization = medOrganizationService.getMedOrganization(data.getIcOrganizationId()); + data.setIcOrganizationId(medOrganization==null ? "" : medOrganization.getoName()); + mv.setViewName("inoculateRecord"); + mv.addObject("recordObj", data); - mv.setViewName("recordList"); - mv.addObject("recordList", recordList); return mv; -// if (CollectionUtils.isNotEmpty(recordList)) { -// MedInoculateRecord data = recordList.get(0); -// Map map = new HashMap<>(); -// //疫苗名称 -// MedVaccineInfo info = medVaccineinfoService.getMedVaccineInfo(data.getIcVaccineId()); -// if (info != null && isDelete.equals(info.getIsDelete())) { -// map.put("vaccineInfoName", info.getViName()); -// //生产企业 -// MedFactory medFactory = medFactoryService.getMedFactory(info.getViFactoryId()); -// if (medFactory != null && isDelete.equals(medFactory.getIsDelete())) { -// map.put("factoryName", medFactory.getFName()); -// } -// } else { -// map.put("vaccineInfoName", null); -// map.put("factoryName", null); -// -// } -// //接种日期 -// map.put("inoculateTime", DateUtil.getSecond(DateUtil.parseYMD(data.getIcInoculateTime()))); -// //接种医生 -// map.put("doctorName", data.getIcDoctor()); -// //接种部位 -// map.put("position", data.getIcPosition()); -// -// //接种单位 -// MedOrganization medOrganization = medOrganizationService.getMedOrganization(data.getIcOrganizationId()); -// if (medOrganization != null && isDelete.equals(medOrganization.getIsDelete())) { -// map.put("organizationName", medOrganization.getoName()); -// } else { -// map.put("organizationName", null); -// } -// //疫苗批号 -// map.put("batchNumber", data.getIcBatchNumber()); -// list.add(map); -// } -// ResultUtils.buildSuccessResultAndWrite(response, list); } } diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java index 87a9d36..e6a65d2 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -168,4 +169,5 @@ public class VaccineNamesController extends BaseController{ + } diff --git a/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm b/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm index b5cb6d4..b01057a 100644 --- a/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm +++ b/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm @@ -134,7 +134,7 @@
- 乙肝疫苗 + $!recordObj.icVaccineId
@@ -143,31 +143,31 @@ 接种单位
  • - 东半壁店卫生院 + $!recordObj.icFactoryName
  • 接种时间 接种医生
  • - 2016年5月12日 - 王医生 + $!recordObj.icInoculateTime + $!recordObj.icDoctor
  • 接种部位 接种剂次
  • - 左上臂 - 第1/2次 + $!recordObj.icPosition + $!recordObj.icJiCi
  • 疫苗生产企业 疫苗批号
  • - 华尔顿 - 1324235123 + $!recordObj.icFactoryName + $!recordObj.icBatchNumber
    • @@ -179,42 +179,32 @@ 接种预防疾病
  • - 乙肝肝炎 + $!recordObj.vnName
  • 接种时间
  • - 3月龄(1/2)， 6月龄(2/2) + $!recordObj.mouthAge
  • 接种部位
  • - 上臂三角肌(注射) -
    • -
  • - 接种效果 -
    • -
  • - - 凡按照规定程序注射3针乙肝疫苗的人，95%能产生保护作用，可以生产抗体乙肝病毒的抗体，但有5%的注射3针后任不产生抗体，出现免疫无应答或低应答状态。 - + $!recordObj.vnPosition
  • 接种禁忌
  • - 1.发热或暂缓注射 - 2.对疫苗已知的任何成分过敏者 - 3.患有急性或慢性严重疾病者 + $!recordObj.vnTaboo
  • 不良反应
  • - 注射部位局部反应-疼痛、红斑(皮肤发红)、硬结、中度、过敏性的发热。 + $!recordObj.vnDescription
    • diff --git a/webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm b/webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm index 1e7b8b0..be9acd5 100644 --- a/webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm +++ b/webApi/src/main/webapp/WEB-INF/html/vaccineNameList.vm @@ -171,14 +171,14 @@
  • $!vaccineName.vnPositionName
    • -
  • +
  • 接种禁忌
    • -- 1.8.3.1