diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index d526a6c..cc4b1e2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -180,16 +180,6 @@ public class MatDeliverController extends BaseController {
         BaseListResponse baseListResponse;
         childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
         String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId());
-
-        String hsColum = "vcCardNo,name,cardNo,phone,husbandName,husbandCardNo,husbandPhone,pliveTypeId,pcensusTypeId,registerAddress,address,postAddress,dueDate,fileCode,chBpSsy1,chBpSzy1,dueWeek,fetalPosition,heartRate,fetalPresentation,perinealCondition,deliveryMode,breath,needleNum,pulse,prodprocessOne,prodprocessTwo,prodprocessThree,totalprocess,ohloseBloodL,thloseBloodL,rhloseBloodL,loseBloodCause,tpmcType,tpSize,tpWeight,umbilicalCordLength,umbilicalCordEx,umbilicalCordExType,tireNumber,maternalInfo,operationCause,fmHospital,deliverDoctor,sex,babyWeight,babyHeight,apgarScorePf1,apgarScorePf5,apgarScorePf10,pregnancyOut,asphyxiaM,deathCause,babyHealthy,malformation";
-
-        Organization o = organizationService.getOrganization(Integer.parseInt(hospitalId));
-        if (o != null && "12".equals(o.getCityId()))
-        {
-            childbirthManagerRequest.setInitQuery(hsColum);
-            childbirthManagerRequest.setInitQueryMap(childbirthManagerRequest.getInitQueryMapHs());
-        }
-
         try {
             Map<String, String> query;
             if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) {
@@ -259,6 +249,17 @@ public class MatDeliverController extends BaseController {
         try {
             childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
 
+            String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId());
+
+            String hsColum = "vcCardNo,name,cardNo,phone,husbandName,husbandCardNo,husbandPhone,pliveTypeId,pcensusTypeId,registerAddress,address,postAddress,dueDate,fileCode,chBpSsy1,chBpSzy1,dueWeek,fetalPosition,heartRate,fetalPresentation,perinealCondition,deliveryMode,breath,needleNum,pulse,prodprocessOne,prodprocessTwo,prodprocessThree,totalprocess,ohloseBloodL,thloseBloodL,rhloseBloodL,loseBloodCause,tpmcType,tpSize,tpWeight,umbilicalCordLength,umbilicalCordEx,umbilicalCordExType,tireNumber,maternalInfo,operationCause,fmHospital,deliverDoctor,sex,babyWeight,babyHeight,apgarScorePf1,apgarScorePf5,apgarScorePf10,pregnancyOut,asphyxiaM,deathCause,babyHealthy,malformation";
+
+            Organization o = organizationService.getOrganization(Integer.parseInt(hospitalId));
+            if (o != null && "12".equals(o.getCityId()))
+            {
+                childbirthManagerRequest.setInitQuery(hsColum);
+                childbirthManagerRequest.setInitQueryMap(childbirthManagerRequest.getInitQueryMapHs());
+            }
+
             Map<String, String> query;
             if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) {
                 // 自定义查询