diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
index b8bbfb9d..2b280998 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
@@ -38,9 +38,11 @@ public class AppEnforcementRegistrationController extends BaseController
     private String prefix = "project/code/registration";
 
     @Autowired private IEnforcementRegistrationService enforcementRegistrationService;
+    @Autowired private IEnterpriseLawEnforcementService enterpriseLawEnforcementService;
     @Autowired private ILinkageDictService iLinkageDictService;
     @Autowired private IEnterpriseComplaintService enterpriseComplaintService;
     @Autowired private IEnterpriseInformationService iEnterpriseInformationService;
+    @Autowired private IEnterpriseEvaluateService enterpriseEvaluateService;
     @Autowired private IZqyjjdm137344Service iZqyjjdm137344Service;
     @Autowired private UserApi userApi;
     @Autowired private DictDataApi dictDataApi;
@@ -352,7 +354,6 @@ public class AppEnforcementRegistrationController extends BaseController
         return prefix + "/edit";
     }
 
-    @Autowired private IEnterpriseLawEnforcementService enterpriseLawEnforcementService;
     /**
      * 修改保存执法端-执法登记
      */
@@ -510,6 +511,94 @@ public class AppEnforcementRegistrationController extends BaseController
         return ZDResponse.success("查询成功",enforcementRegistration);
     }
 
+    /**
+     * 执法登记详情 - 联合执法版本
+     */
+    @GetMapping("/queryUniteById/{id}")
+    @ResponseBody
+    public ZDResponse queryUniteById(@PathVariable("id") String id)
+    {
+        List<EnforcementRegistration> regResults = new ArrayList<>();
+        List<EnterpriseLawEnforcement> lawResults = new ArrayList<>();
+        // 先获取登记数据  - 获取批次id
+        EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id);
+        // 通过联合执法的批次id获取整个批次的联合执法
+        if (StringUtils.isNotEmpty(enforcementRegistration.getUniteCheck())) {
+            // 已登记联合检查
+            EnforcementRegistration regRarams = new EnforcementRegistration();
+            regRarams.setUniteCheck(enforcementRegistration.getUniteCheck());
+            regResults = enforcementRegistrationService.selectEnforcementRegistrationList(regRarams);
+            // 预约未登记的
+            EnterpriseLawEnforcement lawRarams = new EnterpriseLawEnforcement();
+            lawRarams.setUniteCheck(enforcementRegistration.getUniteCheck());
+            lawRarams.setIsReg(0);
+            lawResults = enterpriseLawEnforcementService.selectEnterpriseLawEnforcementList(lawRarams);
+        } else {
+            regResults.add(enforcementRegistration);
+        }
+
+        for (EnforcementRegistration reg : regResults) {
+            // 执法人员1需要展示用户名+执法码
+            UserBean userBean = userApi.getUserByUserId(reg.getLawEnforcerId());
+            String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum();
+            reg.setLawEnforcer(userBean.getUserName() +" "+ lawCN);
+
+            // 执法人员2需要展示用户名+执法码
+            List<UserBean> userBeans = new ArrayList<>();
+            if (StringUtils.isNotEmpty(reg.getLawEnforcerIdTwo())) {
+                userBeans = userApi.getUserByUserIds(reg.getLawEnforcerIdTwo());
+            }
+            String tmpUserShow = "";
+            for (UserBean ub : userBeans) {
+                String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
+                tmpUserShow += ub.getUserName() +" "+ lawCertificateNum + ",";
+            }
+            if (tmpUserShow.length() > 0) {
+                tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);
+            }
+            reg.setLawEnforcer2Show(tmpUserShow);
+
+            // 字典回显
+            DictDataBean dictParams = new DictDataBean();
+            // 执法领域
+            if (StringUtils.isNotEmpty(reg.getLawField())) {
+                dictParams.setDictType("law_field");
+                List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
+                for (DictDataBean d : dicts) {
+                    if (d.getDictValue().equals(reg.getLawField())) {
+                        reg.setLawFieldText(d.getDictLabel());
+                        break;
+                    }
+                }
+            }
+            // 执法类别
+            if (StringUtils.isNotEmpty(reg.getCheckCategory())) {
+                dictParams.setDictType("check_category");
+                List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
+                for (DictDataBean d : dicts) {
+                    if (d.getDictValue().equals(reg.getCheckCategory())) {
+                        reg.setCheckCategoryText(d.getDictLabel());
+                        break;
+                    }
+                }
+            }
+            // 评价
+
+            //查询行政检查评价
+            EnterpriseEvaluate enterpriseEvaluate = new EnterpriseEvaluate();
+//        if (StringUtils.isNotEmpty(enforcementRegistration.getUniteCheck())) {
+//            enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(enforcementRegistration.getUniteCheck());
+//        } else {
+            enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(enforcementRegistration.getId());
+//        }
+            reg.setEnterpriseEvaluate(enterpriseEvaluate);
+        }
+        Map<String, List> result = new HashMap<>();
+        result.put("regResults", regResults);
+        result.put("lawResults", lawResults);
+        return ZDResponse.success("查询成功",result);
+    }
+
     /**
      * 查询附件信息
      *
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java
index dc563913..093dbc12 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java
@@ -22,6 +22,7 @@ public interface EnforcementRegistrationMapper
      * @return 执法端-执法登记
      */
     EnforcementRegistration selectEnforcementRegistrationById(String id);
