diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java index 7e85b18..06aacbe 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java @@ -33,7 +33,12 @@ public class JsonUtil { } public static String obj2JsonString(Object obj) { - return JSONObject.fromObject(obj).toString(); + try { + return JSONObject.fromObject(obj).toString(); + }catch (Exception e){ + ExceptionUtils.catchException(e,"obj2 json string error ."+e.getMessage()); + } + return null; } public static String array2JsonString(Object obj) { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java index 7b3f655..391873e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java @@ -83,13 +83,13 @@ public class BabyVisitModel extends BaseModel { private String neonatalAsphyxia; // 是否畸形 - private int deformity; + private String deformity; // 听力情况 private int hearing; // 疾病筛查 - private int disease; + private String disease; // 出生体重 private double birthWeight; @@ -332,11 +332,11 @@ public class BabyVisitModel extends BaseModel { this.neonatalAsphyxia = neonatalAsphyxia; } - public int getDeformity() { + public String getDeformity() { return deformity; } - public void setDeformity(int deformity) { + public void setDeformity(String deformity) { this.deformity = deformity; } @@ -348,11 +348,11 @@ public class BabyVisitModel extends BaseModel { this.hearing = hearing; } - public int getDisease() { + public String getDisease() { return disease; } - public void setDisease(int disease) { + public void setDisease(String disease) { this.disease = disease; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index f87eb8c..d680354 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -32,9 +32,9 @@ public class Patients extends BaseModel { * 地址 */ private String address; - private int provinceId; - private int cityId; - private int areaId; + private Integer provinceId; + private Integer cityId; + private Integer areaId; public int getAreaId() { return areaId; @@ -67,7 +67,7 @@ public class Patients extends BaseModel { /** * 是否访视 */ - private int isVisit; + private Integer isVisit; private String id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java index 859bd28..a2257e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java @@ -75,7 +75,7 @@ public class VisitController extends RestController { @ResponseBody @TokenRequired @RequestMapping(value = "/visitbaby", method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE,consumes =MediaType.APPLICATION_JSON_VALUE ) - public BaseResponse addOneBabyVisit(@Valid + public BaseResponse addOneBabyVisit(@Valid @RequestBody BabyVisitAddRequest babyVisitAddRequest) { return visitFacade.addOrUpdateBabyAndVisit(babyVisitAddRequest); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java index 3f38d17..4445993 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java @@ -3,10 +3,13 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.BabyVisitModel; import com.lyms.platform.pojo.Patients; import java.util.Date; +import java.util.List; +import java.util.Map; @Form public class BabyVisitAddRequest implements IBasicRequestConvert { @@ -22,32 +25,14 @@ public class BabyVisitAddRequest implements IBasicRequestConvert private int cityId; private int areaId; - public void setAddress(String address) { - this.address = address; - } + private String phone; - public int getAreaId() { - return areaId; + public String getPhone() { + return phone; } - public void setAreaId(int areaId) { - this.areaId = areaId; - } - - public int getCityId() { - return cityId; - } - - public void setCityId(int cityId) { - this.cityId = cityId; - } - - public int getProvinceId() { - return provinceId; - } - - public void setProvinceId(int provinceId) { - this.provinceId = provinceId; + public void setPhone(String phone) { + this.phone = phone; } // 名称 @@ -83,25 +68,25 @@ public class BabyVisitAddRequest implements IBasicRequestConvert private int week; // 母亲患病情况 - private String sickenInfo; + private Map sickenInfo; // 助产结构名称 private String org; // 出生情况 - private String birthSituation; + private Map birthSituation; // 新生儿窒息 - private String neonatalAsphyxia; + private int neonatalAsphyxia; // 是否畸形 - private int deformity; + private Map deformity; // 听力情况 private int hearing; // 疾病筛查 - private int disease; + private Map disease; // 出生体重 private double birthWeight; @@ -140,61 +125,61 @@ public class BabyVisitAddRequest implements IBasicRequestConvert private double respiratoryRate; // 面色 - private String complexion; + private Map complexion; // 黄疸部位 - private String jaundiceParts; + private Map jaundiceParts; // 前卤 - private String bregma; + private Map bregma; // 眼睛 - private String eye; + private Map eye; // 四肢活动度 - private String limbsActivity; + private Map limbsActivity; // 耳外观 - private String earAppearance; + private Map earAppearance; // 颈部包块 - private String cervicalMass; + private Map cervicalMass; // 鼻 - private String nose; + private Map nose; // 皮肤 - private String skin; + private Map skin; // 口腔 - private String mouthCavity; + private Map mouthCavity; // 肛门 - private String anus; + private Map anus; // 心肺听诊 - private String auscultation; + private Map auscultation; // 胸部 - private String breast; + private Map breast; // 腹部触诊 - private String abdominalPalpation; + private Map abdominalPalpation; // 脊柱 - private String backbone; + private Map backbone; // 外生殖器 - private String pudendum; + private Map pudendum; // 脐带 - private String funicle; + private Map funicle; // 转诊建议 - private String referralAdvice; + private Map referralAdvice; // 指导 - private String guide; + private List guide; // 本次访视时间 private String currentVisit; @@ -211,6 +196,35 @@ public class BabyVisitAddRequest implements IBasicRequestConvert // 访视记录id private String id; + public void setAddress(String address) { + this.address = address; + } + + public int getAreaId() { + return areaId; + } + + public void setAreaId(int areaId) { + this.areaId = areaId; + } + + public int getCityId() { + return cityId; + } + + public void setCityId(int cityId) { + this.cityId = cityId; + } + + public int getProvinceId() { + return provinceId; + } + + public void setProvinceId(int provinceId) { + this.provinceId = provinceId; + } + + public String getId() { return id; } @@ -331,307 +345,312 @@ public class BabyVisitAddRequest implements IBasicRequestConvert this.week = week; } - public String getSickenInfo() { - return sickenInfo; + public Map getAbdominalPalpation() { + return abdominalPalpation; } - public void setSickenInfo(String sickenInfo) { - this.sickenInfo = sickenInfo; + public void setAbdominalPalpation(Map abdominalPalpation) { + this.abdominalPalpation = abdominalPalpation; } - public String getOrg() { - return org; + public String getAddress() { + return address; } - public void setOrg(String org) { - this.org = org; + public Map getAnus() { + return anus; } - public String getBirthSituation() { - return birthSituation; + public void setAnus(Map anus) { + this.anus = anus; } - public void setBirthSituation(String birthSituation) { - this.birthSituation = birthSituation; + public Map getAuscultation() { + return auscultation; } - public String getNeonatalAsphyxia() { - return neonatalAsphyxia; + public void setAuscultation(Map auscultation) { + this.auscultation = auscultation; } - public void setNeonatalAsphyxia(String neonatalAsphyxia) { - this.neonatalAsphyxia = neonatalAsphyxia; + public Map getBackbone() { + return backbone; } - public int getDeformity() { - return deformity; + public void setBackbone(Map backbone) { + this.backbone = backbone; } - public void setDeformity(int deformity) { - this.deformity = deformity; + public Map getBirthSituation() { + return birthSituation; } - public int getHearing() { - return hearing; + public void setBirthSituation(Map birthSituation) { + this.birthSituation = birthSituation; } - public void setHearing(int hearing) { - this.hearing = hearing; + public Map getBreast() { + return breast; } - public int getDisease() { - return disease; + public void setBreast(Map breast) { + this.breast = breast; } - public void setDisease(int disease) { - this.disease = disease; + public Map getBregma() { + return bregma; } - public double getBirthWeight() { - return birthWeight; + public void setBregma(Map bregma) { + this.bregma = bregma; } - public void setBirthWeight(double birthWeight) { - this.birthWeight = birthWeight; + public Map getCervicalMass() { + return cervicalMass; } - public double getWeight() { - return weight; + public void setCervicalMass(Map cervicalMass) { + this.cervicalMass = cervicalMass; } - public void setWeight(double weight) { - this.weight = weight; + public Map getComplexion() { + return complexion; } - public double getHeight() { - return height; + public void setComplexion(Map complexion) { + this.complexion = complexion; } - public void setHeight(double height) { - this.height = height; + public Map getDeformity() { + return deformity; } - public int getFeedType() { - return feedType; + public void setDeformity(Map deformity) { + this.deformity = deformity; } - public void setFeedType(int feedType) { - this.feedType = feedType; + public Map getDisease() { + return disease; } - public int getEatMilk() { - return eatMilk; + public void setDisease(Map disease) { + this.disease = disease; } - public void setEatMilk(int eatMilk) { - this.eatMilk = eatMilk; + public Map getEarAppearance() { + return earAppearance; } - public int getEatTime() { - return eatTime; + public void setEarAppearance(Map earAppearance) { + this.earAppearance = earAppearance; } - public void setEatTime(int eatTime) { - this.eatTime = eatTime; + public Map getEye() { + return eye; } - public int getEmesis() { - return emesis; + public void setEye(Map eye) { + this.eye = eye; } - public void setEmesis(int emesis) { - this.emesis = emesis; + public Map getFunicle() { + return funicle; } - public String getShit() { - return shit; + public void setFunicle(Map funicle) { + this.funicle = funicle; } - public void setShit(String shit) { - this.shit = shit; + public int getHearing() { + return hearing; } - public int getShitTimes() { - return shitTimes; + public void setHearing(int hearing) { + this.hearing = hearing; } - public void setShitTimes(int shitTimes) { - this.shitTimes = shitTimes; + public Map getJaundiceParts() { + return jaundiceParts; } - public double getTemperature() { - return temperature; + public void setJaundiceParts(Map jaundiceParts) { + this.jaundiceParts = jaundiceParts; } - public void setTemperature(double temperature) { - this.temperature = temperature; + public Map getLimbsActivity() { + return limbsActivity; } - public double getHeartRate() { - return heartRate; + public void setLimbsActivity(Map limbsActivity) { + this.limbsActivity = limbsActivity; } - public void setHeartRate(double heartRate) { - this.heartRate = heartRate; + public Map getMouthCavity() { + return mouthCavity; } - public double getRespiratoryRate() { - return respiratoryRate; + public void setMouthCavity(Map mouthCavity) { + this.mouthCavity = mouthCavity; } - public void setRespiratoryRate(double respiratoryRate) { - this.respiratoryRate = respiratoryRate; + public int getNeonatalAsphyxia() { + return neonatalAsphyxia; } - public String getComplexion() { - return complexion; + public void setNeonatalAsphyxia(int neonatalAsphyxia) { + this.neonatalAsphyxia = neonatalAsphyxia; } - public void setComplexion(String complexion) { - this.complexion = complexion; + public Map getNose() { + return nose; } - public String getJaundiceParts() { - return jaundiceParts; + public void setNose(Map nose) { + this.nose = nose; } - public void setJaundiceParts(String jaundiceParts) { - this.jaundiceParts = jaundiceParts; + public String getOrg() { + return org; } - public String getBregma() { - return bregma; + public void setOrg(String org) { + this.org = org; } - public void setBregma(String bregma) { - this.bregma = bregma; + public Map getPudendum() { + return pudendum; } - public String getEye() { - return eye; + public void setPudendum(Map pudendum) { + this.pudendum = pudendum; } - public void setEye(String eye) { - this.eye = eye; + public Map getReferralAdvice() { + return referralAdvice; } - public String getLimbsActivity() { - return limbsActivity; + public void setReferralAdvice(Map referralAdvice) { + this.referralAdvice = referralAdvice; } - public void setLimbsActivity(String limbsActivity) { - this.limbsActivity = limbsActivity; + public Map getSickenInfo() { + return sickenInfo; } - public String getEarAppearance() { - return earAppearance; + public void setSickenInfo(Map sickenInfo) { + this.sickenInfo = sickenInfo; } - public void setEarAppearance(String earAppearance) { - this.earAppearance = earAppearance; + public Map getSkin() { + return skin; } - public String getCervicalMass() { - return cervicalMass; + public void setSkin(Map skin) { + this.skin = skin; } - public void setCervicalMass(String cervicalMass) { - this.cervicalMass = cervicalMass; + public double getBirthWeight() { + return birthWeight; } - public String getNose() { - return nose; + public void setBirthWeight(double birthWeight) { + this.birthWeight = birthWeight; } - public void setNose(String nose) { - this.nose = nose; + public double getWeight() { + return weight; } - public String getSkin() { - return skin; + public void setWeight(double weight) { + this.weight = weight; } - public void setSkin(String skin) { - this.skin = skin; + public double getHeight() { + return height; } - public String getMouthCavity() { - return mouthCavity; + public void setHeight(double height) { + this.height = height; } - public void setMouthCavity(String mouthCavity) { - this.mouthCavity = mouthCavity; + public int getFeedType() { + return feedType; } - public String getAnus() { - return anus; + public void setFeedType(int feedType) { + this.feedType = feedType; } - public void setAnus(String anus) { - this.anus = anus; + public int getEatMilk() { + return eatMilk; } - public String getAuscultation() { - return auscultation; + public void setEatMilk(int eatMilk) { + this.eatMilk = eatMilk; } - public void setAuscultation(String auscultation) { - this.auscultation = auscultation; + public int getEatTime() { + return eatTime; } - public String getBreast() { - return breast; + public void setEatTime(int eatTime) { + this.eatTime = eatTime; } - public void setBreast(String breast) { - this.breast = breast; + public int getEmesis() { + return emesis; } - public String getAbdominalPalpation() { - return abdominalPalpation; + public void setEmesis(int emesis) { + this.emesis = emesis; } - public void setAbdominalPalpation(String abdominalPalpation) { - this.abdominalPalpation = abdominalPalpation; + public String getShit() { + return shit; } - public String getBackbone() { - return backbone; + public void setShit(String shit) { + this.shit = shit; } - public void setBackbone(String backbone) { - this.backbone = backbone; + public int getShitTimes() { + return shitTimes; } - public String getPudendum() { - return pudendum; + public void setShitTimes(int shitTimes) { + this.shitTimes = shitTimes; } - public void setPudendum(String pudendum) { - this.pudendum = pudendum; + public double getTemperature() { + return temperature; } - public String getFunicle() { - return funicle; + public void setTemperature(double temperature) { + this.temperature = temperature; } - public void setFunicle(String funicle) { - this.funicle = funicle; + public double getHeartRate() { + return heartRate; } - public String getReferralAdvice() { - return referralAdvice; + public void setHeartRate(double heartRate) { + this.heartRate = heartRate; } - public void setReferralAdvice(String referralAdvice) { - this.referralAdvice = referralAdvice; + public double getRespiratoryRate() { + return respiratoryRate; + } + + public void setRespiratoryRate(double respiratoryRate) { + this.respiratoryRate = respiratoryRate; } - public String getGuide() { + + public List getGuide() { return guide; } - public void setGuide(String guide) { + public void setGuide(List guide) { this.guide = guide; } @@ -680,22 +699,22 @@ public class BabyVisitAddRequest implements IBasicRequestConvert babyVisitModel.setFjob(fjob); babyVisitModel.setFname(fname); babyVisitModel.setFphone(fphone); - babyVisitModel.setAbdominalPalpation(abdominalPalpation); - babyVisitModel.setAnus(anus); - babyVisitModel.setAuscultation(auscultation); - babyVisitModel.setBackbone(backbone); + babyVisitModel.setAbdominalPalpation(JsonUtil.obj2JsonString(abdominalPalpation)); + babyVisitModel.setAnus(JsonUtil.obj2JsonString(anus)); + babyVisitModel.setAuscultation(JsonUtil.obj2JsonString(auscultation)); + babyVisitModel.setBackbone(JsonUtil.obj2JsonString(backbone)); babyVisitModel.setBirth(DateUtil.parseYMD(birth)); - babyVisitModel.setBirthSituation(birthSituation); + babyVisitModel.setBirthSituation(JsonUtil.obj2JsonString(birthSituation)); babyVisitModel.setBirthWeight(birthWeight); babyVisitModel.setNextVisitAddr(nextVisitAddr); babyVisitModel.setWeek(week); - babyVisitModel.setSickenInfo(sickenInfo); + babyVisitModel.setSickenInfo(JsonUtil.obj2JsonString(sickenInfo)); babyVisitModel.setOrg(org); - babyVisitModel.setBirthSituation(birthSituation); - babyVisitModel.setNeonatalAsphyxia(neonatalAsphyxia); - babyVisitModel.setDeformity(deformity); + babyVisitModel.setBirthSituation(JsonUtil.obj2JsonString(birthSituation)); + babyVisitModel.setNeonatalAsphyxia(JsonUtil.obj2JsonString(neonatalAsphyxia)); + babyVisitModel.setDeformity(JsonUtil.obj2JsonString(deformity)); babyVisitModel.setHearing(hearing); - babyVisitModel.setDisease(disease); + babyVisitModel.setDisease(JsonUtil.obj2JsonString(disease)); babyVisitModel.setBirthWeight(birthWeight); babyVisitModel.setWeight(weight); babyVisitModel.setHeight(height); @@ -708,25 +727,26 @@ public class BabyVisitAddRequest implements IBasicRequestConvert babyVisitModel.setTemperature(temperature); babyVisitModel.setHeartRate(heartRate); babyVisitModel.setRespiratoryRate(respiratoryRate); - babyVisitModel.setComplexion(complexion); - babyVisitModel.setJaundiceParts(jaundiceParts); - babyVisitModel.setBregma(bregma); - babyVisitModel.setEye(eye); - babyVisitModel.setLimbsActivity(limbsActivity); - babyVisitModel.setEarAppearance(earAppearance); - babyVisitModel.setCervicalMass(cervicalMass); - babyVisitModel.setNose(nose); - babyVisitModel.setSkin(skin); - babyVisitModel.setMouthCavity(mouthCavity); - babyVisitModel.setAnus(anus); - babyVisitModel.setAuscultation(auscultation); - babyVisitModel.setBreast(breast); - babyVisitModel.setAbdominalPalpation(abdominalPalpation); - babyVisitModel.setBackbone(backbone); - babyVisitModel.setPudendum(pudendum); - babyVisitModel.setFunicle(funicle); - babyVisitModel.setReferralAdvice(referralAdvice); - babyVisitModel.setGuide(guide); + + babyVisitModel.setComplexion(JsonUtil.obj2JsonString(complexion)); + babyVisitModel.setJaundiceParts(JsonUtil.obj2JsonString(jaundiceParts)); + babyVisitModel.setBregma(JsonUtil.obj2JsonString(bregma)); + babyVisitModel.setEye(JsonUtil.obj2JsonString(eye)); + babyVisitModel.setLimbsActivity(JsonUtil.obj2JsonString(limbsActivity)); + babyVisitModel.setEarAppearance(JsonUtil.obj2JsonString(earAppearance)); + babyVisitModel.setCervicalMass(JsonUtil.obj2JsonString(cervicalMass)); + babyVisitModel.setNose(JsonUtil.obj2JsonString(nose)); + babyVisitModel.setSkin(JsonUtil.obj2JsonString(skin)); + babyVisitModel.setMouthCavity(JsonUtil.obj2JsonString(mouthCavity)); + babyVisitModel.setAnus(JsonUtil.obj2JsonString(anus)); + babyVisitModel.setAuscultation(JsonUtil.obj2JsonString(auscultation)); + babyVisitModel.setBreast(JsonUtil.obj2JsonString(breast)); + babyVisitModel.setAbdominalPalpation(JsonUtil.obj2JsonString(abdominalPalpation)); + babyVisitModel.setBackbone(JsonUtil.obj2JsonString(backbone)); + babyVisitModel.setPudendum(JsonUtil.obj2JsonString(pudendum)); + babyVisitModel.setFunicle(JsonUtil.obj2JsonString(funicle)); + babyVisitModel.setReferralAdvice(JsonUtil.obj2JsonString(referralAdvice)); + babyVisitModel.setGuide(JsonUtil.obj2JsonString(guide)); babyVisitModel.setCurrentVisit(DateUtil.parseYMD(currentVisit)); babyVisitModel.setNextVisitAddr(nextVisitAddr); babyVisitModel.setNextVisitDate(DateUtil.parseYMD(nextVisitDate)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java index 7f1811d..704c8e5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java @@ -137,7 +137,7 @@ public class BabyVisitResult implements IBasicResultConvert