jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7adb6d41c0be5c330e836d5af4d4107511276a8c

Authored by liquanyu
1 parent 71883e1f80
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿童

Showing 12 changed files with 502 additions and 20 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java View file @ 7adb6d4
... ... @@ -687,6 +687,71 @@
687 687 */
688 688 private String lhaxisr;
689 689  
  690 + private String sf;//是否失访
  691 + private String sfRea;//失访原因
  692 + private String xb;//胸部
  693 + private String nextSfType;//下次随访类型
  694 + private String fypg;//发育评估
  695 + private Map<String,Object> zyzd; //中医指导
  696 + private String zrks;//转让科室
  697 +
  698 +
  699 + public String getSf() {
  700 + return sf;
  701 + }
  702 +
  703 + public void setSf(String sf) {
  704 + this.sf = sf;
  705 + }
  706 +
  707 + public String getSfRea() {
  708 + return sfRea;
  709 + }
  710 +
  711 + public void setSfRea(String sfRea) {
  712 + this.sfRea = sfRea;
  713 + }
  714 +
  715 + public String getXb() {
  716 + return xb;
  717 + }
  718 +
  719 + public void setXb(String xb) {
  720 + this.xb = xb;
  721 + }
  722 +
  723 + public String getNextSfType() {
  724 + return nextSfType;
  725 + }
  726 +
  727 + public void setNextSfType(String nextSfType) {
  728 + this.nextSfType = nextSfType;
  729 + }
  730 +
  731 + public String getFypg() {
  732 + return fypg;
  733 + }
  734 +
  735 + public void setFypg(String fypg) {
  736 + this.fypg = fypg;
  737 + }
  738 +
  739 + public Map<String, Object> getZyzd() {
  740 + return zyzd;
  741 + }
  742 +
  743 + public void setZyzd(Map<String, Object> zyzd) {
  744 + this.zyzd = zyzd;
  745 + }
  746 +
  747 + public String getZrks() {
  748 + return zrks;
  749 + }
  750 +
  751 + public void setZrks(String zrks) {
  752 + this.zrks = zrks;
  753 + }
  754 +
690 755 public String getLhdsl() {
691 756 return lhdsl;
692 757 }
platform-dal/src/main/java/com/lyms/platform/pojo/BabyChinaMedicineModel.java View file @ 7adb6d4
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import org.springframework.data.mongodb.core.mapping.Document;
  4 +
3 5 import java.util.Date;
4 6 import java.util.Map;
5   -
  7 +@Document(collection = "lyms_baby_chinamed")
