shiyang / regional-platform

Download as
Browse Code »

Commit a440de042032e8733a7ac34fd72338bbe19b45e5

Authored by liquanyu
2 parents 1c11a0e3dd e0c88dfe7e
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ a440de0
... ... @@ -262,6 +262,7 @@
262 262 data.add(new AntData(postReviewModel, null != organization ? organization.getName() : ""));
263 263 }
264 264 }
  265 +
265 266 listDate.add(data);
266 267 }
267 268 antexListResult.setData(listDate);
... ... @@ -318,6 +319,32 @@
318 319 return patients;
319 320 }
320 321  
  322 + /**
  323 + * 查看是否满足产筛申请条件
  324 + *
  325 + * 1.孕周 15周-到20 周 并且没有做过产筛
  326 + * @param date
  327 + * @param parentId
  328 + * @return
  329 + */
  330 + public String cap(Date date,String parentId){
  331 + if(null==date){
  332 + return "0";
  333 + }
  334 + int day= DateUtil.getDays(date,new Date());
  335 + int start = 15*7;
  336 + int end = 20*7+6;
  337 + if(day>=start&&day<=end){
  338 + SieveApplyOrderQuery sieveApplyOrderQuery=new SieveApplyOrderQuery();
  339 + sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
  340 + sieveApplyOrderQuery.setParentId(parentId);
  341 + List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
  342 + if(CollectionUtils.isEmpty(list)){
  343 + return "1";
  344 + }
  345 + }
  346 + return "0";
  347 + }
