jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1fa8c76c536e13befdfee7339d45b3d52ea35852

Authored by zhangchao
1 parent 56405bdda3
Exists in dev

#fix:优化艾梅乙数据同步

Showing 3 changed files with 126 additions and 30 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java View file @ 1fa8c76
... ... @@ -434,20 +434,8 @@
434 434 amy= params.get("HBeAg").contains("阳")||params.get("HBeAg").contains("陽")?true:false;
435 435 }
436 436 }
437   - if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
438   - p=true;
439   - patients.setHBsAbJ(params.get("HBsAb-J"));
440   - if (!amy){
441   - amy= params.get("HBsAb-J").contains("阴")?true:false;
442   - }
443   - }
444   - if (StringUtils.isNotEmpty(params.get("HBsAb"))){
445   - p=true;
446   - patients.setHBsAbJ(params.get("HBsAb"));
447   - if (!amy){
448   - amy= params.get("HBsAb").contains("阴")?true:false;
449   - }
450   - }
  437 +
  438 +
451 439 if (StringUtils.isNotEmpty(params.get("HBsAg-J"))){
452 440 p=true;
453 441 patients.setHBsAgJ(params.get("HBsAg-J"));
... ... @@ -490,6 +478,20 @@
490 478 amy= params.get("TP-抗体").contains("阳")||params.get("TP-抗体").contains("陽")?true:false;
491 479 }
492 480 }
  481 + if (StringUtils.isNotEmpty(params.get("HBsAb"))){
  482 + p=true;
  483 + patients.setHBsAbJ(params.get("HBsAb"));
  484 + /*if (!amy){
  485 + amy= params.get("HBsAb").contains("阴")?true:false;
  486 + }*/
  487 + }
  488 + if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
  489 + p=true;
  490 + patients.setHBsAbJ(params.get("HBsAb-J"));
  491 + /* if (!amy){
  492 + amy= params.get("HBsAb-J").contains("阴")?true:false;
  493 + }*/
  494 + }