6 8 public class BabyChinaMedicineModel {
7 9 private String id;
8 10 private String babyId; //儿童id
platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java View file @ 7adb6d4
... ... @@ -5,6 +5,7 @@
5 5  
6 6 import java.util.Date;
7 7 import java.util.List;
  8 +import java.util.Map;
8 9  
9 10 /**
10 11 * Created by lt on 2017/7/18 0018
... ... @@ -155,6 +156,142 @@
155 156  
156 157 // 下次访视时间
157 158 private Date nextVisitTimeDesc;
  159 +
  160 + private String tlsc; //听力筛查
  161 + private String jbsc; //疾病筛查
  162 + private String xb;//胸部
  163 + private Map<String,Object> zzjy; //转诊建议
  164 + private String orgDept;//机构及科室
  165 + private Map<String,Object> zd; //指导
  166 + private String nextAddr;//下次随访地点
  167 + private String nextSfType;//下次随访类型
  168 + private Integer csWeek;//出生孕周
  169 + private Integer csDay; //出生天
  170 + private String hbqk;// 母亲患病情况
  171 + private String dueOrg;//助产机构名称
  172 + private String csqk;//出生情况
  173 + private String newZx; //新生儿窒息
  174 + private Integer malformation; //畸形
  175 +
  176 + public Integer getCsWeek() {
  177 + return csWeek;
  178 + }
  179 +
  180 + public void setCsWeek(Integer csWeek) {
  181 + this.csWeek = csWeek;
  182 + }
  183 +
  184 + public Integer getCsDay() {
  185 + return csDay;
  186 + }
  187 +
  188 + public void setCsDay(Integer csDay) {
  189 + this.csDay = csDay;
  190 + }
  191 +
  192 + public String getHbqk() {
  193 + return hbqk;
  194 + }
  195 +
  196 + public void setHbqk(String hbqk) {
  197 + this.hbqk = hbqk;
  198 + }
  199 +
  200 + public String getDueOrg() {
  201 + return dueOrg;
  202 + }
  203 +
  204 + public void setDueOrg(String dueOrg) {
  205 + this.dueOrg = dueOrg;
  206 + }
  207 +
  208 + public String getCsqk() {
  209 + return csqk;
  210 + }
  211 +
  212 + public void setCsqk(String csqk) {
  213 + this.csqk = csqk;
  214 + }
  215 +
  216 + public String getNewZx() {
  217 + return newZx;
  218 + }
  219 +
  220 + public void setNewZx(String newZx) {
  221 + this.newZx = newZx;
  222 + }
  223 +
  224 + public Integer getMalformation() {
  225 + return malformation;
  226 + }
  227 +
  228 + public void setMalformation(Integer malformation) {
  229 + this.malformation = malformation;
  230 + }
  231 +
  232 + public String getTlsc() {
  233 + return tlsc;
  234 + }
  235 +
  236 + public void setTlsc(String tlsc) {
  237 + this.tlsc = tlsc;
  238 + }
  239 +
  240 + public String getJbsc() {
  241 + return jbsc;
  242 + }
  243 +
  244 + public void setJbsc(String jbsc) {
  245 + this.jbsc = jbsc;
  246 + }
  247 +
  248 + public String getXb() {
  249 + return xb;
  250 + }
  251 +
  252 + public void setXb(String xb) {
  253 + this.xb = xb;
  254 + }
  255 +
  256 + public Map<String, Object> getZzjy() {
  257 + return zzjy;
  258 + }
  259 +
  260 + public void setZzjy(Map<String, Object> zzjy) {
  261 + this.zzjy = zzjy;
  262 + }
  263 +
  264 + public String getOrgDept() {
  265 + return orgDept;
  266 + }
  267 +
  268 + public void setOrgDept(String orgDept) {
  269 + this.orgDept = orgDept;
  270 + }
  271 +
  272 + public Map<String, Object> getZd() {
  273 + return zd;
  274 + }
  275 +
  276 + public void setZd(Map<String, Object> zd) {
  277 + this.zd = zd;
  278 + }
  279 +
  280 + public String getNextAddr() {
  281 + return nextAddr;
  282 + }
  283 +
  284 + public void setNextAddr(String nextAddr) {
  285 + this.nextAddr = nextAddr;
  286 + }
  287 +
  288 + public String getNextSfType() {
  289 + return nextSfType;
  290 + }
  291 +
  292 + public void setNextSfType(String nextSfType) {
  293 + this.nextSfType = nextSfType;
  294 + }
158 295  
159 296 public String getBregmaticOther() {
160 297 return bregmaticOther;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ 7adb6d4
... ... @@ -356,8 +356,10 @@
356 356 */
357 357 @RequestMapping(value = "/getBaseConfig", method = RequestMethod.GET)
358 358 @ResponseBody
359   - public BaseObjectResponse getBaseConfig() {
360   - return babyCheckFacade.getBaseConfig();
  359 + @TokenRequired
  360 + public BaseObjectResponse getBaseConfig(HttpServletRequest request) {
  361 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  362 + return babyCheckFacade.getBaseConfig(loginState.getId());
361 363 }
362 364  
363 365 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 7adb6d4
... ... @@ -17,6 +17,7 @@
17 17 import com.lyms.platform.operate.web.service.BabyAfterVisitService;
18 18 import com.lyms.platform.operate.web.service.PatientWeightService;
19 19 import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
  20 +import com.lyms.platform.operate.web.utils.CommonsHelper;
20 21 import com.lyms.platform.operate.web.utils.MongoUtil;
21 22 import com.lyms.platform.operate.web.utils.ResponseUtil;
22 23 import com.lyms.platform.permission.dao.master.CouponMapper;
... ... @@ -783,6 +784,15 @@
783 784 model.setLhdsl(request.getLhdsl());
784 785 model.setLhdcl(request.getLhdcl());
785 786 model.setLhaxisl(request.getLhaxisl());
  787 +
  788 + model.setSf(request.getSf());
  789 + model.setSfRea(request.getSfRea());
  790 + model.setXb(request.getXb());
  791 + model.setNextSfType(request.getNextSfType());
  792 + model.setFypg(request.getFypg());
  793 + model.setZyzd(request.getZyzd());
  794 + model.setZrks(request.getZrks());
  795 +
786 796 return model;
787 797 }
788 798  
... ... @@ -1998,6 +2008,8 @@
1998 2008 }else {
1999 2009 base.setQhdHighRiskInfo(null);
2000 2010 }
  2011 + base.setFname(model.getFname());
  2012 + base.setHomeAddress(CommonsHelper.getResidence(model.getProvinceId(),model.getCityId(),model.getAreaId(),model.getStreetId(),model.getAddress(),basicConfigService));
