代码修改

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/dao/SignFamilyRenewLogDao.java

@@ -40,4 +40,7 @@ public interface SignFamilyRenewLogDao extends PagingAndSortingRepository<SignFa
     */
    @Query("select a from SignFamilyRenewLog a where a.doctor<>a.oldDoctor")
    List<SignFamilyRenewLog> findChangeDoctor(Pageable pageable) throws Exception;
    @Query("select a.proId from SignFamilyRenewLog a where a.signCode=?1")
    String getProId(String signCode);
}

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/service/ChargeZYService.java

@@ -37,6 +37,8 @@ public class ChargeZYService {
    private PatientDao patientDao;
    @Autowired
    private SignFamilyMappingDao signFamilyMappingDao;
    @Autowired
    private SignFamilyRenewLogDao signFamilyRenewLogDao;
    /**
     * 获取机构映射
@@ -122,7 +124,13 @@ public class ChargeZYService {
                params.put("CHARGE_TIME", DateUtil.dateToStrLong(sign.getExpensesTime()));  //缴费时间
                params.put("INSUR_PRO_ID", charge.getMiRegisterNo());  //医保签约号
                proId = signFamilyMappingDao.getProId(signCode);
                if("1".equals(sign.getRenewFlag())){
                    proId = signFamilyRenewLogDao.getProId(signCode);
                }else {
                    proId = signFamilyMappingDao.getProId(signCode);
                }
                params.put("PRO_ID", proId);  //标志(智业签约主键)
                operator = doctorMappingDao.findByDocotrCodeAndJwDoctorHospital(operator,hm[0]);  //【医生映射】