493 495 if (p){
494 496 /* if (StringUtils.isNotEmpty(applyDoctor)&&canConvertToInt(applyDoctor)){
495 497 patients.setLastCheckEmployeeId(applyDoctor);
... ... @@ -646,20 +648,7 @@
646 648 amy= params.get("HBeAg").contains("阳")||params.get("HBeAg").contains("陽")?true:false;
647 649 }
648 650 }
649   - if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
650   - p=true;
651   - patients.setHBsAbJ(params.get("HBsAb-J"));
652   - if (!amy){
653   - amy= params.get("HBsAb-J").contains("阴")?true:false;
654   - }
655   - }
656   - if (StringUtils.isNotEmpty(params.get("HBsAb"))){
657   - p=true;
658   - patients.setHBsAbJ(params.get("HBsAb"));
659   - if (!amy){
660   - amy= params.get("HBsAb").contains("阴")?true:false;
661   - }
662   - }
  651 +
663 652 if (StringUtils.isNotEmpty(params.get("HBsAg-J"))){
664 653 p=true;
665 654 patients.setHBsAgJ(params.get("HBsAg-J"));
... ... @@ -701,6 +690,20 @@
701 690 if (!amy){
702 691 amy= params.get("TP-抗体").contains("阳")||params.get("TP-抗体").contains("陽")?true:false;
703 692 }
  693 + }
  694 + if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
  695 + p=true;
  696 + patients.setHBsAbJ(params.get("HBsAb-J"));
  697 + /* if (!amy){
  698 + amy= params.get("HBsAb-J").contains("阴")?true:false;
  699 + }*/
  700 + }
  701 + if (StringUtils.isNotEmpty(params.get("HBsAb"))){
  702 + p=true;
  703 + patients.setHBsAbJ(params.get("HBsAb"));
  704 + /* if (!amy){
  705 + amy= params.get("HBsAb").contains("阴")?true:false;
  706 + }*/
704 707 }
705 708 if (p){
706 709 /* if (StringUtils.isNotEmpty(applyDoctor)&&canConvertToInt(applyDoctor)){
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 1fa8c76
... ... @@ -1448,8 +1448,8 @@
1448 1448 mongoCondits.add(new MongoCondition("hBsAgJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBsAgJ", "陽", MongoOper.LIKE)));
1449 1449 }else if (diseaseType.equals(DiseaseTypeEnums.MEIDU.getName())) {
1450 1450 //梅毒查询
1451   - mongoCondits.add(new MongoCondition("tp", "阳", MongoOper.LIKE));
1452   - mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE));
  1451 + mongoCondits.add(new MongoCondition("tp", "阳", MongoOper.LIKE).orCondition(new MongoCondition("tp", "陽", MongoOper.LIKE)));
  1452 + mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("HIVJ", "陽", MongoOper.LIKE)));
1453 1453 // mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("HIVJ", "陽", MongoOper.LIKE)));
1454 1454 }
1455 1455 if (c1 != null) {
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml View file @ 1fa8c76
... ... @@ -737,6 +737,89 @@
737 737 <property name="cronExpression" value="0 0 9 * * ?"></property>
738 738 </bean>
739 739  
  740 +
  741 + <!--大同上午10点推送服务到期提醒 -->
  742 + <bean id="serviceSyncExpireWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
  743 + <!-- 要调用的bean -->
  744 + <property name="targetObject" ref="bookbuildingFacade"></property>
  745 + <!-- 要调用的Method -->
  746 + <property name="targetMethod" value="serviceExpireSync"></property>
  747 + <!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
  748 + <property name="concurrent" value="false"></property>
  749 + </bean>
  750 +
  751 + <!-- 配置一个触发器 0 0 10 * * ?-->
  752 + <bean id="serviceSyncExpireWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
  753 + <property name="jobDetail" ref="serviceSyncExpireWork"></property>
  754 + <property name="cronExpression" value="0 0 10 * * ?"></property>
  755 + </bean>
  756 +
  757 +
  758 + <!--大同下午18点推送预建档未审核提醒 -->
  759 + <bean id="archiveServiceSyncWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
  760 + <!-- 要调用的bean -->
  761 + <property name="targetObject" ref="bookbuildingFacade"></property>
  762 + <!-- 要调用的Method -->
  763 + <property name="targetMethod" value="archiveServiceSync"></property>
  764 + <!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
  765 + <property name="concurrent" value="false"></property>
  766 + </bean>
  767 +
  768 + <!-- 配置一个触发器 0 0 18 * * ?-->
  769 + <bean id="archiveServiceSyncWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
  770 + <property name="jobDetail" ref="archiveServiceSyncWork"></property>
  771 + <property name="cronExpression" value="0 0 18 * * ?"></property>
  772 + </bean>
  773 +
  774 + <!--大同早上7点30推送未建档提醒 -->
  775 + <bean id="serviceMsgSyncWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
  776 + <!-- 要调用的bean -->
  777 + <property name="targetObject" ref="bookbuildingFacade"></property>
  778 + <!-- 要调用的Method -->
  779 + <property name="targetMethod" value="bookbuildingMsg"></property>
  780 + <!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
  781 + <property name="concurrent" value="false"></property>
  782 + </bean>
  783 +
  784 + <!-- 配置一个触发器 0 31 7 * * ?-->
  785 + <bean id="serviceMsgSyncWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
  786 + <property name="jobDetail" ref="serviceMsgSyncWork"></property>
  787 + <property name="cronExpression" value="0 0 7 * * ?"></property>
  788 + </bean>
  789 +
  790 + <!--大同下午17点30推送体重营养报告提醒 -->
  791 + <bean id="serviceReportSyncWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
  792 + <!-- 要调用的bean -->
  793 + <property name="targetObject" ref="bookbuildingFacade"></property>
  794 + <!-- 要调用的Method -->
  795 + <property name="targetMethod" value="serviceReportMsg"></property>
  796 + <!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
  797 + <property name="concurrent" value="false"></property>
  798 + </bean>
  799 +
  800 + <!-- 配置一个触发器 0 31 7 * * ?-->
  801 + <bean id="serviceReportSyncWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
  802 + <property name="jobDetail" ref="serviceReportSyncWork"></property>
  803 + <property name="cronExpression" value="0 35 18 * * ?"></property>
  804 + </bean>
  805 +
  806 +
  807 + <!-- 儿保小程序服务内容通知 -->
  808 + <bean id="babyBuildingSyncJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
  809 + <!-- 要调用的bean -->
  810 + <property name="targetObject" ref="babyBookbuildingFacade"/>
  811 + <!-- 要调用的Method -->
  812 + <property name="targetMethod" value="buildingSync"/>
  813 + <!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
  814 + <property name="concurrent" value="false"/>
  815 + </bean>
  816 +
  817 + <bean id="babyBuildingSyncJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
  818 + <property name="jobDetail" ref="babyBuildingSyncJob"/>
  819 + <property name="cronExpression" value="0 0 16 * * ?"/>
  820 + </bean>
  821 +
  822 +
740 823 <!-- 总调度,用于启动定时器 -->
741 824 <bean id="schedulerFactory" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
742 825 <property name="triggers" >
... ... @@ -810,6 +893,16 @@
810 893 <!--<ref bean="bookbuildingSyncMsgWorkTrigger"/>-->
811 894 <!-- 大同服务提醒-->
812 895 <ref bean="serviceSyncWorkTrigger"/>
  896 + <!--大同预约建档当日未审核提醒-->
  897 + <ref bean="archiveServiceSyncWorkTrigger"/>
  898 + <!--大同预约建档当日未审核提醒-->
  899 + <ref bean="serviceMsgSyncWorkTrigger"/>
  900 + <!--大同预孕期体重营养报告提醒-->
  901 + <ref bean="serviceReportSyncWorkTrigger"/>
  902 + <!-- 儿保小程序服务提醒-->
  903 + <ref bean="babyBuildingSyncJobTrigger"/>
  904 + <!-- 大同服务到期提醒-->
  905 + <ref bean="serviceSyncExpireWorkTrigger"/>
813 906 </list>
814 907 </property>
815 908 </bean>