fangcheng / regional-platform

Download as
Browse Code »

Commit c056bb7d65c6e36c7ce0fdff98457e2790ea7d71

Authored by liquanyu
1 parent 8e77d3cff3
Exists in master and in 1 other branch nobuildprocess

儿童建档修改

Showing 2 changed files with 46 additions and 43 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ c056bb7
... ... @@ -316,12 +316,10 @@
316 316 if(!StringUtils.isEmpty(diagnose)){
317 317 condition=condition.and("diagnose", diagnose, MongoOper.LIKE);
318 318 }
319   - if(!StringUtils.isEmpty(phoneId)){
320   - condition=condition.and("phoneId", phoneId, MongoOper.LIKE);
321   - }
322   -
323   - if(!StringUtils.isEmpty(cardId)){
324   - condition=condition.and("cardId", cardId, MongoOper.LIKE);
  319 + if(!StringUtils.isEmpty(phoneId) || !StringUtils.isEmpty(cardId)){
  320 + MongoCondition con1 = MongoCondition.newInstance("phoneId", phoneId, MongoOper.LIKE);
  321 + MongoCondition con = MongoCondition.newInstance("cardId", cardId, MongoOper.LIKE);
  322 + condition = condition.orCondition(new MongoCondition[]{con1, con});
325 323 }
326 324  
327 325 if(null!=sex){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ c056bb7
... ... @@ -125,13 +125,27 @@
125 125 public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request) {
126 126 BabyModel model = getBabyModel(request);
127 127 model.setModified(new Date());
  128 +
  129 + if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) {
  130 +
  131 + String cardId = request.getMommyCertificateNum() +
  132 + DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
  133 + model.setCardId(cardId + request.getBabyName());
  134 + }
  135 + if (StringUtils.isNotEmpty(request.getMommyPhone()))
  136 + {
  137 + String phoneId = request.getMommyPhone() +
  138 + DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
  139 + model.setPhoneId(phoneId + request.getBabyName());
  140 + }
  141 +
128 142 if (!StringUtils.isEmpty(request.getPid())) {
129 143 PersonModel pmodel = new PersonModel();
130 144 pmodel.setName(request.getBabyName());
131 145 pmodel.setBirth(DateUtil.parseYMD(request.getBabyBirthday()));
132 146 pmodel.setPhone(request.getMommyPhone());
133 147 pmodel.setCardNo(request.getMommyCertificateNum());
134   - pmodel.setType(1);
  148 + pmodel.setType(2);
135 149 pmodel.setYn(YnEnums.YES.getId());
136 150 pmodel.setModified(new Date());
137 151 personService.updatePerson(pmodel, request.getPid());
138 152  
139 153  
140 154  
... ... @@ -150,23 +164,30 @@
150 164 */
151 165 public BaseObjectResponse addBabyBookbuilding(BabyBookbuildingAddRequest request) {
152 166  
153   - //判断儿童的就诊卡号是否建档 在该家医院
154   - if (StringUtils.isNotEmpty(request.getVcCardNo()))
  167 + //判断儿童是否建档在该医院
  168 + if (StringUtils.isNotEmpty(request.getMommyPhone()) || StringUtils.isNotEmpty(request.getMommyCertificateNum()))
155 169 {
156 170 BabyModelQuery babyQuery = new BabyModelQuery();
157 171 babyQuery.setYn(YnEnums.YES.getId());
158   - babyQuery.setVcCardNo(request.getVcCardNo());
  172 + String phoneId = request.getMommyPhone() +
  173 + DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday())) +request.getBabyName();
  174 +
  175 + String cardId = request.getMommyCertificateNum() +
  176 + DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday())) +request.getBabyName();
  177 + babyQuery.setPhoneId(phoneId);
  178 + babyQuery.setCardId(cardId);
159 179 babyQuery.setHospitalId(request.getHospitalId());
160 180 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
161 181 if (CollectionUtils.isNotEmpty(models))
162 182 {
163 183 BaseObjectResponse br = new BaseObjectResponse();
164 184 br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
165   - br.setErrormsg("该就诊卡号儿童已经建档");
  185 + br.setErrormsg("儿童在医院已经建档");
166 186 return br;
167 187 }
168 188 }
169 189  
  190 +
