liquanyu / regional-platform

Download as
Browse Code »

Commit 2a3728e1a5dc3121956f712e11b6f5bea00c9d4b

Authored by litao@lymsh.com
1 parent 1df911fe27
Exists in master and in 1 other branch dev

耳保 和bug修复

Showing 5 changed files with 681 additions and 8 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/SequenceConstant.java View file @ 2a3728e
... ... @@ -7,5 +7,9 @@
7 7 public static final String QUEUE = "SEQUENCE_QUEUE";
8 8 public static final String QUEUE_TYPE = "SEQUENCE_QUEUE";
9 9 public static final String QUEUE_REMARK = "SEQUENCE_QUEUE";
  10 +
  11 + public static final String HOSPITAL_COUPON_CODE = "HOSPITAL_COUPON_CODE";
  12 + public static final String HOSPITAL_COUPON_CODE_REMARK = "医院优惠券打印的时候显示编码";
  13 +
10 14 }
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 2a3728e
... ... @@ -261,10 +261,6 @@
261 261 }
262 262 }
263 263  
264   - public static void main(String[] args) {
265   - System.out.println(getYyyyMmDd(new Date()));
266   - }
267   -
268 264 public static Date parseYMD(String s) {
269 265 if (s == null) {
270 266 return null;
... ... @@ -1057,6 +1053,12 @@
1057 1053 calendar.setTime(now);
1058 1054 calendar.add(Calendar.WEEK_OF_YEAR, week);
1059 1055 return calendar.getTime();
  1056 + }
  1057 +
  1058 + public static Integer getCurrentYear() {
  1059 + Calendar calendar = Calendar.getInstance();
  1060 + calendar.setTime(new Date());
  1061 + return calendar.get(Calendar.YEAR);
1060 1062 }
1061 1063  
1062 1064 }
platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyePatient.java View file @ 2a3728e
  1 +package com.lyms.platform.pojo;
  2 +
  3 +import org.springframework.data.mongodb.core.mapping.Document;
  4 +
  5 +import java.util.Date;
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * 儿童眼保健检查建档
  10 + * Created by lt on 2017/8/1 0001
  11 + */
  12 +@Document(collection="lyms_baby_eye_patient")
  13 +public class BabyEyePatient {
  14 +
  15 + private String id;
  16 +
  17 + private Date created;
  18 +
  19 + private String yn;
  20 +
  21 + // 操作人ID
  22 + private String operaterId;
  23 +
  24 + private String hospitalId;
  25 +
  26 + private String babyId;
  27 +
  28 + private String pid;
  29 +
  30 + /**================================= 儿童基本信息 ==================================*/
  31 + private String name;
  32 +
  33 + private String sex;
  34 +
  35 + /**
  36 + * 身份证号
  37 + */
  38 + private String vaCard;
  39 +
  40 + private Date birth;
  41 +
  42 + /**
  43 + * 民族id
  44 + */
  45 + private String nationId;
  46 +
  47 + private String provinceId;
  48 +
  49 + private String cityId;
  50 +
  51 + private String areaId;
  52 +
  53 + private String streetId;
  54 +
  55 + private String address;
  56 +
  57 + /**
  58 + * 邮编
  59 + */
  60 + private String zipCode;
  61 +
  62 + /**================================== 母亲基本信息 =============================*/
  63 + private String mName;
  64 +
  65 + /**
  66 + * 证件类型Id
  67 + */
  68 + private String mcCardTypeId;
  69 +
  70 + /**
  71 + * 证件号
  72 + */
  73 + private String mCardNo;
  74 +
  75 + private Date mBirth;
  76 +
  77 + /**
  78 + * 文化程度id
  79 + */
  80 + private String mPlevelTypeId;
  81 +
  82 + /**
  83 + * 职业类别Id
  84 + */
  85 + private String mHprofessionTypeId;
  86 +
  87 + /**===================== 父亲基本信息 ========================*/
  88 + private String fName;
  89 +
  90 + private String fPhone;
  91 +
  92 + private Date fBirth;
  93 +
  94 + /**
  95 + * 文化程度id
  96 + */
  97 + private String fPlevelTypeId;
  98 +
  99 + /**
  100 + * 职业类别Id
  101 + */
  102 + private String fHprofessionTypeId;
  103 +
  104 +
  105 + /**=================== 分娩信息 ==================*/
  106 + /**
  107 + * 预产期
  108 + */
  109 + private Date dueDate;
  110 +
  111 + /**
  112 + * 分娩方式
  113 + */
  114 + private String deliveryType;
  115 +
  116 + /**
  117 + * 第几胎
  118 + */
  119 + private Integer parityNum;
  120 +
  121 + /**
  122 + * 第几产
  123 + */
  124 + private Integer productNum;
  125 +
  126 + /**
  127 + * 体重
  128 + */
  129 + private String weight;
  130 +
  131 + /**
  132 + * 身长
  133 + */
  134 + private String length;
  135 +
  136 + /**
  137 + * 头围
  138 + */
  139 + private String head;
  140 +
  141 + /**
  142 + * aogar一分钟评分
  143 + */
  144 + private String apgarOneMin;
  145 +
  146 + /**
  147 + * aogar五分钟评分
  148 + */
  149 + private String apgaFiveMin;
  150 +
  151 + /**
  152 + * aogar十分钟评分
  153 + */
  154 + private String apgaTenMin;
  155 +
  156 + /**
  157 + * 是否畸形
  158 + */
  159 + private boolean malformation;
  160 +
  161 + /**
  162 + * 分娩医院
  163 + */
  164 + private String fmHospitalId;
  165 +
  166 + /**===================== 高危及诊断 ============================*/
  167 + /**
  168 + * 母亲孕期高危因素
  169 + */
  170 + private List<String> mHighRiskFactorIds;
  171 +
  172 + /**
  173 + * 是否是高危儿
  174 + */
  175 + private boolean gesell;
  176 +
  177 + /**
  178 + * 诊断
  179 + */
  180 + private List<String> diagnosiIds;
  181 +
  182 + /**
  183 + * 住院号
  184 + */
  185 + private String hospitalizationNum;
  186 +
  187 + /**
  188 + * 新生儿出院诊断
  189 + */
  190 + private String ddIds;
  191 +
  192 + /**=========================== 院内信息 =======================*/
  193 + /**
  194 + * 建档医生
  195 + */
  196 + private String doctor;
  197 +
  198 + /**
  199 + * 建档日期
  200 + */
  201 + private Date bookBuildingDate;
  202 +
  203 + /**
  204 + * 就诊卡号
  205 + */
  206 + private String visitCard;
  207 +
  208 + /**
  209 + * 条形码
  210 + */
  211 + private String barCode;
  212 +
  213 + /**
  214 + * 备注
  215 + */
  216 + private String remark;
  217 +
  218 + /**
  219 + * 服务类型
  220 + */
  221 + private String serviceType;
  222 +
  223 + /**
  224 + * 服务状态
  225 + */
  226 + private String serviceStatus;
  227 +
  228 + public String getId() {
  229 + return id;
  230 + }
  231 +
  232 + public void setId(String id) {
  233 + this.id = id;
  234 + }
  235 +
  236 + public Date getCreated() {
  237 + return created;
  238 + }
  239 +
  240 + public void setCreated(Date created) {
  241 + this.created = created;
  242 + }
  243 +
  244 + public String getYn() {
  245 + return yn;
  246 + }
  247 +
  248 + public void setYn(String yn) {
  249 + this.yn = yn;
  250 + }
  251 +
  252 + public String getOperaterId() {
  253 + return operaterId;
  254 + }
  255 +
  256 + public void setOperaterId(String operaterId) {
  257 + this.operaterId = operaterId;
  258 + }
  259 +
  260 + public String getHospitalId() {
  261 + return hospitalId;
  262 + }
  263 +
  264 + public void setHospitalId(String hospitalId) {
  265 + this.hospitalId = hospitalId;
  266 + }
  267 +
  268 + public String getBabyId() {
  269 + return babyId;
  270 + }
  271 +
  272 + public void setBabyId(String babyId) {
  273 + this.babyId = babyId;
  274 + }
  275 +
  276 + public String getPid() {
  277 + return pid;
  278 + }
  279 +
  280 + public void setPid(String pid) {
  281 + this.pid = pid;
  282 + }
  283 +
  284 + public String getName() {
  285 + return name;
  286 + }
  287 +
  288 + public void setName(String name) {
  289 + this.name = name;
  290 + }
  291 +
  292 + public String getSex() {
  293 + return sex;
  294 + }
  295 +
  296 + public void setSex(String sex) {
  297 + this.sex = sex;
  298 + }
  299 +
  300 + public String getVaCard() {
  301 + return vaCard;
  302 + }
  303 +
  304 + public void setVaCard(String vaCard) {
  305 + this.vaCard = vaCard;
  306 + }
  307 +
  308 + public Date getBirth() {
  309 + return birth;
  310 + }
  311 +
  312 + public void setBirth(Date birth) {
  313 + this.birth = birth;
  314 + }
  315 +
  316 + public String getNationId() {
  317 + return nationId;
  318 + }
  319 +
  320 + public void setNationId(String nationId) {
  321 + this.nationId = nationId;
  322 + }
  323 +
  324 + public String getProvinceId() {
  325 + return provinceId;
  326 + }
  327 +
  328 + public void setProvinceId(String provinceId) {
  329 + this.provinceId = provinceId;
  330 + }
  331 +
  332 + public String getCityId() {
  333 + return cityId;
  334 + }
  335 +
  336 + public void setCityId(String cityId) {
  337 + this.cityId = cityId;
  338 + }
  339 +
  340 + public String getAreaId() {
  341 + return areaId;
  342 + }
  343 +
  344 + public void setAreaId(String areaId) {
  345 + this.areaId = areaId;
  346 + }
  347 +
  348 + public String getStreetId() {
  349 + return streetId;
  350 + }
  351 +
  352 + public void setStreetId(String streetId) {
  353 + this.streetId = streetId;
  354 + }
  355 +
  356 + public String getAddress() {
  357 + return address;
  358 + }
  359 +
  360 + public void setAddress(String address) {
  361 + this.address = address;
  362 + }
  363 +
  364 + public String getZipCode() {
  365 + return zipCode;
  366 + }
  367 +
  368 + public void setZipCode(String zipCode) {
  369 + this.zipCode = zipCode;
  370 + }
  371 +
  372 + public String getmName() {
  373 + return mName;
  374 + }
  375 +
  376 + public void setmName(String mName) {
  377 + this.mName = mName;
  378 + }
  379 +
  380 + public String getMcCardTypeId() {
  381 + return mcCardTypeId;
  382 + }
  383 +
  384 + public void setMcCardTypeId(String mcCardTypeId) {
  385 + this.mcCardTypeId = mcCardTypeId;
  386 + }
  387 +
  388 + public String getmCardNo() {
  389 + return mCardNo;
  390 + }
  391 +
  392 + public void setmCardNo(String mCardNo) {
  393 + this.mCardNo = mCardNo;
  394 + }
  395 +
  396 + public Date getmBirth() {
  397 + return mBirth;
  398 + }
  399 +
  400 + public void setmBirth(Date mBirth) {
  401 + this.mBirth = mBirth;
  402 + }
  403 +
  404 + public String getmPlevelTypeId() {
  405 + return mPlevelTypeId;
  406 + }
  407 +
  408 + public void setmPlevelTypeId(String mPlevelTypeId) {
  409 + this.mPlevelTypeId = mPlevelTypeId;
  410 + }
  411 +
  412 + public String getmHprofessionTypeId() {
  413 + return mHprofessionTypeId;
  414 + }
  415 +
  416 + public void setmHprofessionTypeId(String mHprofessionTypeId) {
  417 + this.mHprofessionTypeId = mHprofessionTypeId;
  418 + }
  419 +
  420 + public String getfName() {
  421 + return fName;
  422 + }
  423 +
  424 + public void setfName(String fName) {
  425 + this.fName = fName;
  426 + }
  427 +
  428 + public String getfPhone() {
  429 + return fPhone;
  430 + }
  431 +
  432 + public void setfPhone(String fPhone) {
  433 + this.fPhone = fPhone;
  434 + }
  435 +
  436 + public Date getfBirth() {
  437 + return fBirth;
  438 + }
  439 +
  440 + public void setfBirth(Date fBirth) {
  441 + this.fBirth = fBirth;
  442 + }
  443 +
  444 + public String getfPlevelTypeId() {
  445 + return fPlevelTypeId;
  446 + }
  447 +
  448 + public void setfPlevelTypeId(String fPlevelTypeId) {
  449 + this.fPlevelTypeId = fPlevelTypeId;
  450 + }
  451 +
  452 + public String getfHprofessionTypeId() {
  453 + return fHprofessionTypeId;
  454 + }
  455 +
  456 + public void setfHprofessionTypeId(String fHprofessionTypeId) {
  457 + this.fHprofessionTypeId = fHprofessionTypeId;
  458 + }
  459 +
  460 + public Date getDueDate() {
  461 + return dueDate;
  462 + }
  463 +
  464 + public void setDueDate(Date dueDate) {
  465 + this.dueDate = dueDate;
  466 + }
  467 +
  468 + public String getDeliveryType() {
  469 + return deliveryType;
  470 + }
  471 +
  472 + public void setDeliveryType(String deliveryType) {
  473 + this.deliveryType = deliveryType;
  474 + }
  475 +
  476 + public Integer getParityNum() {
  477 + return parityNum;
  478 + }
  479 +
  480 + public void setParityNum(Integer parityNum) {
  481 + this.parityNum = parityNum;
  482 + }
  483 +
  484 + public Integer getProductNum() {
  485 + return productNum;
  486 + }
  487 +
  488 + public void setProductNum(Integer productNum) {
  489 + this.productNum = productNum;
  490 + }
  491 +
  492 + public String getWeight() {
  493 + return weight;
  494 + }
  495 +
  496 + public void setWeight(String weight) {
  497 + this.weight = weight;
  498 + }
  499 +
  500 + public String getLength() {
  501 + return length;
  502 + }
  503 +
  504 + public void setLength(String length) {
  505 + this.length = length;
  506 + }
  507 +
  508 + public String getHead() {
  509 + return head;
  510 + }
  511 +
  512 + public void setHead(String head) {
  513 + this.head = head;
  514 + }
  515 +
  516 + public String getApgarOneMin() {
  517 + return apgarOneMin;
  518 + }
  519 +
  520 + public void setApgarOneMin(String apgarOneMin) {
  521 + this.apgarOneMin = apgarOneMin;
  522 + }
  523 +
  524 + public String getApgaFiveMin() {
  525 + return apgaFiveMin;
  526 + }
  527 +
  528 + public void setApgaFiveMin(String apgaFiveMin) {
  529 + this.apgaFiveMin = apgaFiveMin;
  530 + }
  531 +
  532 + public String getApgaTenMin() {
  533 + return apgaTenMin;
  534 + }
  535 +
  536 + public void setApgaTenMin(String apgaTenMin) {
  537 + this.apgaTenMin = apgaTenMin;
  538 + }
  539 +
  540 + public boolean isMalformation() {
  541 + return malformation;
  542 + }
  543 +
  544 + public void setMalformation(boolean malformation) {
  545 + this.malformation = malformation;
  546 + }
  547 +
  548 + public String getFmHospitalId() {
  549 + return fmHospitalId;
  550 + }
  551 +
  552 + public void setFmHospitalId(String fmHospitalId) {
  553 + this.fmHospitalId = fmHospitalId;
  554 + }
  555 +
  556 + public List<String> getmHighRiskFactorIds() {
  557 + return mHighRiskFactorIds;
  558 + }
  559 +
  560 + public void setmHighRiskFactorIds(List<String> mHighRiskFactorIds) {
  561 + this.mHighRiskFactorIds = mHighRiskFactorIds;
  562 + }
  563 +
  564 + public boolean isGesell() {
  565 + return gesell;
  566 + }
  567 +
  568 + public void setGesell(boolean gesell) {
  569 + this.gesell = gesell;
  570 + }
  571 +
  572 + public List<String> getDiagnosiIds() {
  573 + return diagnosiIds;
  574 + }
  575 +
  576 + public void setDiagnosiIds(List<String> diagnosiIds) {
  577 + this.diagnosiIds = diagnosiIds;
  578 + }
  579 +
  580 + public String getHospitalizationNum() {
  581 + return hospitalizationNum;
  582 + }
  583 +
  584 + public void setHospitalizationNum(String hospitalizationNum) {
  585 + this.hospitalizationNum = hospitalizationNum;
  586 + }
  587 +
  588 + public String getDdIds() {
  589 + return ddIds;
  590 + }
  591 +
  592 + public void setDdIds(String ddIds) {
  593 + this.ddIds = ddIds;
  594 + }
  595 +
  596 + public String getDoctor() {
  597 + return doctor;
  598 + }
  599 +
  600 + public void setDoctor(String doctor) {
  601 + this.doctor = doctor;
  602 + }
  603 +
  604 + public Date getBookBuildingDate() {
  605 + return bookBuildingDate;
  606 + }
  607 +
  608 + public void setBookBuildingDate(Date bookBuildingDate) {
  609 + this.bookBuildingDate = bookBuildingDate;
  610 + }
  611 +
  612 + public String getVisitCard() {
  613 + return visitCard;
  614 + }
  615 +
  616 + public void setVisitCard(String visitCard) {
  617 + this.visitCard = visitCard;
  618 + }
  619 +
  620 + public String getBarCode() {
  621 + return barCode;
  622 + }
  623 +
  624 + public void setBarCode(String barCode) {
  625 + this.barCode = barCode;
  626 + }
  627 +
  628 + public String getRemark() {
  629 + return remark;
  630 + }
  631 +
  632 + public void setRemark(String remark) {
  633 + this.remark = remark;
  634 + }
  635 +
  636 + public String getServiceType() {
  637 + return serviceType;
  638 + }
  639 +
  640 + public void setServiceType(String serviceType) {
  641 + this.serviceType = serviceType;
  642 + }
  643 +
  644 + public String getServiceStatus() {
  645 + return serviceStatus;
  646 + }
  647 +
  648 + public void setServiceStatus(String serviceStatus) {
  649 + this.serviceStatus = serviceStatus;
  650 + }
  651 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java View file @ 2a3728e
1 1 package com.lyms.platform.operate.web.controller;
2 2  
  3 +import com.alibaba.fastjson.JSON;
  4 +import com.lyms.platform.biz.SequenceConstant;
3 5 import com.lyms.platform.biz.service.PatientsService;
4 6 import com.lyms.platform.common.annotation.TokenRequired;
5 7 import com.lyms.platform.common.base.BaseController;
... ... @@ -9,6 +11,7 @@
9 11 import com.lyms.platform.common.utils.PropertiesUtil;
10 12 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
11 13 import com.lyms.platform.permission.service.CouponService;
  14 +import com.lyms.platform.pojo.PlantformConfigModel;
12 15 import org.slf4j.Logger;
13 16 import org.slf4j.LoggerFactory;
14 17 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -21,6 +24,9 @@
21 24 import org.springframework.web.bind.annotation.ResponseBody;
22 25  
23 26 import javax.servlet.http.HttpServletRequest;
  27 +import java.util.Date;
  28 +import java.util.HashMap;
  29 +import java.util.Map;
24 30  
25 31 /**
26 32 * @Author: litao
... ... @@ -132,8 +138,16 @@
132 138 @RequestMapping(method = RequestMethod.GET, value = "/test")
133 139 @ResponseBody
134 140 public BaseObjectResponse testUse() {
135   - System.err.println("xxxxxxxxxxxxxxxxx");
136   - patientsService.autoMatDeliver();
  141 + PlantformConfigModel config = new PlantformConfigModel();
  142 + config.setCreateDate(new Date());
  143 + config.setKey("216");
  144 + Map<Integer, Integer> map = new HashMap<>();
  145 + map.put(2017, 0);
  146 + map.put(2018, 0);
  147 + config.setValue(JSON.toJSONString(map));
  148 + config.setRemark(SequenceConstant.HOSPITAL_COUPON_CODE_REMARK);
  149 + config.setType(SequenceConstant.HOSPITAL_COUPON_CODE);
  150 + mongoTemplate.save(config);
137 151 return RespBuilder.buildSuccess();
138 152 }
139 153  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java View file @ 2a3728e
... ... @@ -193,10 +193,10 @@
193 193 if(StringUtils.isNotBlank(pid)) {
194 194 PersonModel person = mongoTemplate.findById(pid, PersonModel.class);
195 195 if(person != null) {
196   - temp.put("cardNo", person.getCardNo());
  196 + temp.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(person.getCardNo()));
197 197 temp.put("name", person.getName());
198 198 temp.put("age", DateUtil.getAge(person.getBirth()));
199   - temp.put("phone", person.getPhone());
  199 + temp.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(person.getPhone()));
200 200 }
201 201 }
202 202 BabyModel babyModel = mongoTemplate.findById(visit.getBabyId(), BabyModel.class);