diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/enumdata/YnEnum.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/enumdata/YnEnum.java index 3bb6385..a7b92e3 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/enumdata/YnEnum.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/enumdata/YnEnum.java @@ -4,6 +4,9 @@ package com.lymsh.yimiao.main.data.enumdata; * Created by riecard on 15/9/28. */ public enum YnEnum { + + + yes(1,"有效"), no(2,"无效"); 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 019b95f..2a0aca5 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 @@ -13,6 +13,15 @@ public class MedInoculateRecord { private String icOrganizationId; private String icIsInoculate; private String icJiCi; + private String isDelete; + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } public String getIcId() { return icId; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java index 1b53873..ca19eb9 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java @@ -17,6 +17,15 @@ public class MedInoculateRecordQuery extends BaseQuery { private String icOrganizationId; private String icIsInoculate; private String icJiCi; + private String isDelete; + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } public String getIcId() { return icId; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineName.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineName.java index 6295e87..aa30c46 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineName.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineName.java @@ -12,6 +12,15 @@ public class MedVaccineName { private String vnDescription; private String vnIsValid; private Integer vnVaccineType; + private String isDelete; + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } public Integer getVnVaccineType() { return vnVaccineType; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineNameQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineNameQuery.java index 468b172..4635e5e 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineNameQuery.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineNameQuery.java @@ -16,6 +16,15 @@ public class MedVaccineNameQuery extends BaseQuery { private String vnDescription; private String vnIsValid; private Integer vnVaccineType; + private String isDelete; + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } public Integer getVnVaccineType() { return vnVaccineType; diff --git a/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml b/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml index 5122c99..4125465 100644 --- a/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml +++ b/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml @@ -8,15 +8,16 @@ - + + @@ -52,7 +53,7 @@ and ic_inoculateTime = #{icInoculateTime,jdbcType=VARCHAR} and ic_doctor = #{icDoctor,jdbcType=VARCHAR} -and ic_position = #{icPosition,jdbcType=VARCHAR} +and io_position = #{icPosition,jdbcType=VARCHAR} and ic_batchNumber = #{icBatchNumber,jdbcType=VARCHAR} @@ -66,13 +67,16 @@ and ic_isInoculate = #{icIsInoculate,jdbcType=VARCHAR} and ic_jici = #{icJiCi,jdbcType=VARCHAR} + +and ic_delete = #{isDelete,jdbcType=VARCHAR} + -select vn_id,vn_name,vn_preventDisease,vn_monthAge,vn_position,vn_taboo,vn_description,vn_isValid,vn_vaccineType +select vn_id,vn_name,vn_preventDisease,vn_monthAge,vn_position,vn_taboo,vn_description,vn_isValid,vn_vaccineType,isDelete from med_vaccinename WHERE vn_id = #{vnId,jdbcType=VARCHAR} @@ -45,7 +46,11 @@ and vn_name = #{vnName,jdbcType=VARCHAR} and vn_preventDisease = #{vnPreventDisease,jdbcType=VARCHAR} -and vn_monthAge = #{vnMonthAge,jdbcType=VARCHAR} +and (vn_monthAge = #{vnMonthAge,jdbcType=VARCHAR} + OR vn_monthAge like CONCAT(#{vnMonthAge,jdbcType=VARCHAR}, ',%') + OR vn_monthAge LIKE CONCAT('%,',#{vnMonthAge,jdbcType=VARCHAR}) + OR vn_monthAge LIKE '%,'||#{vnMonthAge,jdbcType=VARCHAR}||',%' + ) and vn_position = #{vnPosition,jdbcType=VARCHAR} @@ -62,13 +67,16 @@ and vn_isValid = #{vnIsValid,jdbcType=VARCHAR} and vn_vaccineType = #{vnVaccineType,jdbcType=INTEGER} + + and isDelete = #{isDelete,jdbcType=INTEGER} + select id,type,content,created,yn,publish_id,publish_name +from ym_notifications +WHERE id = #{id,jdbcType=INTEGER} diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java index 0fa4e2b..c2d8aa4 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java @@ -19,6 +19,7 @@ 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 sun.security.util.Length; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -55,6 +56,7 @@ public class KidsController extends BaseController{ @Autowired private MedInoculateRecordService medInoculateRecordService; + private final static String isDelete = "1"; // /** // * 发送验证码 @@ -361,6 +363,7 @@ public class KidsController extends BaseController{ * * @param response * @param mouthAge 月龄 + * @param id 宝宝ID */ @RequestMapping(value = "/inoculatePlan", method = RequestMethod.GET) @TokenRequired @@ -372,44 +375,69 @@ public class KidsController extends BaseController{ List freeList = new ArrayList<>(); List chargeList = new ArrayList<>(); + Map map = new HashMap<>(); + //先根据月龄去找这个月龄下要接种的所有疫苗 MedVaccineNameQuery vaccineNameQuery = new MedVaccineNameQuery(); vaccineNameQuery.setVnMonthAge(mouthAge); + vaccineNameQuery.setIsDelete(isDelete); List vaccineNameList = medVaccineNameService.queryMedVaccineName(vaccineNameQuery); if (CollectionUtils.isNotEmpty(vaccineNameList)){ for (MedVaccineName data : vaccineNameList){ //免费 if (data.getVnVaccineType()==1){ - Map map = new HashMap<>(); - - map.put("id",data.getVnId()); - map.put("name",data.getVnName()); - //需要处理剂次 - map.put("jiCi",""); - //去接种预约表里面查某个疫苗是否接种,如果在指定时间内没有接种 - MedInoculateRecordQuery inoculateRecordQuery = new MedInoculateRecordQuery(); - inoculateRecordQuery.setIcKidId(id); - inoculateRecordQuery.setIcVaccineId(data.getVnId()); - List inoculateRecordList = medInoculateRecordService.queryMedInoculateRecord(inoculateRecordQuery); - if (CollectionUtils.isNotEmpty(inoculateRecordList)){ - MedInoculateRecord medInoculateRecord = inoculateRecordList.get(0); - - - } - - - + freeList.add(getInoculate(data,mouthAge,id)); //收费 }else if (data.getVnVaccineType()==2){ - Map map = new HashMap<>(); + chargeList.add(getInoculate(data,mouthAge,id)); + } + } + } + map.put("freeList",freeList); + map.put("chargeList",chargeList); + list.add(map); + ResultUtils.buildSuccessResultAndWrite(response,list); + } + public Map getInoculate(MedVaccineName data,String mouthAge,String kidId){ + Map map = new HashMap<>(); + map.put("id",data.getVnId());//疫苗名称ID + map.put("name",data.getVnName());//疫苗名称title + String mouth = null; + int length = 0; + if (data.getVnMonthAge()!=null){ + + String[] ages = data.getVnMonthAge().split(","); + for (int a = 0 ; a < ages.length ; a++){ + if (mouthAge.equals(ages[a])){ + length = a + 1; } } + mouth = "(第" + length + "/" + ages.length + "剂)"; } - + map.put("mouthAge",mouth); + + //去接种预约表里面查某个疫苗是否接种,如果在指定时间内没有接种 + + boolean isInoculate = false; + + MedInoculateRecordQuery inoculateRecordQuery = new MedInoculateRecordQuery(); + inoculateRecordQuery.setIcKidId(kidId); + inoculateRecordQuery.setIcVaccineId(data.getVnId()); + inoculateRecordQuery.setIsDelete(isDelete); + List inoculateRecordList = medInoculateRecordService.queryMedInoculateRecord(inoculateRecordQuery); + if (CollectionUtils.isNotEmpty(inoculateRecordList)){ + MedInoculateRecord medInoculateRecord = inoculateRecordList.get(0); + //是否接种 + if (length == Integer.valueOf(medInoculateRecord.getIcJiCi())){ + isInoculate = true; + } + } + map.put("isInoculate",isInoculate); + return map; } /** diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java index e737d99..bb93189 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java @@ -39,17 +39,12 @@ public class NotificationsController extends BaseController{ //获取消息(1.系统消息2.接种消息) @RequestMapping(value = "/notifications", method = RequestMethod.GET) @TokenRequired - public void getNotifications(HttpServletResponse response, - @RequestParam("page") int page, - @RequestParam("limit") int limit ){ + public void getNotifications(HttpServletResponse response){ YmNotificationsQuery notificationsQuery = new YmNotificationsQuery(); notificationsQuery.setYn(YnEnum.yes.getId()); - notificationsQuery.setPage(page); - notificationsQuery.setLimit(limit); notificationsQuery.setSort("created desc"); - notificationsQuery.setNeed("y"); List notificationsList = notificationsService.queryYmNotifications(notificationsQuery); @@ -65,10 +60,7 @@ public class NotificationsController extends BaseController{ list.add(map); } } - CommonResult result = new CommonResult(); - result.setList(list); - result.setPageInfo(notificationsQuery.getPageInfo()); - ResultUtils.buildSuccessResultAndWrite(response,result); + ResultUtils.buildSuccessResultAndWrite(response,list); } //定时发送给当前登录用户接种通知