2001 2013  
2002 2014 }
2003 2015 }
... ... @@ -2808,6 +2820,14 @@
2808 2820 model.setLhdsl(checkModel.getLhdsl());
2809 2821 model.setLhdcl(checkModel.getLhdcl());
2810 2822 model.setLhaxisl(checkModel.getLhaxisl());
  2823 +
  2824 + model.setSf(checkModel.getSf());
  2825 + model.setSfRea(checkModel.getSfRea());
  2826 + model.setXb(checkModel.getXb());
  2827 + model.setNextSfType(checkModel.getNextSfType());
  2828 + model.setFypg(checkModel.getFypg());
  2829 + model.setZyzd(checkModel.getZyzd());
  2830 + model.setZrks(checkModel.getZrks());
2811 2831 return model;
2812 2832  
2813 2833 }
2814 2834  
... ... @@ -3108,8 +3128,9 @@
3108 3128 return growthEvaluate;
3109 3129 }
3110 3130  
3111   - public BaseObjectResponse getBaseConfig() {
  3131 + public BaseObjectResponse getBaseConfig(Integer userId) {
3112 3132  
  3133 + String hospitalId = autoMatchFacade.getHospitalId(userId);
3113 3134 Map <String, Object> map = new HashMap();
3114 3135  
3115 3136 //抚养方式
3116 3137  
... ... @@ -3124,13 +3145,20 @@
3124 3145 List qbType = QbTypeEnums.getQbTypeEnums();
3125 3146 map.put("qbType", qbType);
3126 3147  
3127   - //月龄套餐
3128   - List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class);
3129   - map.put("jctc", jctc);
  3148 + if ("2100001605".equals(hospitalId))
  3149 + {
  3150 + //隆化定制 月龄套餐
  3151 + List jctc2 = EnumUtil.toJson(ChildCareEnums.JCTCEnums2.class);
  3152 + map.put("jctc", jctc2);
  3153 + }
  3154 + else
  3155 + {
  3156 + //月龄套餐
  3157 + List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class);
  3158 + map.put("jctc", jctc);
3130 3159  
3131   - //隆化定制 月龄套餐
3132   - List jctc2 = EnumUtil.toJson(ChildCareEnums.JCTCEnums2.class);
3133   - map.put("jctc", jctc2);
  3160 +
  3161 + }
