diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateorderMapper.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateorderMapper.java index e9263e8..b046da6 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateorderMapper.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateorderMapper.java @@ -1,21 +1,21 @@ package com.lymsh.yimiao.main.data.dao; -import com.lymsh.yimiao.main.data.model.MedInoculateorder; +import com.lymsh.yimiao.main.data.model.MedInoculateOrder; import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery; import java.util.List; public interface MedInoculateorderMapper { - public void addMedInoculateorder(MedInoculateorder obj); + public void addMedInoculateorder(MedInoculateOrder obj); - public void updateMedInoculateorder(MedInoculateorder obj); + public void updateMedInoculateorder(MedInoculateOrder obj); public void deleteMedInoculateorder(Integer id); - public MedInoculateorder getMedInoculateorder(String id); + public MedInoculateOrder getMedInoculateorder(String id); public int queryMedInoculateorderCount(MedInoculateorderQuery query); - public List queryMedInoculateorder(MedInoculateorderQuery query); + public List queryMedInoculateorder(MedInoculateorderQuery query); } \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculaterecordMapper.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculaterecordMapper.java index 302ff98..6095e44 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculaterecordMapper.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculaterecordMapper.java @@ -1,7 +1,7 @@ package com.lymsh.yimiao.main.data.dao; +import com.lymsh.yimiao.main.data.model.MedInoculateRecordQuery; import com.lymsh.yimiao.main.data.model.MedInoculaterecord; -import com.lymsh.yimiao.main.data.model.MedInoculaterecordQuery; import java.util.List; @@ -14,8 +14,8 @@ public interface MedInoculaterecordMapper { public MedInoculaterecord getMedInoculaterecord(String id); - public int queryMedInoculaterecordCount(MedInoculaterecordQuery query); + public int queryMedInoculaterecordCount(MedInoculateRecordQuery query); - public List queryMedInoculaterecord(MedInoculaterecordQuery query); + public List queryMedInoculaterecord(MedInoculateRecordQuery query); } \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrder.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrder.java new file mode 100644 index 0000000..7065acf --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrder.java @@ -0,0 +1,78 @@ +package com.lymsh.yimiao.main.data.model; + +import java.util.Date; + +public class MedInoculateOrder { + private String ioId; + private String ioKidId; + private String ioVaccineId; + private String ioOrganizationId; + private String ioInoculateDate; + private String ioInoculateTime; + private String ioOrderOPer; + private String ioOrderTime; + + public String getIoId() { + return ioId; + } + + public void setIoId(String ioId) { + this.ioId = ioId; + } + + public String getIoKidId() { + return ioKidId; + } + + public void setIoKidId(String ioKidId) { + this.ioKidId = ioKidId; + } + + public String getIoVaccineId() { + return ioVaccineId; + } + + public void setIoVaccineId(String ioVaccineId) { + this.ioVaccineId = ioVaccineId; + } + + public String getIoOrganizationId() { + return ioOrganizationId; + } + + public void setIoOrganizationId(String ioOrganizationId) { + this.ioOrganizationId = ioOrganizationId; + } + + public String getIoInoculateDate() { + return ioInoculateDate; + } + + public void setIoInoculateDate(String ioInoculateDate) { + this.ioInoculateDate = ioInoculateDate; + } + + public String getIoInoculateTime() { + return ioInoculateTime; + } + + public void setIoInoculateTime(String ioInoculateTime) { + this.ioInoculateTime = ioInoculateTime; + } + + public String getIoOrderOPer() { + return ioOrderOPer; + } + + public void setIoOrderOPer(String ioOrderOPer) { + this.ioOrderOPer = ioOrderOPer; + } + + public String getIoOrderTime() { + return ioOrderTime; + } + + public void setIoOrderTime(String ioOrderTime) { + this.ioOrderTime = ioOrderTime; + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..1b53873 --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java @@ -0,0 +1,100 @@ +package com.lymsh.yimiao.main.data.model; + + +import java.util.Date; + +import com.lymsh.mommybaby.basecommon.base.BaseQuery; + + +public class MedInoculateRecordQuery extends BaseQuery { + private String icId; + private String icKidId; + private String icVaccineId; + private String icInoculateTime; + private String icDoctor; + private String icPosition; + private String icBatchNumber; + private String icOrganizationId; + private String icIsInoculate; + private String icJiCi; + + public String getIcId() { + return icId; + } + + public void setIcId(String icId) { + this.icId = icId; + } + + public String getIcKidId() { + return icKidId; + } + + public void setIcKidId(String icKidId) { + this.icKidId = icKidId; + } + + public String getIcVaccineId() { + return icVaccineId; + } + + public void setIcVaccineId(String icVaccineId) { + this.icVaccineId = icVaccineId; + } + + public String getIcInoculateTime() { + return icInoculateTime; + } + + public void setIcInoculateTime(String icInoculateTime) { + this.icInoculateTime = icInoculateTime; + } + + public String getIcDoctor() { + return icDoctor; + } + + public void setIcDoctor(String icDoctor) { + this.icDoctor = icDoctor; + } + + public String getIcPosition() { + return icPosition; + } + + public void setIcPosition(String icPosition) { + this.icPosition = icPosition; + } + + public String getIcBatchNumber() { + return icBatchNumber; + } + + public void setIcBatchNumber(String icBatchNumber) { + this.icBatchNumber = icBatchNumber; + } + + public String getIcOrganizationId() { + return icOrganizationId; + } + + public void setIcOrganizationId(String icOrganizationId) { + this.icOrganizationId = icOrganizationId; + } + + public String getIcIsInoculate() { + return icIsInoculate; + } + + public void setIcIsInoculate(String icIsInoculate) { + this.icIsInoculate = icIsInoculate; + } + + public String getIcJiCi() { + return icJiCi; + } + + public void setIcJiCi(String icJiCi) { + this.icJiCi = icJiCi; + } +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateorder.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateorder.java index 7f9f98d..7065acf 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateorder.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateorder.java @@ -2,7 +2,7 @@ package com.lymsh.yimiao.main.data.model; import java.util.Date; -public class MedInoculateorder { +public class MedInoculateOrder { private String ioId; private String ioKidId; private String ioVaccineId; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateorderService.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateorderService.java index 5538eb9..5add6c6 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateorderService.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateorderService.java @@ -1,21 +1,21 @@ package com.lymsh.yimiao.main.data.service; -import com.lymsh.yimiao.main.data.model.MedInoculateorder; +import com.lymsh.yimiao.main.data.model.MedInoculateOrder; import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery; import java.util.List; public interface MedInoculateorderService { - public void addMedInoculateorder(MedInoculateorder obj); + public void addMedInoculateorder(MedInoculateOrder obj); - public void updateMedInoculateorder(MedInoculateorder obj); + public void updateMedInoculateorder(MedInoculateOrder obj); public void deleteMedInoculateorder(Integer id); - public MedInoculateorder getMedInoculateorder(String id); + public MedInoculateOrder getMedInoculateorder(String id); public int queryMedInoculateorderCount(MedInoculateorderQuery query); - public List queryMedInoculateorder(MedInoculateorderQuery query); + public List queryMedInoculateorder(MedInoculateorderQuery query); } \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculateorderServiceImpl.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculateorderServiceImpl.java index eb8ae97..673148a 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculateorderServiceImpl.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculateorderServiceImpl.java @@ -1,13 +1,12 @@ package com.lymsh.yimiao.main.data.service.impl; import com.lymsh.yimiao.main.data.dao.MedInoculateorderMapper; -import com.lymsh.yimiao.main.data.model.MedInoculateorder; +import com.lymsh.yimiao.main.data.model.MedInoculateOrder; import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery; import com.lymsh.yimiao.main.data.service.MedInoculateorderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @Service @@ -17,16 +16,16 @@ public class MedInoculateorderServiceImpl implements MedInoculateorderService { private MedInoculateorderMapper medInoculateorderMapper; @Override -public void addMedInoculateorder(MedInoculateorder obj){medInoculateorderMapper.addMedInoculateorder(obj);} +public void addMedInoculateorder(MedInoculateOrder obj){medInoculateorderMapper.addMedInoculateorder(obj);} @Override -public void updateMedInoculateorder(MedInoculateorder obj){medInoculateorderMapper.updateMedInoculateorder(obj);} +public void updateMedInoculateorder(MedInoculateOrder obj){medInoculateorderMapper.updateMedInoculateorder(obj);} @Override public void deleteMedInoculateorder (Integer id){medInoculateorderMapper.deleteMedInoculateorder(id);} @Override -public MedInoculateorder getMedInoculateorder (String id){return medInoculateorderMapper.getMedInoculateorder(id);} +public MedInoculateOrder getMedInoculateorder (String id){return medInoculateorderMapper.getMedInoculateorder(id);} @Override public int queryMedInoculateorderCount (MedInoculateorderQuery query){return medInoculateorderMapper.queryMedInoculateorderCount(query);} @Override -public List queryMedInoculateorder (MedInoculateorderQuery query){if (query.getNeed() != null) {query.mysqlBuild(medInoculateorderMapper.queryMedInoculateorderCount(query));}return medInoculateorderMapper.queryMedInoculateorder(query);} +public List queryMedInoculateorder (MedInoculateorderQuery query){if (query.getNeed() != null) {query.mysqlBuild(medInoculateorderMapper.queryMedInoculateorderCount(query));}return medInoculateorderMapper.queryMedInoculateorder(query);} } \ No newline at end of file diff --git a/mainData/src/main/resources/mainOrm/MedInoculateorder.xml b/mainData/src/main/resources/mainOrm/MedInoculateorder.xml index 5d991c9..fd45082 100644 --- a/mainData/src/main/resources/mainOrm/MedInoculateorder.xml +++ b/mainData/src/main/resources/mainOrm/MedInoculateorder.xml @@ -2,7 +2,7 @@ - + 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 74d6268..ce4d657 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 @@ -209,10 +209,10 @@ public class KidsController extends BaseController{ inoculateorderQuery.setIoKidId(id); //时间倒序 inoculateorderQuery.setIoInoculateTime("ioInoculateTime desc"); - List inoculateorderList = medInoculateorderService.queryMedInoculateorder(inoculateorderQuery); + List inoculateorderList = medInoculateorderService.queryMedInoculateorder(inoculateorderQuery); if (CollectionUtils.isNotEmpty(inoculateorderList)) { //取出离现在日期最近的一个预约接种 - MedInoculateorder medInoculateorder = inoculateorderList.get(0); + MedInoculateOrder medInoculateorder = inoculateorderList.get(0); //下次接种时间 map.put("ioInoculateTime", medInoculateorder.getIoInoculateTime()); //下次接种疫苗