diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
index 2ebe09d..2d0bb33 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
@@ -434,20 +434,8 @@ public class LisServiceImpl implements LisService {
                         amy= params.get("HBeAg").contains("阳")||params.get("HBeAg").contains("陽")?true:false;
                     }
                 }
-                if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
-                    p=true;
-                    patients.setHBsAbJ(params.get("HBsAb-J"));
-                    if (!amy){
-                        amy= params.get("HBsAb-J").contains("阴")?true:false;
-                    }
-                }
-                if (StringUtils.isNotEmpty(params.get("HBsAb"))){
-                    p=true;
-                    patients.setHBsAbJ(params.get("HBsAb"));
-                    if (!amy){
-                        amy= params.get("HBsAb").contains("阴")?true:false;
-                    }
-                }
+
+
                 if (StringUtils.isNotEmpty(params.get("HBsAg-J"))){
                     p=true;
                     patients.setHBsAgJ(params.get("HBsAg-J"));
@@ -490,6 +478,20 @@ public class LisServiceImpl implements LisService {
                         amy= params.get("TP-抗体").contains("阳")||params.get("TP-抗体").contains("陽")?true:false;
                     }
                 }
+                if (StringUtils.isNotEmpty(params.get("HBsAb"))){
+                    p=true;
+                    patients.setHBsAbJ(params.get("HBsAb"));
+                    /*if (!amy){
+                        amy= params.get("HBsAb").contains("阴")?true:false;
+                    }*/
+                }
+                if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
+                    p=true;
+                    patients.setHBsAbJ(params.get("HBsAb-J"));
+                   /* if (!amy){
+                        amy= params.get("HBsAb-J").contains("阴")?true:false;
+                    }*/
+                }
                 if (p){
                  /*   if (StringUtils.isNotEmpty(applyDoctor)&&canConvertToInt(applyDoctor)){
                         patients.setLastCheckEmployeeId(applyDoctor);
@@ -646,20 +648,7 @@ public class LisServiceImpl implements LisService {
                             amy= params.get("HBeAg").contains("阳")||params.get("HBeAg").contains("陽")?true:false;
                         }
                     }
-                    if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
-                        p=true;
-                        patients.setHBsAbJ(params.get("HBsAb-J"));
-                        if (!amy){
-                            amy= params.get("HBsAb-J").contains("阴")?true:false;
-                        }
-                    }
-                    if (StringUtils.isNotEmpty(params.get("HBsAb"))){
-                        p=true;
-                        patients.setHBsAbJ(params.get("HBsAb"));
-                        if (!amy){
-                            amy= params.get("HBsAb").contains("阴")?true:false;
-                        }
-                    }
+
                     if (StringUtils.isNotEmpty(params.get("HBsAg-J"))){
                         p=true;
                         patients.setHBsAgJ(params.get("HBsAg-J"));
@@ -702,6 +691,20 @@ public class LisServiceImpl implements LisService {
                             amy= params.get("TP-抗体").contains("阳")||params.get("TP-抗体").contains("陽")?true:false;
                         }
                     }
+                    if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
+                        p=true;
+                        patients.setHBsAbJ(params.get("HBsAb-J"));
+                      /*  if (!amy){
+                            amy= params.get("HBsAb-J").contains("阴")?true:false;
+                        }*/
+                    }
+                    if (StringUtils.isNotEmpty(params.get("HBsAb"))){
+                        p=true;
+                        patients.setHBsAbJ(params.get("HBsAb"));
+                      /*  if (!amy){
+                            amy= params.get("HBsAb").contains("阴")?true:false;
+                        }*/
+                    }
                     if (p){
                       /*  if (StringUtils.isNotEmpty(applyDoctor)&&canConvertToInt(applyDoctor)){
                             patients.setLastCheckEmployeeId(applyDoctor);
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index 2e05db4..5375fd9 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -1448,8 +1448,8 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
               mongoCondits.add(new MongoCondition("hBsAgJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBsAgJ", "陽", MongoOper.LIKE)));
           }else if (diseaseType.equals(DiseaseTypeEnums.MEIDU.getName())) {
               //梅毒查询
-              mongoCondits.add(new MongoCondition("tp", "阳", MongoOper.LIKE));
-              mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE));
+              mongoCondits.add(new MongoCondition("tp", "阳", MongoOper.LIKE).orCondition(new MongoCondition("tp", "陽", MongoOper.LIKE)));
+              mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("HIVJ", "陽", MongoOper.LIKE)));
              // mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("HIVJ", "陽", MongoOper.LIKE)));
           }
           if (c1 != null) {
diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
index d12070a..a3b8071 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
@@ -737,6 +737,89 @@
 		<property name="cronExpression" value="0 0 9 * * ?"></property>
 	</bean>
 
+
+	<!--大同上午10点推送服务到期提醒 -->
+	<bean id="serviceSyncExpireWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<!-- 要调用的bean -->
+		<property name="targetObject" ref="bookbuildingFacade"></property>
+		<!-- 要调用的Method -->
+		<property name="targetMethod" value="serviceExpireSync"></property>
+		<!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
+		<property name="concurrent" value="false"></property>
+	</bean>
+
+	<!-- 配置一个触发器  0 0 10 * * ?-->
+	<bean id="serviceSyncExpireWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="serviceSyncExpireWork"></property>
+		<property name="cronExpression" value="0 0 10 * * ?"></property>
+	</bean>
+
+
+	<!--大同下午18点推送预建档未审核提醒 -->
+	<bean id="archiveServiceSyncWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<!-- 要调用的bean -->
+		<property name="targetObject" ref="bookbuildingFacade"></property>
+		<!-- 要调用的Method -->
+		<property name="targetMethod" value="archiveServiceSync"></property>
+		<!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
+		<property name="concurrent" value="false"></property>
+	</bean>
+
+	<!-- 配置一个触发器  0 0 18 * * ?-->
+	<bean id="archiveServiceSyncWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="archiveServiceSyncWork"></property>
+		<property name="cronExpression" value="0 0 18 * * ?"></property>
+	</bean>
+
+	<!--大同早上7点30推送未建档提醒 -->
+	<bean id="serviceMsgSyncWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<!-- 要调用的bean -->
+		<property name="targetObject" ref="bookbuildingFacade"></property>
+		<!-- 要调用的Method -->
+		<property name="targetMethod" value="bookbuildingMsg"></property>
+		<!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
+		<property name="concurrent" value="false"></property>
+	</bean>
+
+	<!-- 配置一个触发器  0 31 7 * * ?-->
+	<bean id="serviceMsgSyncWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="serviceMsgSyncWork"></property>
+		<property name="cronExpression" value="0 0 7 * * ?"></property>
+	</bean>
+
+	<!--大同下午17点30推送体重营养报告提醒 -->
+	<bean id="serviceReportSyncWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<!-- 要调用的bean -->
+		<property name="targetObject" ref="bookbuildingFacade"></property>
+		<!-- 要调用的Method -->
+		<property name="targetMethod" value="serviceReportMsg"></property>
+		<!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
+		<property name="concurrent" value="false"></property>
+	</bean>
+
+	<!-- 配置一个触发器  0 31 7 * * ?-->
+	<bean id="serviceReportSyncWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="serviceReportSyncWork"></property>
+		<property name="cronExpression" value="0 35 18 * * ?"></property>
+	</bean>
+
+
+	<!-- 儿保小程序服务内容通知 -->
+	<bean id="babyBuildingSyncJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<!-- 要调用的bean -->
+		<property name="targetObject" ref="babyBookbuildingFacade"/>
+		<!-- 要调用的Method -->
+		<property name="targetMethod" value="buildingSync"/>
+		<!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
+		<property name="concurrent" value="false"/>
+	</bean>
+
+	<bean id="babyBuildingSyncJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="babyBuildingSyncJob"/>
+		<property name="cronExpression" value="0 0 16 * * ?"/>
+	</bean>
+
+
 	<!-- 总调度,用于启动定时器 -->
 	<bean id="schedulerFactory" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
 		<property name="triggers" >
@@ -810,6 +893,16 @@
 				<!--<ref bean="bookbuildingSyncMsgWorkTrigger"/>-->
 				<!-- 大同服务提醒-->
 				<ref bean="serviceSyncWorkTrigger"/>
+				<!--大同预约建档当日未审核提醒-->
+				<ref bean="archiveServiceSyncWorkTrigger"/>
+				<!--大同预约建档当日未审核提醒-->
+				<ref bean="serviceMsgSyncWorkTrigger"/>
+				<!--大同预孕期体重营养报告提醒-->
+				<ref bean="serviceReportSyncWorkTrigger"/>
+				<!-- 儿保小程序服务提醒-->
+				<ref bean="babyBuildingSyncJobTrigger"/>
+				<!-- 大同服务到期提醒-->
+				<ref bean="serviceSyncExpireWorkTrigger"/>
 			</list>
 		</property>
 	</bean>