3134 3162  
3135 3163  
3136 3164 List diseases = BabyDiseaseEnums.getBabyDiseaseEnums();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyChinaMedFacade.java View file @ 7adb6d4
... ... @@ -145,19 +145,29 @@
145 145 param.mysqlBuild((int) count);
146 146 query.skip(param.getOffset()).limit(param.getLimit());
147 147 List<BabyChinaMedicineModel> chinaMedicineModels = mongoTemplate.find(query, BabyChinaMedicineModel.class);
148   -// List<Map<String,Object>> results = new LinkedList<>();
149   -// for (BabyChinaMedicineModel model : chinaMedicineModels) {
150   -// Map<String,Object> result = new HashMap<>();
151   -// result.put("id",model.getId());
152   -// result.put("ageType",model.get());
153   -// result.put("id",model.getId());
154   -// result.put("id",model.getId());
155   -// results.add(result);
156   -// }
  148 + List<Map<String,Object>> results = new LinkedList<>();
  149 + for (BabyChinaMedicineModel model : chinaMedicineModels) {
  150 + Map<String,Object> result = new LinkedHashMap<>();
  151 + BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getBabyId());
  152 + result.put("id",model.getId());
  153 + result.put("babyId",model.getBabyId());
  154 + result.put("babyName",babyModel.getName());//儿童姓名
  155 + result.put("mcertNo",babyModel.getMcertNo());//母亲身份证号
  156 + result.put("mphone",babyModel.getMphone());//母亲手机号
  157 + result.put("ageType",model.getAgeType());//月龄类型
  158 + result.put("checkDate",DateUtil.getyyyy_MM_dd(model.getCheckDate()));//随访时间
  159 + result.put("nextCheckDate",DateUtil.getyyyy_MM_dd(model.getNextCheckDate()));//下次随访时间
  160 + result.put("chinaMed",model.getChinaMed());//中医指导
  161 + result.put("checkDoctor",model.getCheckDoctor());//随访医生
  162 + result.put("addUser",model.getAddUser());//录入人
  163 + result.put("addDate",DateUtil.getyyyy_MM_dd(model.getAddDate()));//录入时间
  164 + result.put("addHospital",model.getAddHospital());//添加机构
  165 + results.add(result);
  166 + }
157 167  
158 168  
159 169 BaseListResponse baseListResponse = new BaseListResponse();
160   - baseListResponse.setData(chinaMedicineModels);
  170 + baseListResponse.setData(results);
161 171 baseListResponse.setPageInfo(param.getPageInfo());
162 172 return baseListResponse;
163 173 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 7adb6d4
... ... @@ -5549,6 +5549,7 @@
5549 5549 }
5550 5550 result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
5551 5551 result.setBnationId(model.getBnationId() == null ? "" : getBasicConfig(model.getBnationId()));//民族
  5552 + result.setNationId(model.getNationId() == null ? "" : getBasicConfig(model.getNationId()));//民族
5552 5553 result.setEncoded(model.getEncoded());
5553 5554 result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason()));
5554 5555 result.setBabyHighRiskReason(mongoUtil.findNames(model.getBabyHighRiskReason()));
... ... @@ -6475,6 +6476,15 @@
6475 6476 model.setLhdsl(checkModel.getLhdsl());
6476 6477 model.setLhdcl(checkModel.getLhdcl());
6477 6478 model.setLhaxisl(checkModel.getLhaxisl());
  6479 +
  6480 +
  6481 + model.setSf(checkModel.getSf());
  6482 + model.setSfRea(checkModel.getSfRea());
  6483 + model.setXb(checkModel.getXb());
  6484 + model.setNextSfType(checkModel.getNextSfType());
  6485 + model.setFypg(checkModel.getFypg());
  6486 + model.setZyzd(checkModel.getZyzd());
  6487 + model.setZrks(checkModel.getZrks());
