Commit 5a097c10693df5be3390fde3adad5e405829da3f
1 parent
a6f3eb2455
Exists in
master
and in
6 other branches
分娩报告卡导出
Showing 5 changed files with 68 additions and 7 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
- platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
5a097c1
| ... | ... | @@ -325,7 +325,7 @@ |
| 325 | 325 | map.put("regAddress",regAddress); |
| 326 | 326 | map.put("phone",queryModel.getPhone()); |
| 327 | 327 | |
| 328 | - AntExChuQuery antExChuQuery = new AntExChuQuery(); | |
| 328 | + /* AntExChuQuery antExChuQuery = new AntExChuQuery(); | |
| 329 | 329 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 330 | 330 | antExChuQuery.setParentId(patients.getId()); |
| 331 | 331 | List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 332 | 332 | |
| ... | ... | @@ -340,14 +340,29 @@ |
| 340 | 340 | { |
| 341 | 341 | map.put("yc",""); |
| 342 | 342 | map.put("cc",""); |
| 343 | - } | |
| 343 | + }*/ | |
| 344 | + map.put("yc",queryModel.getGravidity()); | |
| 345 | + map.put("cc",queryModel.getDueCount()); | |
| 344 | 346 | map.put("week",queryModel.getDueWeek()); |
| 345 | 347 | HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); |
| 346 | 348 | //妊娠期高危因素 |
| 347 | 349 | map.put("risk", highScoreResult.gethighRiskStr()); |
| 348 | - map.put("A","-"); | |
| 349 | - map.put("M","-"); | |
| 350 | - map.put("Y","-"); | |
| 350 | + String a = ""; | |
| 351 | + String m = ""; | |
| 352 | + String y = ""; | |
| 353 | + Map<String,Object> amy = queryModel.getMyzd(); | |
| 354 | + if(true == amy.get("0")){ | |
| 355 | + a = "√"; | |
| 356 | + } | |
| 357 | + else if(true == amy.get("1")){ | |
| 358 | + m = "√"; | |
| 359 | + } | |
| 360 | + else if(true == amy.get("2")){ | |
| 361 | + y = "√"; | |
| 362 | + } | |
| 363 | + map.put("A",a); | |
| 364 | + map.put("M",m); | |
| 365 | + map.put("Y",y); | |
| 351 | 366 | String aModel1 = ""; |
| 352 | 367 | String aModel2 = ""; |
| 353 | 368 | String aModel3 = ""; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
View file @
5a097c1
| ... | ... | @@ -894,7 +894,8 @@ |
| 894 | 894 | public void newSieveLab(String date){ |
| 895 | 895 | try{ |
| 896 | 896 | String nowDate=null; |
| 897 | - String path = "E:\\temp"; | |
| 897 | + //String path = "E:\\temp"; | |
| 898 | + String path = "/data/soft/mms/csjg"; | |
| 898 | 899 | File file = new File(path); |
| 899 | 900 | File[] files = file.listFiles(); |
| 900 | 901 | System.out.println("该目录下文件个数:" + files.length); |
| ... | ... | @@ -1040,6 +1041,14 @@ |
| 1040 | 1041 | br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(babySieveModel); |
| 1041 | 1042 | |
| 1042 | 1043 | return br; |
| 1044 | + } | |
| 1045 | + | |
| 1046 | + | |
| 1047 | + public void handWorker(){ | |
| 1048 | + String date = DateUtil.getymd(); | |
| 1049 | + newSieveLab(date); | |
| 1050 | + System.out.print(date); | |
| 1051 | + //System.out.print("我是定时任务!!!"); | |
| 1043 | 1052 | } |
| 1044 | 1053 | |
| 1045 | 1054 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
View file @
5a097c1
| ... | ... | @@ -407,10 +407,28 @@ |
| 407 | 407 | private String fmTime; |
| 408 | 408 | |
| 409 | 409 | private Integer gravidity;//孕次 |
| 410 | + private Integer dueCount;//产次 | |
| 410 | 411 | private String department;//科室(1:产一;2:产二) |
| 411 | 412 | private String analMode;//镇痛方式(1:无痛;2:无痛+陪娩;3:导乐+陪娩;4:陪娩) |
| 412 | 413 | private Integer siLielevel;//会阴撕裂 |
| 413 | 414 | private String incision;//切开方式 |
| 415 | + private Map<String,Object> myzd;//母婴阻断 | |
| 416 | + | |
| 417 | + public Integer getDueCount() { | |
| 418 | + return dueCount; | |
| 419 | + } | |
| 420 | + | |
| 421 | + public void setDueCount(Integer dueCount) { | |
| 422 | + this.dueCount = dueCount; | |
| 423 | + } | |
| 424 | + | |
| 425 | + public Map<String, Object> getMyzd() { | |
| 426 | + return myzd; | |
| 427 | + } | |
| 428 | + | |
| 429 | + public void setMyzd(Map<String, Object> myzd) { | |
| 430 | + this.myzd = myzd; | |
| 431 | + } | |
| 414 | 432 | |
| 415 | 433 | public Integer getSiLielevel() { |
| 416 | 434 | return siLielevel; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
View file @
5a097c1
| ... | ... | @@ -479,6 +479,8 @@ |
| 479 | 479 | childbirthManagerQueryModel.setGravidity(maternalDeliverModel.getGravidity());//孕次 |
| 480 | 480 | childbirthManagerQueryModel.setDepartment(maternalDeliverModel.getDepartment());//科室 |
| 481 | 481 | childbirthManagerQueryModel.setAnalMode(maternalDeliverModel.getAnalMode());//镇痛方式 |
| 482 | + childbirthManagerQueryModel.setDueCount(maternalDeliverModel.getDueCount());//产次 | |
| 483 | + childbirthManagerQueryModel.setMyzd(maternalDeliverModel.getMyzd());//母婴阻断 | |
| 482 | 484 | |
| 483 | 485 | childbirthManagerQueryModelList.add(childbirthManagerQueryModel); |
| 484 | 486 |
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
View file @
5a097c1
| ... | ... | @@ -363,6 +363,22 @@ |
| 363 | 363 | </bean> |
| 364 | 364 | |
| 365 | 365 | |
| 366 | + <!-- 承德新筛接口对接--> | |
| 367 | + <bean id="cdBabySieveDataJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"> | |
| 368 | + <!-- 要调用的bean --> | |
| 369 | + <property name="targetObject" ref="babySieveFacede"/> | |
| 370 | + <!-- 要调用的Method --> | |
| 371 | + <property name="targetMethod" value="handWorker"/> | |
| 372 | + <!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 --> | |
| 373 | + <property name="concurrent" value="false"/> | |
| 374 | + </bean> | |
| 375 | + | |
| 376 | + <bean id="cdBsDataJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean"> | |
| 377 | + <property name="jobDetail" ref="cdBabySieveDataJob"/> | |
| 378 | + <property name="cronExpression" value="0 0 20 * * ?"/> | |
| 379 | + </bean> | |
| 380 | + | |
| 381 | + | |
| 366 | 382 | <!-- 总调度,用于启动定时器 --> |
| 367 | 383 | <bean id="schedulerFactory" class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> |
| 368 | 384 | <property name="triggers" > |
| ... | ... | @@ -395,7 +411,8 @@ |
| 395 | 411 | <!--<ref bean="dzfyFmTrigger"/>--> |
| 396 | 412 | <!--<ref bean="crisisTrigger"/>--> |
| 397 | 413 | <!--<ref bean="qhdFmHistoryTrigger"/>--> |
| 398 | - | |
| 414 | + <!-- 承德新筛接口--> | |
| 415 | + <!--<ref bean="cdBsDataJobTrigger"/>--> | |
| 399 | 416 | <!--<ref bean="zcChanJianTrigger"/>--> |
| 400 | 417 | <ref bean="patientSerivceEndJobTrigger"/> |
| 401 | 418 | </list> |