diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
index 6914dfb..82cae69 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
@@ -1505,7 +1505,7 @@ public class TestController {
 
         if (CollectionUtils.isNotEmpty(organizationList)) {
             for (Organization organization : organizationList) {
-
+//            patientsQuery1.setPid("59e8552e0cf25dc5fc6554a4");
                 patientsQuery1.setHospitalId(organization.getId() + "");
                 List<Patients> pats = patientsService.queryPatient(patientsQuery1);
 
@@ -1562,70 +1562,67 @@ public class TestController {
                                         }
 
                                         antExChuModelList.clear();
-
-                                        // 查询复诊
-                                        AntExQuery antExQuery = new AntExQuery();
-                                        antExQuery.setYn(YnEnums.YES.getId());
-                                        antExQuery.setParentId(pat.getId());
-                                        antExQuery.setHospitalId(pat.getHospitalId());
-                                        List<AntenatalExaminationModel> antenatalExaminationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
-                                        if (CollectionUtils.isNotEmpty(antenatalExaminationModelList)) {
-                                            for (AntenatalExaminationModel fmodel : antenatalExaminationModelList) {
-                                                String highriskStr = fmodel.getRiskFactor();
-                                                if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(highriskStr)) {
-                                                    List<String> highrisks = JsonUtil.toList(highriskStr, String.class);
-                                                    if (CollectionUtils.isNotEmpty(highrisks)) {
-                                                        if (CollectionUtils.isNotEmpty(highrisks)) {
-                                                            int modCount = doRiskHandle(highrisks);
-                                                            if (modCount > 0) {
-                                                                fmodel.setRiskFactor(JsonUtil.array2JsonString(highrisks));
-                                                                antenatalExaminationService.updateOneAnt(fmodel, fmodel.getId());
-                                                            }
-                                                        }
+                                    }
+                                    // 查询复诊
+                                    AntExQuery antExQuery = new AntExQuery();
+                                    antExQuery.setYn(YnEnums.YES.getId());
+                                    antExQuery.setParentId(pat.getId());
+                                    antExQuery.setHospitalId(pat.getHospitalId());
+                                    List<AntenatalExaminationModel> antenatalExaminationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
+                                    if (CollectionUtils.isNotEmpty(antenatalExaminationModelList)) {
+                                        for (AntenatalExaminationModel fmodel : antenatalExaminationModelList) {
+                                            String highriskStr = fmodel.getRiskFactor();
+                                            if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(highriskStr)) {
+                                                List highrisks = JsonUtil.toList(highriskStr, List.class);
+                                                if (CollectionUtils.isNotEmpty(highrisks)) {
+                                                    int modCount = doRiskHandle(highrisks);
+                                                    if (modCount > 0) {
+                                                        fmodel.setRiskFactor(JsonUtil.array2JsonString(highrisks));
+                                                        antenatalExaminationService.updateOneAnt(fmodel, fmodel.getId());
                                                     }
                                                 }
                                             }
                                         }
+                                    }
 
-                                        antenatalExaminationModelList.clear();
+                                    antenatalExaminationModelList.clear();
 
 
-                                        //初诊复诊冗余记录
-                                        AntExRecordQuery query = new AntExRecordQuery();
-                                        query.setParentId(pat.getId());
-                                        List<AntExRecordModel> antExRecordModels = recordService.queryAntExRecords(query);
-                                        if (CollectionUtils.isNotEmpty(antExRecordModels)) {
-                                            for (AntExRecordModel model : antExRecordModels) {
-                                                List<String> highrisks = model.gethRisk();
+                                    //初诊复诊冗余记录
+                                    AntExRecordQuery query = new AntExRecordQuery();
+                                    query.setParentId(pat.getId());
+                                    List<AntExRecordModel> antExRecordModels = recordService.queryAntExRecords(query);
+                                    if (CollectionUtils.isNotEmpty(antExRecordModels)) {
+                                        for (AntExRecordModel model : antExRecordModels) {
+                                            List<String> highrisks = model.gethRisk();
+                                            if (CollectionUtils.isNotEmpty(highrisks)) {
                                                 if (CollectionUtils.isNotEmpty(highrisks)) {
-                                                    if (CollectionUtils.isNotEmpty(highrisks)) {
-                                                        int modCount = doRiskHandle(highrisks);
-                                                        if (modCount > 0) {
-                                                            model.sethRisk(highrisks);
-                                                            recordService.updateOne(model, model.getId());
-                                                        }
+                                                    int modCount = doRiskHandle(highrisks);
+                                                    if (modCount > 0) {
+                                                        model.sethRisk(highrisks);
+                                                        recordService.updateOne(model, model.getId());
                                                     }
                                                 }
                                             }
                                         }
+                                    }
 
-                                        antExRecordModels.clear();
+                                    antExRecordModels.clear();
 
-                                        ReferralApplyOrderQuery applyOrderQuery = new ReferralApplyOrderQuery();
-                                        applyOrderQuery.setParentId(pat.getId());
-                                        if (applyOrderService.queryCount(applyOrderQuery) > 0) {
-                                            ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel();
-                                            referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(loa.getRiskFactorId()).split(",")));
-                                            referralApplyOrderModel.setOtherHighRisk(loa.getoRiskFactor());
-                                            List<String> rlevel=Collections.emptyList();
-                                            if(StringUtils.isNotEmpty(loa.getRiskLevelId())&&!"[]".equals(loa.getRiskLevelId())){
-                                                rlevel= JsonUtil.jkstr2Obj(loa.getRiskLevelId(), List.class);
+                                    ReferralApplyOrderQuery applyOrderQuery = new ReferralApplyOrderQuery();
+                                    applyOrderQuery.setParentId(pat.getId());
+                                    if (applyOrderService.queryCount(applyOrderQuery) > 0) {
+                                        ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel();
+                                        referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(loa.getRiskFactorId()).split(",")));
+                                        referralApplyOrderModel.setOtherHighRisk(loa.getoRiskFactor());
+                                        List<String> rlevel = Collections.emptyList();
+                                        if (StringUtils.isNotEmpty(loa.getRiskLevelId()) && !"[]".equals(loa.getRiskLevelId())) {
+                                            rlevel = JsonUtil.jkstr2Obj(loa.getRiskLevelId(), List.class);
 
-                                                com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true);
-                                            }
-                                            referralApplyOrderModel.setrLevel(rlevel);
-                                            applyOrderService.updateByParentId(applyOrderQuery, referralApplyOrderModel);
+                                            com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel, true);
                                         }
+                                        referralApplyOrderModel.setrLevel(rlevel);
+                                        applyOrderService.updateByParentId(applyOrderQuery, referralApplyOrderModel);
                                     }
                                 }
                             }
@@ -1650,7 +1647,7 @@ public class TestController {
                 if (!patientRisk.contains(highRisks.get(key))) {
                     patientRisk.add(highRisks.get(key));
                     //骨盆狭窄或产道畸形
-                    if(key.equals("4ec114d7-9c78-4dfc-878c-1139ef3ff04c")){
+                    if (key.equals("4ec114d7-9c78-4dfc-878c-1139ef3ff04c")) {
                         patientRisk.add("5a40c747422b03d4ad2bf7c0");
                     }
                     modCount++;