6478 6488 return model;
6479 6489  
6480 6490 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java View file @ 7adb6d4
... ... @@ -646,6 +646,70 @@
646 646 */
647 647 private String lhaxisr;
648 648  
  649 + private String sf;//是否失访
  650 + private String sfRea;//失访原因
  651 + private String xb;//胸部
  652 + private String nextSfType;//下次随访类型
  653 + private String fypg;//发育评估
  654 + private Map<String,Object> zyzd; //中医指导
  655 + private String zrks;//转让科室
  656 +
  657 + public String getSf() {
  658 + return sf;
  659 + }
  660 +
  661 + public void setSf(String sf) {
  662 + this.sf = sf;
  663 + }
  664 +
  665 + public String getSfRea() {
  666 + return sfRea;
  667 + }
  668 +
  669 + public void setSfRea(String sfRea) {
  670 + this.sfRea = sfRea;
  671 + }
  672 +
  673 + public String getXb() {
  674 + return xb;
  675 + }
  676 +
  677 + public void setXb(String xb) {
  678 + this.xb = xb;
  679 + }
  680 +
  681 + public String getNextSfType() {
  682 + return nextSfType;
  683 + }
  684 +
  685 + public void setNextSfType(String nextSfType) {
  686 + this.nextSfType = nextSfType;
  687 + }
  688 +
  689 + public String getFypg() {
  690 + return fypg;
  691 + }
  692 +
  693 + public void setFypg(String fypg) {
  694 + this.fypg = fypg;
  695 + }
  696 +
  697 + public Map<String, Object> getZyzd() {
  698 + return zyzd;
  699 + }
  700 +
  701 + public void setZyzd(Map<String, Object> zyzd) {
  702 + this.zyzd = zyzd;
  703 + }
  704 +
  705 + public String getZrks() {
  706 + return zrks;
  707 + }
  708 +
  709 + public void setZrks(String zrks) {
  710 + this.zrks = zrks;
  711 + }
  712 +