+    EnforcementRegistration selectEnforcementRegistrationByLawId(String id);
 
     /**
      * 查询执法端-执法登记列表
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java
index 5bad5204..04188446 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java
@@ -26,6 +26,7 @@ public interface EnterpriseEvaluateMapper
      * @return
      */
     public EnterpriseEvaluate selectEnterpriseEvaluateByRelId(String relId);
+    public EnterpriseEvaluate selectEnterpriseEvaluateByUniteCheck(String uniteCheck);
 
     /**
      * 查询企业端-执法评价列表
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
index 1e4f0f79..1f585f57 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
@@ -22,6 +22,7 @@ public interface IEnforcementRegistrationService
      * @return 执法端-执法登记
      */
     EnforcementRegistration selectEnforcementRegistrationById(String id);
+    EnforcementRegistration selectEnforcementRegistrationByLawId(String id);
     EnforcementRegistration getEnforcementRegistrationById(String id);
 
     /**
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java
index 4096afa6..a8f08555 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java
@@ -26,6 +26,7 @@ public interface IEnterpriseEvaluateService
      * @return 企业端-执法评价
      */
     public EnterpriseEvaluate selectEnterpriseEvaluateByRelId(String relId);
+    public EnterpriseEvaluate selectEnterpriseEvaluateByUniteCheck(String uniteCheck);
 
     /**
      * 查询企业端-执法评价列表
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
index 691eab0e..5797b3a8 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
@@ -86,6 +86,49 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         }
         if(enforcementRegistration.getSubsidiaryerId() != null){
 //            UserBean user = userApi.getUserByUserId(enforcementRegistration.getSubsidiaryerId());
+//            enforcementRegistration.setSubsidiaryer(enforcementRegistration.getSubsidiaryer() + " " + user.getLawCertificateNum() );
+            enforcementRegistration.setSubsidiaryer(enforcementRegistration.getSubsidiaryer());
+        }
+        if(StrUtil.isNotEmpty(enforcementRegistration.getLawEnforcementItem())) {
+            LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(enforcementRegistration.getLawEnforcementItem());
+            if (BeanUtil.isNotEmpty(linkageDict) && StrUtil.isNotEmpty(linkageDict.getId())) {
+                enforcementRegistration.setLawEnforcementItemText(linkageDict.getTitle());
+            }
+        }
+        if(StrUtil.isNotEmpty(enforcementRegistration.getLawEnforcementBasis())) {
+            LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(enforcementRegistration.getLawEnforcementBasis());
+            if (BeanUtil.isNotEmpty(linkageDict) && StrUtil.isNotEmpty(linkageDict.getId())) {
+                enforcementRegistration.setLawEnforcementBasisText(linkageDict.getTitle());
+            }
+        }
+        //查询行政检查评价
+        EnterpriseEvaluate enterpriseEvaluate = new EnterpriseEvaluate();
+//        if (StringUtils.isNotEmpty(enforcementRegistration.getUniteCheck())) {
+//            enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(enforcementRegistration.getUniteCheck());
+//        } else {
+            enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(enforcementRegistration.getId());
+//        }
+        enforcementRegistration.setEnterpriseEvaluate(enterpriseEvaluate);
+        return enforcementRegistration;
+    }
+
+
+    @Override
+    public EnforcementRegistration selectEnforcementRegistrationByLawId(String id)
+    {
+        EnforcementRegistration enforcementRegistration = enforcementRegistrationMapper.selectEnforcementRegistrationByLawId(id);
+        if(enforcementRegistration.getLawEnforcerId() != null){
+//            UserBean user = userApi.getUserByUserId(enforcementRegistration.getLawEnforcerId());
+//            enforcementRegistration.setLawEnforcer(enforcementRegistration.getLawEnforcer() + " " + user.getLawCertificateNum() );
+            enforcementRegistration.setLawEnforcer(enforcementRegistration.getLawEnforcer());
+        }
+        if(enforcementRegistration.getLawEnforcerIdTwo() != null){
+//            List<UserBean> users = userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo());
+//            enforcementRegistration.setLawEnforcerTwo(enforcementRegistration.getLawEnforcerTwo() + " " + user.getLawCertificateNum() );
+            enforcementRegistration.setLawEnforcerTwo(enforcementRegistration.getLawEnforcerTwo());
+        }
+        if(enforcementRegistration.getSubsidiaryerId() != null){
+//            UserBean user = userApi.getUserByUserId(enforcementRegistration.getSubsidiaryerId());
 //            enforcementRegistration.setSubsidiaryer(enforcementRegistration.getSubsidiaryer() + " " + user.getLawCertificateNum() );
             enforcementRegistration.setSubsidiaryer(enforcementRegistration.getSubsidiaryer());
         }
@@ -126,18 +169,6 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     {
         List<EnforcementRegistration> enforcementRegistrations =
                 enforcementRegistrationMapper.selectEnforcementRegistrationList(enforcementRegistration);
-        //TODO 客户提出检查事项修改为手填，取消字典回显
-//        for (EnforcementRegistration registration : enforcementRegistrations) {
-//            LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(registration.getLawEnforcementItem());
-//            if(BeanUtil.isNotEmpty(linkageDict) && StrUtil.isNotEmpty(linkageDict.getId())){
-//                registration.setLawEnforcementItemText(linkageDict.getTitle());
-//            }
-//            LinkageDict linkageBasic = linkageDictMapper.selectLinkageDictById(registration.getLawEnforcementBasis());
-//            if(BeanUtil.isNotEmpty(linkageBasic) && StrUtil.isNotEmpty(linkageBasic.getId())){
-//                registration.setLawEnforcementBasisText(linkageBasic.getTitle());
-//            }
-//        }
-
         return enforcementRegistrations;
     }
 
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java
index 3654755f..617efffd 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java
@@ -58,6 +58,10 @@ public class EnterpriseEvaluateServiceImpl implements IEnterpriseEvaluateService
     public EnterpriseEvaluate selectEnterpriseEvaluateByRelId(String relId) {
         return enterpriseEvaluateMapper.selectEnterpriseEvaluateByRelId(relId);
     }
+    @Override
+    public EnterpriseEvaluate selectEnterpriseEvaluateByUniteCheck(String uniteCheck) {
+        return enterpriseEvaluateMapper.selectEnterpriseEvaluateByUniteCheck(uniteCheck);
+    }
 
     /**
      * 查询企业端-执法评价列表
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java
index ddd8cf54..6dc5db09 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java
@@ -138,6 +138,7 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
 //        }
         return enterpriseLawEnforcements;
     }
+
     @Override
     public long selectTotal(EnterpriseLawEnforcement enterpriseLawEnforcement) {
         return enterpriseLawEnforcementMapper.selectTotal(enterpriseLawEnforcement);
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index c048b1db..6826387f 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -235,6 +235,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectEnforcementRegistrationVo"/>
         where id = #{id}
     </select>
+    <select id="selectEnforcementRegistrationByLawId" parameterType="String" resultMap="EnforcementRegistrationResult">
+        <include refid="selectEnforcementRegistrationVo"/>
+        where law_id = #{id}
+    </select>
         
     <insert id="insertEnforcementRegistration" parameterType="EnforcementRegistration">
         insert into enforcement_registration
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml
index 9defe7b4..d27167ad 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml
@@ -47,6 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectEnterpriseEvaluateVo"/>
         where enforcement_id = #{id}
     </select>
+
+    <select id="selectEnterpriseEvaluateByUniteCheck" parameterType="String" resultMap="EnterpriseEvaluateResult">
+        <include refid="selectEnterpriseEvaluateVo"/>
+        where unite_check = #{id}
+    </select>
         
     <insert id="insertEnterpriseEvaluate" parameterType="EnterpriseEvaluate">
         insert into enterprise_evaluate
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
index 06dc1bd2..fc35ea3a 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isSubmit != null "> and is_submit = #{isSubmit}</if>
             <if test="lawEnforcementItem != null and lawEnforcementItem != ''"> and law_enforcement_item like concat('%', #{lawEnforcementItem}, '%')</if>
             <if test="lawEnforcementCode != null and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
-            <if test="lawEnforcerId != null  and lawEnforcerId != ''"> and law_enforcer_id = #{lawEnforcerId}</if>
+            <if test="lawEnforcerId != null  and lawEnforcerId != ''"> and (law_enforcer_id = #{lawEnforcerId} or find_in_set (#{lawEnforcerId}, law_enforcer_two_id))</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
@@ -110,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by check_time desc
     </select>
+
     <select id="selectTotal" parameterType="EnterpriseLawEnforcement" resultType="long">
         select count(1) from enterprise_law_enforcement
         <where>