jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 137da96f060a16dec110ed947bf5093494672b7c

Authored by wtt
1 parent 24c44ed362
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 51 additions and 18 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java View file @ 137da96
... ... @@ -59,11 +59,11 @@
59 59 private String bjId;
60 60  
61 61 // 既往史 "yeaOrNo", "yes" "no" ,内容：content
62   - private Map pastHistory;
  62 + private Map<String,Object> pastHistory;
63 63 //传染病史
64   - private Map infectDiseases;
  64 + private Map<String,Object> infectDiseases;
65 65 //过敏史
66   - private Map ywgmHistory;
  66 + private Map<String,Object> ywgmHistory;
67 67 //家长确认签字
68 68 private String qurenqianzi;
69 69  
70 70  
71 71  
72 72  
73 73  
74 74  
... ... @@ -280,27 +280,27 @@
280 280 this.bjId = bjId;
281 281 }
282 282  
283   - public Map getPastHistory() {
  283 + public Map <String, Object> getPastHistory() {
284 284 return pastHistory;
285 285 }
286 286  
287   - public void setPastHistory(Map pastHistory) {
  287 + public void setPastHistory(Map <String, Object> pastHistory) {
288 288 this.pastHistory = pastHistory;
289 289 }
290 290  
291   - public Map getInfectDiseases() {
  291 + public Map <String, Object> getInfectDiseases() {
292 292 return infectDiseases;
293 293 }
294 294  
295   - public void setInfectDiseases(Map infectDiseases) {
  295 + public void setInfectDiseases(Map <String, Object> infectDiseases) {
296 296 this.infectDiseases = infectDiseases;
297 297 }
298 298  
299   - public Map getYwgmHistory() {
  299 + public Map <String, Object> getYwgmHistory() {
300 300 return ywgmHistory;
301 301 }
302 302  
303   - public void setYwgmHistory(Map ywgmHistory) {
  303 + public void setYwgmHistory(Map <String, Object> ywgmHistory) {
304 304 this.ywgmHistory = ywgmHistory;
305 305 }
306 306  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java View file @ 137da96
... ... @@ -15,6 +15,7 @@
15 15 import com.lyms.platform.operate.web.result.BabyKindergartenCheckResult;
16 16 import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
17 17 import com.lyms.platform.operate.web.utils.CommonsHelper;
  18 +import com.lyms.platform.operate.web.utils.FunvCommonUtil;
18 19 import com.lyms.platform.permission.model.Users;
19 20 import com.lyms.platform.permission.service.OrganizationService;
20 21 import com.lyms.platform.permission.service.UsersService;
... ... @@ -242,6 +243,37 @@
242 243 BabyKindergartenCheckModel babyKindergartenCheckModel = babyKindergartenCheckService.queryById(id);
243 244 BabyKindergartenCheckResult babyKindergartenCheckResult = new BabyKindergartenCheckResult();
244 245 babyKindergartenCheckResult.convertToResult(babyKindergartenCheckModel);
  246 + Map map = babyKindergartenCheckModel.getPastHistory();
  247 + Map mm = new HashMap();
  248 + String mapStr = "";
  249 + if(map!=null){
  250 + boolean dx = map.get("dx") == null ? false : (boolean) map.get("dx");
  251 + if (dx) {
  252 + mapStr += " 癫痫,";
  253 + }
  254 + boolean xtxxz = map.get("xtxxz") == null ? false : (boolean) map.get("xtxxz");
  255 + if (xtxxz) {
  256 + mapStr += " 先天性心脏病,";
  257 + }
  258 + boolean gr = map.get("gr") == null ? false : (boolean) map.get("gr");
  259 + if (gr) {
  260 + mapStr += " 高热,";
  261 + }
  262 + boolean xc = map.get("xc") == null ? false : (boolean) map.get("xc");
  263 + if (xc) {
  264 + mapStr += " 哮喘,";
  265 + }
  266 + boolean qt = map.get("qt") == null ? false : (boolean) map.get("qt");
  267 + if (qt) {
  268 + mapStr += " 其它,";
  269 + if (map.containsKey("qtc")) {
  270 + mapStr += map.get("qtc")+",";
  271 + }
  272 + }
  273 + mapStr = FunvCommonUtil.spitd(mapStr);
  274 + mm.put("pastHistory", mapStr);
  275 + }
  276 + babyKindergartenCheckResult.setPastHistory(mm);
245 277  
246 278 if (StringUtils.isNotEmpty(babyKindergartenCheckModel.getCheckDoctor())) {
247 279 Users users = usersService.getUsers(NumberUtils.toInt(babyKindergartenCheckModel.getCheckDoctor()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java View file @ 137da96
... ... @@ -62,11 +62,11 @@
62 62 private Map bjIdMap;//不传
63 63  
64 64 // 既往史 "yeaOrNo", "yes" "no" , xtxxz:true 先天性心脏病，dx:true 癫痫，gr:true 高热，xc:true 哮喘，qt:true 其它 qtc: 其它内容
65   - private Map pastHistory;
  65 + private Map<String,Object> pastHistory;
66 66 //传染病史
67   - private Map infectDiseases;
  67 + private Map<String,Object> infectDiseases;
68 68 //过敏史
69   - private Map ywgmHistory;
  69 + private Map<String,Object> ywgmHistory;
70 70 //家长确认签字
71 71 private String qurenqianzi;
72 72  
73 73  
74 74  
75 75  
76 76  
77 77  
... ... @@ -307,27 +307,28 @@
307 307 this.bjId = bjId;
308 308 }
309 309  
310   - public Map getPastHistory() {
  310 +
  311 + public Map <String, Object> getPastHistory() {
311 312 return pastHistory;
312 313 }
313 314  
314   - public void setPastHistory(Map pastHistory) {
  315 + public void setPastHistory(Map <String, Object> pastHistory) {
315 316 this.pastHistory = pastHistory;
316 317 }
317 318  
318   - public Map getInfectDiseases() {
  319 + public Map <String, Object> getInfectDiseases() {
319 320 return infectDiseases;
320 321 }
321 322  
322   - public void setInfectDiseases(Map infectDiseases) {
  323 + public void setInfectDiseases(Map <String, Object> infectDiseases) {
323 324 this.infectDiseases = infectDiseases;
324 325 }
325 326  
326   - public Map getYwgmHistory() {
  327 + public Map <String, Object> getYwgmHistory() {
327 328 return ywgmHistory;
328 329 }
329 330  
330   - public void setYwgmHistory(Map ywgmHistory) {
  331 + public void setYwgmHistory(Map <String, Object> ywgmHistory) {
331 332 this.ywgmHistory = ywgmHistory;
332 333 }
333 334