Commit c45aecdd336afbf634dfc93c0c9fdcc9f88c1c60
1 parent
e07ffe97f0
Exists in
master
and in
6 other branches
add log4j async flush disk
Showing 7 changed files with 472 additions and 325 deletions
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
- platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarResult.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
View file @
c45aecd
| ... | ... | @@ -34,7 +34,17 @@ |
| 34 | 34 | * 状态 1=正常 -1=禁用 |
| 35 | 35 | */ |
| 36 | 36 | private Integer status; |
| 37 | - | |
| 37 | + | |
| 38 | + private String babyPatientId; | |
| 39 | + | |
| 40 | + public String getBabyPatientId() { | |
| 41 | + return babyPatientId; | |
| 42 | + } | |
| 43 | + | |
| 44 | + public void setBabyPatientId(String babyPatientId) { | |
| 45 | + this.babyPatientId = babyPatientId; | |
| 46 | + } | |
| 47 | + | |
| 38 | 48 | public String getPersonId() { |
| 39 | 49 | return personId; |
| 40 | 50 | } |
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml
View file @
c45aecd
| ... | ... | @@ -13,11 +13,12 @@ |
| 13 | 13 | <result column="last_update_hospital_id" property="lastUpdateHospitalId" jdbcType="VARCHAR"/> |
| 14 | 14 | <result column="high_risk_cause" property="highRiskCause" jdbcType="VARCHAR"/> |
| 15 | 15 | <result column="status" property="status" jdbcType="INTEGER"/> |
| 16 | + <result column="baby_patient_id" property="babyPatientId" jdbcType="VARCHAR"/> | |
| 16 | 17 | </resultMap> |
| 17 | 18 | |
| 18 | 19 | |
| 19 | 20 | <insert id="addBabyPatientExtendEar" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEar"> |
| 20 | -insert into baby_patient_extend_ear (id,person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status) values (#{id},#{personId},#{createDate},#{createUserId},#{createHospitalId},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{highRiskCause},#{status}) | |
| 21 | +insert into baby_patient_extend_ear (id,person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status,baby_patient_id) values (#{id},#{personId},#{createDate},#{createUserId},#{createHospitalId},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{highRiskCause},#{status},#{babyPatientId}) | |
| 21 | 22 | </insert> |
| 22 | 23 | |
| 23 | 24 | |
| ... | ... | @@ -48,6 +49,9 @@ |
| 48 | 49 | <if test="highRiskCause != null and highRiskCause != ''"> |
| 49 | 50 | high_risk_cause = #{highRiskCause,jdbcType=VARCHAR}, |
| 50 | 51 | </if> |
| 52 | + <if test="babyPatientId != null and babyPatientId != ''"> | |
| 53 | + baby_patient_id = #{babyPatientId,jdbcType=VARCHAR}, | |
| 54 | + </if> | |
| 51 | 55 | <if test="status != null and status >= 0"> |
| 52 | 56 | status = #{status,jdbcType=INTEGER}, |
| 53 | 57 | </if> |
| ... | ... | @@ -109,6 +113,9 @@ |
| 109 | 113 | </if> |
| 110 | 114 | <if test="status != null and status >= 0"> |
| 111 | 115 | and status = #{status,jdbcType=INTEGER} |
| 116 | + </if> | |
| 117 | + <if test="babyPatientId != null and babyPatientId != ''"> | |
| 118 | + baby_patient_id = #{babyPatientId,jdbcType=VARCHAR}, | |
| 112 | 119 | </if> |
| 113 | 120 | </where> |
| 114 | 121 | </sql> |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java
View file @
c45aecd
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
c45aecd
| ... | ... | @@ -14,7 +14,9 @@ |
| 14 | 14 | import com.lyms.platform.common.result.ResponseCode; |
| 15 | 15 | import com.lyms.platform.common.utils.DateUtil; |
| 16 | 16 | import com.lyms.platform.operate.web.request.BabyEarAddRequest; |
| 17 | +import com.lyms.platform.operate.web.request.BabyEarBase; | |
| 17 | 18 | import com.lyms.platform.operate.web.request.BabyScreenAddRequest; |
| 19 | +import com.lyms.platform.operate.web.result.BabyEarResult; | |
| 18 | 20 | import com.lyms.platform.operate.web.utils.ResponseUtil; |
| 19 | 21 | import com.lyms.platform.permission.model.*; |
| 20 | 22 | import com.lyms.platform.permission.service.*; |
| 21 | 23 | |
| 22 | 24 | |
| 23 | 25 | |
| ... | ... | @@ -130,23 +132,32 @@ |
| 130 | 132 | if(null!=baby){ |
| 131 | 133 | //处理儿童person信息 |
| 132 | 134 | String pid = handBabyPerson(baby).getId(); |
| 135 | + String id = babyEarAddRequest.getBase().getId(); | |
| 133 | 136 | String babyPatientId = baby.getId(); |
| 134 | 137 | if(StringUtils.isEmpty(baby.getId())){ |
| 135 | 138 | baby.setPid(pid); |
| 136 | 139 | babyPatientId=babyService.addOneBaby(baby).getId(); |
| 137 | 140 | } |
| 138 | - | |
| 139 | 141 | BabyPatientExtendEar babyPatientExtendEar =new BabyPatientExtendEar(); |
| 140 | - babyPatientExtendEar.setCreateDate(new Date()); | |
| 141 | - babyPatientExtendEar.setCreateHospitalId(hId); | |
| 142 | - babyPatientExtendEar.setCreateUserId(userId + ""); | |
| 143 | - babyPatientExtendEar.setPersonId(pid); | |
| 144 | - babyPatientExtendEar.setLastUpdateDate(new Date()); | |
| 145 | - babyPatientExtendEar.setLastUpdateHospitalId(hId); | |
| 146 | - babyPatientExtendEar.setStatus(1); | |
| 142 | + if(StringUtils.isEmpty( id)){ | |
| 143 | + babyPatientExtendEar.setCreateDate(new Date()); | |
| 144 | + babyPatientExtendEar.setCreateHospitalId(hId); | |
| 145 | + babyPatientExtendEar.setCreateUserId(userId + ""); | |
| 146 | + babyPatientExtendEar.setPersonId(pid); | |
| 147 | + babyPatientExtendEar.setLastUpdateDate(new Date()); | |
| 148 | + babyPatientExtendEar.setLastUpdateHospitalId(hId); | |
| 149 | + babyPatientExtendEar.setLastUpdateUserId(userId+""); | |
| 150 | + babyPatientExtendEar.setStatus(1); | |
| 151 | + babyPatientExtendEar.setBabyPatientId(babyPatientId); | |
| 152 | + babyPatientExtendEarService.addBabyPatientExtendEar(babyPatientExtendEar); | |
| 153 | + }else{ | |
| 154 | + babyPatientExtendEar.setId(id); | |
| 155 | + babyPatientExtendEar.setLastUpdateDate(new Date()); | |
| 156 | + babyPatientExtendEar.setLastUpdateHospitalId(hId); | |
| 157 | + babyPatientExtendEar.setLastUpdateUserId(userId+""); | |
| 158 | + babyPatientExtendEarService.updateBabyPatientExtendEar(babyPatientExtendEar); | |
| 159 | + } | |
| 147 | 160 | |
| 148 | - babyPatientExtendEarService.addBabyPatientExtendEar(babyPatientExtendEar); | |
| 149 | - | |
| 150 | 161 | if(StringUtils.isEmpty(babyPatientExtendEarBirth.getBabyPatientId())){ |
| 151 | 162 | babyPatientExtendEarBirth.setBabyPatientId(babyPatientId); |
| 152 | 163 | } |
| 153 | 164 | |
| 154 | 165 | |
| 155 | 166 | |
| 156 | 167 | |
| ... | ... | @@ -182,15 +193,53 @@ |
| 182 | 193 | |
| 183 | 194 | /** |
| 184 | 195 | * 查看儿童听筛建档 |
| 196 | + * | |
| 185 | 197 | * @param babyId |
| 186 | 198 | */ |
| 187 | 199 | public BaseResponse findBabyEarById(String babyId){ |
| 188 | 200 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
| 189 | - BabyModel babyModel = babyService.getOneBabyById(babyId); | |
| 201 | + BabyModel babyModel = babyService.getOneBabyById(babyId); | |
| 190 | 202 | if(null!=babyModel){ |
| 203 | + //兒童信息 | |
| 204 | + BabyEarResult babyEarResult = new BabyEarResult(); | |
| 205 | + BabyEarBase babyEarBase =new BabyEarBase(babyModel); | |
| 206 | + BabyPatientExtendEarQuery babyPatientExtendEarQuery = new BabyPatientExtendEarQuery(); | |
| 207 | + babyPatientExtendEarQuery.setBabyPatientId(babyModel.getId()); | |
| 208 | + List<BabyPatientExtendEar> babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(babyPatientExtendEarQuery); | |
| 209 | + if(CollectionUtils.isNotEmpty(babyPatientExtendEars)){ | |
| 210 | + babyEarBase.setId(babyPatientExtendEars.get(0).getId()); | |
| 211 | + } | |
| 191 | 212 | |
| 192 | - } | |
| 213 | + //查詢母親的信息 | |
| 214 | + BabyPatientExtendEarMotherQuery babyPatientExtendEarMotherQuery = new BabyPatientExtendEarMotherQuery(); | |
| 215 | + babyPatientExtendEarMotherQuery.setBabyPatientId(babyId); | |
| 216 | + List<BabyPatientExtendEarMother> babyPatientExtendEarMothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(babyPatientExtendEarMotherQuery); | |
| 217 | + if(CollectionUtils.isNotEmpty(babyPatientExtendEarMothers)){ | |
| 218 | + babyEarResult.setPatientExtendEarMother(babyPatientExtendEarMothers.get(0)); | |
| 219 | + } | |
| 193 | 220 | |
| 221 | + //查詢家庭信息 | |
| 222 | + BabyPatientExtendEarFamilyQuery babyPatientExtendEarFamilyQuery = new BabyPatientExtendEarFamilyQuery(); | |
| 223 | + babyPatientExtendEarFamilyQuery.setBabyPatientId(babyId); | |
| 224 | + | |
| 225 | + List<BabyPatientExtendEarFamily> babyPatientExtendEarFamilies= babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(babyPatientExtendEarFamilyQuery); | |
| 226 | + if(CollectionUtils.isNotEmpty(babyPatientExtendEarFamilies)){ | |
| 227 | + babyEarResult.setPatientExtendEarFamily(babyPatientExtendEarFamilies.get(0)); | |
| 228 | + } | |
| 229 | + | |
| 230 | + BabyPatientExtendEarBirthQuery babyPatientExtendEarBirthQuery = new BabyPatientExtendEarBirthQuery(); | |
| 231 | + babyPatientExtendEarBirthQuery.setBabyPatientId(babyId); | |
| 232 | + List<BabyPatientExtendEarBirth> babyPatientExtendEarBirths= babyPatientExtendEarBirthService.queryBabyPatientExtendEarBirth(babyPatientExtendEarBirthQuery); | |
| 233 | + | |
| 234 | + if(CollectionUtils.isNotEmpty(babyPatientExtendEarBirths)){ | |
| 235 | + babyEarResult.setBabyBirth(babyPatientExtendEarBirths.get(0)); | |
| 236 | + } | |
| 237 | + babyEarResult.setBase(babyEarBase); | |
| 238 | + objectResponse.setData(babyEarResult); | |
| 239 | + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
| 240 | + }else{ | |
| 241 | + objectResponse.setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("没有对应的儿童"); | |
| 242 | + } | |
| 194 | 243 | return objectResponse; |
| 195 | 244 | } |
| 196 | 245 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarAddRequest.java
View file @
c45aecd
| ... | ... | @@ -42,306 +42,6 @@ |
| 42 | 42 | |
| 43 | 43 | private BabyPatientExtendEarFamily patientExtendEarFamily; |
| 44 | 44 | |
| 45 | - /** | |
| 46 | - * 邮政编码和高危因素没有存储在mongodb | |
| 47 | - * | |
| 48 | - * 儿童基本信息请求对象 | |
| 49 | - */ | |
| 50 | - private static class BabyEarBase implements IBasicRequestConvert<BabyModel> { | |
| 51 | - private String id; | |
| 52 | - //儿童建档记录id | |
| 53 | - private String babyId; | |
| 54 | - private String pid; | |
| 55 | - //儿童名字 | |
| 56 | - private String name; | |
| 57 | - //儿童身份证号 | |
| 58 | - private String cardNo; | |
| 59 | - //儿童生日 | |
| 60 | - private String birth; | |
| 61 | - //儿童家庭地址 | |
| 62 | - private String provinceId; | |
| 63 | - private String cityId; | |
| 64 | - private String areaId; | |
| 65 | - private String streetId; | |
| 66 | - private String address; | |
| 67 | - | |
| 68 | - // 母亲信息 | |
| 69 | - private String mname; | |
| 70 | - | |
| 71 | - private String mphone; | |
| 72 | - | |
| 73 | - private Date mbirth; | |
| 74 | - | |
| 75 | - //职业类别 | |
| 76 | - private String mproTypeId; | |
| 77 | - | |
| 78 | - //证件号 | |
| 79 | - private String mcertNo; | |
| 80 | - //证件类型ID | |
| 81 | - private String mcertTypeId; | |
| 82 | - | |
| 83 | - //文化程度ID | |
| 84 | - private String mLevelId; | |
| 85 | - | |
| 86 | - @Override | |
| 87 | - public BabyModel convertToDataModel() { | |
| 88 | - BabyModel babyModel= new BabyModel(); | |
| 89 | - babyModel.setMname(mname); | |
| 90 | - babyModel.setMphone(mphone); | |
| 91 | - babyModel.setMbirth(mbirth); | |
| 92 | - babyModel.setMproTypeId(mproTypeId); | |
| 93 | - babyModel.setMcertNo(mcertNo); | |
| 94 | - babyModel.setMcertTypeId(mcertTypeId); | |
| 95 | - babyModel.setmLevelId(mLevelId); | |
| 96 | - babyModel.setId(babyId); | |
| 97 | - babyModel.setBirth(DateUtil.parseYMD(birth)); | |
| 98 | - babyModel.setCardNo(cardNo); | |
| 99 | - babyModel.setName(name); | |
| 100 | - babyModel.setAddress(address); | |
| 101 | - babyModel.setAreaId(areaId); | |
| 102 | - babyModel.setProvinceId(provinceId); | |
| 103 | - babyModel.setCityId(cityId); | |
| 104 | - babyModel.setStreetId(streetId); | |
| 105 | - babyModel.setSex(sex); | |
| 106 | - babyModel.setfLevelId(fLevelId); | |
| 107 | - babyModel.setFname(fname); | |
| 108 | - babyModel.setFphone(fphone); | |
| 109 | - babyModel.setFbirth(DateUtil.parseYMD(fbirth)); | |
| 110 | - babyModel.setFproTypeId(fproTypeId); | |
| 111 | - return babyModel; | |
| 112 | - } | |
| 113 | - //邮编号码 | |
| 114 | - private String postCode; | |
| 115 | - //性别 | |
| 116 | - private Integer sex; | |
| 117 | - | |
| 118 | - // 父亲信息 | |
| 119 | - private String fname; | |
| 120 | - | |
| 121 | - private String fphone; | |
| 122 | - | |
| 123 | - private String fbirth; | |
| 124 | - | |
| 125 | - //文化程度ID | |
| 126 | - private String fLevelId; | |
| 127 | - | |
| 128 | - //职业类别 | |
| 129 | - private String fproTypeId; | |
| 130 | - | |
| 131 | - //高危因素 | |
| 132 | - private String highRiskCause; | |
| 133 | - | |
| 134 | - public String getId() { | |
| 135 | - return id; | |
| 136 | - } | |
| 137 | - | |
| 138 | - public void setId(String id) { | |
| 139 | - this.id = id; | |
| 140 | - } | |
| 141 | - | |
| 142 | - public String getBabyId() { | |
| 143 | - return babyId; | |
| 144 | - } | |
| 145 | - | |
| 146 | - public void setBabyId(String babyId) { | |
| 147 | - this.babyId = babyId; | |
| 148 | - } | |
| 149 | - | |
| 150 | - public String getPid() { | |
| 151 | - return pid; | |
| 152 | - } | |
| 153 | - | |
| 154 | - public void setPid(String pid) { | |
| 155 | - this.pid = pid; | |
| 156 | - } | |
| 157 | - | |
| 158 | - public String getName() { | |
| 159 | - return name; | |
| 160 | - } | |
| 161 | - | |
| 162 | - public void setName(String name) { | |
| 163 | - this.name = name; | |
| 164 | - } | |
| 165 | - | |
| 166 | - public String getCardNo() { | |
| 167 | - return cardNo; | |
| 168 | - } | |
| 169 | - | |
| 170 | - public void setCardNo(String cardNo) { | |
| 171 | - this.cardNo = cardNo; | |
| 172 | - } | |
| 173 | - | |
| 174 | - public String getBirth() { | |
| 175 | - return birth; | |
| 176 | - } | |
| 177 | - | |
| 178 | - public void setBirth(String birth) { | |
| 179 | - this.birth = birth; | |
| 180 | - } | |
| 181 | - | |
| 182 | - public String getProvinceId() { | |
| 183 | - return provinceId; | |
| 184 | - } | |
| 185 | - | |
| 186 | - public void setProvinceId(String provinceId) { | |
| 187 | - this.provinceId = provinceId; | |
| 188 | - } | |
| 189 | - | |
| 190 | - public String getCityId() { | |
| 191 | - return cityId; | |
| 192 | - } | |
| 193 | - | |
| 194 | - public void setCityId(String cityId) { | |
| 195 | - this.cityId = cityId; | |
| 196 | - } | |
| 197 | - | |
| 198 | - public String getAreaId() { | |
| 199 | - return areaId; | |
| 200 | - } | |
| 201 | - | |
| 202 | - public void setAreaId(String areaId) { | |
| 203 | - this.areaId = areaId; | |
| 204 | - } | |
| 205 | - | |
| 206 | - public String getStreetId() { | |
| 207 | - return streetId; | |
| 208 | - } | |
| 209 | - | |
| 210 | - public void setStreetId(String streetId) { | |
| 211 | - this.streetId = streetId; | |
| 212 | - } | |
| 213 | - | |
| 214 | - public String getAddress() { | |
| 215 | - return address; | |
| 216 | - } | |
| 217 | - | |
| 218 | - public void setAddress(String address) { | |
| 219 | - this.address = address; | |
| 220 | - } | |
| 221 | - | |
| 222 | - public String getMname() { | |
| 223 | - return mname; | |
| 224 | - } | |
| 225 | - | |
| 226 | - public void setMname(String mname) { | |
| 227 | - this.mname = mname; | |
| 228 | - } | |
| 229 | - | |
| 230 | - public String getMphone() { | |
| 231 | - return mphone; | |
| 232 | - } | |
| 233 | - | |
| 234 | - public void setMphone(String mphone) { | |
| 235 | - this.mphone = mphone; | |
| 236 | - } | |
| 237 | - | |
| 238 | - public Date getMbirth() { | |
| 239 | - return mbirth; | |
| 240 | - } | |
| 241 | - | |
| 242 | - public void setMbirth(Date mbirth) { | |
| 243 | - this.mbirth = mbirth; | |
| 244 | - } | |
| 245 | - | |
| 246 | - public String getMproTypeId() { | |
| 247 | - return mproTypeId; | |
| 248 | - } | |
| 249 | - | |
| 250 | - public void setMproTypeId(String mproTypeId) { | |
| 251 | - this.mproTypeId = mproTypeId; | |
| 252 | - } | |
| 253 | - | |
| 254 | - public String getMcertNo() { | |
| 255 | - return mcertNo; | |
| 256 | - } | |
| 257 | - | |
| 258 | - public void setMcertNo(String mcertNo) { | |
| 259 | - this.mcertNo = mcertNo; | |
| 260 | - } | |
| 261 | - | |
| 262 | - public String getMcertTypeId() { | |
| 263 | - return mcertTypeId; | |
| 264 | - } | |
| 265 | - | |
| 266 | - public void setMcertTypeId(String mcertTypeId) { | |
| 267 | - this.mcertTypeId = mcertTypeId; | |
| 268 | - } | |
| 269 | - | |
| 270 | - public String getmLevelId() { | |
| 271 | - return mLevelId; | |
| 272 | - } | |
| 273 | - | |
| 274 | - public void setmLevelId(String mLevelId) { | |
| 275 | - this.mLevelId = mLevelId; | |
| 276 | - } | |
| 277 | - | |
| 278 | - public String getPostCode() { | |
| 279 | - return postCode; | |
| 280 | - } | |
| 281 | - | |
| 282 | - public void setPostCode(String postCode) { | |
| 283 | - this.postCode = postCode; | |
| 284 | - } | |
| 285 | - | |
| 286 | - public Integer getSex() { | |
| 287 | - return sex; | |
| 288 | - } | |
| 289 | - | |
| 290 | - public void setSex(Integer sex) { | |
| 291 | - this.sex = sex; | |
| 292 | - } | |
| 293 | - | |
| 294 | - public String getFname() { | |
| 295 | - return fname; | |
| 296 | - } | |
| 297 | - | |
| 298 | - public void setFname(String fname) { | |
| 299 | - this.fname = fname; | |
| 300 | - } | |
| 301 | - | |
| 302 | - public String getFphone() { | |
| 303 | - return fphone; | |
| 304 | - } | |
| 305 | - | |
| 306 | - public void setFphone(String fphone) { | |
| 307 | - this.fphone = fphone; | |
| 308 | - } | |
| 309 | - | |
| 310 | - public String getFbirth() { | |
| 311 | - return fbirth; | |
| 312 | - } | |
| 313 | - | |
| 314 | - public void setFbirth(String fbirth) { | |
| 315 | - this.fbirth = fbirth; | |
| 316 | - } | |
| 317 | - | |
| 318 | - public String getfLevelId() { | |
| 319 | - return fLevelId; | |
| 320 | - } | |
| 321 | - | |
| 322 | - public void setfLevelId(String fLevelId) { | |
| 323 | - this.fLevelId = fLevelId; | |
| 324 | - } | |
| 325 | - | |
| 326 | - public String getFproTypeId() { | |
| 327 | - return fproTypeId; | |
| 328 | - } | |
| 329 | - | |
| 330 | - public void setFproTypeId(String fproTypeId) { | |
| 331 | - this.fproTypeId = fproTypeId; | |
| 332 | - } | |
| 333 | - | |
| 334 | - public String getHighRiskCause() { | |
| 335 | - return highRiskCause; | |
| 336 | - } | |
| 337 | - | |
| 338 | - public void setHighRiskCause(String highRiskCause) { | |
| 339 | - this.highRiskCause = highRiskCause; | |
| 340 | - } | |
| 341 | -//status 状态默认为 | |
| 342 | -// private String status; | |
| 343 | - } | |
| 344 | - | |
| 345 | 45 | public BabyEarBase getBase() { |
| 346 | 46 | return base; |
| 347 | 47 | } |
| ... | ... | @@ -372,16 +72,6 @@ |
| 372 | 72 | |
| 373 | 73 | public void setPatientExtendEarFamily(BabyPatientExtendEarFamily patientExtendEarFamily) { |
| 374 | 74 | this.patientExtendEarFamily = patientExtendEarFamily; |
| 375 | - } | |
| 376 | - public static void main(String[] args){ | |
| 377 | - BabyEarAddRequest request= new BabyEarAddRequest(); | |
| 378 | - request.setBase(new BabyEarBase()); | |
| 379 | - request.setBabyBirth(new BabyPatientExtendEarBirth()); | |
| 380 | - request.setPatientExtendEarFamily(new BabyPatientExtendEarFamily()); | |
| 381 | - request.setPatientExtendEarMother(new BabyPatientExtendEarMother()); | |
| 382 | - System.out.println(JsonUtil.obj2Str(new BabyEarBase())); | |
| 383 | - System.out.println(JsonUtil.obj2Str(request)); | |
| 384 | - System.out.println(JsonUtil.obj2Str(new BabyPatientExtendEarBirth())); | |
| 385 | 75 | } |
| 386 | 76 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
View file @
c45aecd
| 1 | +package com.lyms.platform.operate.web.request; | |
| 2 | + | |
| 3 | +import com.lyms.platform.common.base.IBasicRequestConvert; | |
| 4 | +import com.lyms.platform.common.utils.DateUtil; | |
| 5 | +import com.lyms.platform.pojo.BabyModel; | |
| 6 | + | |
| 7 | +import java.util.Date; | |
| 8 | + | |
| 9 | + /** | |
| 10 | + * 邮政编码和高危因素没有存储在mongodb | |
| 11 | + * | |
| 12 | + * 儿童基本信息请求对象 | |
| 13 | + */ | |
| 14 | + public class BabyEarBase implements IBasicRequestConvert<BabyModel> { | |
| 15 | + | |
| 16 | + public BabyEarBase(){ | |
| 17 | + | |
| 18 | + } | |
| 19 | + | |
| 20 | + private String id; | |
| 21 | + //儿童建档记录id | |
| 22 | + private String babyId; | |
| 23 | + private String pid; | |
| 24 | + //儿童名字 | |
| 25 | + private String name; | |
| 26 | + //儿童身份证号 | |
| 27 | + private String cardNo; | |
| 28 | + //儿童生日 | |
| 29 | + private String birth; | |
| 30 | + //儿童家庭地址 | |
| 31 | + private String provinceId; | |
| 32 | + private String cityId; | |
| 33 | + private String areaId; | |
| 34 | + private String streetId; | |
| 35 | + private String address; | |
| 36 | + | |
| 37 | + // 母亲信息 | |
| 38 | + private String mname; | |
| 39 | + | |
| 40 | + private String mphone; | |
| 41 | + | |
| 42 | + private String mbirth; | |
| 43 | + | |
| 44 | + //职业类别 | |
| 45 | + private String mproTypeId; | |
| 46 | + | |
| 47 | + //证件号 | |
| 48 | + private String mcertNo; | |
| 49 | + //证件类型ID | |
| 50 | + private String mcertTypeId; | |
| 51 | + public BabyEarBase(BabyModel babyModel){ | |
| 52 | + setBabyId(babyModel.getId()); | |
| 53 | + setPid(babyModel.getPid()); | |
| 54 | + setName(babyModel.getName()); | |
| 55 | + setCardNo(babyModel.getCardNo()); | |
| 56 | + setBirth(DateUtil.getYmd(babyModel.getBirth())); | |
| 57 | + setProvinceId(babyModel.getProvinceId()); | |
| 58 | + setCityId(babyModel.getCityId()); | |
| 59 | + setAreaId(babyModel.getAreaId()); | |
| 60 | + setStreetId(babyModel.getStreetId()); | |
| 61 | + setAddress(babyModel.getAddress()); | |
| 62 | + setMname(babyModel.getMname()); | |
| 63 | + setMphone(babyModel.getMphone()); | |
| 64 | + setMbirth(DateUtil.getYmd(babyModel.getMbirth())); | |
| 65 | + setMproTypeId(babyModel.getMproTypeId()); | |
| 66 | + setMcertNo(babyModel.getMcertNo()); | |
| 67 | + setMcertTypeId(babyModel.getMcertTypeId()); | |
| 68 | + setmLevelId(babyModel.getmLevelId()); | |
| 69 | + setPostCode(""); | |
| 70 | + setSex(babyModel.getSex()); | |
| 71 | + setFname(babyModel.getFname()); | |
| 72 | + setFphone(babyModel.getFphone()); | |
| 73 | + setFbirth(DateUtil.getYmd(babyModel.getFbirth())); | |
| 74 | + setfLevelId(babyModel.getfLevelId()); | |
| 75 | + setFproTypeId(babyModel.getFproTypeId()); | |
| 76 | + setHighRiskCause(babyModel.getHighRiskReason()); | |
| 77 | + } | |
| 78 | + //文化程度ID | |
| 79 | + private String mLevelId; | |
| 80 | + //邮编号码 | |
| 81 | + private String postCode; | |
| 82 | + //性别 | |
| 83 | + private Integer sex; | |
| 84 | + | |
| 85 | + // 父亲信息 | |
| 86 | + private String fname; | |
| 87 | + | |
| 88 | + private String fphone; | |
| 89 | + | |
| 90 | + private String fbirth; | |
| 91 | + | |
| 92 | + //文化程度ID | |
| 93 | + private String fLevelId; | |
| 94 | + | |
| 95 | + //职业类别 | |
| 96 | + private String fproTypeId; | |
| 97 | + | |
| 98 | + //高危因素 | |
| 99 | + private String highRiskCause; | |
| 100 | + | |
| 101 | + | |
| 102 | + @Override | |
| 103 | + public BabyModel convertToDataModel() { | |
| 104 | + BabyModel babyModel= new BabyModel(); | |
| 105 | + babyModel.setMname(mname); | |
| 106 | + babyModel.setMphone(mphone); | |
| 107 | + babyModel.setMbirth(DateUtil.parseYMD(mbirth)); | |
| 108 | + babyModel.setMproTypeId(mproTypeId); | |
| 109 | + babyModel.setMcertNo(mcertNo); | |
| 110 | + babyModel.setMcertTypeId(mcertTypeId); | |
| 111 | + babyModel.setmLevelId(mLevelId); | |
| 112 | + babyModel.setId(babyId); | |
| 113 | + babyModel.setBirth(DateUtil.parseYMD(birth)); | |
| 114 | + babyModel.setCardNo(cardNo); | |
| 115 | + babyModel.setName(name); | |
| 116 | + babyModel.setAddress(address); | |
| 117 | + babyModel.setAreaId(areaId); | |
| 118 | + babyModel.setProvinceId(provinceId); | |
| 119 | + babyModel.setCityId(cityId); | |
| 120 | + babyModel.setStreetId(streetId); | |
| 121 | + babyModel.setSex(sex); | |
| 122 | + babyModel.setfLevelId(fLevelId); | |
| 123 | + babyModel.setFname(fname); | |
| 124 | + babyModel.setFphone(fphone); | |
| 125 | + babyModel.setFbirth(DateUtil.parseYMD(fbirth)); | |
| 126 | + babyModel.setFproTypeId(fproTypeId); | |
| 127 | + return babyModel; | |
| 128 | + } | |
| 129 | + | |
| 130 | + public String getId() { | |
| 131 | + return id; | |
| 132 | + } | |
| 133 | + | |
| 134 | + public void setId(String id) { | |
| 135 | + this.id = id; | |
| 136 | + } | |
| 137 | + | |
| 138 | + public String getBabyId() { | |
| 139 | + return babyId; | |
| 140 | + } | |
| 141 | + | |
| 142 | + public void setBabyId(String babyId) { | |
| 143 | + this.babyId = babyId; | |
| 144 | + } | |
| 145 | + | |
| 146 | + public String getPid() { | |
| 147 | + return pid; | |
| 148 | + } | |
| 149 | + | |
| 150 | + public void setPid(String pid) { | |
| 151 | + this.pid = pid; | |
| 152 | + } | |
| 153 | + | |
| 154 | + public String getName() { | |
| 155 | + return name; | |
| 156 | + } | |
| 157 | + | |
| 158 | + public void setName(String name) { | |
| 159 | + this.name = name; | |
| 160 | + } | |
| 161 | + | |
| 162 | + public String getCardNo() { | |
| 163 | + return cardNo; | |
| 164 | + } | |
| 165 | + | |
| 166 | + public void setCardNo(String cardNo) { | |
| 167 | + this.cardNo = cardNo; | |
| 168 | + } | |
| 169 | + | |
| 170 | + public String getBirth() { | |
| 171 | + return birth; | |
| 172 | + } | |
| 173 | + | |
| 174 | + public void setBirth(String birth) { | |
| 175 | + this.birth = birth; | |
| 176 | + } | |
| 177 | + | |
| 178 | + public String getProvinceId() { | |
| 179 | + return provinceId; | |
| 180 | + } | |
| 181 | + | |
| 182 | + public void setProvinceId(String provinceId) { | |
| 183 | + this.provinceId = provinceId; | |
| 184 | + } | |
| 185 | + | |
| 186 | + public String getCityId() { | |
| 187 | + return cityId; | |
| 188 | + } | |
| 189 | + | |
| 190 | + public void setCityId(String cityId) { | |
| 191 | + this.cityId = cityId; | |
| 192 | + } | |
| 193 | + | |
| 194 | + public String getAreaId() { | |
| 195 | + return areaId; | |
| 196 | + } | |
| 197 | + | |
| 198 | + public void setAreaId(String areaId) { | |
| 199 | + this.areaId = areaId; | |
| 200 | + } | |
| 201 | + | |
| 202 | + public String getStreetId() { | |
| 203 | + return streetId; | |
| 204 | + } | |
| 205 | + | |
| 206 | + public void setStreetId(String streetId) { | |
| 207 | + this.streetId = streetId; | |
| 208 | + } | |
| 209 | + | |
| 210 | + public String getAddress() { | |
| 211 | + return address; | |
| 212 | + } | |
| 213 | + | |
| 214 | + public void setAddress(String address) { | |
| 215 | + this.address = address; | |
| 216 | + } | |
| 217 | + | |
| 218 | + public String getMname() { | |
| 219 | + return mname; | |
| 220 | + } | |
| 221 | + | |
| 222 | + public void setMname(String mname) { | |
| 223 | + this.mname = mname; | |
| 224 | + } | |
| 225 | + | |
| 226 | + public String getMphone() { | |
| 227 | + return mphone; | |
| 228 | + } | |
| 229 | + | |
| 230 | + public void setMphone(String mphone) { | |
| 231 | + this.mphone = mphone; | |
| 232 | + } | |
| 233 | + | |
| 234 | + public String getMbirth() { | |
| 235 | + return mbirth; | |
| 236 | + } | |
| 237 | + | |
| 238 | + public void setMbirth(String mbirth) { | |
| 239 | + this.mbirth = mbirth; | |
| 240 | + } | |
| 241 | + | |
| 242 | + public String getMproTypeId() { | |
| 243 | + return mproTypeId; | |
| 244 | + } | |
| 245 | + | |
| 246 | + public void setMproTypeId(String mproTypeId) { | |
| 247 | + this.mproTypeId = mproTypeId; | |
| 248 | + } | |
| 249 | + | |
| 250 | + public String getMcertNo() { | |
| 251 | + return mcertNo; | |
| 252 | + } | |
| 253 | + | |
| 254 | + public void setMcertNo(String mcertNo) { | |
| 255 | + this.mcertNo = mcertNo; | |
| 256 | + } | |
| 257 | + | |
| 258 | + public String getMcertTypeId() { | |
| 259 | + return mcertTypeId; | |
| 260 | + } | |
| 261 | + | |
| 262 | + public void setMcertTypeId(String mcertTypeId) { | |
| 263 | + this.mcertTypeId = mcertTypeId; | |
| 264 | + } | |
| 265 | + | |
| 266 | + public String getmLevelId() { | |
| 267 | + return mLevelId; | |
| 268 | + } | |
| 269 | + | |
| 270 | + public void setmLevelId(String mLevelId) { | |
| 271 | + this.mLevelId = mLevelId; | |
| 272 | + } | |
| 273 | + | |
| 274 | + public String getPostCode() { | |
| 275 | + return postCode; | |
| 276 | + } | |
| 277 | + | |
| 278 | + public void setPostCode(String postCode) { | |
| 279 | + this.postCode = postCode; | |
| 280 | + } | |
| 281 | + | |
| 282 | + public Integer getSex() { | |
| 283 | + return sex; | |
| 284 | + } | |
| 285 | + | |
| 286 | + public void setSex(Integer sex) { | |
| 287 | + this.sex = sex; | |
| 288 | + } | |
| 289 | + | |
| 290 | + public String getFname() { | |
| 291 | + return fname; | |
| 292 | + } | |
| 293 | + | |
| 294 | + public void setFname(String fname) { | |
| 295 | + this.fname = fname; | |
| 296 | + } | |
| 297 | + | |
| 298 | + public String getFphone() { | |
| 299 | + return fphone; | |
| 300 | + } | |
| 301 | + | |
| 302 | + public void setFphone(String fphone) { | |
| 303 | + this.fphone = fphone; | |
| 304 | + } | |
| 305 | + | |
| 306 | + public String getFbirth() { | |
| 307 | + return fbirth; | |
| 308 | + } | |
| 309 | + | |
| 310 | + public void setFbirth(String fbirth) { | |
| 311 | + this.fbirth = fbirth; | |
| 312 | + } | |
| 313 | + | |
| 314 | + public String getfLevelId() { | |
| 315 | + return fLevelId; | |
| 316 | + } | |
| 317 | + | |
| 318 | + public void setfLevelId(String fLevelId) { | |
| 319 | + this.fLevelId = fLevelId; | |
| 320 | + } | |
| 321 | + | |
| 322 | + public String getFproTypeId() { | |
| 323 | + return fproTypeId; | |
| 324 | + } | |
| 325 | + | |
| 326 | + public void setFproTypeId(String fproTypeId) { | |
| 327 | + this.fproTypeId = fproTypeId; | |
| 328 | + } | |
| 329 | + | |
| 330 | + public String getHighRiskCause() { | |
| 331 | + return highRiskCause; | |
| 332 | + } | |
| 333 | + | |
| 334 | + public void setHighRiskCause(String highRiskCause) { | |
| 335 | + this.highRiskCause = highRiskCause; | |
| 336 | + } | |
| 337 | +//status 状态默认为 | |
| 338 | +// private String status; | |
| 339 | + } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarResult.java
View file @
c45aecd
| 1 | +package com.lyms.platform.operate.web.result; | |
| 2 | + | |
| 3 | +import com.lyms.platform.operate.web.request.BabyEarBase; | |
| 4 | +import com.lyms.platform.permission.model.BabyPatientExtendEarBirth; | |
| 5 | +import com.lyms.platform.permission.model.BabyPatientExtendEarFamily; | |
| 6 | +import com.lyms.platform.permission.model.BabyPatientExtendEarMother; | |
| 7 | + | |
| 8 | +/** | |
| 9 | + * Created by jiangjiazhi on 2017/5/27. | |
| 10 | + */ | |
| 11 | +public class BabyEarResult { | |
| 12 | + //儿童档案信息 | |
| 13 | + private BabyEarBase base; | |
| 14 | + //儿童出生信息 | |
| 15 | + private BabyPatientExtendEarBirth babyBirth; | |
| 16 | + | |
| 17 | + private BabyPatientExtendEarMother patientExtendEarMother; | |
| 18 | + | |
| 19 | + private BabyPatientExtendEarFamily patientExtendEarFamily; | |
| 20 | + | |
| 21 | + public BabyEarBase getBase() { | |
| 22 | + return base; | |
| 23 | + } | |
| 24 | + | |
| 25 | + public void setBase(BabyEarBase base) { | |
| 26 | + this.base = base; | |
| 27 | + } | |
| 28 | + | |
| 29 | + public BabyPatientExtendEarBirth getBabyBirth() { | |
| 30 | + return babyBirth; | |
| 31 | + } | |
| 32 | + | |
| 33 | + public void setBabyBirth(BabyPatientExtendEarBirth babyBirth) { | |
| 34 | + this.babyBirth = babyBirth; | |
| 35 | + } | |
| 36 | + | |
| 37 | + public BabyPatientExtendEarMother getPatientExtendEarMother() { | |
| 38 | + return patientExtendEarMother; | |
| 39 | + } | |
| 40 | + | |
| 41 | + public void setPatientExtendEarMother(BabyPatientExtendEarMother patientExtendEarMother) { | |
| 42 | + this.patientExtendEarMother = patientExtendEarMother; | |
| 43 | + } | |
| 44 | + | |
| 45 | + public BabyPatientExtendEarFamily getPatientExtendEarFamily() { | |
| 46 | + return patientExtendEarFamily; | |
| 47 | + } | |
| 48 | + | |
| 49 | + public void setPatientExtendEarFamily(BabyPatientExtendEarFamily patientExtendEarFamily) { | |
| 50 | + this.patientExtendEarFamily = patientExtendEarFamily; | |
| 51 | + } | |
| 52 | +} |