649 713 public String getLhdsl() {
650 714 return lhdsl;
651 715 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java View file @ 7adb6d4
... ... @@ -144,7 +144,24 @@
144 144  
145 145 //胆红素 腹
146 146 private String bilirubinBelly;
  147 + private String homeAddress; //家庭地址
  148 + private String fname; //父亲姓名
147 149  
  150 + public String getHomeAddress() {
  151 + return homeAddress;
  152 + }
  153 +
  154 + public void setHomeAddress(String homeAddress) {
  155 + this.homeAddress = homeAddress;
  156 + }
  157 +
  158 + public String getFname() {
  159 + return fname;
  160 + }
  161 +
  162 + public void setFname(String fname) {
  163 + this.fname = fname;
  164 + }
148 165  
149 166 public String getBilirubinBelly() {
150 167 return bilirubinBelly;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java View file @ 7adb6d4
... ... @@ -39,6 +39,70 @@
39 39 private String xlsqxw;// 社区行为(心理月龄)
40 40 private String diagnoseNLS; //能力商诊断
41 41  
  42 + private String sf;//是否失访
  43 + private String sfRea;//失访原因
  44 + private String xb;//胸部
  45 + private String nextSfType;//下次随访类型
  46 + private String fypg;//发育评估
  47 + private Map<String,Object> zyzd; //中医指导
  48 + private String zrks;//转让科室
  49 +
  50 + public String getSf() {
  51 + return sf;
  52 + }
  53 +
  54 + public void setSf(String sf) {
  55 + this.sf = sf;
  56 + }
  57 +
  58 + public String getSfRea() {
  59 + return sfRea;
  60 + }
  61 +
  62 + public void setSfRea(String sfRea) {
  63 + this.sfRea = sfRea;
  64 + }
  65 +
  66 + public String getXb() {
  67 + return xb;
  68 + }
  69 +
  70 + public void setXb(String xb) {
  71 + this.xb = xb;
  72 + }
  73 +
  74 + public String getNextSfType() {
  75 + return nextSfType;
  76 + }
  77 +
  78 + public void setNextSfType(String nextSfType) {
  79 + this.nextSfType = nextSfType;
  80 + }
  81 +
  82 + public String getFypg() {
  83 + return fypg;
  84 + }
  85 +
  86 + public void setFypg(String fypg) {
  87 + this.fypg = fypg;
  88 + }
  89 +
  90 + public Map<String, Object> getZyzd() {
  91 + return zyzd;
  92 + }
  93 +
  94 + public void setZyzd(Map<String, Object> zyzd) {
  95 + this.zyzd = zyzd;
  96 + }
  97 +
  98 + public String getZrks() {
  99 + return zrks;
  100 + }
  101 +
  102 + public void setZrks(String zrks) {
  103 + this.zrks = zrks;
  104 + }
  105 +
42 106 public String getDiagnoseNLS() {
43 107 return diagnoseNLS;
44 108 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java View file @ 7adb6d4
... ... @@ -888,6 +888,71 @@
888 888 */
889 889 private String lhaxisr;
890 890  
  891 +
  892 + private String sf;//是否失访
  893 + private String sfRea;//失访原因
  894 + private String xb;//胸部
  895 + private String nextSfType;//下次随访类型
  896 + private String fypg;//发育评估
  897 + private Map<String,Object> zyzd; //中医指导
  898 + private String zrks;//转让科室
  899 +
  900 + public String getSf() {
  901 + return sf;
  902 + }
  903 +
  904 + public void setSf(String sf) {
  905 + this.sf = sf;
  906 + }
  907 +
  908 + public String getSfRea() {
  909 + return sfRea;
  910 + }
  911 +
  912 + public void setSfRea(String sfRea) {
  913 + this.sfRea = sfRea;
  914 + }
  915 +
  916 + public String getXb() {
  917 + return xb;
  918 + }
  919 +
  920 + public void setXb(String xb) {
  921 + this.xb = xb;
  922 + }
  923 +
  924 + public String getNextSfType() {
  925 + return nextSfType;
  926 + }
  927 +
  928 + public void setNextSfType(String nextSfType) {
  929 + this.nextSfType = nextSfType;
  930 + }
  931 +
  932 + public String getFypg() {
  933 + return fypg;
  934 + }
  935 +
  936 + public void setFypg(String fypg) {
  937 + this.fypg = fypg;
  938 + }
  939 +
  940 + public Map<String, Object> getZyzd() {
  941 + return zyzd;
  942 + }
  943 +
  944 + public void setZyzd(Map<String, Object> zyzd) {
  945 + this.zyzd = zyzd;
  946 + }
  947 +
  948 + public String getZrks() {
  949 + return zrks;
  950 + }
  951 +
  952 + public void setZrks(String zrks) {
  953 + this.zrks = zrks;
  954 + }
  955 +
891 956 public String getLhdsl() {
892 957 return lhdsl;
893 958 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java View file @ 7adb6d4
... ... @@ -349,6 +349,24 @@
349 349 NewbornVisit newbornVisit = mongoTemplate.findById(id, NewbornVisit.class);
350 350 if(newbornVisit != null) {
351 351 Map<String, Object> restMap = new HashMap<>();
  352 +
  353 + restMap.put("tlsc",newbornVisit.getTlsc());
  354 + restMap.put("jbsc",newbornVisit.getJbsc());
  355 + restMap.put("xb",newbornVisit.getXb());
  356 + restMap.put("zzjy",newbornVisit.getZzjy());
  357 + restMap.put("orgDept",newbornVisit.getOrgDept());
  358 + restMap.put("zd",newbornVisit.getZd());
  359 + restMap.put("nextAddr",newbornVisit.getNextAddr());
  360 + restMap.put("nextSfType",newbornVisit.getNextSfType());
  361 +
  362 + restMap.put("csWeek",newbornVisit.getCsWeek());
  363 + restMap.put("csDay",newbornVisit.getCsDay());
  364 + restMap.put("hbqk",newbornVisit.getHbqk());
  365 + restMap.put("dueOrg",newbornVisit.getDueOrg());
  366 + restMap.put("csqk",newbornVisit.getCsqk());
  367 + restMap.put("newZx",newbornVisit.getNewZx());
  368 + restMap.put("malformation",newbornVisit.getMalformation());
  369 +
352 370 restMap.put("id", newbornVisit.getId()); /** id */
353 371  
354 372 /**