diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
index 676eecf..551a2f1 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
@@ -26,10 +26,6 @@ public class PremaritalCheckup  extends BaseModel {
     private  String jczt;
     //加上绝经 1否 2 是
     private  String fkjjState;
-    //婚检时间
-    private Date premaritalUpTime;
-    //医院ID
-    private String hospitalId;
     //创建时间
     private Date created;
     //修改时间
@@ -379,8 +375,6 @@ public class PremaritalCheckup  extends BaseModel {
     private String yiJianQiTaDetails;
     //指导意见
     private String zhiDaoYiJian;
-    //婚检医生
-    private String hunJianDoctor;
     //婚前卫生咨询
     private String hunqianHealth;
     //咨询指导结果
@@ -440,17 +434,59 @@ public class PremaritalCheckup  extends BaseModel {
     private String seJue;
 
 
-    //婚检信息签名
+    //婚检信息时间（婚检信息配套）
+    private Date baseTime;
+    //婚检信息医生（婚检信息配套）
+    private String baseDoctor;
+    //婚检信息医生签名（婚检信息配套）
     private String baseSign;
-
-    //体格检查签名
+    //婚检查医院（婚检信息配套）
+    private String baseHospitalId;
+
+    //体格检查时间（体格检查配套）
+    private Date physiqueTime;
+    //体格检查医生（体格检查配套）
+    private String physiqueDoctor;
+    //体格检查签名（体格检查配套）
     private String physiqueSign;
-
-    //生殖检查签名
+    //体格检查医院（体格检查配套）
+    private String physiqueHospitalId;
+
+    //生殖检查时间（生殖检查配套）
+    private Date repTime;
+    //生殖检查医生（生殖检查配套）
+    private String repDoctor;
+    //生殖检查签名（生殖检查配套）
     private String repSign;
-
-    //婚前指导签名
+    //生殖检查医院（生殖检查配套）
+    private String repHospitalId;
+
+    //临床检查时间（临床检查配套）
+    private Date clinicTime;
+    //临床检查医生（临床检查配套）
+    private String clinicDoctor;
+    //临床检查签名（临床检查配套）
+    private String clinicSign;
+    //临床检查医院（临床检查配套）
+    private String clinicHospitalId;
+
+    //辅助检查时间（辅助检查配套）
+    private Date assistTime;
+    //辅助检查医生（辅助检查配套）
+    private String assistDoctor;
+    //辅助检查签名（辅助检查配套）
+    private String assistSign;
+    //辅助检查医院（辅助检查配套）
+    private String assistHospitalId;
+
+    //婚检时间（婚前指导配套）
+    private Date premaritalUpTime;
+    //婚前指导医生（婚前指导配套）
+    private String hunJianDoctor;
+    //婚前指导签名（婚前指导配套）
     private String guidSign;
+    //医院ID（婚前指导配套）
+    private String hospitalId;
 
     //用户签名
     private String userSign;
@@ -537,8 +573,146 @@ public class PremaritalCheckup  extends BaseModel {
     //胺臭味试验26
     private String acwsy;
 
+    public Date getBaseTime() {
+        return baseTime;
+    }
+
+    public void setBaseTime(Date baseTime) {
+        this.baseTime = baseTime;
+    }
+
+    public String getBaseDoctor() {
+        return baseDoctor;
+    }
+
+    public void setBaseDoctor(String baseDoctor) {
+        this.baseDoctor = baseDoctor;
+    }
+
+    public String getBaseHospitalId() {
+        return baseHospitalId;
+    }
+
+    public void setBaseHospitalId(String baseHospitalId) {
+        this.baseHospitalId = baseHospitalId;
+    }
+
+    public Date getPhysiqueTime() {
+        return physiqueTime;
+    }
+
+    public void setPhysiqueTime(Date physiqueTime) {
+        this.physiqueTime = physiqueTime;
+    }
+
+    public String getPhysiqueDoctor() {
+        return physiqueDoctor;
+    }
+
+    public void setPhysiqueDoctor(String physiqueDoctor) {
+        this.physiqueDoctor = physiqueDoctor;
+    }
+
+    public String getPhysiqueHospitalId() {
+        return physiqueHospitalId;
+    }
+
+    public void setPhysiqueHospitalId(String physiqueHospitalId) {
+        this.physiqueHospitalId = physiqueHospitalId;
+    }
+
+    public Date getRepTime() {
+        return repTime;
+    }
+
+    public void setRepTime(Date repTime) {
+        this.repTime = repTime;
+    }
+
+    public String getRepDoctor() {
+        return repDoctor;
+    }
+
+    public void setRepDoctor(String repDoctor) {
+        this.repDoctor = repDoctor;
+    }
+
+    public String getRepHospitalId() {
+        return repHospitalId;
+    }
+
+    public void setRepHospitalId(String repHospitalId) {
+        this.repHospitalId = repHospitalId;
+    }
+
+    public Date getClinicTime() {
+        return clinicTime;
+    }
+
+    public void setClinicTime(Date clinicTime) {
+        this.clinicTime = clinicTime;
+    }
+
+    public String getClinicDoctor() {
+        return clinicDoctor;
+    }
+
+    public void setClinicDoctor(String clinicDoctor) {
+        this.clinicDoctor = clinicDoctor;
+    }
+
+    public String getClinicSign() {
+        return clinicSign;
+    }
+
+    public void setClinicSign(String clinicSign) {
+        this.clinicSign = clinicSign;
+    }
+
+    public String getClinicHospitalId() {
+        return clinicHospitalId;
+    }
+
+    public void setClinicHospitalId(String clinicHospitalId) {
+        this.clinicHospitalId = clinicHospitalId;
+    }
+
+    public Date getAssistTime() {
+        return assistTime;
+    }
+
+    public void setAssistTime(Date assistTime) {
+        this.assistTime = assistTime;
+    }
+
+    public String getAssistDoctor() {
+        return assistDoctor;
+    }
+
+    public void setAssistDoctor(String assistDoctor) {
+        this.assistDoctor = assistDoctor;
+    }
+
+    public String getAssistSign() {
+        return assistSign;
+    }
+
+    public void setAssistSign(String assistSign) {
+        this.assistSign = assistSign;
+    }
+
+    public String getAssistHospitalId() {
+        return assistHospitalId;
+    }
+
+    public void setAssistHospitalId(String assistHospitalId) {
+        this.assistHospitalId = assistHospitalId;
+    }
+
     /************************************************************************/
 
+
+
     public String getLhHiv() {
         return lhHiv;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
index d5a5452..48a449c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
@@ -263,15 +263,45 @@ public class PremaritalCheckupFacade {
         checkupResult.setCxNum(result.getCxNum());
         checkupResult.setId(result.getId());
         checkupResult.setParentId(result.getId());
+
+        checkupResult.setBaseTime(DateUtil.getyyyy_MM_dd(result.getBaseTime()));
+        checkupResult.setPhysiqueTime(DateUtil.getyyyy_MM_dd(result.getPhysiqueTime()));
+        checkupResult.setRepTime(DateUtil.getyyyy_MM_dd(result.getRepTime()));
+        checkupResult.setClinicTime(DateUtil.getyyyy_MM_dd(result.getClinicTime()));
+        checkupResult.setAssistTime(DateUtil.getyyyy_MM_dd(result.getAssistTime()));
         checkupResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
+
+        checkupResult.setBaseDoctor(result.getBaseDoctor());
+        checkupResult.setPhysiqueDoctor(result.getPhysiqueDoctor());
+        checkupResult.setRepDoctor(result.getRepDoctor());
+        checkupResult.setClinicDoctor(result.getClinicDoctor());
+        checkupResult.setAssistDoctor(result.getAssistDoctor());
+        checkupResult.setHunJianDoctor(result.getHunJianDoctor());
+
+        checkupResult.setBaseSign(result.getBaseSign());
+        checkupResult.setPhysiqueSign(result.getPhysiqueSign());
+        checkupResult.setRepSign(result.getRepSign());
+        checkupResult.setClinicSign(result.getClinicSign());
+        checkupResult.setAssistSign(result.getAssistSign());
+        checkupResult.setGuidSign(result.getGuidSign());
+
+        checkupResult.setUserSign(result.getUserSign());
+
+        checkupResult.setBaseHospitalId(result.getBaseHospitalId());
+        checkupResult.setPhysiqueHospitalId(result.getPhysiqueHospitalId());
+        checkupResult.setRepHospitalId(result.getRepHospitalId());
+        checkupResult.setClinicHospitalId(result.getClinicHospitalId());
+        checkupResult.setAssistHospitalId(result.getAssistHospitalId());
+        checkupResult.setHospitalId(result.getHospitalId());
+
         checkupResult.setPublishId(result.getPublishId());
         //查询的时候,返回医院的名称
-        if (result.getHospitalId() != null) {
-            Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId()));
-            if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
-                checkupResult.setHospitalId(organization.getName());
-            }
-        }
+//        if (result.getHospitalId() != null) {
+//            Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId()));
+//            if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
+//                checkupResult.setHospitalId(organization.getName());
+//            }
+//        }
         checkupResult.setCertificateNum(result.getCertificateNum());
         checkupResult.setCertificateTypeId(result.getCertificateTypeId());
         checkupResult.setVcCardNo(result.getVcCardNo());
@@ -452,7 +482,7 @@ public class PremaritalCheckupFacade {
                 hunJianDoctor = users.getName();
             }
         }*/
-        checkupResult.setHunJianDoctor(result.getHunJianDoctor());
+
         //       checkupResult.setHunJianDoctor(hunJianDoctor);
 
         //新增字段赋值
@@ -488,12 +518,6 @@ public class PremaritalCheckupFacade {
         checkupResult.setYuyan(result.getYuyan());
         checkupResult.setSeJue(result.getSeJue());
 
-
-        checkupResult.setBaseSign(result.getBaseSign());
-        checkupResult.setPhysiqueSign(result.getPhysiqueSign());
-        checkupResult.setRepSign(result.getRepSign());
-        checkupResult.setGuidSign(result.getGuidSign());
-        checkupResult.setUserSign(result.getUserSign());
         checkupResult.setJczt(result.getJczt());
         checkupResult.setFkjjState(result.getFkjjState());
         checkupResult.setNumCode(com.lyms.platform.common.utils.StringUtils.numCodeStr(result.getNumCode()));
@@ -944,8 +968,6 @@ public class PremaritalCheckupFacade {
         checkup.setYiXueYiJian(addRequest.getYiXueYiJian());
         checkup.setYiJianQiTaDetails(addRequest.getYiJianQiTaDetails());
         checkup.setZhiDaoYiJian(addRequest.getZhiDaoYiJian());
-        checkup.setHunJianDoctor(addRequest.getHunJianDoctor());
-
         checkup.setMailNo(addRequest.getMailNo());
         checkup.setShiliRight(addRequest.getShiliRight());
         checkup.setShiliLeft(addRequest.getShiliLeft());
@@ -954,11 +976,34 @@ public class PremaritalCheckupFacade {
         checkup.setYuyan(addRequest.getYuyan());
         checkup.setSeJue(addRequest.getSeJue());
 
+        checkup.setBaseTime(DateUtil.parseYMD(addRequest.getBaseTime()));
+        checkup.setPhysiqueTime(DateUtil.parseYMD(addRequest.getPhysiqueTime()));
+        checkup.setRepTime(DateUtil.parseYMD(addRequest.getRepTime()));
+        checkup.setClinicTime(DateUtil.parseYMD(addRequest.getClinicTime()));
+        checkup.setAssistTime(DateUtil.parseYMD(addRequest.getAssistTime()));
+        checkup.setPremaritalUpTime(DateUtil.parseYMD(addRequest.getPremaritalUpTime()));
+
+        checkup.setBaseDoctor(addRequest.getBaseDoctor());
+        checkup.setPhysiqueDoctor(addRequest.getPhysiqueDoctor());
+        checkup.setRepDoctor(addRequest.getRepDoctor());
+        checkup.setClinicDoctor(addRequest.getClinicDoctor());
+        checkup.setAssistDoctor(addRequest.getAssistDoctor());
+        checkup.setHunJianDoctor(addRequest.getHunJianDoctor());
 
         checkup.setBaseSign(addRequest.getBaseSign());
         checkup.setPhysiqueSign(addRequest.getPhysiqueSign());
         checkup.setRepSign(addRequest.getRepSign());
+        checkup.setClinicSign(addRequest.getClinicSign());
+        checkup.setAssistSign(addRequest.getAssistSign());
         checkup.setGuidSign(addRequest.getGuidSign());
+
+        checkup.setBaseHospitalId(addRequest.getBaseHospitalId());
+        checkup.setPhysiqueHospitalId(addRequest.getPhysiqueHospitalId());
+        checkup.setRepHospitalId(addRequest.getRepHospitalId());
+        checkup.setClinicHospitalId(addRequest.getClinicHospitalId());
+        checkup.setAssistHospitalId(addRequest.getAssistHospitalId());
+        checkup.setHospitalId(addRequest.getHospitalId());
+
         checkup.setUserSign(addRequest.getUserSign());
 
         /**隆化-增加 X线摄影报告
@@ -973,7 +1018,6 @@ public class PremaritalCheckupFacade {
         checkup.setModified(new Date());
         checkup.setVcCardNo(addRequest.getVcCardNo());
         checkup.setCertificateNum(addRequest.getCertificateNum());
-        checkup.setPremaritalUpTime(DateUtil.parseYMD(addRequest.getPremaritalUpTime()));
         checkup.setIsSync(1);
         if (StringUtils.isNotEmpty(addRequest.getId())) {
             //修改
@@ -986,7 +1030,6 @@ public class PremaritalCheckupFacade {
             checkup.setParentId(model.getId());
             checkup.setPublishId(userId);
             checkup.setCreated(new Date());
-            checkup.setHospitalId(addRequest.getHospitalId());
             setNumCode(checkup);
             PremaritalCheckup premaritalCheckup = premaritalCheckupService.addPremaritalCheckup(checkup);
             id = premaritalCheckup.getId();
@@ -1869,12 +1912,114 @@ public class PremaritalCheckupFacade {
         //复制
         BeanUtils.copy(result, checkupResult);
         checkupResult.setCxNum(result.getCxNum());
+
+        checkupResult.setBaseTime(DateUtil.getyyyy_MM_dd(result.getBaseTime()));
+        checkupResult.setPhysiqueTime(DateUtil.getyyyy_MM_dd(result.getPhysiqueTime()));
+        checkupResult.setRepTime(DateUtil.getyyyy_MM_dd(result.getRepTime()));
+        checkupResult.setClinicTime(DateUtil.getyyyy_MM_dd(result.getClinicTime()));
+        checkupResult.setAssistTime(DateUtil.getyyyy_MM_dd(result.getAssistTime()));
+        checkupResult.setHunJianDate(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
+
+        String baseDoctor = "";
+        if (result.getBaseDoctor() != null) {
+            Users users = usersService.getUsers(Integer.parseInt(result.getBaseDoctor()));
+            if (users != null && users.getYn() == YnEnums.YES.getId()) {
+                baseDoctor = users.getName();
+            }
+        }
+        checkupResult.setBaseDoctor(baseDoctor);
+
+        String physiqueDoctor = "";
+        if (result.getPhysiqueDoctor() != null) {
+            Users users = usersService.getUsers(Integer.parseInt(result.getPhysiqueDoctor()));
+            if (users != null && users.getYn() == YnEnums.YES.getId()) {
+                physiqueDoctor = users.getName();
+            }
+        }
+        checkupResult.setPhysiqueDoctor(physiqueDoctor);
+
+        String repDoctor = "";
+        if (result.getRepDoctor() != null) {
+            Users users = usersService.getUsers(Integer.parseInt(result.getRepDoctor()));
+            if (users != null && users.getYn() == YnEnums.YES.getId()) {
+                repDoctor = users.getName();
+            }
+        }
+        checkupResult.setRepDoctor(repDoctor);
+
+        String clinicDoctor = "";
+        if (result.getClinicDoctor() != null) {
+            Users users = usersService.getUsers(Integer.parseInt(result.getClinicDoctor()));
+            if (users != null && users.getYn() == YnEnums.YES.getId()) {
+                clinicDoctor = users.getName();
+            }
+        }
+        checkupResult.setClinicDoctor(clinicDoctor);
+
+        String assistDoctor = "";
+        if (result.getAssistDoctor() != null) {
+            Users users = usersService.getUsers(Integer.parseInt(result.getAssistDoctor()));
+            if (users != null && users.getYn() == YnEnums.YES.getId()) {
+                assistDoctor = users.getName();
+            }
+        }
+        checkupResult.setAssistDoctor(assistDoctor);
+
+        String hunJianDoctor = "";
+        if (result.getHunJianDoctor() != null) {
+            Users users = usersService.getUsers(Integer.parseInt(result.getHunJianDoctor()));
+            if (users != null && users.getYn() == YnEnums.YES.getId()) {
+                hunJianDoctor = users.getName();
+            }
+        }
+        checkupResult.setHunJianDoctor(hunJianDoctor);
+
         checkupResult.setBaseSign(result.getBaseSign());
         checkupResult.setPhysiqueSign(result.getPhysiqueSign());
         checkupResult.setRepSign(result.getRepSign());
+        checkupResult.setClinicSign(result.getClinicSign());
+        checkupResult.setAssistSign(result.getAssistSign());
         checkupResult.setGuidSign(result.getGuidSign());
         checkupResult.setUserSign(result.getUserSign());
 
+        //查询的时候,返回医院的名称
+        if (result.getBaseHospitalId() != null) {
+            Organization organization = organizationService.getOrganization(Integer.valueOf(result.getBaseHospitalId()));
+            if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
+                checkupResult.setBaseHospitalId(organization.getName());
+            }
+        }
+        if (result.getPhysiqueHospitalId() != null) {
+            Organization organization = organizationService.getOrganization(Integer.valueOf(result.getPhysiqueHospitalId()));
+            if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
+                checkupResult.setPhysiqueHospitalId(organization.getName());
+            }
+        }
+        if (result.getRepHospitalId() != null) {
+            Organization organization = organizationService.getOrganization(Integer.valueOf(result.getRepHospitalId()));
+            if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
+                checkupResult.setRepHospitalId(organization.getName());
+            }
+        }
+        if (result.getClinicHospitalId() != null) {
+            Organization organization = organizationService.getOrganization(Integer.valueOf(result.getClinicHospitalId()));
+            if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
+                checkupResult.setClinicHospitalId(organization.getName());
+            }
+        }
+        if (result.getAssistHospitalId() != null) {
+            Organization organization = organizationService.getOrganization(Integer.valueOf(result.getAssistHospitalId()));
+            if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
+                checkupResult.setAssistHospitalId(organization.getName());
+            }
+        }
+        if (result.getHospitalId() != null) {
+            Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId()));
+            if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
+                checkupResult.setHunJianHospital(organization.getName());
+            }
+        }
+
         checkupResult.setUsername(archiveModel.getUsername());
         checkupResult.setSex(getBaseicConfigByid(archiveModel.getSex()));
         checkupResult.setBirthday(DateUtil.getyyyy_MM_dd(archiveModel.getBirthday()));
@@ -1905,24 +2050,7 @@ public class PremaritalCheckupFacade {
         checkupResult.setIsBloodshed(result.getIsBloodshed());
         checkupResult.setBloodshed(result.getBloodshed());
 
-        checkupResult.setHunJianDate(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
-        String hunJianDoctor = "";
-        if (result.getHunJianDoctor() != null) {
-            Users users = usersService.getUsers(Integer.parseInt(result.getHunJianDoctor()));
-            if (users != null && users.getYn() == YnEnums.YES.getId()) {
-                hunJianDoctor = users.getName();
-            }
-        }
-        checkupResult.setHunJianDoctor(hunJianDoctor);
-        //checkupResult.setHunJianDoctor(result.getHunJianDoctor());
 
-        //查询的时候,返回医院的名称
-        if (result.getHospitalId() != null) {
-            Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId()));
-            if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
-                checkupResult.setHunJianHospital(organization.getName());
-            }
-        }
 
         checkupResult.setMenarcheAge(UnitHandle(result.getMenarcheAge(), UnitConstants.SUI));
         if (result.getMenstrualCycle() != null && !"/".equals(result.getMenstrualCycle())) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
index 810cab7..fc5f2fa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
@@ -21,10 +21,6 @@ public class PremaritalCheckupAddRequest {
     private String id;
     //女性/男性ID
     private  String parentId;
-    //婚检时间
-    private String premaritalUpTime;
-    //医院ID
-    private String hospitalId;
     //证件号
     private String certificateNum;
     //证件类型Id
@@ -407,15 +403,14 @@ public class PremaritalCheckupAddRequest {
     private String yiJianQiTaDetails;
     //指导意见
     private String zhiDaoYiJian;
-    //婚检医生
-    private String hunJianDoctor;
+
     //转诊医院
     private String referralHospital;
     //转诊日期
     private String referralDate;
     //出具证明时间
     private String issueTime;
-    //主检医师签名
+    //主检医师签名（系统没有用）
     private String doctorSign;
 
     private Integer sexType;
@@ -435,17 +430,60 @@ public class PremaritalCheckupAddRequest {
     //色觉
     private String seJue;
 
-    //婚检信息签名
-    private String baseSign;
 
-    //体格检查签名
+    //婚检信息时间（婚检信息配套）
+    private String baseTime;
+    //婚检信息医生（婚检信息配套）
+    private String baseDoctor;
+    //婚检信息医生签名（婚检信息配套）
+    private String baseSign;
+    //婚检查医院（婚检信息配套）
+    private String baseHospitalId;
+
+    //体格检查时间（体格检查配套）
+    private String physiqueTime;
+    //体格检查医生（体格检查配套）
+    private String physiqueDoctor;
+    //体格检查签名（体格检查配套）
     private String physiqueSign;
-
-    //生殖检查签名
+    //体格检查医院（体格检查配套）
+    private String physiqueHospitalId;
+
+    //生殖检查时间（生殖检查配套）
+    private String repTime;
+    //生殖检查医生（生殖检查配套）
+    private String repDoctor;
+    //生殖检查签名（生殖检查配套）
     private String repSign;
-
-    //婚前指导签名
+    //生殖检查医院（生殖检查配套）
+    private String repHospitalId;
+
+    //临床检查时间（临床检查配套）
+    private String clinicTime;
+    //临床检查医生（临床检查配套）
+    private String clinicDoctor;
+    //临床检查签名（临床检查配套）
+    private String clinicSign;
+    //临床检查医院（临床检查配套）
+    private String clinicHospitalId;
+
+    //辅助检查时间（辅助检查配套）
+    private String assistTime;
+    //辅助检查医生（辅助检查配套）
+    private String assistDoctor;
+    //辅助检查签名（辅助检查配套）
+    private String assistSign;
+    //辅助检查医院（辅助检查配套）
+    private String assistHospitalId;
+
+    //婚检时间（婚前指导配套）
+    private String premaritalUpTime;
+    //婚前指导医生（婚前指导配套）
+    private String hunJianDoctor;
+    //婚前指导签名（婚前指导配套）
     private String guidSign;
+    //医院ID（婚前指导配套）
+    private String hospitalId;
 
     //用户签名
     private String userSign;
@@ -526,8 +564,145 @@ public class PremaritalCheckupAddRequest {
     //胺臭味试验26
     private String acwsy;
 
+    public String getBaseTime() {
+        return baseTime;
+    }
+
+    public void setBaseTime(String baseTime) {
+        this.baseTime = baseTime;
+    }
+
+    public String getBaseDoctor() {
+        return baseDoctor;
+    }
+
+    public void setBaseDoctor(String baseDoctor) {
+        this.baseDoctor = baseDoctor;
+    }
+
+    public String getBaseHospitalId() {
+        return baseHospitalId;
+    }
+
+    public void setBaseHospitalId(String baseHospitalId) {
+        this.baseHospitalId = baseHospitalId;
+    }
+
+    public String getPhysiqueTime() {
+        return physiqueTime;
+    }
+
+    public void setPhysiqueTime(String physiqueTime) {
+        this.physiqueTime = physiqueTime;
+    }
+
+    public String getPhysiqueDoctor() {
+        return physiqueDoctor;
+    }
+
+    public void setPhysiqueDoctor(String physiqueDoctor) {
+        this.physiqueDoctor = physiqueDoctor;
+    }
+
+    public String getPhysiqueHospitalId() {
+        return physiqueHospitalId;
+    }
+
+    public void setPhysiqueHospitalId(String physiqueHospitalId) {
+        this.physiqueHospitalId = physiqueHospitalId;
+    }
+
+    public String getRepTime() {
+        return repTime;
+    }
+
+    public void setRepTime(String repTime) {
+        this.repTime = repTime;
+    }
+
+    public String getRepDoctor() {
+        return repDoctor;
+    }
+
+    public void setRepDoctor(String repDoctor) {
+        this.repDoctor = repDoctor;
+    }
+
+    public String getRepHospitalId() {
+        return repHospitalId;
+    }
+
+    public void setRepHospitalId(String repHospitalId) {
+        this.repHospitalId = repHospitalId;
+    }
+
+    public String getClinicTime() {
+        return clinicTime;
+    }
+
+    public void setClinicTime(String clinicTime) {
+        this.clinicTime = clinicTime;
+    }
+
+    public String getClinicDoctor() {
+        return clinicDoctor;
+    }
+
+    public void setClinicDoctor(String clinicDoctor) {
+        this.clinicDoctor = clinicDoctor;
+    }
+
+    public String getClinicSign() {
+        return clinicSign;
+    }
+
+    public void setClinicSign(String clinicSign) {
+        this.clinicSign = clinicSign;
+    }
+
+    public String getClinicHospitalId() {
+        return clinicHospitalId;
+    }
+
+    public void setClinicHospitalId(String clinicHospitalId) {
+        this.clinicHospitalId = clinicHospitalId;
+    }
+
+    public String getAssistTime() {
+        return assistTime;
+    }
+
+    public void setAssistTime(String assistTime) {
+        this.assistTime = assistTime;
+    }
+
+    public String getAssistDoctor() {
+        return assistDoctor;
+    }
+
+    public void setAssistDoctor(String assistDoctor) {
+        this.assistDoctor = assistDoctor;
+    }
+
+    public String getAssistSign() {
+        return assistSign;
+    }
+
+    public void setAssistSign(String assistSign) {
+        this.assistSign = assistSign;
+    }
+
+    public String getAssistHospitalId() {
+        return assistHospitalId;
+    }
+
+    public void setAssistHospitalId(String assistHospitalId) {
+        this.assistHospitalId = assistHospitalId;
+    }
+
     /************************************************************************/
 
+
     public String getWbc() {
         return wbc;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
index c57d533..a5d4162 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
@@ -9,18 +9,6 @@ import java.util.Map;
 public class PremaritalCheckupPageResult {
 
 
-    //婚检信息签名
-    private String baseSign;
-
-    //体格检查签名
-    private String physiqueSign;
-
-    //生殖检查签名
-    private String repSign;
-
-    //婚前指导签名
-    private String guidSign;
-
     //用户签名
     private String userSign;
 //    private String id;
@@ -75,17 +63,6 @@ public class PremaritalCheckupPageResult {
 
     /****婚检信息 ***/
 
-    //婚检日期
-    private String hunJianDate;
-
-    //婚检医生
-    private String hunJianDoctor;
-
-    //婚检医院
-    private String hunJianHospital;
-
-
-
 
 
     /****************** 婚育史 ********************/
@@ -489,8 +466,198 @@ public class PremaritalCheckupPageResult {
     private String lqj;
     //胺臭味试验26
     private String acwsy;
+    /*****************************************/
+    //婚检信息时间（婚检信息配套）
+    private String baseTime;
+    //婚检信息医生（婚检信息配套）
+    private String baseDoctor;
+    //婚检信息医生签名（婚检信息配套）
+    private String baseSign;
+    //婚检查医院（婚检信息配套）
+    private String baseHospitalId;
+
+    //体格检查时间（体格检查配套）
+    private String physiqueTime;
+    //体格检查医生（体格检查配套）
+    private String physiqueDoctor;
+    //体格检查签名（体格检查配套）
+    private String physiqueSign;
+    //体格检查医院（体格检查配套）
+    private String physiqueHospitalId;
+
+    //生殖检查时间（生殖检查配套）
+    private String repTime;
+    //生殖检查医生（生殖检查配套）
+    private String repDoctor;
+    //生殖检查签名（生殖检查配套）
+    private String repSign;
+    //生殖检查医院（生殖检查配套）
+    private String repHospitalId;
+
+    //临床检查时间（临床检查配套）
+    private String clinicTime;
+    //临床检查医生（临床检查配套）
+    private String clinicDoctor;
+    //临床检查签名（临床检查配套）
+    private String clinicSign;
+    //临床检查医院（临床检查配套）
+    private String clinicHospitalId;
+
+    //辅助检查时间（辅助检查配套）
+    private String assistTime;
+    //辅助检查医生（辅助检查配套）
+    private String assistDoctor;
+    //辅助检查签名（辅助检查配套）
+    private String assistSign;
+    //辅助检查医院（辅助检查配套）
+    private String assistHospitalId;
+
+    //婚检日期（婚前指导配套）
+    private String hunJianDate;
+    //婚前指导医生（婚前指导配套）
+    private String hunJianDoctor;
+    //婚前指导签名（婚前指导配套）
+    private String guidSign;
+    //婚检医院（婚前指导配套）
+    private String hunJianHospital;
+
+/************************************************************************/
+
+    public String getBaseTime() {
+        return baseTime;
+    }
+
+    public void setBaseTime(String baseTime) {
+        this.baseTime = baseTime;
+    }
+
+    public String getBaseDoctor() {
+        return baseDoctor;
+    }
+
+    public void setBaseDoctor(String baseDoctor) {
+        this.baseDoctor = baseDoctor;
+    }
+
+    public String getBaseHospitalId() {
+        return baseHospitalId;
+    }
+
+    public void setBaseHospitalId(String baseHospitalId) {
+        this.baseHospitalId = baseHospitalId;
+    }
+
+    public String getPhysiqueTime() {
+        return physiqueTime;
+    }
+
+    public void setPhysiqueTime(String physiqueTime) {
+        this.physiqueTime = physiqueTime;
+    }
+
+    public String getPhysiqueDoctor() {
+        return physiqueDoctor;
+    }
+
+    public void setPhysiqueDoctor(String physiqueDoctor) {
+        this.physiqueDoctor = physiqueDoctor;
+    }
+
+    public String getPhysiqueHospitalId() {
+        return physiqueHospitalId;
+    }
 
-    /************************************************************************/
+    public void setPhysiqueHospitalId(String physiqueHospitalId) {
+        this.physiqueHospitalId = physiqueHospitalId;
+    }
+
+    public String getRepTime() {
+        return repTime;
+    }
+
+    public void setRepTime(String repTime) {
+        this.repTime = repTime;
+    }
+
+    public String getRepDoctor() {
+        return repDoctor;
+    }
+
+    public void setRepDoctor(String repDoctor) {
+        this.repDoctor = repDoctor;
+    }
+
+    public String getRepHospitalId() {
+        return repHospitalId;
+    }
+
+    public void setRepHospitalId(String repHospitalId) {
+        this.repHospitalId = repHospitalId;
+    }
+
+    public String getClinicTime() {
+        return clinicTime;
+    }
+
+    public void setClinicTime(String clinicTime) {
+        this.clinicTime = clinicTime;
+    }
+
+    public String getClinicDoctor() {
+        return clinicDoctor;
+    }
+
+    public void setClinicDoctor(String clinicDoctor) {
+        this.clinicDoctor = clinicDoctor;
+    }
+
+    public String getClinicSign() {
+        return clinicSign;
+    }
+
+    public void setClinicSign(String clinicSign) {
+        this.clinicSign = clinicSign;
+    }
+
+    public String getClinicHospitalId() {
+        return clinicHospitalId;
+    }
+
+    public void setClinicHospitalId(String clinicHospitalId) {
+        this.clinicHospitalId = clinicHospitalId;
+    }
+
+    public String getAssistTime() {
+        return assistTime;
+    }
+
+    public void setAssistTime(String assistTime) {
+        this.assistTime = assistTime;
+    }
+
+    public String getAssistDoctor() {
+        return assistDoctor;
+    }
+
+    public void setAssistDoctor(String assistDoctor) {
+        this.assistDoctor = assistDoctor;
+    }
+
+    public String getAssistSign() {
+        return assistSign;
+    }
+
+    public void setAssistSign(String assistSign) {
+        this.assistSign = assistSign;
+    }
+
+    public String getAssistHospitalId() {
+        return assistHospitalId;
+    }
+
+    public void setAssistHospitalId(String assistHospitalId) {
+        this.assistHospitalId = assistHospitalId;
+    }
 
     public String getWbc() {
         return wbc;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
index 3c54f47..26a5dfb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
@@ -13,10 +13,7 @@ public class PremaritalCheckupResult {
     private String id;
     //女性/男性ID
     private  String parentId;
-    //婚检时间
-    private String premaritalUpTime;
-    //医院ID
-    private String hospitalId;
+
     //操作人
     private Integer publishId;
     //证件号
@@ -343,8 +340,7 @@ public class PremaritalCheckupResult {
     private String yiJianQiTaDetails;
     //指导意见
     private String zhiDaoYiJian;
-    //婚检医生
-    private String hunJianDoctor;
+
     //婚前卫生咨询
     private String hunqianHealth;
     //咨询指导结果
@@ -405,17 +401,8 @@ public class PremaritalCheckupResult {
 
     //色觉
     private String seJue;
-    //婚检信息签名
-    private String baseSign;
 
-    //体格检查签名
-    private String physiqueSign;
 
-    //生殖检查签名
-    private String repSign;
-
-    //婚前指导签名
-    private String guidSign;
 
     //用户签名
     private String userSign;
@@ -500,8 +487,200 @@ public class PremaritalCheckupResult {
     private String lqj;
     //胺臭味试验26
     private String acwsy;
+    /*****************************************/
+    //婚检信息时间（婚检信息配套）
+    private String baseTime;
+    //婚检信息医生（婚检信息配套）
+    private String baseDoctor;
+    //婚检信息医生签名（婚检信息配套）
+    private String baseSign;
+    //婚检查医院（婚检信息配套）
+    private String baseHospitalId;
+
+    //体格检查时间（体格检查配套）
+    private String physiqueTime;
+    //体格检查医生（体格检查配套）
+    private String physiqueDoctor;
+    //体格检查签名（体格检查配套）
+    private String physiqueSign;
+    //体格检查医院（体格检查配套）
+    private String physiqueHospitalId;
+
+    //生殖检查时间（生殖检查配套）
+    private String repTime;
+    //生殖检查医生（生殖检查配套）
+    private String repDoctor;
+    //生殖检查签名（生殖检查配套）
+    private String repSign;
+    //生殖检查医院（生殖检查配套）
+    private String repHospitalId;
+
+    //临床检查时间（临床检查配套）
+    private String clinicTime;
+    //临床检查医生（临床检查配套）
+    private String clinicDoctor;
+    //临床检查签名（临床检查配套）
+    private String clinicSign;
+    //临床检查医院（临床检查配套）
+    private String clinicHospitalId;
+
+    //辅助检查时间（辅助检查配套）
+    private String assistTime;
+    //辅助检查医生（辅助检查配套）
+    private String assistDoctor;
+    //辅助检查签名（辅助检查配套）
+    private String assistSign;
+    //辅助检查医院（辅助检查配套）
+    private String assistHospitalId;
+
+    //婚检时间（婚前指导配套）
+    private String premaritalUpTime;
+    //婚前指导医生（婚前指导配套）
+    private String hunJianDoctor;
+    //婚前指导签名（婚前指导配套）
+    private String guidSign;
+    //医院ID（婚前指导配套）
+    private String hospitalId;
+
+    public String getBaseTime() {
+        return baseTime;
+    }
+
+    public void setBaseTime(String baseTime) {
+        this.baseTime = baseTime;
+    }
+
+    public String getBaseDoctor() {
+        return baseDoctor;
+    }
+
+    public void setBaseDoctor(String baseDoctor) {
+        this.baseDoctor = baseDoctor;
+    }
+
+    public String getBaseHospitalId() {
+        return baseHospitalId;
+    }
+
+    public void setBaseHospitalId(String baseHospitalId) {
+        this.baseHospitalId = baseHospitalId;
+    }
+
+    public String getPhysiqueTime() {
+        return physiqueTime;
+    }
+
+    public void setPhysiqueTime(String physiqueTime) {
+        this.physiqueTime = physiqueTime;
+    }
+
+    public String getPhysiqueDoctor() {
+        return physiqueDoctor;
+    }
+
+    public void setPhysiqueDoctor(String physiqueDoctor) {
+        this.physiqueDoctor = physiqueDoctor;
+    }
+
+    public String getPhysiqueHospitalId() {
+        return physiqueHospitalId;
+    }
+
+    public void setPhysiqueHospitalId(String physiqueHospitalId) {
+        this.physiqueHospitalId = physiqueHospitalId;
+    }
+
+    public String getRepTime() {
+        return repTime;
+    }
+
+    public void setRepTime(String repTime) {
+        this.repTime = repTime;
+    }
+
+    public String getRepDoctor() {
+        return repDoctor;
+    }
+
+    public void setRepDoctor(String repDoctor) {
+        this.repDoctor = repDoctor;
+    }
+
+    public String getRepHospitalId() {
+        return repHospitalId;
+    }
+
+    public void setRepHospitalId(String repHospitalId) {
+        this.repHospitalId = repHospitalId;
+    }
+
+    public String getClinicTime() {
+        return clinicTime;
+    }
+
+    public void setClinicTime(String clinicTime) {
+        this.clinicTime = clinicTime;
+    }
+
+    public String getClinicDoctor() {
+        return clinicDoctor;
+    }
+
+    public void setClinicDoctor(String clinicDoctor) {
+        this.clinicDoctor = clinicDoctor;
+    }
+
+    public String getClinicSign() {
+        return clinicSign;
+    }
+
+    public void setClinicSign(String clinicSign) {
+        this.clinicSign = clinicSign;
+    }
+
+    public String getClinicHospitalId() {
+        return clinicHospitalId;
+    }
+
+    public void setClinicHospitalId(String clinicHospitalId) {
+        this.clinicHospitalId = clinicHospitalId;
+    }
+
+    public String getAssistTime() {
+        return assistTime;
+    }
+
+    public void setAssistTime(String assistTime) {
+        this.assistTime = assistTime;
+    }
+
+    public String getAssistDoctor() {
+        return assistDoctor;
+    }
+
+    public void setAssistDoctor(String assistDoctor) {
+        this.assistDoctor = assistDoctor;
+    }
+
+    public String getAssistSign() {
+        return assistSign;
+    }
+
+    public void setAssistSign(String assistSign) {
+        this.assistSign = assistSign;
+    }
+
+    public String getAssistHospitalId() {
+        return assistHospitalId;
+    }
+
+    public void setAssistHospitalId(String assistHospitalId) {
+        this.assistHospitalId = assistHospitalId;
+    }
 
     /************************************************************************/
+
+
     public String getLhHiv() {
         return lhHiv;
     }