321 348  
322 349 /**
323 350 * 查询产前检查
... ... @@ -365,7 +392,7 @@
365 392 }
366 393  
367 394 antexListResult.convertToResult(list, patients, antExChuModel);
368   -
  395 + antexListResult.setIsSieve(cap(patients.getLastMenses(),patients.getId()));
369 396 antexListResult.setRiskFactor(data);
370 397 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
371 398 }
... ... @@ -416,6 +443,12 @@
416 443 SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery();
417 444 applyOrderQuery.setParentId(examinationModel.getParentId());
418 445 applyOrderQuery.setYn(YnEnums.YES.getId());
  446 + Patients patients = patientsService.findOnePatientById(examinationModel.getParentId());
  447 + Date data = null;
  448 + if(null!=data){
  449 + data=patients.getLastMenses();
  450 + }
  451 + antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId()));
419 452 antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
420 453 object = antenatalExaminationResult;
421 454 } else {
... ... @@ -452,6 +485,7 @@
452 485 applyOrderQuery.setParentId(antExChuModel.getParentId());
453 486 applyOrderQuery.setYn(YnEnums.YES.getId());
454 487 antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
  488 + antexChuResult.setIsSieve(cap(antExChuModel.getLastMenses(),antExChuModel.getParentId()));
455 489 object = antexChuResult;
456 490 }
457 491 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ a440de0
... ... @@ -16,6 +16,7 @@
16 16 import com.lyms.platform.permission.model.Organization;
17 17 import com.lyms.platform.permission.service.OrganizationService;
18 18 import com.lyms.platform.pojo.*;
  19 +import com.lyms.platform.query.AntExChuQuery;
19 20 import com.lyms.platform.query.AntExQuery;
20 21 import com.lyms.platform.query.MatDeliverQuery;
21 22 import com.lyms.platform.query.PatientsQuery;
22 23  
23 24  
... ... @@ -154,9 +155,11 @@
154 155 antExQuery.setYn(YnEnums.YES.getId());
155 156 List<AntenatalExaminationModel> examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
156 157 try {
  158 + String tTireNumber="";
  159 + List data = new ArrayList();
157 160 if(CollectionUtils.isNotEmpty(examinationModel)){
158   - List data = new ArrayList();
159 161 if(null!=examinationModel&&StringUtils.isNotEmpty(examinationModel.get(0).getRiskFactor())){
  162 + tTireNumber=examinationModel.get(0).getTireNumber();
160 163 List l = JsonUtil.toList(examinationModel.get(0).getRiskFactor(),List.class);
161 164 for(int i=0;i<l.size();i++){
162 165 String key = (String)l.get(i);
163 166  
... ... @@ -166,10 +169,26 @@
166 169 }
167 170 }
168 171 }
169   - matDeliverListResult.setRiskFactor(data);
  172 + }else{
  173 + AntExChuQuery antExChuQuery=new AntExChuQuery();
  174 + antExChuQuery.setYn(YnEnums.YES.getId());
  175 + antExChuQuery.setParentId(patients.getId());
  176 + List<AntExChuModel> antExChuModels= antenatalExaminationService.queryAntExChu(antExChuQuery);
  177 + if(CollectionUtils.isNotEmpty(antExChuModels)){
  178 + tTireNumber=antExChuModels.get(0).getTireNumber();
  179 + List l = JsonUtil.toList(antExChuModels.get(0).getHighrisk(),List.class);
  180 + for(int i=0;i<l.size();i++){
  181 + String key = (String)l.get(i);
  182 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(key);
  183 + if(null!=basicConfig){
  184 + data.add(basicConfig.getName());
  185 + }
  186 + }
  187 + }
170 188 }
171 189  
172   -
  190 + matDeliverListResult.setRiskFactor(data);
  191 + matDeliverListResult.setTireNumber1(tTireNumber);
173 192 }catch (Exception e){}
174 193 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(matDeliverListResult);
175 194 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ a440de0
... ... @@ -16,7 +16,7 @@
16 16 public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
17 17  
18 18 private String id;
19   -
  19 + private String isSieve;
20 20 private String parentId;
21 21 //当前孕周
22 22 private String currentDueDate;
... ... @@ -75,6 +75,14 @@
75 75 //是否有产筛
76 76 private int hasSieve;
77 77 private String cDueWeek;
  78 +
  79 + public String getIsSieve() {
  80 + return isSieve;
  81 + }
  82 +
  83 + public void setIsSieve(String isSieve) {
  84 + this.isSieve = isSieve;
  85 + }
78 86  
79 87 public String getcDueWeek() {
80 88 return cDueWeek;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ a440de0
... ... @@ -16,6 +16,8 @@
16 16 public class AntexChuResult {
17 17  
18 18 private String parentId;
  19 +
  20 + private String isSieve;
19 21 /**
20 22 * 基本信息
21 23 **/
... ... @@ -207,6 +209,14 @@
207 209 private int hasRefer;
208 210 //是否有产筛
209 211 private int hasSieve;
  212 +
  213 + public String getIsSieve() {
  214 + return isSieve;
  215 + }
  216 +
  217 + public void setIsSieve(String isSieve) {
  218 + this.isSieve = isSieve;
  219 + }
210 220  
211 221 public Map getBp() {
212 222 return bp;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java View file @ a440de0
... ... @@ -41,7 +41,17 @@
41 41  
42 42 private String cardNo;
43 43 private String vcCardNo;
  44 + private String isSieve;
44 45 //<!---------基本信息----------->
  46 +
  47 +
  48 + public String getIsSieve() {
  49 + return isSieve;
  50 + }
  51 +
  52 + public void setIsSieve(String isSieve) {
  53 + this.isSieve = isSieve;
  54 + }
45 55  
46 56 public String getCardNo() {
47 57 return cardNo;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java View file @ a440de0
... ... @@ -42,7 +42,18 @@
42 42 //末次月经
43 43 private String lastMenses;
44 44  
  45 + // 胎数
  46 + private String tireNumber1;
  47 +
45 48 private List data = new ArrayList();
  49 +
  50 + public String getTireNumber1() {
  51 + return tireNumber1;
  52 + }
  53 +
  54 + public void setTireNumber1(String tireNumber1) {
  55 + this.tireNumber1 = tireNumber1;
  56 + }
46 57  
47 58 public MatDeliverListResult convertToResult(List<MaternalDeliverModel> destList,Patients patients) {
48 59 setId(patients.getId());