diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java
index 07ddfdb..c0a2db4 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java
@@ -463,7 +463,7 @@ public class QhdJbgwInterface {
                     map.put("GESTDAYS",String.valueOf(day));
 
                     Map<String, Object> mapcc = new HashMap<>();
-                    findProcess(data.getProdprocess(),mapcc);
+                    findProcess(data.getProdprocess(), mapcc);
                     if(StringUtils.isNotEmpty(mapcc.get("one").toString())){
                         int oShi = mapcc.get("one").toString().indexOf("时");
                         if(oShi == -1){
@@ -959,29 +959,44 @@ public class QhdJbgwInterface {
                         }else{
                             map.put("MOTHERBIRTHDATE",null);
                         }
-                        if(newbornVisit.getCheckTimeDesc() != null){
-                            int days = Integer.parseInt(newbornVisit.getCheckTimeDesc().substring(1, newbornVisit.getCheckTimeDesc().indexOf("周")));
-                            if(days < 7){
+                        if(StringUtils.isNotEmpty(newbornVisit.getCheckTimeDesc())){
+                            int zhou = newbornVisit.getCheckTimeDesc().indexOf("周");
+                            if(-1 == zhou){
                                 map.put("BIRTHGESTWEEKS",null);
-                                map.put("BIRTHGESTDAYS",String.valueOf(days));
+                                int tian = newbornVisit.getCheckTimeDesc().indexOf("天");
+                                if(-1 == tian){
+                                    map.put("BIRTHGESTWEEKS",null);
+                                    map.put("BIRTHGESTDAYS",null);
+                                }else{
+                                    int day = Integer.parseInt(newbornVisit.getCheckTimeDesc().substring(0, tian));
+                                    map.put("BIRTHGESTDAYS",String.valueOf(day));
+                                }
+
                             }else{
-                                int week = days/7;
-                                int day = days%7;
-                                map.put("BIRTHGESTWEEKS",String.valueOf(week));
-                                map.put("BIRTHGESTDAYS",String.valueOf(day));
+                                int days = Integer.parseInt(newbornVisit.getCheckTimeDesc().substring(0, newbornVisit.getCheckTimeDesc().indexOf("周")));
+                                if(days < 7){
+                                    map.put("BIRTHGESTWEEKS",null);
+                                    map.put("BIRTHGESTDAYS",String.valueOf(days));
+                                }else{
+                                    int week = days/7;
+                                    int day = days%7;
+                                    map.put("BIRTHGESTWEEKS",String.valueOf(week));
+                                    map.put("BIRTHGESTDAYS",String.valueOf(day));
+                                }
                             }
+
                         }else{
                             map.put("BIRTHGESTWEEKS",null);
                             map.put("BIRTHGESTDAYS",null);
                         }
-                        String fmhospital = "";
+                        /*String fmhospital = "";
                         if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getDeliverOrg())) {
                             Organization organization = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg()));
                             if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                                 fmhospital = organization.getName();
                             }
-                        }
-                        map.put("DELIVERYORGNAME",fmhospital);
+                        }*/
+                        map.put("DELIVERYORGNAME",model.getDeliverOrg());
                         map.put("ASPHYXIACODE","1");
                         map.put("APGARSCORECODE",null);
                         map.put("APGARSCORE",null);