170 191 //通过查询是否有该孕妇
171 192 PatientsQuery puerperaQuery = new PatientsQuery();
172 193 puerperaQuery.setCardNo(request.getMommyCertificateNum());
173 194  
174 195  
... ... @@ -236,25 +257,18 @@
236 257 BabyModel model = getBabyModel(request);
237 258 model.setPid(resperson.getId());
238 259  
239   - BabyModelQuery babyQuery = new BabyModelQuery();
240   - babyQuery.setYn(YnEnums.YES.getId());
241   -
242   - int count = 0;
243 260 if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) {
244 261  
245 262 String cardId = request.getMommyCertificateNum() +
246 263 DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
247   - babyQuery.setCardId(cardId);
248   - count = babyBookbuildingService.queryBabyCount(babyQuery);
249   - model.setCardId(cardId + request.getSex() + (count + 1));
  264 + //count = babyBookbuildingService.queryBabyCount(babyQuery);
  265 + model.setCardId(cardId + request.getBabyName());
250 266 }
251 267 if (StringUtils.isNotEmpty(request.getMommyPhone()))
252 268 {
253 269 String phoneId = request.getMommyPhone() +
254 270 DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
255   - babyQuery.setPhoneId(phoneId);
256   - count = babyBookbuildingService.queryBabyCount(babyQuery);
257   - model.setPhoneId(phoneId + request.getSex() + (count + 1));
  271 + model.setPhoneId(phoneId + request.getBabyName());
258 272 }
259 273  
260 274 model.setParentId(patients.getId());
261 275  
... ... @@ -761,19 +775,18 @@
761 775 List<BabyModel> models = null;
762 776 if (!StringUtils.isEmpty(param.getCardNo())) {
763 777 babyQuery.setCardId(param.getCardNo());
764   - models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
765   - if (!CollectionUtils.isNotEmpty(models)) {
766   - //通过查询孕妇
767   - PatientsQuery puerperaQuery = new PatientsQuery();
768   - puerperaQuery.setCardNo(param.getCardNo());
769   - puerperaQuery.setYn(YnEnums.YES.getId());
770   - Patients patients = patientsService.findOnePatientByCardNo(puerperaQuery);
771   - if (patients != null && StringUtils.isNotEmpty(patients.getPhone())) {
772   - babyQuery.setPhoneId(patients.getPhone());
773   - babyQuery.setCardId(null);
774   - models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
775   - }
  778 +
  779 + //通过查询孕妇
  780 + PatientsQuery puerperaQuery = new PatientsQuery();
  781 + puerperaQuery.setCardNo(param.getCardNo());
  782 + puerperaQuery.setYn(YnEnums.YES.getId());
  783 + Patients patients = patientsService.findOnePatientByCardNo(puerperaQuery);
  784 + if (patients != null && StringUtils.isNotEmpty(patients.getPhone())) {
  785 + babyQuery.setPhoneId(patients.getPhone());
776 786 }
  787 +
  788 + models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  789 +
777 790 } else if (param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo())) {
778 791 babyQuery.setHospitalId(param.getHospitalId());
779 792 babyQuery.setVcCardNo(param.getVcCardNo());
... ... @@ -784,15 +797,7 @@
784 797 Set<String> uid = new HashSet<>();
785 798 for (BabyModel model : models) {
786 799 if (model != null) {
787   - if (StringUtils.isNotEmpty(model.getCardId()))
788   - {
789   - uid.add(model.getCardId());
790   - }
791   - else if (StringUtils.isNotEmpty(model.getPhoneId()))
792   - {
793   - uid.add(model.getPhoneId());
794   - }
795   -
  800 + uid.add(model.getId());
796 801 }
797 802  
798 803 }
... ... @@ -803,7 +808,7 @@
803 808 List<Map<String, String>> list = new ArrayList<>();
804 809 for (BabyModel model : models) {
805 810  
806   - if ((id.equals(model.getCardId()) || id.equals(model.getPhoneId())) && isNotExist(list, model.getId())) {
  811 + if (id.equals(model.getCardId())) {
807 812 Map<String, String> buildRecords = new HashMap<>();
808 813 buildRecords.put("id", model.getId());
809 814 buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(model.getBuildDate()));