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 21fa513..753fb87 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
@@ -384,16 +384,16 @@ public class MatDeliverController extends BaseController{
                 String aModel3 = "";
                 String aModel4 = "";
                 //镇痛方式
-                if("1".equals(queryModel.getAnalMode())){
+                if("1".equals(queryModel.getZgnmz())){
                     aModel1 = "√";
                 }
-                else if("2".equals(queryModel.getAnalMode())){
+                if("1".equals(queryModel.getDlfm())){
                     aModel2 = "√";
                 }
-                else if("3".equals(queryModel.getAnalMode())){
+                if("1".equals(queryModel.getFmzty())){
                     aModel3 = "√";
                 }
-                else if("4".equals(queryModel.getAnalMode())){
+                if("1".equals(queryModel.getZypbfm())){
                     aModel4 = "√";
                 }
                 map.put("aModel1",aModel1);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
index 4a13ff4..f79b1a5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
@@ -419,6 +419,43 @@ public class ChildbirthManagerQueryModel {
     private String incision;//切开方式
     private Map<String,Object> myzd;//母婴阻断
 
+    private String zgnmz;//椎管内麻醉(0:未选择；1:已选择)
+    private String dlfm;//导乐分娩(0:未选择；1:已选择)
+    private String fmzty;//分娩镇痛仪(0:未选择；1:已选择)
+    private String zypbfm;//专业陪伴分娩(0:未选择；1:已选择)
+
+    public String getZgnmz() {
+        return zgnmz;
+    }
+
+    public void setZgnmz(String zgnmz) {
+        this.zgnmz = zgnmz;
+    }
+
+    public String getDlfm() {
+        return dlfm;
+    }
+
+    public void setDlfm(String dlfm) {
+        this.dlfm = dlfm;
+    }
+
+    public String getFmzty() {
+        return fmzty;
+    }
+
+    public void setFmzty(String fmzty) {
+        this.fmzty = fmzty;
+    }
+
+    public String getZypbfm() {
+        return zypbfm;
+    }
+
+    public void setZypbfm(String zypbfm) {
+        this.zypbfm = zypbfm;
+    }
+
     public Integer getDueCount() {
         return dueCount;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
index d93b796..b62941c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
@@ -493,7 +493,11 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
                 //威海新增导出字段
                 childbirthManagerQueryModel.setGravidity(maternalDeliverModel.getGravidity());//孕次
                 childbirthManagerQueryModel.setDepartment(maternalDeliverModel.getDepartment());//科室
-                childbirthManagerQueryModel.setAnalMode(maternalDeliverModel.getAnalMode());//镇痛方式
+                //childbirthManagerQueryModel.setAnalMode(maternalDeliverModel.getAnalMode());//镇痛方式
+                childbirthManagerQueryModel.setZgnmz(maternalDeliverModel.getZgnmz());//椎管内麻醉(0:未选择；1:已选择)
+                childbirthManagerQueryModel.setDlfm(maternalDeliverModel.getDlfm());//导乐分娩(0:未选择；1:已选择)
+                childbirthManagerQueryModel.setFmzty(maternalDeliverModel.getFmzty());//分娩镇痛仪(0:未选择；1:已选择)
+                childbirthManagerQueryModel.setZypbfm(maternalDeliverModel.getZypbfm());//专业陪伴分娩(0:未选择；1:已选择)
                 childbirthManagerQueryModel.setDueCount(maternalDeliverModel.getDueCount());//产次
                 childbirthManagerQueryModel.setMyzd(maternalDeliverModel.getMyzd());//母婴阻断
 
diff --git a/platform-operate-api/src/main/resources/fm_record.xls b/platform-operate-api/src/main/resources/fm_record.xls
index b3f985a81f0a40cb361d13021091ac01304bbb4f..d839d409b7c2fa194361ee41da19a5e8f57fadf9 100644
GIT binary patch
delta 817
zcma)2O-NKx6#mZ4n>TM7XWrj5@69MRF0x-6Ekn>s3&KblOG82zNmQg1MHEp{ilF_{
zkB4#-l`Sk<MK4+yRFrM1O%N9LW2+V|G>QlznC^R{CE=obxcA-feBZg}JFj!d-#O&J
zvs;q)y<8(t4Df!bhnk!TX_Tb#y25;ZFW0REvK<!)V)d-|(V3RU`clMP_#b)R9xUR)
zV4S}yasC`EVL4>;Ii-M)C^l~pyCM|hIiVbG5Zs8+-BOa=F78hhn^thGQp#t8OF5}5
zaC$?r0LeTawfJGwrm%a<Vans6nocOf)sL(O+ykmp)hS5DsZYYKS3?n=t6F4ohiWDA
zrYYT7AcZ{TY>&03*ekjo568ohk{%o3QPtw(s!a)3NBQo_QO%}VyjQbGb<ad(s``(M
zC0@0`*Mvs6FjD+RQ+YUQ1an<uoYm5TN$XZ3K2`l1tzw2G@Yt)id8=Rr{Aa>N9vkBG
zy8FT-{m=~k%O~B}8#O}HXQXG)*pr%3!+l3Jv(n9`r-P0WTRT57Rxa8?rbg_-4iN`X
zif-{=ck-S}i#~F9<vP-w7nO@?SpXDm>p$AP>A}@g7bVcImW>&?VPUh#yPuj%?+$*+
z$RIP5%(P!FtCt(NVAa^XZMDGdX5d>JP;nUOIte`Q1B{zM^L^mPGvG9*SAVZMhCFB@
zTEi-Qkl<onL@M$Z8!*s04Vy4=J%^pbsx7@y5($7r_+XmOiC4w)-M6++>gtWjPQggP
YANaYMCI+0M4`u$qa+IUQ(TDr#Hxp#U7XSbN

delta 714
zcmZvaO=uHA6vzLQZ1yA3{Yba_WrB-`sBKCtiWP&g2qI{;g5aTrs)vfLpNLkyXf72g
zqL5dbi_qes2T#%!4<59K>ZPERN|malc<8Z$pr8nGvN53t8TQS*`Tzd!%?w+dix%gi
zPcH~!Q5hQ<FVR)uE{g}hgbEX8j`pYNv)IFYG9-IlY^6(5iuNiyXiT!mS3G(lW$CPv
zr8e0oPj<qurp?M8edqZT*`g_)uSyOL$SFE3oAiLs%Up{qdQei#7?bInYST;Ap;bLu
z(!}}(Q%KTsZXCdmst!B@y8Uh+LWjQs6QPNzv{|$1r{=UM>o~py1ch#CX;*9PKQas}
zVI?4Vp<ktnW;2uSaDPE}*v8t5wT986%eu|%T6EQhzu7+<`c0bTOudRj?>Ol;$Z^9c
zC(68&5|SQO^&BU2hV5=@Fz<1i-^K%GLq?=iT;0%6o4wjXH9-%JT7_4}4SK69dQ<KS
zWtDo9hqzo$=KgbB=O0r^)=FqCRbk6xN(V{vz*hHb7w-s>oxnK^@^KBF80C-a(Z#&Y
zN;H~3$b?`%-_9}-u$942*JJgm9m5mb`*`xF|M;<b!hzul+O}^kV;uno`he*nVC^Qb
z`yOz+47`~J)aSs-*Fa&O?l1lhM)voX)Cg>T3Wf+DwjC@kbcl3isb}V+6A{jTm?{LR
c<ybUk4)NbK$b8uqjdfxVb_QpbCRqgd3okgg9{>OV